Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[martinf] 44996: fix TCHAR array initialization
by martinf＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: martinf Date: Fri Jan 8 14:19:48 2010 New Revision: 44996 URL: http://svn.reactos.org/svn/reactos?rev=44996&view=rev Log: fix TCHAR array initialization Modified: trunk/reactos/base/shell/explorer/ (props changed) trunk/reactos/base/shell/explorer/doc/TODO.txt trunk/reactos/base/shell/explorer/shell/mainframe.cpp Propchange: trunk/reactos/base/shell/explorer/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Fri Jan 8 14:19:48 2010 @@ -5,3 +5,14 @@ *.ncb *.suo *.sln +Debug +doxy-doc +Release +UDebug +URelease +Win32 +*.chm +*.dll +*.aps +*.gch +*.exe Modified: trunk/reactos/base/shell/explorer/doc/TODO.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/doc/TO… ============================================================================== --- trunk/reactos/base/shell/explorer/doc/TODO.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/doc/TODO.txt [iso-8859-1] Fri Jan 8 14:19:48 2010 @@ -1,3 +1,15 @@ +I noticed two things: + +1) The painting isn't done quite properly in the top, right part (the +empty menu/toolbar area part) of the explorer when in SDI mode. + +2) When you switch back and forth from SDI to MDI, the toolbar +settings (i.e., which ones to show) are not conserved. + +I found these issues while running your explorer from Windows XP SP2's explorer. + + +- update problem in folders opened from the desktop in SDI mode - Combobox to switch the second input field between "Filter" and "Command" - rewrite autostart code and include all possible autostart locations - read "DESCRIPT.ION" files to display file descriptions Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shell/… ============================================================================== --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp [iso-8859-1] Fri Jan 8 14:19:48 2010 @@ -154,8 +154,8 @@ { HDC hDC = GetDC(NULL); #ifndef _NO_REBAR - //static WCHAR Title1[] = TEXT("Toolbar"); - static WCHAR Title2[] = TEXT("Address :"); + //static TCHAR Title1[] = TEXT("Toolbar"); + static TCHAR Title2[] = TEXT("Address :"); #endif if (hDC)

1 0

[arty] 44995: Keep pages referenced while paging out so we can follow the LRU chain in all cases. Explicitly handle STATUS_MM_RESTART_OPERATION like we used to. My previous code for pulling in a page, then faulting it into the address space wasn't correct; we take the easier route of pretending we're starting fresh once we've pulled the page into the section. MmDeleteSectionAssociation is now necessary since we may not hold the (quite) last reference.
by arty＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: arty Date: Fri Jan 8 11:26:30 2010 New Revision: 44995 URL: http://svn.reactos.org/svn/reactos?rev=44995&view=rev Log: Keep pages referenced while paging out so we can follow the LRU chain in all cases. Explicitly handle STATUS_MM_RESTART_OPERATION like we used to. My previous code for pulling in a page, then faulting it into the address space wasn't correct; we take the easier route of pretending we're starting fresh once we've pulled the page into the section. MmDeleteSectionAssociation is now necessary since we may not hold the (quite) last reference. Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h branches/arty-newcc/ntoskrnl/mm/balance.c branches/arty-newcc/ntoskrnl/mm/freelist.c branches/arty-newcc/ntoskrnl/mm/mmfault.c branches/arty-newcc/ntoskrnl/mm/rmap.c branches/arty-newcc/ntoskrnl/mm/section/data.c branches/arty-newcc/ntoskrnl/mm/section/fault.c branches/arty-newcc/ntoskrnl/mm/section/pagefile.c Modified: branches/arty-newcc/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/include/int… ============================================================================== --- branches/arty-newcc/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/include/internal/mm.h [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -2207,7 +2207,7 @@ _MmTryToLockAddressSpace(IN PMMSUPPORT AddressSpace, const char *file, int line) { BOOLEAN Result = KeTryToAcquireGuardedMutex(&CONTAINING_RECORD(AddressSpace, EPROCESS, Vm)->AddressCreationLock); - DbgPrint("(%s:%d) Try Lock Address Space %x -> %s\n", file, line, AddressSpace, Result ? "true" : "false"); + //DbgPrint("(%s:%d) Try Lock Address Space %x -> %s\n", file, line, AddressSpace, Result ? "true" : "false"); return Result; } Modified: branches/arty-newcc/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/balance.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/balance.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -33,7 +33,7 @@ BOOLEAN MiBalancerInitialized = FALSE; MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; -/*static*/ ULONG MiMinimumAvailablePages = 0x3000; +/*static*/ ULONG MiMinimumAvailablePages = 128; static ULONG MiNrTotalPages; static LIST_ENTRY AllocationListHead; static KSPIN_LOCK AllocationListLock; @@ -137,21 +137,19 @@ MmTrimUserMemory(ULONG Target, ULONG Priority, PULONG NrFreedPages) { PFN_TYPE CurrentPage; - PFN_TYPE NextPage; NTSTATUS Status; (*NrFreedPages) = 0; DPRINT("Trimming user memory (want %d)\n", Target); - + + // Current page is referenced CurrentPage = MmGetLRUFirstUserPage(); while (CurrentPage != 0 && Target > 0) { - //DPRINT("Trying page %x\n", CurrentPage); - NextPage = MmGetLRUNextUserPage(CurrentPage); Status = MmPageOutPhysicalAddress(CurrentPage); - //DPRINT("Status: %x\n", Status); if (NT_SUCCESS(Status)) { + MmRemoveLRUUserPage(CurrentPage); Target--; (*NrFreedPages)++; } @@ -160,9 +158,12 @@ MmRemoveLRUUserPage(CurrentPage); MmInsertLRULastUserPage(CurrentPage); } - - CurrentPage = NextPage; + + // Reference is updated + CurrentPage = MmGetLRUNextUserPage(CurrentPage); } + if (CurrentPage) + MmDereferencePage(CurrentPage); // Dereference matches MmGetLRUFirst/Next DPRINT("Done\n"); return(STATUS_SUCCESS); } Modified: branches/arty-newcc/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/freelist… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/freelist.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -107,6 +107,7 @@ } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); ASSERT_PFN(PageDescriptor); + MmReferencePage(PageDescriptor - MmPfnDatabase); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); return PageDescriptor - MmPfnDatabase; } @@ -148,7 +149,9 @@ return 0; } PageDescriptor = CONTAINING_RECORD(NextListEntry, PHYSICAL_PAGE, ListEntry); + MmReferencePage(PageDescriptor - MmPfnDatabase); KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); + MmDereferencePage(PreviousPfn); return PageDescriptor - MmPfnDatabase; } @@ -156,7 +159,10 @@ NTAPI MmRemoveLRUUserPage(PFN_TYPE Page) { + KIRQL oldIrql; + oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); RemoveEntryList(&MiGetPfnEntry(Page)->ListEntry); + KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } PFN_NUMBER Modified: branches/arty-newcc/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/mmfault.… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/mmfault.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -172,6 +172,11 @@ ASSERT(FALSE); DPRINT("Restarting fault %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; + } + else if (Status == STATUS_MM_RESTART_OPERATION) + { + // Clean slate + RtlZeroMemory(&Resources, sizeof(Resources)); } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) { @@ -355,6 +360,11 @@ DPRINT("Done waiting for %x\n", Address); Status = STATUS_MM_RESTART_OPERATION; } + else if (Status == STATUS_MM_RESTART_OPERATION) + { + // Clean slate + RtlZeroMemory(&Resources, sizeof(Resources)); + } else if (Status == STATUS_MORE_PROCESSING_REQUIRED) { if (Thread->ActiveFaultCount > 1) @@ -413,7 +423,8 @@ PETHREAD Thread; PMMSUPPORT AddressSpace; NTSTATUS Status; - + + Address &= ~(PAGE_SIZE - 1); DPRINT("MmNotPresentFault(Mode %d, Address %x)\n", Mode, Address); Thread = PsGetCurrentThread(); @@ -461,6 +472,8 @@ IN PVOID TrapInformation) { PMEMORY_AREA MemoryArea; + + Address = (PVOID)(((ULONG_PTR)Address) & ~(PAGE_SIZE - 1)); /* Cute little hack for ROS */ if ((ULONG_PTR)Address >= (ULONG_PTR)MmSystemRangeStart) Modified: branches/arty-newcc/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/rmap.c?r… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/rmap.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -349,7 +349,7 @@ if (MmGetRmapListHeadPage(Page)) { - DPRINT1("Page %x was re-acquired while we were evicting it\n", Page); + DPRINT("Page %x was re-acquired while we were evicting it\n", Page); MmLockSectionSegment(Segment); MiSetPageEntrySectionSegment(Segment, &FileOffset, Dirty ? DIRTY_SSE(MAKE_PFN_SSE(SectionPage)) : MAKE_PFN_SSE(SectionPage)); MmUnlockSectionSegment(Segment); @@ -366,7 +366,7 @@ if (!Evicted && SectionPage) { - DPRINT1 + DPRINT ("Failed to page out, replacing %x at %x in segment %x\n", SectionPage, FileOffset.LowPart, Segment); MmLockSectionSegment(Segment); Modified: branches/arty-newcc/ntoskrnl/mm/section/data.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/data.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -1174,7 +1174,7 @@ MiWriteBackPage(FileObject, FileOffset, PAGE_SIZE, OldPage); DPRINT("Dereference page %x\n", OldPage); } - ASSERT(MmGetReferenceCountPage(OldPage) == 1); + MmDeleteSectionAssociation(OldPage); MmDereferencePage(OldPage); DPRINT("Done\n"); } Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/fault.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -97,6 +97,8 @@ &MemoryArea->Data.SectionData.RegionListHead, Address, NULL); + ASSERT(Region); + TotalOffset.QuadPart += MemoryArea->Data.SectionData.ViewOffset.QuadPart; FileOffset = TotalOffset; @@ -145,27 +147,41 @@ if (Required->State && Required->Page[0]) { - DPRINT("Have file and page, set page in section @ %x\n", TotalOffset.LowPart); - Status = MiSetPageEntrySectionSegment - (Segment, &TotalOffset, Entry = MAKE_PFN_SSE(Required->Page[0])); - if (NT_SUCCESS(Status)) - { - MmReferencePage(Required->Page[0]); + DPRINT("Have file and page, set page %x in section @ %x\n", Required->Page[0], TotalOffset.LowPart); + if (Required->State & 2) + { + Status = MiSetPageEntrySectionSegment + (Segment, &TotalOffset, Entry = MAKE_PFN_SSE(Required->Page[0])); + if (!NT_SUCCESS(Status)) + { + MmDereferencePage(Required->Page[0]); + } + MmUnlockSectionSegment(Segment); + DPRINT("XXX Set Event %x\n", Status); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + DPRINT("Status %x\n", Status); + return STATUS_MM_RESTART_OPERATION; + } + else + { + DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); if (NT_SUCCESS(Status)) { MmInsertRmap(Required->Page[0], Process, Address); + if (Locked) MmLockPage(Required->Page[0]); } else { + // Drop the reference for our address space ... MmDereferencePage(Required->Page[0]); } - } - MmUnlockSectionSegment(Segment); - DPRINT("XXX Set Event %x\n", Status); - KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); - DPRINT("Status %x\n", Status); - return Status; + MmUnlockSectionSegment(Segment); + DPRINT("XXX Set Event %x\n", Status); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + DPRINT("Status %x\n", Status); + return Status; + } } else if (MmIsPageSwapEntry(Process, Address)) { @@ -180,8 +196,7 @@ else { DPRINT("Swap in\n"); - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); - Required->State = 7; + Required->State = 1; Required->Consumer = Consumer; Required->SwapEntry = SwapEntry; Required->DoAcquisition = MiSwapInPage; @@ -201,9 +216,7 @@ else { DPRINT("Swap in\n"); - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); - MiSetPageEntrySectionSegment(Segment, &TotalOffset, MAKE_SWAP_SSE(MM_WAIT_ENTRY)); - Required->State = 7; + Required->State = 3; Required->Consumer = Consumer; Required->SwapEntry = SwapEntry; Required->DoAcquisition = MiSwapInPage; @@ -220,6 +233,7 @@ if (NT_SUCCESS(Status)) { MmInsertRmap(Page, Process, Address); + if (Locked) MmLockPage(Required->Page[0]); Required->Page[0] = 0; } DPRINT("XXX Set Event %x\n", Status); @@ -241,7 +255,7 @@ (IMAGE_SCN_CNT_CODE | IMAGE_SCN_CNT_INITIALIZED_DATA)))) { DPRINT("Read from file %08x\n", FileOffset.LowPart); - Required->State = 1; + Required->State = 3; Required->Context = Section->FileObject; Required->Consumer = Consumer; Required->FileOffset = FileOffset; @@ -252,7 +266,7 @@ else { DPRINT("Get Page\n"); - Required->State = 1; + Required->State = 3; Required->Amount = 1; Required->Consumer = Consumer; Required->DoAcquisition = MiGetOnePage; @@ -338,45 +352,47 @@ if (Required->Page[0] && Required->State) { - Page = Required->Page[0]; - DPRINT("Have Page: %x %d\n", Page, Required->State); - if (Required->State & 1) + if (Required->State & 2) { DPRINT("Set in section @ %x\n", Offset.LowPart); Status = MiSetPageEntrySectionSegment - (Segment, &Offset, MAKE_PFN_SSE(Page)); - } - - if (Required->State & 2) - { - DPRINT("Set in address space @ %x\n", Address); - Status = MmCreateVirtualMapping - (Process, Address, Attributes, &Page, 1); + (Segment, &Offset, Entry = MAKE_PFN_SSE(Required->Page[0])); + if (!NT_SUCCESS(Status)) + { + MmDereferencePage(Required->Page[0]); + } + MmUnlockSectionSegment(Segment); + DPRINT("XXX Set Event %x\n", Status); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + DPRINT("Status %x\n", Status); + return STATUS_MM_RESTART_OPERATION; + } + else + { + DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); + Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); if (NT_SUCCESS(Status)) { - MmInsertRmap(Page, Process, Address); - if (Locked) MmLockPage(Page); + MmInsertRmap(Required->Page[0], Process, Address); + if (Locked) MmLockPage(Required->Page[0]); } - } - - if (Required->State & 4) - { - DPRINT("Take a reference\n"); - Status = STATUS_SUCCESS; - MmReferencePage(Page); - } - - MmUnlockSectionSegment(Segment); - DPRINT("XXX Set Event %x\n", Status); - KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); - DPRINT("Done: %x\n", Status); - return Status; + else + { + // Drop the reference for our address space + MmDereferencePage(Required->Page[0]); + } + MmUnlockSectionSegment(Segment); + DPRINT("XXX Set Event %x\n", Status); + KeSetEvent(&MmWaitPageEvent, IO_NO_INCREMENT, FALSE); + DPRINT("Done: %x\n", Status); + return Status; + } } if (Entry == 0 && !HasSwapEntry && Offset.QuadPart < PAGE_ROUND_UP(Segment->RawLength.QuadPart)) { - Required->State = 7; + Required->State = 3; Required->Context = Section->FileObject; Required->Consumer = MC_USER; Required->FileOffset.QuadPart = Offset.QuadPart + Segment->Image.FileOffset; @@ -398,8 +414,7 @@ * Must be private page we have swapped out. */ DPRINT("Private swapped out page\n"); - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); - Required->State = 2; + Required->State = 1; Required->Consumer = MC_USER; Required->DoAcquisition = MiSwapInPage; MmUnlockSectionSegment(Segment); @@ -414,10 +429,9 @@ else if (IS_SWAP_FROM_SSE(Entry)) { DPRINT("Swap in section page\n"); - Required->State = 7; + Required->State = 3; Required->Consumer = MC_USER; MmGetPageFileMapping(Process, (PVOID)PAddress, &Required->SwapEntry); - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); Required->DoAcquisition = MiSwapInPage; MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; @@ -430,7 +444,7 @@ Offset.QuadPart >= PAGE_ROUND_UP(Segment->RawLength.QuadPart))) { DPRINT("BSS Page\n"); - Required->State = 2; + Required->State = 1; Required->Amount = 1; Required->Consumer = MC_USER; Required->DoAcquisition = MiGetOnePage; @@ -835,7 +849,6 @@ } DPRINT("MiWriteSwapPage (%x -> %x)\n", OurPage, Required->SwapEntry); Required->DoAcquisition = MiWriteSwapPage; - MmCreatePageFileMapping(Process, Address, MM_WAIT_ENTRY); MmUnlockSectionSegment(Segment); return STATUS_MORE_PROCESSING_REQUIRED; } Modified: branches/arty-newcc/ntoskrnl/mm/section/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/mm/section/pagefile.c [iso-8859-1] Fri Jan 8 11:26:30 2010 @@ -176,7 +176,7 @@ Status = STATUS_PAGEFILE_QUOTA; else { - DPRINT("Writing to swap page\n"); + DPRINT1("Writing to swap %x page %x\n", Swap, Page); Status = MmWriteToSwapPage(Swap, Page); } @@ -207,7 +207,7 @@ if (WritePage) { - DPRINT("Segment %x FileObject %x Offset %x\n", Segment, Segment->FileObject, FileOffset->LowPart); + DPRINT1("MiWriteBackPage(Segment %x FileObject %x Offset %x)\n", Segment, Segment->FileObject, FileOffset->LowPart); Status = MiWriteBackPage(Segment->FileObject, FileOffset, PAGE_SIZE, Page); } @@ -215,6 +215,7 @@ { DPRINT("Removing page %x for real\n", Page); MmSetSavedSwapEntryPage(Page, 0); + MmDeleteSectionAssociation(Page); MmDereferencePage(Page); }

1 0

[mjmartin] 44994: [usb/usbehci] - CompletePendingRequest: Release the spinlock before and reacquire it after calling IoCallDriver
by mjmartin＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: mjmartin Date: Fri Jan 8 10:55:18 2010 New Revision: 44994 URL: http://svn.reactos.org/svn/reactos?rev=44994&view=rev Log: [usb/usbehci] - CompletePendingRequest: Release the spinlock before and reacquire it after calling IoCallDriver Modified: trunk/reactos/drivers/usb/usbehci/misc.c Modified: trunk/reactos/drivers/usb/usbehci/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] Fri Jan 8 10:55:18 2010 @@ -58,13 +58,12 @@ DPRINT("DescriptorType %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); DPRINT("LanguageId %x\n", Urb->UrbControlDescriptorRequest.LanguageId); - KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); - Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); IoCompleteRequest(Irp, IO_NO_INCREMENT); - return; + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); } KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql);

1 0

[mjmartin] 44993: [usb/usbehci] - Initial implementation of usbehci, aka USB 2.0. - Implement AddDevice, StartDevice, InterruptService and DPC Routines. - Implement basic IRP queuing and handling. - Implement starting, stopping of EHCI controller and querying port capabilities. - Implement PNP for Query Relations, Query ID, Query BusInfo. - Implement finding the active ports when USB devices are attached and releasing control to companion controller if devices is not a high speed devices. - Impl
by mjmartin＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: mjmartin Date: Fri Jan 8 10:34:36 2010 New Revision: 44993 URL: http://svn.reactos.org/svn/reactos?rev=44993&view=rev Log: [usb/usbehci] - Initial implementation of usbehci, aka USB 2.0. - Implement AddDevice, StartDevice, InterruptService and DPC Routines. - Implement basic IRP queuing and handling. - Implement starting, stopping of EHCI controller and querying port capabilities. - Implement PNP for Query Relations, Query ID, Query BusInfo. - Implement finding the active ports when USB devices are attached and releasing control to companion controller if devices is not a high speed devices. - Implement reporting devices connects to upper Pdo (hub) driver. - Hub driver attaches successfully and sends URBs to query descriptors from USB devices on Windows. - Currently not build enabled as it will cause problems with current UsbDriver in trunk. - Code heavily based on current PCI drivers and UsbDriver from trunk. Added: trunk/reactos/drivers/usb/usbehci/ (with props) trunk/reactos/drivers/usb/usbehci/common.c (with props) trunk/reactos/drivers/usb/usbehci/fdo.c (with props) trunk/reactos/drivers/usb/usbehci/misc.c (with props) trunk/reactos/drivers/usb/usbehci/pdo.c (with props) trunk/reactos/drivers/usb/usbehci/usbehci.c (with props) trunk/reactos/drivers/usb/usbehci/usbehci.h (with props) trunk/reactos/drivers/usb/usbehci/usbehci.rbuild (with props) trunk/reactos/drivers/usb/usbehci/usbehci.rc (with props) Propchange: trunk/reactos/drivers/usb/usbehci/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Jan 8 10:34:36 2010 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Added: trunk/reactos/drivers/usb/usbehci/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/common… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/common.c (added) +++ trunk/reactos/drivers/usb/usbehci/common.c [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,147 @@ + +#define INITGUID +#include "usbehci.h" +#include <wdmguid.h> +#include <stdio.h> +#define NDEBUG +#include <debug.h> + +/* PUBLIC AND PRIVATE FUNCTIONS ***********************************************/ + +NTSTATUS NTAPI +GetBusInterface(PDEVICE_OBJECT DeviceObject, PBUS_INTERFACE_STANDARD busInterface) +{ + KEVENT Event; + NTSTATUS Status; + PIRP Irp; + IO_STATUS_BLOCK IoStatus; + PIO_STACK_LOCATION Stack; + + if ((!DeviceObject) || (!busInterface)) + return STATUS_UNSUCCESSFUL; + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + Irp = IoBuildSynchronousFsdRequest(IRP_MJ_PNP, + DeviceObject, + NULL, + 0, + NULL, + &Event, + &IoStatus); + + if (Irp == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Stack=IoGetNextIrpStackLocation(Irp); + Stack->MajorFunction = IRP_MJ_PNP; + Stack->MinorFunction = IRP_MN_QUERY_INTERFACE; + Stack->Parameters.QueryInterface.Size = sizeof(BUS_INTERFACE_STANDARD); + Stack->Parameters.QueryInterface.InterfaceType = (LPGUID)&GUID_BUS_INTERFACE_STANDARD; + Stack->Parameters.QueryInterface.Version = 1; + Stack->Parameters.QueryInterface.Interface = (PINTERFACE)busInterface; + Stack->Parameters.QueryInterface.InterfaceSpecificData = NULL; + Irp->IoStatus.Status=STATUS_NOT_SUPPORTED ; + + Status=IoCallDriver(DeviceObject, Irp); + + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + + Status=IoStatus.Status; + } + + return Status; +} + +NTSTATUS NTAPI +ForwardAndWaitCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, PKEVENT Event) +{ + if (Irp->PendingReturned) + { + KeSetEvent(Event, IO_NO_INCREMENT, FALSE); + } + return STATUS_MORE_PROCESSING_REQUIRED; +} + +NTSTATUS NTAPI +ForwardAndWait(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PFDO_DEVICE_EXTENSION DeviceExtensions; + KEVENT Event; + NTSTATUS Status; + + + DeviceExtensions = DeviceObject->DeviceExtension; + KeInitializeEvent(&Event, NotificationEvent, FALSE); + IoCopyCurrentIrpStackLocationToNext(Irp); + IoSetCompletionRoutine(Irp, (PIO_COMPLETION_ROUTINE)ForwardAndWaitCompletionRoutine, &Event, TRUE, TRUE, TRUE); + Status = IoCallDriver(DeviceExtensions->LowerDevice, Irp); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Irp->IoStatus.Status; + } + + return Status; +} + +NTSTATUS NTAPI +ForwardIrpAndForget(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PDEVICE_OBJECT LowerDevice; + + LowerDevice = ((PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->LowerDevice; +DPRINT1("DeviceObject %x, LowerDevice %x\n", DeviceObject, LowerDevice); + ASSERT(LowerDevice); + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(LowerDevice, Irp); +} + +/* Copied fom trunk PCI drivers */ +NTSTATUS +DuplicateUnicodeString(ULONG Flags, PCUNICODE_STRING SourceString, PUNICODE_STRING DestinationString) +{ + if (SourceString == NULL || DestinationString == NULL + || SourceString->Length > SourceString->MaximumLength + || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) + || Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) + { + return STATUS_INVALID_PARAMETER; + } + + + if ((SourceString->Length == 0) + && (Flags != (RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE | + RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING))) + { + DestinationString->Length = 0; + DestinationString->MaximumLength = 0; + DestinationString->Buffer = NULL; + } + else + { + USHORT DestMaxLength = SourceString->Length; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestMaxLength += sizeof(UNICODE_NULL); + + DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + if (DestinationString->Buffer == NULL) + return STATUS_NO_MEMORY; + + RtlCopyMemory(DestinationString->Buffer, SourceString->Buffer, SourceString->Length); + DestinationString->Length = SourceString->Length; + DestinationString->MaximumLength = DestMaxLength; + + if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) + DestinationString->Buffer[DestinationString->Length / sizeof(WCHAR)] = 0; + } + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/usb/usbehci/common.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/fdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/fdo.c (added) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,819 @@ + +/* INCLUDES *******************************************************************/ +#include "usbehci.h" +#include <stdio.h> +//#include "ntstrsafe.h" + +VOID NTAPI +EhciDefferedRoutine(PKDPC Dpc, PVOID DeferredContext, PVOID SystemArgument1, PVOID SystemArgument2) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + ULONG CStatus; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; + + CStatus = (ULONG) SystemArgument2; + + /* Port Change */ + if (CStatus & EHCI_STS_PCD) + { + LONG i; + ULONG tmp; + ULONG Base; + + Base = (ULONG)FdoDeviceExtension->ResourceMemory; + + /* Loop through the ports */ + for (i = 0; i < FdoDeviceExtension->ECHICaps.HCSParams.PortCount; i++) + { + tmp = READ_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i))); + + /* Check for port change on this port */ + if (tmp & 0x02) + { + PIO_WORKITEM WorkItem = NULL; + + /* Connect or Disconnect? */ + if (tmp & 0x01) + { + DPRINT1("Device connected on port %d\n", i); + + /* Check if a companion host controller exists */ + if (FdoDeviceExtension->ECHICaps.HCSParams.CHCCount) + { + tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); + + /* Port should be in disabled state, as per USB 2.0 specs */ + if (tmp & 0x04) + { + DPRINT1("Warning: The port the device has just connected to is not disabled!\n"); + } + + /* Is this non high speed device */ + if (tmp & 0x400) + { + DPRINT1("Releasing ownership to companion host controller!\n"); + /* Release ownership to companion host controller */ + WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), 0x4000); + } + } + + KeStallExecutionProcessor(30); + DPRINT("port tmp %x\n", tmp); + + /* As per USB 2.0 Specs, 9.1.2. Reset the port and clear the status change */ + tmp |= 0x100 | 0x02; + /* Sanity, Disable port */ + tmp &= ~0x04; + + WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), tmp); + + KeStallExecutionProcessor(20); + + tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); + + DPRINT("port tmp %x\n", tmp); + + FdoDeviceExtension->ChildDeviceCount++; + CompletePendingRequest(FdoDeviceExtension); + + WorkItem = IoAllocateWorkItem(FdoDeviceExtension->Pdo); + + if (!WorkItem) + { + DPRINT1("WorkItem allocation failed!\n"); + } + + IoQueueWorkItem(WorkItem, + (PIO_WORKITEM_ROUTINE)DeviceArrivalWorkItem, + DelayedWorkQueue, + FdoDeviceExtension); + } + else + { + DPRINT1("Device disconnected on port %d\n", i); + + /* Clear status change */ + tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); + tmp |= 0x02; + WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), tmp); + } + + } + } + } +} + +BOOLEAN NTAPI +InterruptService(PKINTERRUPT Interrupt, PVOID ServiceContext) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PDEVICE_OBJECT DeviceObject = (PDEVICE_OBJECT) ServiceContext; + ULONG CurrentFrame; + ULONG Base; + ULONG CStatus = 0; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + + Base = (ULONG)FdoDeviceExtension->ResourceMemory; + + /* Read device status */ + CStatus = READ_REGISTER_ULONG ((PULONG) (Base + EHCI_USBSTS)); + CurrentFrame = READ_REGISTER_ULONG((PULONG) (Base + EHCI_FRINDEX)); + + CStatus &= (EHCI_ERROR_INT | EHCI_STS_INT | EHCI_STS_IAA | EHCI_STS_PCD | EHCI_STS_FLR); + + if ((!CStatus) || (FdoDeviceExtension->DeviceState == 0)) + { + /* This interrupt isnt for us or not ready for it. */ + return FALSE; + } + + /* Clear status */ + WRITE_REGISTER_ULONG((PULONG) (Base + EHCI_USBSTS), CStatus); + + if (CStatus & EHCI_ERROR_INT) + { + DPRINT1("EHCI Status=0x%x\n", CStatus); + } + + if (CStatus & EHCI_STS_FATAL) + { + DPRINT1("EHCI: Host System Error. Possible PCI problems.\n"); + ASSERT(FALSE); + } + + if (CStatus & EHCI_STS_HALT) + { + DPRINT("EHCI: Host Controller unexpected halt.\n"); + /* FIXME: Reset the controller */ + } + + if (CStatus & EHCI_STS_INT) + { + FdoDeviceExtension->AsyncComplete = TRUE; + } + + KeInsertQueueDpc(&FdoDeviceExtension->DpcObject, FdoDeviceExtension, (PVOID)CStatus); + + return TRUE; +} + +BOOLEAN +ResetPort(PDEVICE_OBJECT DeviceObject) +{ + + /*FIXME: Implement me */ + + return TRUE; +} + +VOID +StopEhci(PDEVICE_OBJECT DeviceObject) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PEHCI_USBCMD_CONTENT UsbCmd; + ULONG base; + LONG tmp; + + DPRINT1("Stopping Ehci controller\n"); + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + base = (ULONG)FdoDeviceExtension->ResourceMemory; + + WRITE_REGISTER_ULONG((PULONG) (base + EHCI_USBINTR), 0); + + tmp = READ_REGISTER_ULONG((PULONG) (base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT) & tmp; + UsbCmd->Run = 0; + WRITE_REGISTER_ULONG((PULONG) (base + EHCI_USBCMD), tmp); +} + +VOID +StartEhci(PDEVICE_OBJECT DeviceObject) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PEHCI_USBCMD_CONTENT UsbCmd; + PEHCI_USBSTS_CONTEXT usbsts; + NTSTATUS Status; + LONG tmp; + LONG tmp2; + ULONG base; + + DPRINT1("Starting Ehci controller\n"); + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + base = (ULONG)FdoDeviceExtension->ResourceMemory; + + tmp = READ_REGISTER_ULONG ((PULONG)(base + EHCI_USBCMD)); + + /* Stop the device */ + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->Run = 0; + WRITE_REGISTER_ULONG ((PULONG)(base + EHCI_USBCMD), tmp); + + /* Wait for the device to stop */ + for (;;) + { + KeStallExecutionProcessor(10); + tmp = READ_REGISTER_ULONG((PULONG)(base + EHCI_USBSTS)); + usbsts = (PEHCI_USBSTS_CONTEXT)&tmp; + + if (usbsts->HCHalted) + { + break; + } + DPRINT("Waiting for Halt, USBSTS: %x\n", READ_REGISTER_ULONG ((PULONG)(base + EHCI_USBSTS))); + } + + tmp = READ_REGISTER_ULONG ((PULONG)(base + EHCI_USBCMD)); + + /* Reset the device */ + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + UsbCmd->HCReset = TRUE; + WRITE_REGISTER_ULONG ((PULONG)(base + EHCI_USBCMD), tmp); + + /* Wait for the device to reset */ + for (;;) + { + KeStallExecutionProcessor(10); + tmp = READ_REGISTER_ULONG((PULONG)(base + EHCI_USBCMD)); + UsbCmd = (PEHCI_USBCMD_CONTENT)&tmp; + + if (!UsbCmd->HCReset) + { + break; + } + DPRINT("Waiting for reset, USBCMD: %x\n", READ_REGISTER_ULONG ((PULONG)(base + EHCI_USBCMD))); + } + + UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + + /* Disable Interrupts on the device */ + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBINTR), 0); + /* Clear the Status */ + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBSTS), 0x0000001f); + + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_CTRLDSSEGMENT), 0); + + /* Set the Periodic Frame List */ + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_PERIODICLISTBASE), FdoDeviceExtension->PeriodicFramListPhysAddr.LowPart); + /* Set the Async List Queue */ + WRITE_REGISTER_ULONG((PULONG) (base + EHCI_ASYNCLISTBASE), FdoDeviceExtension->AsyncListQueueHeadPtrPhysAddr.LowPart & ~(0x1f)); + + /* Set the ansync and periodic to disable */ + UsbCmd->PeriodicEnable = 0; + UsbCmd->AsyncEnable = 0; + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBCMD), tmp); + + /* Set the threshold */ + UsbCmd->IntThreshold = 1; + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBCMD), tmp); + + KeInitializeDpc(&FdoDeviceExtension->DpcObject, + EhciDefferedRoutine, + FdoDeviceExtension); + + Status = IoConnectInterrupt(&FdoDeviceExtension->EhciInterrupt, + InterruptService, + FdoDeviceExtension->DeviceObject, + NULL, + FdoDeviceExtension->Vector, + FdoDeviceExtension->Irql, + FdoDeviceExtension->Irql, + FdoDeviceExtension->Mode, + FdoDeviceExtension->IrqShared, + FdoDeviceExtension->Affinity, + FALSE); + + /* Turn back on interrupts */ + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBINTR), + EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR + | EHCI_USBINTR_FLROVR | EHCI_USBINTR_PC); + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBINTR), + EHCI_USBINTR_INTE | EHCI_USBINTR_ERR | EHCI_USBINTR_ASYNC | EHCI_USBINTR_HSERR + | EHCI_USBINTR_FLROVR | EHCI_USBINTR_PC); + + //UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; + + UsbCmd->Run = 1; + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_USBCMD), tmp); + + /* Wait for the device to start */ + for (;;) + { + KeStallExecutionProcessor(10); + tmp2 = READ_REGISTER_ULONG((PULONG)(base + EHCI_USBSTS)); + usbsts = (PEHCI_USBSTS_CONTEXT)&tmp2; + + if (!usbsts->HCHalted) + { + break; + } + DPRINT("Waiting for start, USBSTS: %x\n", READ_REGISTER_ULONG ((PULONG)(base + EHCI_USBSTS))); + } + + /* Set all port routing to ECHI controller */ + WRITE_REGISTER_ULONG((PULONG)(base + EHCI_CONFIGFLAG), 1); +} + +VOID +GetCapabilities(PFDO_DEVICE_EXTENSION DeviceExtension, ULONG Base) +{ + PEHCI_CAPS PCap; + PEHCI_HCS_CONTENT PHCS; + LONG i; + + if (!DeviceExtension) + return; + + PCap = &DeviceExtension->ECHICaps; + + PCap->Length = READ_REGISTER_UCHAR((PUCHAR)Base); + PCap->Reserved = READ_REGISTER_UCHAR((PUCHAR)(Base + 1)); + PCap->HCIVersion = READ_REGISTER_USHORT((PUSHORT)(Base + 2)); + PCap->HCSParamsLong = READ_REGISTER_ULONG((PULONG)(Base + 4)); + PCap->HCCParams = READ_REGISTER_ULONG((PULONG)(Base + 8)); + + + DPRINT("Length %d\n", PCap->Length); + DPRINT("Reserved %d\n", PCap->Reserved); + DPRINT("HCIVersion %x\n", PCap->HCIVersion); + DPRINT("HCSParams %x\n", PCap->HCSParamsLong); + DPRINT("HCCParams %x\n", PCap->HCCParams); + + + if (PCap->HCCParams & 0x02) + DPRINT1("Frame list size is configurable\n"); + + if (PCap->HCCParams & 0x01) + DPRINT1("64bit address mode not supported!\n"); + + DPRINT1("Number of Ports: %d\n", PCap->HCSParams.PortCount); + + if (PCap->HCSParams.PortPowerControl) + DPRINT1("Port Power Control is enabled\n"); + + if (!PCap->HCSParams.CHCCount) + { + DPRINT1("Number of Companion Host controllers %x\n", PCap->HCSParams.CHCCount); + DPRINT1("Number of Ports Per CHC: %d\n", PCap->HCSParams.PortPerCHC); + } + + /* Copied from USBDRIVER in trunk */ + PHCS = (PEHCI_HCS_CONTENT)&DeviceExtension->ECHICaps.HCSParams; + if (PHCS->PortRouteRules) + { + for (i = 0; i < 8; i++) + { + PCap->PortRoute[i] = READ_REGISTER_UCHAR((PUCHAR) (Base + 12 + i)); + } + } +} + +NTSTATUS +StartDevice(PDEVICE_OBJECT DeviceObject, PCM_PARTIAL_RESOURCE_LIST raw, PCM_PARTIAL_RESOURCE_LIST translated) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PCM_PARTIAL_RESOURCE_DESCRIPTOR resource; + DEVICE_DESCRIPTION DeviceDescription; + ULONG NumberResources; + ULONG iCount; + ULONG DeviceAddress; + ULONG PropertySize; + ULONG BusNumber; + NTSTATUS Status; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDescription.Master = TRUE; + DeviceDescription.ScatterGather = TRUE; + DeviceDescription.Dma32BitAddresses = TRUE; + DeviceDescription.DmaWidth = 2; + DeviceDescription.InterfaceType = PCIBus; + DeviceDescription.MaximumLength = EHCI_MAX_SIZE_TRANSFER; + + FdoDeviceExtension->pDmaAdapter = IoGetDmaAdapter(FdoDeviceExtension->LowerDevice, + &DeviceDescription, + &FdoDeviceExtension->MapRegisters); + + if (FdoDeviceExtension->pDmaAdapter == NULL) + { + DPRINT1("IoGetDmaAdapter failed!\n"); + ASSERT(FALSE); + } + + /* Allocate Common Buffer for Periodic Frame List */ + FdoDeviceExtension->PeriodicFramList = + FdoDeviceExtension->pDmaAdapter->DmaOperations->AllocateCommonBuffer(FdoDeviceExtension->pDmaAdapter, + sizeof(ULONG) * 1024, &FdoDeviceExtension->PeriodicFramListPhysAddr, FALSE); + + if (FdoDeviceExtension->PeriodicFramList == NULL) + { + DPRINT1("FdoDeviceExtension->PeriodicFramList is null\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Zeroize it */ + RtlZeroMemory(FdoDeviceExtension->PeriodicFramList, sizeof(ULONG) * 1024); + + /* Allocate Common Buffer for Async List Head Queue */ + FdoDeviceExtension->AsyncListQueueHeadPtr = + FdoDeviceExtension->pDmaAdapter->DmaOperations->AllocateCommonBuffer(FdoDeviceExtension->pDmaAdapter, + /* FIXME: Memory Size should be calculated using + structures sizes needed for queue head + 20480 (max data transfer */ + 20800, + &FdoDeviceExtension->AsyncListQueueHeadPtrPhysAddr, FALSE); + + if (FdoDeviceExtension->AsyncListQueueHeadPtr == NULL) + { + DPRINT1("Failed to allocate common buffer for AsyncListQueueHeadPtr!\n"); + return STATUS_UNSUCCESSFUL; + } + + /* Zeroize it */ + RtlZeroMemory(FdoDeviceExtension->AsyncListQueueHeadPtr, + /* FIXME: Same as FIXME above */ + 20800); + + Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, + DevicePropertyAddress, + sizeof(ULONG), + &DeviceAddress, + &PropertySize); + if (NT_SUCCESS(Status)) + { + DPRINT1("--->DeviceAddress: %x\n", DeviceAddress); + } + + Status = IoGetDeviceProperty(FdoDeviceExtension->LowerDevice, + DevicePropertyBusNumber, + sizeof(ULONG), + &BusNumber, + &PropertySize); + if (NT_SUCCESS(Status)) + { + DPRINT1("--->BusNumber: %x\n", BusNumber); + } + + /* Get the resources the PNP Manager gave */ + NumberResources = translated->Count; + DPRINT("NumberResources %d\n", NumberResources); + for (iCount = 0; iCount < NumberResources; iCount++) + { + DPRINT("Resource Info %d:\n", iCount); + resource = &translated->PartialDescriptors[iCount]; + switch(resource->Type) + { + case CmResourceTypePort: + { + DPRINT("Port Start: %x\n", resource->u.Port.Start); + DPRINT("Port Length %d\n", resource->u.Port.Length); + /* FIXME: Handle Ports */ + break; + } + case CmResourceTypeInterrupt: + { + DPRINT("Interrupt Vector: %x\n", resource->u.Interrupt.Vector); + FdoDeviceExtension->Vector = resource->u.Interrupt.Vector; + FdoDeviceExtension->Irql = resource->u.Interrupt.Level; + FdoDeviceExtension->Affinity = resource->u.Interrupt.Affinity; + FdoDeviceExtension->Mode = (resource->Flags == CM_RESOURCE_INTERRUPT_LATCHED) ? Latched : LevelSensitive; + FdoDeviceExtension->IrqShared = resource->ShareDisposition == CmResourceShareShared; + break; + } + case CmResourceTypeMemory: + { + ULONG ResourceBase = 0; + ULONG MemLength; + + DPRINT("Mem Start: %x\n", resource->u.Memory.Start); + DPRINT("Mem Length: %d\n", resource->u.Memory.Length); + + ResourceBase = (ULONG) MmMapIoSpace(resource->u.Memory.Start, resource->u.Memory.Length, FALSE); + DPRINT("ResourceBase %x\n", ResourceBase); + + FdoDeviceExtension->ResourceBase = (PULONG) ResourceBase; + GetCapabilities(FdoDeviceExtension, (ULONG)ResourceBase); + FdoDeviceExtension->ResourceMemory = (PULONG)((ULONG)ResourceBase + FdoDeviceExtension->ECHICaps.Length); + DPRINT("ResourceMemory %x\n", FdoDeviceExtension->ResourceMemory); + if (FdoDeviceExtension->ResourceBase == NULL) + { + DPRINT1("MmMapIoSpace failed!!!!!!!!!\n"); + } + MemLength = resource->u.Memory.Length; + FdoDeviceExtension->Size = MemLength; + + break; + } + case CmResourceTypeDma: + { + DPRINT("Dma Channel: %x\n", resource->u.Dma.Channel); + DPRINT("Dma Port: %d\n", resource->u.Dma.Port); + break; + } + default: + { + DPRINT1("PNP Manager gave invalid resource type!! Notify Developers!\n"); + ASSERT(FALSE); + break; + } + } + } + + StartEhci(DeviceObject); + FdoDeviceExtension->DeviceState = DEVICESTARTED; + return STATUS_SUCCESS; +} + +NTSTATUS +FdoQueryBusRelations( + PDEVICE_OBJECT DeviceObject, + PDEVICE_RELATIONS* pDeviceRelations) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_RELATIONS DeviceRelations = NULL; + PDEVICE_OBJECT Pdo; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + NTSTATUS Status; + ULONG UsbDeviceNumber = 0; + WCHAR CharDeviceName[64]; + UNICODE_STRING DeviceName; + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* Create the PDO */ + while (TRUE) + { + /* FIXME: Use safe string sprintf*/ + /* RtlStringCchPrintfW(CharDeviceName, 64, L"USBFDO-%d", UsbDeviceNumber); */ + swprintf(CharDeviceName, L"\\Device\\USBPDO-%d", UsbDeviceNumber); + RtlInitUnicodeString(&DeviceName, CharDeviceName); + DPRINT("DeviceName %wZ\n", &DeviceName); + + Status = IoCreateDevice(DeviceObject->DriverObject, + sizeof(PDO_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_BUS_EXTENDER, + 0, + FALSE, + &Pdo); + + if (NT_SUCCESS(Status)) + break; + + if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) + { + /* Try the next name */ + UsbDeviceNumber++; + continue; + } + + /* Bail on any other error */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("UsbEhci: Failed to create PDO %wZ, Status %x\n", &DeviceName, Status); + return Status; + } + } + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)Pdo->DeviceExtension; + RtlZeroMemory(PdoDeviceExtension, sizeof(PDO_DEVICE_EXTENSION)); + PdoDeviceExtension->Common.IsFdo = FALSE; + + PdoDeviceExtension->ControllerFdo = DeviceObject; + + Pdo->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceExtension->Pdo = Pdo; + + /*swprintf(CharSymLinkName, L"\\Device\\HCD%d", UsbDeviceNumber); + RtlInitUnicodeString(&SymLinkName, CharSymLinkName); + Status = IoCreateSymbolicLink(&SymLinkName, &DeviceName); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Warning: Unable to create symbolic link for ehci usb device!\n"); + }*/ + + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); + if (!DeviceRelations) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = Pdo; + ObReferenceObject(Pdo); + + *pDeviceRelations = DeviceRelations; + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +FdoDispatchPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) +{ + NTSTATUS Status; + PIO_STACK_LOCATION Stack = NULL; + PCM_PARTIAL_RESOURCE_LIST raw; + PCM_PARTIAL_RESOURCE_LIST translated; + ULONG_PTR Information = 0; + + Stack = IoGetCurrentIrpStackLocation(Irp); + + switch(Stack->MinorFunction) + { + case IRP_MN_START_DEVICE: + { + DPRINT("START_DEVICE\n"); + Irp->IoStatus.Status = STATUS_SUCCESS; + Status = ForwardAndWait(DeviceObject, Irp); + + raw = &Stack->Parameters.StartDevice.AllocatedResources->List[0].PartialResourceList; + translated = &Stack->Parameters.StartDevice.AllocatedResourcesTranslated->List[0].PartialResourceList; + Status = StartDevice(DeviceObject, raw, translated); + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS\n"); + switch(Stack->Parameters.QueryDeviceRelations.Type) + { + case BusRelations: + { + PDEVICE_RELATIONS DeviceRelations = NULL; + DPRINT("BusRelations\n"); + Status = FdoQueryBusRelations(DeviceObject, &DeviceRelations); + Information = (ULONG_PTR)DeviceRelations; + break; + } + default: + { + DPRINT("Unknown query device relations type\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + } + break; + } + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + { + DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + return ForwardIrpAndForget(DeviceObject, Irp); + break; + } + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + { + DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + } + default: + { + DPRINT1("IRP_MJ_PNP / Unhandled minor function 0x%lx\n", Stack->MinorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS NTAPI +AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT Pdo) +{ + NTSTATUS Status = STATUS_UNSUCCESSFUL; + PDEVICE_OBJECT Fdo; + ULONG UsbDeviceNumber = 0; + WCHAR CharDeviceName[64]; + WCHAR CharSymLinkName[64]; + UNICODE_STRING DeviceName; + UNICODE_STRING SymLinkName; + ULONG BytesRead; + PCI_COMMON_CONFIG PciConfig; + + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + + DPRINT1("Ehci AddDevice\n"); + + /* Create the FDO */ + while (TRUE) + { + /* FIXME: Use safe string sprintf*/ + /* RtlStringCchPrintfW(CharDeviceName, 64, L"USBFDO-%d", UsbDeviceNumber); */ + swprintf(CharDeviceName, L"\\Device\\USBFDO-%d", UsbDeviceNumber); + RtlInitUnicodeString(&DeviceName, CharDeviceName); + DPRINT1("DeviceName %wZ\n", &DeviceName); + + Status = IoCreateDevice(DriverObject, + sizeof(FDO_DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_CONTROLLER, + 0, + FALSE, + &Fdo); + + if (NT_SUCCESS(Status)) + break; + + if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) + { + /* Try the next name */ + UsbDeviceNumber++; + continue; + } + + /* Bail on any other error */ + if (!NT_SUCCESS(Status)) + { + DPRINT1("UsbEhci: Failed to create %wZ, Status %x\n", &DeviceName, Status); + return Status; + } + } + + swprintf(CharSymLinkName, L"\\Device\\HCD%d", UsbDeviceNumber); + RtlInitUnicodeString(&SymLinkName, CharSymLinkName); + Status = IoCreateSymbolicLink(&SymLinkName, &DeviceName); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Warning: Unable to create symbolic link for ehci usb device!\n"); + } + + DPRINT("Attaching created device %x to %x\n", Fdo, Pdo); + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) Fdo->DeviceExtension; + RtlZeroMemory(FdoDeviceExtension, sizeof(PFDO_DEVICE_EXTENSION)); + + InitializeListHead(&FdoDeviceExtension->IrpQueue); + KeInitializeSpinLock(&FdoDeviceExtension->IrpQueueLock); + + FdoDeviceExtension->Common.IsFdo = TRUE; + FdoDeviceExtension->DeviceObject = Fdo; + + FdoDeviceExtension->LowerDevice = IoAttachDeviceToDeviceStack(Fdo, Pdo); + if (FdoDeviceExtension->LowerDevice == NULL) + { + DPRINT1("UsbEhci: Failed to attach to device stack!\n"); + IoDeleteSymbolicLink(&SymLinkName); + IoDeleteDevice(Fdo); + + return STATUS_NO_SUCH_DEVICE; + } + + Fdo->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; + + DPRINT("Attached %x!\n", FdoDeviceExtension->LowerDevice); + ASSERT(FdoDeviceExtension->LowerDevice == Pdo); + Status = GetBusInterface(FdoDeviceExtension->LowerDevice, &FdoDeviceExtension->BusInterface); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("GetBusInterface() failed with %x\n", Status); + IoDetachDevice(FdoDeviceExtension->LowerDevice); + IoDeleteSymbolicLink(&SymLinkName); + IoDeleteDevice(Fdo); + return Status; + } + + DPRINT("Context %x\n", FdoDeviceExtension->BusInterface.Context); + + BytesRead = (*FdoDeviceExtension->BusInterface.GetBusData)( + FdoDeviceExtension->BusInterface.Context, + PCI_WHICHSPACE_CONFIG, + &PciConfig, + 0, + PCI_COMMON_HDR_LENGTH); + + + if (BytesRead != PCI_COMMON_HDR_LENGTH) + { + DPRINT1("GetBusData failed!\n"); + IoDetachDevice(FdoDeviceExtension->LowerDevice); + IoDeleteSymbolicLink(&SymLinkName); + IoDeleteDevice(Fdo); + + return STATUS_UNSUCCESSFUL; + } + + if (PciConfig.Command & PCI_ENABLE_IO_SPACE) + DPRINT("PCI_ENABLE_IO_SPACE\n"); + + if (PciConfig.Command & PCI_ENABLE_MEMORY_SPACE) + DPRINT("PCI_ENABLE_MEMORY_SPACE\n"); + + if (PciConfig.Command & PCI_ENABLE_BUS_MASTER) + DPRINT("PCI_ENABLE_BUS_MASTER\n"); + + DPRINT("BaseAddress[0] %x\n", PciConfig.u.type0.BaseAddresses[0]); + DPRINT("Vendor %x\n", PciConfig.VendorID); + DPRINT("Device %x\n", PciConfig.DeviceID); + + FdoDeviceExtension->VendorId = PciConfig.VendorID; + FdoDeviceExtension->DeviceId = PciConfig.DeviceID; + + DPRINT("FdoDeviceExtension->NextLowerDevice %x\n", FdoDeviceExtension->LowerDevice); + FdoDeviceExtension->DeviceState = DEVICEINTIALIZED; + + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/usb/usbehci/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/misc.c (added) +++ trunk/reactos/drivers/usb/usbehci/misc.c [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,232 @@ + +#include "usbehci.h" + +VOID +QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp) +{ + KIRQL oldIrql; + + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); + InsertTailList(&DeviceExtension->IrpQueue, &Irp->Tail.Overlay.ListEntry); + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); +} + +VOID +CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension) +{ + PLIST_ENTRY NextIrp = NULL; + PIO_STACK_LOCATION Stack; + KIRQL oldIrql; + PIRP Irp = NULL; + URB *Urb; + + KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); + + /* No Irps in Queue? */ + if (IsListEmpty(&DeviceExtension->IrpQueue)) + { + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + return; + } + + NextIrp = RemoveHeadList(&DeviceExtension->IrpQueue); + while(TRUE) + { + Irp = CONTAINING_RECORD(NextIrp, IRP, Tail.Overlay.ListEntry); + + if (!Irp) + break; + + /* FIXME: Handle cancels */ + /*if (!IoSetCancelRoutine(Irp, NULL)) + { + + }*/ + + + Stack = IoGetCurrentIrpStackLocation(Irp); + + Urb = (PURB) Stack->Parameters.Others.Argument1; + + ASSERT(Urb); + + /* FIXME: Fill in information for Argument1/URB */ + + DPRINT("TransferBuffer %x\n", Urb->UrbControlDescriptorRequest.TransferBuffer); + DPRINT("TransferBufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + DPRINT("Index %x\n", Urb->UrbControlDescriptorRequest.Index); + DPRINT("DescriptorType %x\n", Urb->UrbControlDescriptorRequest.DescriptorType); + DPRINT("LanguageId %x\n", Urb->UrbControlDescriptorRequest.LanguageId); + + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return; + } + + KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); +} + +NTSTATUS +NTAPI +ArrivalNotificationCompletion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID PContext) +{ + IoFreeIrp(Irp); + return STATUS_MORE_PROCESSING_REQUIRED; +} + +VOID +DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) +{ + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PIO_STACK_LOCATION IrpStack = NULL; + PDEVICE_OBJECT PortDeviceObject = NULL; + PIRP Irp = NULL; + + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)Context; + + PortDeviceObject = IoGetAttachedDeviceReference(FdoDeviceExtension->Pdo); + + if (!PortDeviceObject) + { + DPRINT1("Unable to notify Pdos parent of device arrival.\n"); + return; + } + + Irp = IoAllocateIrp(PortDeviceObject->StackSize, FALSE); + + if (!Irp) + { + DPRINT1("Unable to allocate IRP\n"); + } + + IoSetCompletionRoutine(Irp, + (PIO_COMPLETION_ROUTINE)ArrivalNotificationCompletion, + NULL, + TRUE, + TRUE, + TRUE); + + IrpStack = IoGetNextIrpStackLocation(Irp); + IrpStack->Parameters.QueryDeviceRelations.Type = TargetDeviceRelation; + IrpStack->MajorFunction = IRP_MJ_PNP; + IrpStack->MinorFunction = IRP_MN_QUERY_DEVICE_RELATIONS; + + IoCallDriver(PortDeviceObject, Irp); +} + +/* + Get SymblicName from Parameters in Registry Key + Caller is responsible for freeing pool of returned pointer +*/ +PWSTR +GetSymbolicName(PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + HANDLE DevInstRegKey; + UNICODE_STRING SymbolicName; + PKEY_VALUE_PARTIAL_INFORMATION KeyPartInfo; + ULONG SizeNeeded; + PWCHAR SymbolicNameString = NULL; + + Status = IoOpenDeviceRegistryKey(DeviceObject, + PLUGPLAY_REGKEY_DEVICE, + STANDARD_RIGHTS_ALL, + &DevInstRegKey); + + DPRINT("IoOpenDeviceRegistryKey PLUGPLAY_REGKEY_DEVICE Status %x\n", Status); + + if (NT_SUCCESS(Status)) + { + RtlInitUnicodeString(&SymbolicName, L"SymbolicName"); + Status = ZwQueryValueKey(DevInstRegKey, + &SymbolicName, + KeyValuePartialInformation, + NULL, + 0, + &SizeNeeded); + + DPRINT("ZwQueryValueKey status %x, %d\n", Status, SizeNeeded); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + KeyPartInfo = (PKEY_VALUE_PARTIAL_INFORMATION ) ExAllocatePool(PagedPool, SizeNeeded); + if (!KeyPartInfo) + { + DPRINT1("OUT OF MEMORY\n"); + return NULL; + } + else + { + Status = ZwQueryValueKey(DevInstRegKey, + &SymbolicName, + KeyValuePartialInformation, + KeyPartInfo, + SizeNeeded, + &SizeNeeded); + + SymbolicNameString = ExAllocatePool(PagedPool, (KeyPartInfo->DataLength + sizeof(WCHAR))); + if (!SymbolicNameString) + { + return NULL; + } + RtlZeroMemory(SymbolicNameString, KeyPartInfo->DataLength + 2); + RtlCopyMemory(SymbolicNameString, KeyPartInfo->Data, KeyPartInfo->DataLength); + } + + ExFreePool(KeyPartInfo); + } + + ZwClose(DevInstRegKey); + } + + return SymbolicNameString; +} + +/* + Get Physical Device Object Name from registry + Caller is responsible for freeing pool +*/ +PWSTR +GetPhysicalDeviceObjectName(PDEVICE_OBJECT DeviceObject) +{ + NTSTATUS Status; + PWSTR ObjectName = NULL; + ULONG SizeNeeded; + + Status = IoGetDeviceProperty(DeviceObject, + DevicePropertyPhysicalDeviceObjectName, + 0, + NULL, + &SizeNeeded); + + if (Status != STATUS_BUFFER_TOO_SMALL) + { + DPRINT1("Expected STATUS_BUFFER_TOO_SMALL, got %x!\n", Status); + return NULL; + } + + ObjectName = (PWSTR) ExAllocatePool(PagedPool, SizeNeeded + sizeof(WCHAR)); + if (!ObjectName) + { + DPRINT1("Out of memory\n"); + return NULL; + } + + Status = IoGetDeviceProperty(DeviceObject, + DevicePropertyPhysicalDeviceObjectName, + SizeNeeded, + ObjectName, + &SizeNeeded); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to Get Property\n"); + return NULL; + } + + return ObjectName; +} + Propchange: trunk/reactos/drivers/usb/usbehci/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/pdo.c (added) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,424 @@ + +/* INCLUDES *******************************************************************/ +#define INITGUID +#include "usbehci.h" +#include <wdmguid.h> +#include <stdio.h> + +#define NDEBUG +#include <debug.h> + +NTSTATUS NTAPI +PdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PIO_STACK_LOCATION Stack = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + ULONG_PTR Information = 0; + DPRINT("PdoDispatchInternalDeviceControl\n"); + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) PdoDeviceExtension->ControllerFdo->DeviceExtension; + + ASSERT(PdoDeviceExtension->Common.IsFdo == FALSE); + Stack = IoGetCurrentIrpStackLocation(Irp); + DPRINT("IoControlCode %x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + switch(Stack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_INTERNAL_USB_SUBMIT_URB: + { + URB *Urb; + + DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_URB\n"); + DPRINT("Stack->Parameters.DeviceIoControl.InputBufferLength %d\n", + Stack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Stack->Parameters.Others.Argument1 %x\n", Stack->Parameters.Others.Argument1); + + Urb = (PURB) Stack->Parameters.Others.Argument1; + DPRINT("Header Size %d\n", Urb->UrbHeader.Length); + DPRINT("Header Type %d\n", Urb->UrbHeader.Function); + DPRINT("Index %x\n", Urb->UrbControlDescriptorRequest.Index); + + /* Check the type */ + switch(Urb->UrbHeader.Function) + { + case URB_FUNCTION_SELECT_CONFIGURATION: + { + DPRINT1("URB_FUNCTION_SELECT_CONFIGURATION\n"); + break; + } + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + URB *Urb; + DPRINT1("URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE\n"); + Urb = (PURB) Stack->Parameters.Others.Argument1; + Urb->UrbHeader.Status = 0; + + /* Check for ChildDevices */ + if (!FdoDeviceExtension->ChildDeviceCount) + { + /* No device has been plugged in yet. So just queue + the irp and complete it when a device is connected */ + if (FdoDeviceExtension->DeviceState) + QueueRequest(FdoDeviceExtension, Irp); + + Information = 0; + + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + } + else + { + DPRINT1("Reporting of device connects not implemented yet.\n"); + Status = STATUS_SUCCESS; + } + break; + } + /* FIXME: Handle all other Functions */ + default: + DPRINT1("Not handled yet!\n"); + } + break; + } + case IOCTL_INTERNAL_USB_CYCLE_PORT: + { + DPRINT("IOCTL_INTERNAL_USB_CYCLE_PORT\n"); + break; + } + case IOCTL_INTERNAL_USB_ENABLE_PORT: + { + DPRINT("IOCTL_INTERNAL_USB_ENABLE_PORT\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_BUS_INFO: + { + DPRINT("IOCTL_INTERNAL_USB_GET_BUS_INFO\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_BUSGUID_INFO: + { + DPRINT("IOCTL_INTERNAL_USB_GET_BUSGUID_INFO\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_CONTROLLER_NAME: + { + DPRINT("IOCTL_INTERNAL_USB_GET_CONTROLLER_NAME\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: + { + DPRINT("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_HUB_COUNT: + { + DPRINT("IOCTL_INTERNAL_USB_GET_HUB_COUNT\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_HUB_NAME: + { + DPRINT("IOCTL_INTERNAL_USB_GET_HUB_NAME\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO: + { + DPRINT("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_PORT_STATUS: + { + DPRINT("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); + break; + } + case IOCTL_INTERNAL_USB_RESET_PORT: + { + DPRINT("IOCTL_INTERNAL_USB_RESET_PORT\n"); + break; + } + case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO: + { + DPRINT("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n"); + /* This is document as Argument1 = PDO and Argument2 = FDO. + Its actually reversed, the FDO goes in Argument1 and PDO goes in Argument2 */ + if (Stack->Parameters.Others.Argument1) + Stack->Parameters.Others.Argument1 = FdoDeviceExtension->DeviceObject; + if (Stack->Parameters.Others.Argument2) + Stack->Parameters.Others.Argument2 = FdoDeviceExtension->Pdo; + + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + return STATUS_SUCCESS; + break; + } + case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: + { + DPRINT("IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION\n"); + break; + } + default: + { + DPRINT("Unhandled IoControlCode %x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + break; + } + } + + Irp->IoStatus.Information = Information; + if (Status != STATUS_PENDING) + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +PdoQueryId(PDEVICE_OBJECT DeviceObject, PIRP Irp, ULONG_PTR* Information) +{ + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + WCHAR Buffer[256]; + ULONG Index = 0; + ULONG IdType; + UNICODE_STRING SourceString; + UNICODE_STRING String; + NTSTATUS Status; + + IdType = IoGetCurrentIrpStackLocation(Irp)->Parameters.QueryId.IdType; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; + + /* FIXME: Read values from registry */ + + switch (IdType) + { + case BusQueryDeviceID: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryDeviceID\n"); + RtlInitUnicodeString(&SourceString, L"USB\\ROOT_HUB20"); + break; + } + case BusQueryHardwareIDs: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryHardwareIDs\n"); + + Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20&VID8086&PID265C&REV0000") + 1; + Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20&VID8086&PID265") + 1; + Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20") + 1; + + Buffer[Index] = UNICODE_NULL; + SourceString.Length = SourceString.MaximumLength = Index * sizeof(WCHAR); + SourceString.Buffer = Buffer; + break; + } + case BusQueryCompatibleIDs: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); + /* We have none */ + return STATUS_SUCCESS; + break; + } + case BusQueryInstanceID: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryInstanceID\n"); + + /* + Do we need to implement this? + At one point I hade DeviceCapabilities->UniqueID set to TRUE. + And caused usbhub to fail attaching + to the PDO. Setting UniqueID to FALSE, it works + */ + + return STATUS_SUCCESS; + break; + } + default: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_ID / unknown query id type 0x%lx\n", IdType); + return STATUS_NOT_SUPPORTED; + } + } + + /* Lifted from hpoussin */ + Status = DuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, + &SourceString, + &String); + + *Information = (ULONG_PTR)String.Buffer; + return Status; +} + +NTSTATUS +PdoQueryDeviceRelations(PDEVICE_OBJECT DeviceObject, PDEVICE_RELATIONS* pDeviceRelations) +{ + PFDO_DEVICE_EXTENSION DeviceExtension; + PDEVICE_RELATIONS DeviceRelations; + + DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePool(PagedPool, sizeof(DEVICE_RELATIONS)); + if (!DeviceRelations) + return STATUS_INSUFFICIENT_RESOURCES; + + ObReferenceObject(DeviceObject); + DeviceRelations->Count = 1; + DeviceRelations->Objects[0] = DeviceObject; + + *pDeviceRelations = DeviceRelations; + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +PdoDispatchPnp( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + ULONG MinorFunction; + PIO_STACK_LOCATION Stack; + ULONG_PTR Information = 0; + NTSTATUS Status; + + Stack = IoGetCurrentIrpStackLocation(Irp); + MinorFunction = Stack->MinorFunction; + + switch (MinorFunction) + { + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_REMOVE_DEVICE: + case IRP_MN_CANCEL_REMOVE_DEVICE: + case IRP_MN_STOP_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_DEVICE_TEXT: + case IRP_MN_SURPRISE_REMOVAL: + { + Information = Irp->IoStatus.Information; + Status = STATUS_SUCCESS; + break; + } + + case IRP_MN_START_DEVICE: + { + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_DEVICE_RELATIONS: + { + switch (Stack->Parameters.QueryDeviceRelations.Type) + { + case TargetDeviceRelation: + { + PDEVICE_RELATIONS DeviceRelations = NULL; + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); + Status = PdoQueryDeviceRelations(DeviceObject, &DeviceRelations); + Information = (ULONG_PTR)DeviceRelations; + break; + } + default: + { + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unhandled type 0x%lx\n", + Stack->Parameters.QueryDeviceRelations.Type); + //ASSERT(FALSE); + Status = STATUS_NOT_SUPPORTED; + break; + } + } + break; + } + case IRP_MN_QUERY_CAPABILITIES: + { + PDEVICE_CAPABILITIES DeviceCapabilities; + ULONG i; + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_CAPABILITIES\n"); + DeviceCapabilities = (PDEVICE_CAPABILITIES)Stack->Parameters.DeviceCapabilities.Capabilities; + /* FIXME: capabilities can change with connected device */ + DeviceCapabilities->LockSupported = FALSE; + DeviceCapabilities->EjectSupported = FALSE; + DeviceCapabilities->Removable = FALSE; + DeviceCapabilities->DockDevice = FALSE; + DeviceCapabilities->UniqueID = FALSE;//TRUE; + DeviceCapabilities->SilentInstall = FALSE; + DeviceCapabilities->RawDeviceOK = TRUE; + DeviceCapabilities->SurpriseRemovalOK = FALSE; + + /* FIXME */ + DeviceCapabilities->HardwareDisabled = FALSE; + //DeviceCapabilities->NoDisplayInUI = FALSE; + DeviceCapabilities->DeviceState[0] = PowerDeviceD0; + for (i = 0; i < PowerSystemMaximum; i++) + DeviceCapabilities->DeviceState[i] = PowerDeviceD3; + //DeviceCapabilities->DeviceWake = PowerDeviceUndefined; + DeviceCapabilities->D1Latency = 0; + DeviceCapabilities->D2Latency = 0; + DeviceCapabilities->D3Latency = 0; + Status = STATUS_SUCCESS; + break; + } + case IRP_MN_QUERY_RESOURCES: + { + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + { + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } + /*case IRP_MN_QUERY_DEVICE_TEXT: + { + Status = STATUS_NOT_SUPPORTED; + break; + }*/ + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + { + DPRINT("IRP_MJ_PNP / IRP_MN_FILTER_RESOURCE_REQUIREMENTS\n"); + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } + case IRP_MN_QUERY_ID: + { + Status = PdoQueryId(DeviceObject, Irp, &Information); + break; + } + case IRP_MN_QUERY_BUS_INFORMATION: + { + PPNP_BUS_INFORMATION BusInfo; + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_BUS_INFORMATION\n"); + + BusInfo = (PPNP_BUS_INFORMATION)ExAllocatePool(PagedPool, sizeof(PNP_BUS_INFORMATION)); + if (!BusInfo) + Status = STATUS_INSUFFICIENT_RESOURCES; + else + { + /* FIXME */ + /*RtlCopyMemory( + &BusInfo->BusTypeGuid, + &GUID_DEVINTERFACE_XXX, + sizeof(GUID));*/ + + BusInfo->LegacyBusType = PNPBus; + BusInfo->BusNumber = 0; + Information = (ULONG_PTR)BusInfo; + Status = STATUS_SUCCESS; + } + break; + } + default: + { + /* We are the PDO. So ignore */ + DPRINT1("IRP_MJ_PNP / Unknown minor function 0x%lx\n", MinorFunction); + + Information = Irp->IoStatus.Information; + Status = Irp->IoStatus.Status; + break; + } + } + + Irp->IoStatus.Information = Information; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + Propchange: trunk/reactos/drivers/usb/usbehci/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/usbehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.c (added) +++ trunk/reactos/drivers/usb/usbehci/usbehci.c [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,138 @@ +/* + * ReactOS USB ehci driver + * Copyright (C) 2009 Michael Martin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + */ + +/* DEFINES *******************************************************************/ +#include "usbehci.h" +#define NDEBUG + +/* INCLUDES *******************************************************************/ +#include <debug.h> + + +static NTSTATUS NTAPI +IrpStub(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + NTSTATUS Status; + + if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFdo) + { + DPRINT1("ehci: FDO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + return ForwardIrpAndForget(DeviceObject, Irp); + } + + /* We are lower driver, So complete */ + DPRINT1("ehci: PDO stub for major function 0x%lx\n", + IoGetCurrentIrpStackLocation(Irp)->MajorFunction); + + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; +} + +NTSTATUS NTAPI +DispatchDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + DPRINT("DispatchDeviceControl\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +} + +NTSTATUS NTAPI +DispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + DPRINT("DispatchInternalDeviceControl\n"); + if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFdo) + return IrpStub(DeviceObject, Irp); + else + return PdoDispatchInternalDeviceControl(DeviceObject, Irp); +} + +NTSTATUS NTAPI +UsbEhciCleanup(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + DPRINT1("UsbEhciCleanup\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +UsbEhciCreate(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + DPRINT1("UsbEhciCreate\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +NTSTATUS NTAPI +UsbEhciClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + DPRINT1("Close\n"); + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; +} + +VOID NTAPI +DriverUnload(PDRIVER_OBJECT DriverObject) +{ + DPRINT1("Unloading Driver\n"); +} + +NTSTATUS NTAPI +DispatchPnp(PDEVICE_OBJECT DeviceObject, PIRP Irp) +{ + if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFdo) + return FdoDispatchPnp(DeviceObject, Irp); + else + return PdoDispatchPnp(DeviceObject, Irp); +} + +NTSTATUS NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) +{ + DPRINT1("Driver Entry %wZ!\n", RegistryPath); + + DriverObject->DriverExtension->AddDevice = AddDevice; + + DriverObject->MajorFunction[IRP_MJ_CREATE] = UsbEhciCreate; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = UsbEhciClose; + DriverObject->MajorFunction[IRP_MJ_CLEANUP] = UsbEhciCleanup; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = DispatchDeviceControl; + DriverObject->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = DispatchInternalDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = DispatchPnp; + + DriverObject->DriverUnload = DriverUnload; + DPRINT1("Driver entry done\n"); + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/usb/usbehci/usbehci.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.h (added) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,278 @@ + +#ifndef __EHCI_H__ +#define __EHCI_H__ + +#include <ntifs.h> +#include <ntddk.h> +#include <stdio.h> +#define NDEBUG +#include <debug.h> +#include <usbioctl.h> +#include <usb.h> + +#define DEVICEINTIALIZED 0x01 +#define DEVICESTARTED 0x02 +#define DEVICEBUSY 0x04 +#define DEVICESTOPPED 0x08 + + +#define MAX_USB_DEVICES 127 +#define EHCI_MAX_SIZE_TRANSFER 0x100000 + +/* USB Command Register */ +#define EHCI_USBCMD 0x00 +#define EHCI_USBSTS 0x04 +#define EHCI_USBINTR 0x08 +#define EHCI_FRINDEX 0x0C +#define EHCI_CTRLDSSEGMENT 0x10 +#define EHCI_PERIODICLISTBASE 0x14 +#define EHCI_ASYNCLISTBASE 0x18 +#define EHCI_CONFIGFLAG 0x40 +#define EHCI_PORTSC 0x44 + +/* USB Interrupt Register Flags 32 Bits */ +#define EHCI_USBINTR_INTE 0x01 +#define EHCI_USBINTR_ERR 0x02 +#define EHCI_USBINTR_PC 0x04 +#define EHCI_USBINTR_FLROVR 0x08 +#define EHCI_USBINTR_HSERR 0x10 +#define EHCI_USBINTR_ASYNC 0x20 +/* Bits 6:31 Reserved */ + +/* Status Register Flags 32 Bits */ +#define EHCI_STS_INT 0x01 +#define EHCI_STS_ERR 0x02 +#define EHCI_STS_PCD 0x04 +#define EHCI_STS_FLR 0x08 +#define EHCI_STS_FATAL 0x10 +#define EHCI_STS_IAA 0x20 +/* Bits 11:6 Reserved */ +#define EHCI_STS_HALT 0x1000 +#define EHCI_STS_RECL 0x2000 +#define EHCI_STS_PSS 0x4000 +#define EHCI_STS_ASS 0x8000 +#define EHCI_ERROR_INT ( EHCI_STS_FATAL | EHCI_STS_ERR ) + +typedef struct _EHCI_HCS_CONTENT +{ + ULONG PortCount : 4; + ULONG PortPowerControl: 1; + ULONG Reserved : 2; + ULONG PortRouteRules : 1; + ULONG PortPerCHC : 4; + ULONG CHCCount : 4; + ULONG PortIndicator : 1; + ULONG Reserved2 : 3; + ULONG DbgPortNum : 4; + ULONG Reserved3 : 8; + +} EHCI_HCS_CONTENT, *PEHCI_HCS_CONTENT; + +typedef struct _EHCI_HCC_CONTENT +{ + ULONG CurAddrBits : 1; + ULONG VarFrameList : 1; + ULONG ParkMode : 1; + ULONG Reserved : 1; + ULONG IsoSchedThreshold : 4; + ULONG EECPCapable : 8; + ULONG Reserved2 : 16; + +} EHCI_HCC_CONTENT, *PEHCI_HCC_CONTENT; + +typedef struct _EHCI_CAPS { + UCHAR Length; + UCHAR Reserved; + USHORT HCIVersion; + union + { + EHCI_HCS_CONTENT HCSParams; + ULONG HCSParamsLong; + }; + ULONG HCCParams; + UCHAR PortRoute [8]; +} EHCI_CAPS, *PEHCI_CAPS; + + +typedef struct _COMMON_DEVICE_EXTENSION +{ + BOOLEAN IsFdo; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; +} COMMON_DEVICE_EXTENSION, *PCOMMON_DEVICE_EXTENSION; + +typedef struct _FDO_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDRIVER_OBJECT DriverObject; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT LowerDevice; + PDEVICE_OBJECT Pdo; + ULONG DeviceState; + + /* USB Specs says a max of 127 devices */ + ULONG ChildDeviceCount; + + PDMA_ADAPTER pDmaAdapter; + + ULONG Vector; + KIRQL Irql; + + KINTERRUPT_MODE Mode; + BOOLEAN IrqShared; + PKINTERRUPT EhciInterrupt; + KDPC DpcObject; + KAFFINITY Affinity; + + LIST_ENTRY IrpQueue; + KSPIN_LOCK IrpQueueLock; + PIRP CurrentIrp; + + ULONG MapRegisters; + + ULONG BusNumber; + ULONG BusAddress; + ULONG PCIAddress; + USHORT VendorId; + USHORT DeviceId; + + BUS_INTERFACE_STANDARD BusInterface; + + EHCI_CAPS ECHICaps; + + union + { + PULONG ResourcePort; + PULONG ResourceMemory; + }; + + PULONG PeriodicFramList; + PULONG AsyncListQueueHeadPtr; + PHYSICAL_ADDRESS PeriodicFramListPhysAddr; + PHYSICAL_ADDRESS AsyncListQueueHeadPtrPhysAddr; + + BOOLEAN AsyncComplete; + + PULONG ResourceBase; + ULONG Size; + +} FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; + +typedef struct _PDO_DEVICE_EXTENSION +{ + COMMON_DEVICE_EXTENSION Common; + PDEVICE_OBJECT DeviceObject; + PDEVICE_OBJECT ControllerFdo; + +} PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; + + +/* USBCMD register 32 bits */ +typedef struct _EHCI_USBCMD_CONTENT +{ + ULONG Run : 1; + ULONG HCReset : 1; + ULONG FrameListSize : 2; + ULONG PeriodicEnable : 1; + ULONG AsyncEnable : 1; + ULONG DoorBell : 1; + ULONG LightReset : 1; + ULONG AsyncParkCount : 2; + ULONG Reserved : 1; + ULONG AsyncParkEnable : 1; + ULONG Reserved1 : 4; + ULONG IntThreshold : 8; + ULONG Reserved2 : 8; + +} EHCI_USBCMD_CONTENT, *PEHCI_USBCMD_CONTENT; + +typedef struct _EHCI_USBSTS_CONTENT +{ + ULONG USBInterrupt:1; + ULONG ErrorInterrupt:1; + ULONG DetectChangeInterrupt:1; + ULONG FrameListRolloverInterrupt:1; + ULONG HostSystemErrorInterrupt:1; + ULONG AsyncAdvanceInterrupt:1; + ULONG Reserved:6; + ULONG HCHalted:1; + ULONG Reclamation:1; + ULONG PeriodicScheduleStatus:1; + ULONG AsynchronousScheduleStatus:1; +} EHCI_USBSTS_CONTEXT, *PEHCI_USBSTS_CONTEXT; + +typedef struct _EHCI_USBPORTSC_CONTENT +{ + ULONG CurrentConnectStatus:1; + ULONG ConnectStatusChange:1; + ULONG PortEnabled:1; + ULONG PortEnableChanged:1; + ULONG OverCurrentActive:1; + ULONG OverCurrentChange:1; + ULONG ForcePortResume:1; + ULONG Suspend:1; + ULONG PortReset:1; + ULONG Reserved:1; + ULONG LineStatus:2; + ULONG PortPower:1; + ULONG PortOwner:1; +} EHCI_USBPORTSC_CONTENT, *PEHCI_USBPORTSC_CONTENT; + +NTSTATUS NTAPI +GetBusInterface(PDEVICE_OBJECT pcifido, PBUS_INTERFACE_STANDARD busInterface); + +NTSTATUS NTAPI +ForwardAndWaitCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, PKEVENT Event); + +NTSTATUS NTAPI +ForwardAndWait(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +NTSTATUS NTAPI +ForwardIrpAndForget(PDEVICE_OBJECT DeviceObject,PIRP Irp); + +NTSTATUS NTAPI +FdoDispatchPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +NTSTATUS NTAPI +PdoDispatchPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +NTSTATUS NTAPI +AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT Pdo); + +NTSTATUS +DuplicateUnicodeString(ULONG Flags, PCUNICODE_STRING SourceString, PUNICODE_STRING DestinationString); + +PWSTR +GetSymbolicName(PDEVICE_OBJECT DeviceObject); + +PWSTR +GetPhysicalDeviceObjectName(PDEVICE_OBJECT DeviceObject); + +NTSTATUS NTAPI +PdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); + +BOOLEAN +GetDeviceDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, USHORT Port); + +BOOLEAN +GetDeviceDescriptor2(PFDO_DEVICE_EXTENSION DeviceExtension, USHORT Port); + +BOOLEAN +GetStringDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, ULONG DecriptorStringNumber); + +VOID +CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension); + +VOID +QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); + +VOID +QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); + +VOID +CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension); + +VOID +DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); + +#endif Propchange: trunk/reactos/drivers/usb/usbehci/usbehci.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/usbehci.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.rbuild (added) +++ trunk/reactos/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,11 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="usbehci" type="kernelmodedriver" installbase="system32/drivers" installname="usbehci.sys"> + <library>ntoskrnl</library> + <library>hal</library> + <file>usbehci.c</file> + <file>fdo.c</file> + <file>pdo.c</file> + <file>common.c</file> + <file>misc.c</file> +</module> Propchange: trunk/reactos/drivers/usb/usbehci/usbehci.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/usbehci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbehc… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbehci.rc (added) +++ trunk/reactos/drivers/usb/usbehci/usbehci.rc [iso-8859-1] Fri Jan 8 10:34:36 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "USB Ehci Driver\0" +#define REACTOS_STR_INTERNAL_NAME "usbehci\0" +#define REACTOS_STR_ORIGINAL_FILENAME "usbehci.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/usb/usbehci/usbehci.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[mjmartin] 44992: [include/usb200.h] - Fix two unions, make text after last #endif a comment as it should be, and add newline at end of file.
by mjmartin＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: mjmartin Date: Fri Jan 8 10:00:53 2010 New Revision: 44992 URL: http://svn.reactos.org/svn/reactos?rev=44992&view=rev Log: [include/usb200.h] - Fix two unions, make text after last #endif a comment as it should be, and add newline at end of file. Modified: trunk/reactos/include/ddk/usb200.h Modified: trunk/reactos/include/ddk/usb200.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usb200.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/usb200.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usb200.h [iso-8859-1] Fri Jan 8 10:00:53 2010 @@ -27,7 +27,7 @@ UCHAR Reserved:3; UCHAR Type:2; UCHAR Dir:1; - }; + } _BM; UCHAR B; } BM_REQUEST_TYPE, *PBM_REQUEST_TYPE; @@ -80,7 +80,7 @@ USHORT MaxPacket:11; USHORT HSmux:2; USHORT Reserved:3; - }; + } _MP; USHORT us; } USB_HIGH_SPEED_MAXPACKET, *PUSB_HIGH_SPEED_MAXPACKET; @@ -109,4 +109,4 @@ #include <poppack.h> -#endif __USB200_H__ +#endif //__USB200_H__

1 0

[ros-arm-bringup] 44991: - Document and define Timer and System Control Ports (0x43, 0x61) as defined in ISA System Architecture 3rd Edition and The Undocumented PC. - Document PIT access modes, channels and operating modes. - Rewrite HalHandleNMI to use the System Control Port definitions instead of magic values that were never explained. - Rewrite HalMakeBeep not to program the PIT with magic hexadecimal values that were not explained anywhere and seem dubious. - Fix the PIT frequency to match
by ros-arm-bringup＠svn.reactos.org 08 Jan '10

08 Jan '10

Author: ros-arm-bringup Date: Fri Jan 8 05:31:19 2010 New Revision: 44991 URL: http://svn.reactos.org/svn/reactos?rev=44991&view=rev Log: - Document and define Timer and System Control Ports (0x43, 0x61) as defined in ISA System Architecture 3rd Edition and The Undocumented PC. - Document PIT access modes, channels and operating modes. - Rewrite HalHandleNMI to use the System Control Port definitions instead of magic values that were never explained. - Rewrite HalMakeBeep not to program the PIT with magic hexadecimal values that were not explained anywhere and seem dubious. - Fix the PIT frequency to match its correct value of ~1.19318MHz which is what every x86 book states and what Linux and all other operating systems use. This is equivalent to one third of the NTSC color burst (subcarrier frequency) used on CGA computers for video output. Previously, the HAL used 1.193167MHz, which is only used by NT and isn't documented anywhere, and in fact appears to be a typo in the NT sources (a less accurate way of dividing the NTSC color burst gives 1.19318167MHz). Somehow, the ReactOS developer of this function must have made the same "typo", by complete coincidence, of course. - Rewrite part of HalpInitializeClock to use the new definitions. This function was at least somewhat documenting the magic values. Modified: trunk/reactos/hal/halx86/generic/beep.c trunk/reactos/hal/halx86/generic/misc.c trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/halp.h Modified: trunk/reactos/hal/halx86/generic/beep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/beep.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/beep.c [iso-8859-1] Fri Jan 8 05:31:19 2010 @@ -1,10 +1,9 @@ /* * PROJECT: ReactOS HAL - * LICENSE: GPL - See COPYING in the top level directory + * LICENSE: BSD - See COPYING.ARM in the top level directory * FILE: hal/halx86/generic/beep.c * PURPOSE: Speaker support (beeping) - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - * Eric Kohl (ekohl(a)abo.rhein-zeitung.de) + * PROGRAMMERS: ReactOS Portable Systems Group */ /* INCLUDES ******************************************************************/ @@ -12,13 +11,6 @@ #include <hal.h> #define NDEBUG #include <debug.h> - -/* CONSTANTS *****************************************************************/ - -#define TIMER2 (PUCHAR)0x42 -#define TIMER3 (PUCHAR)0x43 -#define PORT_B (PUCHAR)0x61 -#define CLOCKFREQ 1193167 /* FUNCTIONS *****************************************************************/ @@ -29,42 +21,96 @@ NTAPI HalMakeBeep(IN ULONG Frequency) { - UCHAR Data; + SYSTEM_CONTROL_PORT_B_REGISTER SystemControl; + TIMER_CONTROL_PORT_REGISTER TimerControl; ULONG Divider; + BOOLEAN Result = FALSE; - /* Acquire CMOS Lock */ + // + // Acquire CMOS Lock + // HalpAcquireSystemHardwareSpinLock(); - /* Turn the register off */ - Data = READ_PORT_UCHAR(PORT_B); - WRITE_PORT_UCHAR(PORT_B, Data & 0xFC); + // + // Turn the timer off by disconnecting its output pin and speaker gate + // + SystemControl.Bits = __inbyte(SYSTEM_CONTROL_PORT_B); + SystemControl.SpeakerDataEnable = FALSE; + SystemControl.Timer2GateToSpeaker = FALSE; + __outbyte(SYSTEM_CONTROL_PORT_B, SystemControl.Bits); - /* Check if we have a frequency */ + // + // Check if we have a frequency + // if (Frequency) { - /* Set the divider */ - Divider = CLOCKFREQ / Frequency; + // + // Set the divider + // + Divider = PIT_FREQUENCY / Frequency; - /* Check if it's too large */ - if (Divider > 0x10000) + // + // Check if it's too large + // + if (Divider <= 0x10000) { - /* Fail */ - HalpReleaseCmosSpinLock(); - return FALSE; + // + // Program the PIT for binary mode + // + TimerControl.BcdMode = FALSE; + + // + // Program the PIT to generate a square wave (Mode 3) on channel 2. + // Channel 0 is used for the IRQ0 clock interval timer, and channel + // 1 is used for DRAM refresh. + // + // Mode 2 gives much better accuracy, but generates an output signal + // that drops to low for each input signal cycle at 0.8381 useconds. + // This is too fast for the PC speaker to process and would result + // in no sound being emitted. + // + // Mode 3 will generate a high pulse that is a bit longer and will + // allow the PC speaker to notice. Additionally, take note that on + // channel 2, when input goes low the counter will stop and output + // will go to high. + // + TimerControl.OperatingMode = PitOperatingMode3; + TimerControl.Channel = PitChannel2; + + // + // Set the access mode that we'll use to program the reload value. + // + TimerControl.AccessMode = PitAccessModeLowHigh; + + // + // Now write the programming bits + // + __outbyte(TIMER_CONTROL_PORT, TimerControl.Bits); + + // + // Next we write the reload value for channel 2 + // + __outbyte(TIMER_CHANNEL2_DATA_PORT, Divider & 0xFF); + __outbyte(TIMER_CHANNEL2_DATA_PORT, Divider >> 8); + + // + // Reconnect the speaker to the timer and re-enable the output pin + // + SystemControl.Bits = __inbyte(SYSTEM_CONTROL_PORT_B); + SystemControl.SpeakerDataEnable = TRUE; + SystemControl.Timer2GateToSpeaker = TRUE; + __outbyte(SYSTEM_CONTROL_PORT_B, SystemControl.Bits); + Result = TRUE; } - - /* Set timer divider */ - WRITE_PORT_UCHAR(TIMER3, 0xB6); - WRITE_PORT_UCHAR(TIMER2, (UCHAR)(Divider & 0xFF)); - WRITE_PORT_UCHAR(TIMER2, (UCHAR)((Divider>>8) & 0xFF)); - - /* Turn speaker on */ - WRITE_PORT_UCHAR(PORT_B, READ_PORT_UCHAR(PORT_B) | 0x03); } - /* Release CMOS lock */ + // + // Release CMOS lock + // HalpReleaseCmosSpinLock(); - /* Return success */ - return TRUE; + // + // Return success + // + return Result; } Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Fri Jan 8 05:31:19 2010 @@ -88,7 +88,7 @@ Cr4 = __readcr4(); // - // Disable global pit + // Disable global bit // __writecr4(Cr4 & ~CR4_PGE); @@ -121,7 +121,7 @@ NTAPI HalHandleNMI(IN PVOID NmiInfo) { - UCHAR NmiStatus; + SYSTEM_CONTROL_PORT_B_REGISTER SystemControl; // // Don't recurse @@ -129,9 +129,9 @@ if (HalpNMIInProgress++) while (TRUE); // - // Get the NMI Flag - // - NmiStatus = READ_PORT_UCHAR((PUCHAR)0x61); + // Read the system control register B + // + SystemControl.Bits = __inbyte(SYSTEM_CONTROL_PORT_B); // // Switch to boot vieo @@ -161,29 +161,29 @@ // // Display NMI failure string // - HalDisplayString("\n*** Hardware Malfunction\n\n"); - HalDisplayString("Call your hardware vendor for support\n\n"); + InbvDisplayString("\n*** Hardware Malfunction\n\n"); + InbvDisplayString("Call your hardware vendor for support\n\n"); // // Check for parity error // - if (NmiStatus & 0x80) + if (SystemControl.ParityCheck) { // // Display message // - HalDisplayString("NMI: Parity Check / Memory Parity Error\n"); + InbvDisplayString("NMI: Parity Check / Memory Parity Error\n"); } // // Check for I/O failure // - if (NmiStatus & 0x40) + if (SystemControl.ChannelCheck) { // // Display message // - HalDisplayString("NMI: Channel Check / IOCHK\n"); + InbvDisplayString("NMI: Channel Check / IOCHK\n"); } // @@ -200,12 +200,12 @@ // // Halt the system // - HalDisplayString("\n*** The system has halted ***\n"); + InbvDisplayString("\n*** The system has halted ***\n"); // // Enter the debugger if possible // - //if (!KdDebuggerNotPresent && KdDebuggerEnabled) KeEnterKernelDebugger(); + //if (!(KdDebuggerNotPresent) && (KdDebuggerEnabled)) KeEnterKernelDebugger(); // // Freeze the system Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Fri Jan 8 05:31:19 2010 @@ -49,6 +49,7 @@ ULONG Increment; USHORT RollOver; ULONG_PTR Flags; + TIMER_CONTROL_PORT_REGISTER TimerControl; /* Check the CPU Type */ if (Prcb->CpuType <= 4) @@ -59,7 +60,7 @@ } /* Get increment and rollover for the largest time clock ms possible */ - Increment= HalpRolloverTable[HalpLargestClockMS - 1].HighPart; + Increment = HalpRolloverTable[HalpLargestClockMS - 1].HighPart; RollOver = (USHORT)HalpRolloverTable[HalpLargestClockMS - 1].LowPart; /* Set the maximum and minimum increment with the kernel */ @@ -69,11 +70,37 @@ /* Disable interrupts */ Flags = __readeflags(); _disable(); + + // + // Program the PIT for binary mode + // + TimerControl.BcdMode = FALSE; - /* Set the rollover */ - __outbyte(TIMER_CONTROL_PORT, TIMER_SC0 | TIMER_BOTH | TIMER_MD2); - __outbyte(TIMER_DATA_PORT0, RollOver & 0xFF); - __outbyte(TIMER_DATA_PORT0, RollOver >> 8); + // + // Program the PIT to generate a normal rate wave (Mode 3) on channel 0. + // Channel 0 is used for the IRQ0 clock interval timer, and channel + // 1 is used for DRAM refresh. + // + // Mode 2 gives much better accuracy than Mode 3. + // + TimerControl.OperatingMode = PitOperatingMode2; + TimerControl.Channel = PitChannel0; + + // + // Set the access mode that we'll use to program the reload value. + // + TimerControl.AccessMode = PitAccessModeLowHigh; + + // + // Now write the programming bits + // + __outbyte(TIMER_CONTROL_PORT, TimerControl.Bits); + + // + // Next we write the reload value for channel 0 + // + __outbyte(TIMER_CHANNEL0_DATA_PORT, RollOver & 0xFF); + __outbyte(TIMER_CHANNEL0_DATA_PORT, RollOver >> 8); /* Restore interrupts if they were previously enabled */ __writeeflags(Flags); Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Fri Jan 8 05:31:19 2010 @@ -16,13 +16,6 @@ #define RTC_REG_A_UIP 0x80 #define RTC_REGISTER_CENTURY 0x32 -/* Timer Registers and Ports */ -#define TIMER_CONTROL_PORT 0x43 -#define TIMER_DATA_PORT0 0x40 -#define TIMER_SC0 0 -#define TIMER_BOTH 0x30 -#define TIMER_MD2 0x4 - /* Usage flags */ #define IDT_REGISTERED 0x01 #define IDT_LATCHED 0x02 @@ -34,7 +27,106 @@ (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) #define INT_BCD(int) \ (UCHAR)(((int / 10) << 4) + (int % 10)) - + +// +// Commonly stated as being 1.19318MHz +// +// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) +// P. 471 +// +// However, the true value is closer to 1.19318181[...]81MHz since this is 1/3rd +// of the NTSC color subcarrier frequency which runs at 3.57954545[...]45MHz. +// +// Note that Windows uses 1.193167MHz which seems to have no basis. However, if +// one takes the NTSC color subcarrier frequency as being 3.579545 (trimming the +// infinite series) and divides it by three, one obtains 1.19318167. +// +// It may be that the original NT HAL source code introduced a typo and turned +// 119318167 into 1193167 by ommitting the "18". This is very plausible as the +// number is quite long. +// +#define PIT_FREQUENCY 1193182 + +// +// These ports are controlled by the i8254 Programmable Interrupt Timer (PIT) +// +#define TIMER_CHANNEL0_DATA_PORT 0x40 +#define TIMER_CHANNEL1_DATA_PORT 0x41 +#define TIMER_CHANNEL2_DATA_PORT 0x42 +#define TIMER_CONTROL_PORT 0x43 + +// +// Mode 0 - Interrupt On Terminal Count +// Mode 1 - Hardware Re-triggerable One-Shot +// Mode 2 - Rate Generator +// Mode 3 - Square Wave Generator +// Mode 4 - Software Triggered Strobe +// Mode 5 - Hardware Triggered Strobe +// +typedef enum _TIMER_OPERATING_MODES +{ + PitOperatingMode0, + PitOperatingMode1, + PitOperatingMode2, + PitOperatingMode3, + PitOperatingMode4, + PitOperatingMode5, + PitOperatingMode2Reserved, + PitOperatingMode5Reserved +} TIMER_OPERATING_MODES; + +typedef enum _TIMER_ACCESS_MODES +{ + PitAccessModeCounterLatch, + PitAccessModeLow, + PitAccessModeHigh, + PitAccessModeLowHigh +} TIMER_ACCESS_MODES; + +typedef enum _TIMER_CHANNELS +{ + PitChannel0, + PitChannel1, + PitChannel2, + PitReadBack +} TIMER_CHANNELS; + +typedef union _TIMER_CONTROL_PORT_REGISTER +{ + struct + { + UCHAR BcdMode:1; + TIMER_OPERATING_MODES OperatingMode:3; + TIMER_ACCESS_MODES AccessMode:2; + TIMER_CHANNELS Channel:2; + }; + UCHAR Bits; +} TIMER_CONTROL_PORT_REGISTER, *PTIMER_CONTROL_PORT_REGISTER; + +// +// See ISA System Architecture 3rd Edition (Tom Shanley, Don Anderson, John Swindle) +// P. 400 +// +// This port is controled by the i8255 Programmable Peripheral Interface (PPI) +// +#define SYSTEM_CONTROL_PORT_A 0x92 +#define SYSTEM_CONTROL_PORT_B 0x61 +typedef union _SYSTEM_CONTROL_PORT_B_REGISTER +{ + struct + { + UCHAR Timer2GateToSpeaker:1; + UCHAR SpeakerDataEnable:1; + UCHAR ParityCheckEnable:1; + UCHAR ChannelCheckEnable:1; + UCHAR RefreshRequest:1; + UCHAR Timer2Output:1; + UCHAR ChannelCheck:1; + UCHAR ParityCheck:1; + }; + UCHAR Bits; +} SYSTEM_CONTROL_PORT_B_REGISTER, *PSYSTEM_CONTROL_PORT_B_REGISTER; + // // Mm PTE/PDE to Hal PTE/PDE //

1 0

[ros-arm-bringup] 44990: - Restore PROGRAMMER's field correctly.
by ros-arm-bringup＠svn.reactos.org 07 Jan '10

07 Jan '10

Author: ros-arm-bringup Date: Thu Jan 7 20:08:11 2010 New Revision: 44990 URL: http://svn.reactos.org/svn/reactos?rev=44990&view=rev Log: - Restore PROGRAMMER's field correctly. Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Thu Jan 7 20:08:11 2010 @@ -4,6 +4,7 @@ * FILE: halx86/generic/bios.c * PURPOSE: BIOS Access Routines * PROGRAMMERS: ReactOS Portable Systems Group + * Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *******************************************************************/

1 0

[jimtabor] 44989: [User32] - Patch by James Hawkins : Don't try to free a handle with a value of 1, which is the dde handle value for asynchronous operations. - Will sync to wine after a review of new WOW implementation.
by jimtabor＠svn.reactos.org 07 Jan '10

07 Jan '10

Author: jimtabor Date: Thu Jan 7 20:05:57 2010 New Revision: 44989 URL: http://svn.reactos.org/svn/reactos?rev=44989&view=rev Log: [User32] - Patch by James Hawkins : Don't try to free a handle with a value of 1, which is the dde handle value for asynchronous operations. - Will sync to wine after a review of new WOW implementation. Modified: trunk/reactos/dll/win32/user32/misc/dde.c Modified: trunk/reactos/dll/win32/user32/misc/dde.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dde.… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/dde.c [iso-8859-1] Thu Jan 7 20:05:57 2010 @@ -1456,6 +1456,11 @@ BOOL WINAPI DdeFreeDataHandle(HDDEDATA hData) { TRACE("(%p)\n", hData); + + /* 1 is the handle value returned by an asynchronous operation. */ + if (hData == (HDDEDATA)1) + return TRUE; + return GlobalFree(hData) == 0; }

1 0

[jimtabor] 44988: [User32] - Patch by Marcus Meissner : Remove useless NULL check (Coverity). - Will sync to wine after a review of new WOW implementation.
by jimtabor＠svn.reactos.org 07 Jan '10

07 Jan '10

Author: jimtabor Date: Thu Jan 7 19:59:13 2010 New Revision: 44988 URL: http://svn.reactos.org/svn/reactos?rev=44988&view=rev Log: [User32] - Patch by Marcus Meissner : Remove useless NULL check (Coverity). - Will sync to wine after a review of new WOW implementation. Modified: trunk/reactos/dll/win32/user32/windows/mdi.c Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/mdi.c [iso-8859-1] Thu Jan 7 19:59:13 2010 @@ -303,7 +303,7 @@ if (total < 0) /* we are called from CreateWindow */ { MDICLIENTINFO *ci = get_client_info(hwndClient); - total = ci ? ci->nTotalCreated : 0; + total = ci->nTotalCreated; *id = ci ? ci->idFirstChild + ci->nActiveChildren : 0; TRACE("MDI child id %04x\n", *id); }

1 0

[jimtabor] 44987: [User32] - Patch by Marcus Meissner : EM_REPLACESEL Handle OOM error. - Will sync to wine after a review of new WOW implementation.
by jimtabor＠svn.reactos.org 07 Jan '10

07 Jan '10

Author: jimtabor Date: Thu Jan 7 19:55:24 2010 New Revision: 44987 URL: http://svn.reactos.org/svn/reactos?rev=44987&view=rev Log: [User32] - Patch by Marcus Meissner : EM_REPLACESEL Handle OOM error. - Will sync to wine after a review of new WOW implementation. Modified: trunk/reactos/dll/win32/user32/controls/edit.c Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c [iso-8859-1] Thu Jan 7 19:55:24 2010 @@ -5004,8 +5004,8 @@ { LPSTR textA = (LPSTR)lParam; INT countW = MultiByteToWideChar(CP_ACP, 0, textA, -1, NULL, 0); - if((textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); + if(!(textW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR)))) break; + MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
53
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2010