Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 55836: [USBOHCI] - Try to fix some real hardware OHCI initialization hangs
by cgutman＠svn.reactos.org 24 Feb '12

24 Feb '12

Author: cgutman Date: Fri Feb 24 07:26:43 2012 New Revision: 55836 URL: http://svn.reactos.org/svn/reactos?rev=55836&view=rev Log: [USBOHCI] - Try to fix some real hardware OHCI initialization hangs Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Feb 24 07:26:43 2012 @@ -533,7 +533,10 @@ // get frame interval // FrameInterval = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET)); + m_IntervalValue = OHCI_GET_INTERVAL_VALUE(FrameInterval); + FrameInterval = ((FrameInterval & OHCI_FRAME_INTERVAL_TOGGLE) ^ OHCI_FRAME_INTERVAL_TOGGLE); + DPRINT1("FrameInterval %x IntervalValue %x\n", FrameInterval, m_IntervalValue); FrameInterval |= OHCI_FSMPS(m_IntervalValue) | m_IntervalValue; DPRINT1("FrameInterval %x\n", FrameInterval); @@ -1101,11 +1104,6 @@ if ((Reset & OHCI_HOST_CONTROLLER_RESET) == 0) { // - // restore the frame interval register - // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_FRAME_INTERVAL_OFFSET), FrameInterval); - - // // controller completed reset // return STATUS_SUCCESS;

1 0

[dgorbachev] 55835: [FREELDR][NTOSKRNL] Update linker scripts.
by dgorbachev＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: dgorbachev Date: Thu Feb 23 18:59:24 2012 New Revision: 55835 URL: http://svn.reactos.org/svn/reactos?rev=55835&view=rev Log: [FREELDR][NTOSKRNL] Update linker scripts. Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] Thu Feb 23 18:59:24 2012 @@ -23,6 +23,15 @@ __bss_end__ = . ; } + .stab BLOCK(__section_alignment__) (NOLOAD) : + { + *(.stab) + } + .stabstr BLOCK(__section_alignment__) (NOLOAD) : + { + *(.stabstr) + } + /* DWARF debug sections. Symbols in the DWARF debugging sections are relative to the beginning of the section. Unlike other targets that fake this by putting the @@ -43,7 +52,7 @@ /* DWARF 2. */ .debug_info BLOCK(__section_alignment__) (NOLOAD) : { - *(.debug_info) *(.gnu.linkonce.wi.*) + *(.debug_info .gnu.linkonce.wi.*) } .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : { @@ -98,7 +107,7 @@ /* DWARF 4. */ .debug_types BLOCK(__section_alignment__) (NOLOAD) : { - *(.debug_types) *(.gnu.linkonce.wt.*) + *(.debug_types .gnu.linkonce.wt.*) } /DISCARD/ : Modified: trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl_i386.lnk [iso-8859-1] Thu Feb 23 18:59:24 2012 @@ -1,105 +1,150 @@ -OUTPUT_FORMAT(pei-i386) -ENTRY(_mainCRTStartup) SECTIONS { - .text __image_base__ + __section_alignment__ : + .text __image_base__ + __section_alignment__ : { - __text_start__ = .; - *(.init) *(.text) - *(SORT(.text$*)) - *(.glue_7t) - *(.glue_7) - ___CTOR_LIST__ = .; __CTOR_LIST__ = . ; - LONG (-1); *(.ctors); *(.ctor); LONG (0); - ___DTOR_LIST__ = .; __DTOR_LIST__ = . ; - LONG (-1); *(.dtors); *(.dtor); LONG (0); - *(.fini) - /* ??? Why is .gcc_exc here? */ - *(.gcc_exc) - __text_end__ = .; - *(.gcc_except_table) + *(SORT(.text*)) } - /* The Cygwin32 library uses a section to avoid copying certain data - on fork. This used to be named ".data". The linker used - to include this between __data_start__ and __data_end__, but that - breaks building the cygwin32 dll. Instead, we name the section - ".data_cygwin_nocopy" and explictly include it after __data_end__. */ - .data BLOCK(__section_alignment__) : + + .data BLOCK(__section_alignment__) : { - __data_start__ = . ; *(.data) - *(.data2) - *(SORT(.data$*)) - __data_end__ = . ; - *(.data_cygwin_nocopy) + *(SORT(.data*)) } + .rdata BLOCK(__section_alignment__) : { *(.rdata) - *(SORT(.rdata$*)) + *(SORT(.rdata*)) *(.eh_frame) } + .edata BLOCK(__section_alignment__) : { *(.edata) } + /DISCARD/ : { - *(.debug$S) - *(.debug$T) - *(.debug$F) *(.drectve) + *(.gnu.lto_*) } .idata BLOCK(__section_alignment__) : { /* This cannot currently be handled with grouped sections. - See pe.em:sort_sections. */ + See pe.em:sort_sections. */ SORT(*)(.idata$2) SORT(*)(.idata$3) /* These zeroes mark the end of the import list. */ LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); - SORT(*)(.idata$4) + SORT(*)(.idata$4) SORT(*)(.idata$5) SORT(*)(.idata$6) SORT(*)(.idata$7) } - .CRT BLOCK(__section_alignment__) : - { - *(SORT(.CRT$*)) - } + .rsrc BLOCK(__section_alignment__) : - { + { *(.rsrc) *(SORT(.rsrc$*)) } + .bss BLOCK(__section_alignment__) : { - __bss_start__ = . ; *(.bss) *(COMMON) - __bss_end__ = . ; } + .reloc BLOCK(__section_alignment__) : - { + { *(.reloc) - /* These zeroes mark the end of the reloc section. */ - LONG (0); LONG (0); LONG (0); LONG (0); LONG (0); } + .stab BLOCK(__section_alignment__) (NOLOAD) : { - [ .stab ] + *(.stab) } .stabstr BLOCK(__section_alignment__) (NOLOAD) : { - [ .stabstr ] + *(.stabstr) } - INIT BLOCK(__section_alignment__) : + + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section. Unlike other targets that fake this by putting the + section VMA at 0, the PE format will not allow it. */ + /* DWARF 1.1 and DWARF 2. */ + .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : { - __init_start__ = . ; - *(INIT) - __init_end__ = . ; + *(.debug_aranges) + } + .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubnames) + } + .debug_pubtypes BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubtypes) + } + /* DWARF 2. */ + .debug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_info .gnu.linkonce.wi.*) + } + .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_abbrev) + } + .debug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_line) + } + .debug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_frame*) + } + .debug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_str) + } + .debug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_loc) + } + .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macinfo) + } + /* SGI/MIPS DWARF 2 extensions. */ + .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_weaknames) + } + .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_funcnames) + } + .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_typenames) + } + .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_varnames) + } + .debug_macro BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macro) + } + /* DWARF 3. */ + .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_ranges) + } + /* DWARF 4. */ + .debug_types BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_types .gnu.linkonce.wt.*) } } -

1 0

[sginsberg] 55834: [CMAKE] - Specify C4700 (uninitialized variable usage) to cause an error on compile as this is very likely to result in broken code. [NTDLL] - Disable ASSERT in LdrpSearchPath th...
by sginsberg＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: sginsberg Date: Thu Feb 23 13:06:11 2012 New Revision: 55834 URL: http://svn.reactos.org/svn/reactos?rev=55834&view=rev Log: [CMAKE] - Specify C4700 (uninitialized variable usage) to cause an error on compile as this is very likely to result in broken code. [NTDLL] - Disable ASSERT in LdrpSearchPath that could be reading an uninitialized variable. The routine is not fully implemented so this should likely be re-enabled once it is. [BROWSEUI] - Add missing call to BuildRebarBandInfo, or we would end up with an unitialized variable sent to SendMessage. [PCIX] - Fix broken ASSERT - Fix usage of wrong (and uninitialized) variable in the Unicode case for PciGetDescriptionMessage. [DDK] - Prepend "_" to local variable of NdisChainBufferAtBack. Fixes code in ndisuio that called this using the same name as the macro's variable (which resulted in NdisChainBufferAtBack assigning the variable to itself). [WIN32K] - Fix WinPosShowIconTitle that checked if a variable was NULL before assigning it to anything. Modified: trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/ntdll/ldr/ldrutils.c trunk/reactos/dll/win32/browseui/bandsite.cpp trunk/reactos/drivers/bus/pcix/pci/id.c trunk/reactos/include/ddk/ndis.h trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=55834… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -20,6 +20,9 @@ add_definitions(/Dinline=__inline /D__STDC__=1) add_compile_flags("/X /GR- /GS- /Zl /W3") + +# C4700 is almost always likely to result in broken code, so mark it as an error +add_compile_flags("/we4700") # Debugging if(${CMAKE_BUILD_TYPE} MATCHES Debug) Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -1860,7 +1860,9 @@ /* Sanity check */ TestName.Length = (USHORT)ALIGN_DOWN((BufEnd - Buffer), WCHAR); +#if 0 ASSERT(TestName.Length < TestName.MaximumLength); +#endif /* Check if the file exists */ #if 0 Modified: trunk/reactos/dll/win32/browseui/bandsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/bandsit… ============================================================================== --- trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/bandsite.cpp [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -409,6 +409,7 @@ WARN("IBandSite::AddBand(): Call to IDeskBand::SetSite() failed: %x\n", hRet); /* Remove the band from the ReBar control */ + BuildRebarBandInfo(NewBand, &rbi); uBand = (UINT)SendMessageW(fRebarWindow, RB_IDTOINDEX, (WPARAM)rbi.wID, 0); if (uBand != (UINT)-1) { Modified: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -51,7 +51,7 @@ /* Validate valid message length, ending with a newline character */ ASSERT(TextLength > 1); - ASSERT(Description[TextLength / sizeof(WCHAR) == L'\n']); + ASSERT(Description[TextLength / sizeof(WCHAR)] == L'\n'); /* Allocate the buffer to hold the message string */ Buffer = ExAllocatePoolWithTag(PagedPool, TextLength, 'BicP'); @@ -61,8 +61,8 @@ RtlCopyMemory(Buffer, Entry->Text, TextLength - 1); Buffer[TextLength / sizeof(WCHAR)] = UNICODE_NULL; - /* Return the length to the caller */ - if (Length) *Length = UnicodeString.Length; + /* Return the length to the caller, minus the terminating NULL */ + if (Length) *Length = TextLength - 1; } else { Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=558… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -3101,19 +3101,19 @@ #define NdisChainBufferAtBack(Packet, \ Buffer) \ { \ - PNDIS_BUFFER NdisBuffer = (Buffer); \ + PNDIS_BUFFER _NdisBuffer = (Buffer); \ \ - while (NdisBuffer->Next != NULL) \ - NdisBuffer = NdisBuffer->Next; \ + while (_NdisBuffer->Next != NULL) \ + _NdisBuffer = _NdisBuffer->Next; \ \ - NdisBuffer->Next = NULL; \ + _NdisBuffer->Next = NULL; \ \ if ((Packet)->Private.Head != NULL) \ (Packet)->Private.Tail->Next = (Buffer); \ else \ (Packet)->Private.Head = (Buffer); \ \ - (Packet)->Private.Tail = NdisBuffer; \ + (Packet)->Private.Tail = _NdisBuffer; \ (Packet)->Private.ValidCounts = FALSE; \ } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Thu Feb 23 13:06:11 2012 @@ -134,7 +134,7 @@ { HICON hIcon; if (!pWnd->pcls || pWnd->fnid == FNID_DESKTOP) return FALSE; - if (!hIcon) hIcon = pWnd->pcls->hIconSm; + hIcon = pWnd->pcls->hIconSm; if (!hIcon) hIcon = pWnd->pcls->hIcon; if (!hIcon) return FALSE;

1 0

[akhaldi] 55833: [NEWCC] A reintegration checkpoint for the NewCC branch, brought to you by Team NewCC. Differences with current ReactOS trunk: * A new memory area type, MEMORY_AREA_CACHE, is added...
by akhaldi＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: akhaldi Date: Thu Feb 23 12:03:06 2012 New Revision: 55833 URL: http://svn.reactos.org/svn/reactos?rev=55833&view=rev Log: [NEWCC] A reintegration checkpoint for the NewCC branch, brought to you by Team NewCC. Differences with current ReactOS trunk: * A new memory area type, MEMORY_AREA_CACHE, is added, which represents a mapped region of a file. In NEWCC mode, user sections are MEMORY_AREA_CACHE type as well, and obey new semantics. In non-NEWCC mode, they aren't used. * A way of claiming a page entry for a specific thread's work is added. Placing the special SWAPENTRY value MM_WAIT_ENTRY in a page table, or in a section page table should indicate that memory management code is intended to wait for another thread to make some status change before checking the state of the page entry again. In code that uses this convention, a return value of STATUS_SUCCESS + 1 is used to indicate that the caller should use the MiWaitForPageEvent macro to wait until somebody has change the state of a wait entry before checking again. This is a lighter weight mechanism than PAGEOPs. * A way of asking the caller to perform some blocking operation without locks held is provided. This replaces some spaghettified code in which locks are repeatedly taken and broken by code that performs various blocking operations. Using this mechanism, it is possible to do a small amount of non-blocking work, fill in a request, then return STATUS_MORE_PROCESSING_REQUIRED to request that locks be dropped and the blocking operation be carried out. A MM_REQUIRED_RESOURCES structure is provided to consumers of this contract to use to accumulate state across many blocking operations. Several functions wrapping blocking operations are provided in ntoskrnl/cache/reqtools.c. * Image section pages are no longer direct mapped. This is done to simplify consolidation of ownership of pages under the data section system. At a later time, it may be possible to make data pages directly available to image sections for the same file. This is likely the only direct performance impact this code makes on non-NEWCC mode. RMAPs: * A new type of RMAP entry is introduced, distinguished by RMAP_IS_SEGMENT(Address) of the rmap entry. This kind of entry contains a pointer to a section page table node in the Process pointer, which in turn links back to the MM_SECTION_SEGMENT it belongs to. Therefore, a page belonging only to a segment (that is, a segment page that isn't mapped) can exist and be evicted using the normal page eviction mechanism in balance.c. Each of the rmap function has been modified to deal with segment rmaps. * The low 8 bits of the Address field in a segment rmap denote the entry number in the generic table node pointed to by Process that points to the page the rmap belongs to. By combining them, you can determine the file offset the page belongs to. * In NEWCC mode, MmSharePageEntry/UnsharePageEntry are not used, and instead the page reference count is used to keep track of the number of mappings of a page, allowing the last reference expiring to allow the page to be recycled without much intervention. These are still used in non-NEWCC mode. One change has been made, the count fields have been narrowed by 1 bit to make room for a dirty bit in SSE entries, needed when a page is present but unmapped. Section page tables: * The section page tables are now implemented using RtlGenericTables. This enables a fairly compact representation of section page tables without having the existence of a section object imply 4k of fake PDEs. In addition, each node in the generic table has a wide file offset that is a multiple of 256 pages, or 1 megabyte total. Besides needing wide file offsets, the only other visible change caused by the switch to generic tables for section page tables is the need to lock the section segment before interacting with the section page table. Eviction: * Page eviction in cache sections is accomplished by MmpPageOutPhysicalAddress. In the case of a shared page, it tries to remove all mappings of the indicated page. If this process fails at any point, the page will simply be drawn back into the target address spaces. After succeeding at this, if TRUE has been accumulated into the page's dirty bit in the section page table, it is written back, and then permanently removed. NewCC mode: * NEWCC mode is introduced, which rewrites the file cache to a set of cache stripes actively mapped, along with unmapped section data. * NewCC is more authentic in its interpretation of the external interface to the windows cache than the current cache manager, implementing each of the cache manager functions according to the documented interface with no preconceived ideas about how anything should be implemented internally. Cache stripes are implemented on top of section objects, using the same memory manager paths, and therefore economizing code and complexity. This replaces a rather complicated system in which pages can be owned by the cache manager and the memory manager simultaneously and they must cooperate in a fairly sophisticated way to manage them. Since they're quite interdependent in the current code, modifying either is very difficult. In NEWCC, they have a clear division of labor and thus can be worked on independently. * Several third party filesystems that use the kernel Cc interface work properly using NEWCC, including matt wu's ext3 driver. * In contrast with code that tries to make CcInitializeCacheMap and CcUninitializeCacheMap into a pair that supports reference counting, NEWCC lazily initializes the shared and private cache maps as needed and uses the presence of a PrivateCacheMap on at least one file pointing to the SharedCacheMap as an indication that the FILE_OBJECT reference in the SharedCacheMap should still be held. When the last PrivateCacheMap is discarded, that's the appropriate time to tear down caching for a specific file, as the SharedCacheMap data is allowed to be saved and reused. We honor this by making the SharedCacheMap into a depot for keeping track of the PrivateCacheMap objects associated with views of a file. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/copysup.c trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/lazyrite.c trunk/reactos/ntoskrnl/cache/logsup.c trunk/reactos/ntoskrnl/cache/mdlsup.c trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/io.c trunk/reactos/ntoskrnl/cache/section/newmm.h trunk/reactos/ntoskrnl/cache/section/reqtools.c trunk/reactos/ntoskrnl/cache/section/sptab.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild trunk/reactos/ntoskrnl/po/poshtdwn.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… Modified: trunk/reactos/ntoskrnl/cache/copysup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/copysup.c?r… Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… Modified: trunk/reactos/ntoskrnl/cache/lazyrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/lazyrite.c?… Modified: trunk/reactos/ntoskrnl/cache/logsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/logsup.c?re… Modified: trunk/reactos/ntoskrnl/cache/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/mdlsup.c?re… Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… Modified: trunk/reactos/ntoskrnl/cache/section/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/io.… Modified: trunk/reactos/ntoskrnl/cache/section/newmm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/new… Modified: trunk/reactos/ntoskrnl/cache/section/reqtools.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/req… Modified: trunk/reactos/ntoskrnl/cache/section/sptab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/spt… Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=55833… Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=558… Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… Modified: trunk/reactos/ntoskrnl/po/poshtdwn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/poshtdwn.c?rev…

1 0

[cgutman] 55832: [USBUHCI] - Delay for the correct amount of time when performing a global reset and a port reset - Loosen the loop timings a bit to allow for more time for real hardware to complet...
by cgutman＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: cgutman Date: Thu Feb 23 05:27:24 2012 New Revision: 55832 URL: http://svn.reactos.org/svn/reactos?rev=55832&view=rev Log: [USBUHCI] - Delay for the correct amount of time when performing a global reset and a port reset - Loosen the loop timings a bit to allow for more time for real hardware to complete start/stop/reset - Clear only the change bits that were set and handle both bits in the either case - Perform a synchronous callback when the reset completes Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 05:27:24 2012 @@ -499,7 +499,7 @@ // WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_RS); - for(Index = 0; Index < 10; Index++) + for(Index = 0; Index < 100; Index++) { // // wait a bit @@ -576,6 +576,8 @@ VOID CUSBHardwareDevice::GlobalReset() { + LARGE_INTEGER Timeout; + // // back up start of modify register // @@ -586,10 +588,25 @@ // perform global reset // WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_GRESET); - KeStallExecutionProcessor(20); - - // - // clear global reset bit + + // + // delay is 10 ms + // + Timeout.QuadPart = 10; + DPRINT1("Waiting %d milliseconds for global reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // + // clear command register // WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_GRESET); KeStallExecutionProcessor(10); @@ -880,7 +897,7 @@ // // wait a bit // - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); // // get status @@ -893,7 +910,7 @@ // return STATUS_SUCCESS; } - }while(Count++ < 5); + }while(Count++ < 100); DPRINT1("[USBUHCI] Failed to reset controller Status %x\n", Status); return STATUS_UNSUCCESSFUL; @@ -906,6 +923,7 @@ ULONG Port; USHORT Status; ULONG Index; + LARGE_INTEGER Timeout; DPRINT1("[UHCI] ResetPort Id %lu\n", PortIndex); @@ -937,32 +955,43 @@ WriteRegister16(Port, Status | UHCI_PORTSC_RESET); // + // delay is 20 ms for port reset + // + Timeout.QuadPart = 20; + DPRINT1("Waiting %d milliseconds for port reset\n", Timeout.LowPart); + + // + // convert to 100 ns units (absolute) + // + Timeout.QuadPart *= -10000; + + // + // perform the wait + // + KeDelayExecutionThread(KernelMode, FALSE, &Timeout); + + // + // re-read status + // + Status = ReadRegister16(Port); + + // + // remove unwanted bits + // + Status &= UHCI_PORTSC_DATAMASK; + + // + // clear reset port + // + WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); + + + // // now wait a bit // - KeStallExecutionProcessor(250); - - // - // re-read status - // - Status = ReadRegister16(Port); - - // - // remove unwanted bits - // - Status &= UHCI_PORTSC_DATAMASK; - - // - // clear reset port - // - WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); - - - // - // now wait a bit - // KeStallExecutionProcessor(10); - for (Index = 0; Index < 10; Index++) + for (Index = 0; Index < 100; Index++) { // read port status Status = ReadRegister16(Port); @@ -994,8 +1023,7 @@ { // port enabled changed or connection status were set. // acknowledge either / both and wait again. - Status &= UHCI_PORTSC_DATAMASK; - WriteRegister16(Port, Status | UHCI_PORTSC_STATCHA | UHCI_PORTSC_ENABCHA); + WriteRegister16(Port, Status); continue; } @@ -1009,6 +1037,16 @@ m_PortResetChange |= (1 << PortIndex); DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); + // + // is there a callback + // + if (m_SCECallBack) + { + // + // issue callback + // + m_SCECallBack(m_SCEContext); + } return STATUS_SUCCESS; } @@ -1114,7 +1152,7 @@ // read current status // PortRegister = UHCI_PORTSC1 + PortId * 2; - PortStatus = ReadRegister16(PortRegister) & UHCI_PORTSC_DATAMASK; + PortStatus = ReadRegister16(PortRegister); DPRINT("[UHCI] PortStatus %x\n", PortStatus); if (Feature == C_PORT_RESET) @@ -1124,19 +1162,12 @@ // m_PortResetChange &= ~(1 << PortId); } - else if (Feature == C_PORT_CONNECTION) - { - // - // clear connection status - // - WriteRegister16(PortRegister, PortStatus | UHCI_PORTSC_STATCHA); - } - else if (Feature == C_PORT_ENABLE) - { - // - // enable port - // - WriteRegister16(PortRegister, PortStatus | UHCI_PORTSC_ENABCHA); + else if (Feature == C_PORT_CONNECTION || Feature == C_PORT_ENABLE) + { + // + // clear port status changes + // + WriteRegister16(PortRegister, PortStatus); } return STATUS_SUCCESS;

1 0

[janderwald] 55831: [USBUHCI] - Remove left-over assert - Remove dead code - Enable port after reset
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 05:07:07 2012 New Revision: 55831 URL: http://svn.reactos.org/svn/reactos?rev=55831&view=rev Log: [USBUHCI] - Remove left-over assert - Remove dead code - Enable port after reset Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 05:07:07 2012 @@ -647,7 +647,6 @@ Value = 0; BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, 0x60, sizeof(UCHAR)); DPRINT1("[USBUHCI] SBRN %x\n", Value); - ASSERT(FALSE); // // perform global reset @@ -925,15 +924,6 @@ // Status = ReadRegister16(Port); - // - // Before port reset, disable the port - // - WriteRegister16(Port, ReadRegister16(Port) & ~UHCI_PORTSC_ENABLED); - while(ReadRegister16(Port) & UHCI_PORTSC_ENABLED) - { - DPRINT1("Port %x Status %x\n", PortIndex, ReadRegister16(Port)); - KeStallExecutionProcessor(5); - } // @@ -949,7 +939,7 @@ // // now wait a bit // - KeStallExecutionProcessor(50); + KeStallExecutionProcessor(250); // // re-read status @@ -966,10 +956,6 @@ // WriteRegister16(Port, (Status & ~UHCI_PORTSC_RESET)); - // - // set enabled bit - // - WriteRegister16(Port, ReadRegister16(Port) | UHCI_PORTSC_ENABLED); // // now wait a bit @@ -978,20 +964,14 @@ for (Index = 0; Index < 10; Index++) { - // // read port status - // Status = ReadRegister16(Port); - // // remove unwanted bits - // Status &= UHCI_PORTSC_DATAMASK; - // // enable port - // - WriteRegister16(Port, Status); + WriteRegister16(Port, Status | UHCI_PORTSC_ENABLED); // // wait a bit @@ -1029,16 +1009,6 @@ m_PortResetChange |= (1 << PortIndex); DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); -#if 0 - if (Status & UHCI_PORTSC_CURSTAT) - { - // - // queue work item - // - DPRINT1("Queueing work item\n"); - ExQueueWorkItem(&m_StatusChangeWorkItem, DelayedWorkQueue); - } -#endif return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Thu Feb 23 05:07:07 2012 @@ -845,7 +845,30 @@ // // FIXME FIXME FIXME FIXME FIXME // - MaxPacketSize = 1280; + if (GetDeviceSpeed() == UsbLowSpeed) + { + // + // low speed use max 8 bytes + // + MaxPacketSize = 8; + } + else + { + if (m_EndpointDescriptor) + { + // + // use endpoint size + // + MaxPacketSize = m_EndpointDescriptor->EndPointDescriptor.wMaxPacketSize; + } + else + { + // + // use max 64 bytes + // + MaxPacketSize = 64; + } + } do {

1 0

[janderwald] 55830: [USBUHCI] - Fix initialization bugs in real hardware
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 03:22:57 2012 New Revision: 55830 URL: http://svn.reactos.org/svn/reactos?rev=55830&view=rev Log: [USBUHCI] - Fix initialization bugs in real hardware Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 03:22:57 2012 @@ -585,15 +585,13 @@ // // perform global reset // - WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + UHCI_USBCMD), UHCI_USBCMD_GRESET); - - KeStallExecutionProcessor(100); - - // - // clear command register - // - WRITE_PORT_USHORT((PUSHORT)((ULONG)m_Base + UHCI_USBCMD), 0); - + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) | UHCI_USBCMD_GRESET); + KeStallExecutionProcessor(20); + + // + // clear global reset bit + // + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_GRESET); KeStallExecutionProcessor(10); @@ -638,11 +636,18 @@ // // reclaim ownership from BIOS // - Value = PCI_LEGSUP_USBPIRQDEN | PCI_LEGSUP_CLEAR_SMI; + Value = 0; + BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, PCI_LEGSUP, sizeof(USHORT)); + DPRINT1("[USBUHCI] LEGSUP %x\n", Value); + + Value = PCI_LEGSUP_USBPIRQDEN; BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, PCI_LEGSUP, sizeof(USHORT)); DPRINT1("[USBUHCI] Acquired ownership\n"); - + Value = 0; + BusInterface.GetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &Value, 0x60, sizeof(UCHAR)); + DPRINT1("[USBUHCI] SBRN %x\n", Value); + ASSERT(FALSE); // // perform global reset @@ -714,6 +719,7 @@ // m_QueueHead[Index]->PhysicalAddress = Address.LowPart; m_QueueHead[Index]->ElementPhysical = QH_TERMINATE; + m_QueueHead[Index]->LinkPhysical = QH_TERMINATE; if (Index > 0) { @@ -852,6 +858,19 @@ ULONG Count = 0; USHORT Status; + // clear run bit + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_RS); + + // wait for the controller to stop + while((ReadRegister16(UHCI_USBSTS) & UHCI_USBSTS_HCHALT) == 0) + { + DPRINT1("[UHCI] Waiting for the controller to halt\n"); + KeStallExecutionProcessor(10); + } + + // clear configure bit + WriteRegister16(UHCI_USBCMD, ReadRegister16(UHCI_USBCMD) & ~UHCI_USBCMD_CF); + // // reset controller //

1 0

[janderwald] 55829: [HIDCLASS] [USBUHCI] - Silence traces
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 01:51:55 2012 New Revision: 55829 URL: http://svn.reactos.org/svn/reactos?rev=55829&view=rev Log: [HIDCLASS] [USBUHCI] - Silence traces Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp Modified: trunk/reactos/drivers/hid/hidclass/hidclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/hidcl… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/hidclass.c [iso-8859-1] Thu Feb 23 01:51:55 2012 @@ -496,7 +496,7 @@ IoCompleteRequest(IrpContext->OriginalIrp, IO_NO_INCREMENT); - DPRINT1("StopInProgress %x IsEmpty %x\n", IrpContext->FileOp->StopInProgress, IsEmpty); + DPRINT("StopInProgress %x IsEmpty %x\n", IrpContext->FileOp->StopInProgress, IsEmpty); if (IrpContext->FileOp->StopInProgress && IsEmpty) { // Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Thu Feb 23 01:51:55 2012 @@ -350,7 +350,7 @@ // // descriptor is still active // - DPRINT1("Descriptor %p is active Status %x BufferSize %lu\n", Descriptor, Descriptor->Status, Descriptor->BufferSize); + DPRINT("Descriptor %p is active Status %x BufferSize %lu\n", Descriptor, Descriptor->Status, Descriptor->BufferSize); return FALSE; }

1 0

[janderwald] 55828: [USBUHCI] - OHCI -> UHCI - Implement timer routine which checks for new detected devices. In case a port change is detected, the sce callback routine is invoked
by janderwald＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: janderwald Date: Thu Feb 23 01:27:19 2012 New Revision: 55828 URL: http://svn.reactos.org/svn/reactos?rev=55828&view=rev Log: [USBUHCI] - OHCI -> UHCI - Implement timer routine which checks for new detected devices. In case a port change is detected, the sce callback routine is invoked Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp trunk/reactos/drivers/usb/usbuhci/misc.cpp trunk/reactos/drivers/usb/usbuhci/purecall.cpp trunk/reactos/drivers/usb/usbuhci/usb_device.cpp trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp trunk/reactos/drivers/usb/usbuhci/usb_request.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp trunk/reactos/drivers/usb/usbuhci/usbuhci.h Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/hcd_controller.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/hcd_controller.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -22,7 +22,7 @@ VOID NTAPI -OhciDefferedRoutine( +UhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -30,7 +30,18 @@ VOID NTAPI +TimerDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2); + + +VOID +NTAPI StatusChangeWorkItemRoutine(PVOID Context); + + class CUSBHardwareDevice : public IUSBHardwareDevice { @@ -86,7 +97,8 @@ // friend function friend BOOLEAN NTAPI InterruptServiceRoutine(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); - friend VOID NTAPI OhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + friend VOID NTAPI UhciDefferedRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); + friend VOID NTAPI TimerDpcRoutine(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, IN PVOID SystemArgument2); friend VOID NTAPI StatusChangeWorkItemRoutine(PVOID Context); VOID WriteRegister8(IN ULONG Register, IN UCHAR value); VOID WriteRegister16(ULONG Register, USHORT Value); @@ -120,7 +132,7 @@ PDMAMEMORYMANAGER m_MemoryManager; // memory manager HD_INIT_CALLBACK* m_SCECallBack; // status change callback routine PVOID m_SCEContext; // status change callback routine context - WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback + //WORK_QUEUE_ITEM m_StatusChangeWorkItem; // work item for status change callback ULONG m_InterruptMask; // interrupt enabled mask ULONG m_PortResetChange; // port reset status PULONG m_FrameList; // frame list @@ -129,6 +141,8 @@ PUHCI_QUEUE_HEAD m_QueueHead[5]; // queue heads PHYSICAL_ADDRESS m_StrayDescriptorPhysicalAddress; // physical address stray descriptor PUHCI_TRANSFER_DESCRIPTOR m_StrayDescriptor; // stray descriptor + KTIMER m_SCETimer; // SCE timer + KDPC m_SCETimerDpc; // timer dpc }; //================================================================================================= @@ -200,7 +214,15 @@ // // intialize status change work item // - ExInitializeWorkItem(&m_StatusChangeWorkItem, StatusChangeWorkItemRoutine, PVOID(this)); + //ExInitializeWorkItem(&m_StatusChangeWorkItem, StatusChangeWorkItemRoutine, PVOID(this)); + + + // initialize timer + KeInitializeTimer(&m_SCETimer); + + // initialize timer dpc + KeInitializeDpc(&m_SCETimerDpc, TimerDpcRoutine, PVOID(this)); + m_VendorID = 0; m_DeviceID = 0; @@ -258,7 +280,7 @@ case CmResourceTypeInterrupt: { KeInitializeDpc(&m_IntDpcObject, - OhciDefferedRoutine, + UhciDefferedRoutine, this); Status = IoConnectInterrupt(&m_Interrupt, @@ -537,6 +559,13 @@ DPRINT1("[USBUHCI] Controller Frame %x\n", ReadRegister16(UHCI_FRNUM)); DPRINT1("[USBUHCI] Controller Port Status 0 %x\n", ReadRegister16(UHCI_PORTSC1)); DPRINT1("[USBUHCI] Controller Port Status 1 %x\n", ReadRegister16(UHCI_PORTSC1 + 2)); + + + // queue timer + LARGE_INTEGER Expires; + Expires.QuadPart = -10 * 10000; + + KeSetTimerEx(&m_SCETimer, Expires, 1000, &m_SCETimerDpc); // // done @@ -979,8 +1008,9 @@ } m_PortResetChange |= (1 << PortIndex); - DPRINT1("[USBOHCI] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); - + DPRINT1("[USBUhci] Port Index %x Status after reset %x\n", PortIndex, ReadRegister16(Port)); + +#if 0 if (Status & UHCI_PORTSC_CURSTAT) { // @@ -989,6 +1019,7 @@ DPRINT1("Queueing work item\n"); ExQueueWorkItem(&m_StatusChangeWorkItem, DelayedWorkQueue); } +#endif return STATUS_SUCCESS; } @@ -1023,7 +1054,7 @@ // read port status // Status = ReadRegister16(UHCI_PORTSC1 + PortId * 2); - DPRINT1("[USBUHCI] PortId %x Status %x\n", PortId, Status); + DPRINT("[USBUHCI] PortId %x Status %x\n", PortId, Status); // build the status if (Status & UHCI_PORTSC_CURSTAT) @@ -1398,7 +1429,7 @@ VOID NTAPI -OhciDefferedRoutine( +UhciDefferedRoutine( IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID SystemArgument1, @@ -1412,7 +1443,7 @@ // This = (CUSBHardwareDevice*)DeferredContext; - DPRINT("OhciDefferedRoutine\n"); + DPRINT("UhciDefferedRoutine\n"); // // get status @@ -1432,6 +1463,40 @@ // DPRINT1("[USBUHCI] Status %x not handled\n", Status); } + +VOID +NTAPI +TimerDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + CUSBHardwareDevice *This; + USHORT PortStatus = 0; + USHORT PortChange = 0; + + // get parameters + This = (CUSBHardwareDevice*)DeferredContext; + + // check port 0 + This->GetPortStatus(0, &PortStatus, &PortChange); + if (PortChange) + { + // invoke status change work item routine + StatusChangeWorkItemRoutine(DeferredContext); + return; + } + + // check port 1 + This->GetPortStatus(1, &PortStatus, &PortChange); + if (PortChange) + { + // invoke status change work item routine + StatusChangeWorkItemRoutine(DeferredContext); + } +} + VOID NTAPI @@ -1462,7 +1527,7 @@ { PUSBHARDWAREDEVICE This; - This = new(NonPagedPool, TAG_USBOHCI) CUSBHardwareDevice(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBHardwareDevice(0); if (!This) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/hcd_controller.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/hcd_controller.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -755,7 +755,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CHCDController(0); + This = new(NonPagedPool, TAG_USBUHCI) CHCDController(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hub_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hub_controller.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/hub_controller.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/hub_controller.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -209,7 +209,7 @@ // // allocate device address bitmap buffer // - m_DeviceAddressBitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, 16, TAG_USBOHCI); + m_DeviceAddressBitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, 16, TAG_USBUHCI); if (!m_DeviceAddressBitmapBuffer) { // @@ -484,7 +484,7 @@ // // allocate buffer // - DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_USBOHCI); + DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Length * sizeof(WCHAR), TAG_USBUHCI); if (!DeviceName) { @@ -556,7 +556,7 @@ // // allocate buffer // - DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Index * sizeof(WCHAR), TAG_USBOHCI); + DeviceName = (LPWSTR)ExAllocatePoolWithTag(PagedPool, Index * sizeof(WCHAR), TAG_USBUHCI); if (!DeviceName) { @@ -664,7 +664,7 @@ // // allocate device relations // - DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), TAG_USBOHCI); + DeviceRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(PagedPool, sizeof(DEVICE_RELATIONS), TAG_USBUHCI); if (!DeviceRelations) { // @@ -1746,7 +1746,7 @@ // // abort pipe failed // - DPRINT1("[USBOHCI] AbortPipe failed with %x\n", Status); + DPRINT1("[USBUHCI] AbortPipe failed with %x\n", Status); } // @@ -2288,7 +2288,7 @@ // // free entry // - ExFreePoolWithTag(DeviceEntry, TAG_USBOHCI); + ExFreePoolWithTag(DeviceEntry, TAG_USBUHCI); // // done @@ -2383,7 +2383,7 @@ // // allocate device entry // - DeviceEntry = (PUSBDEVICE_ENTRY)ExAllocatePoolWithTag(NonPagedPool, sizeof(USBDEVICE_ENTRY), TAG_USBOHCI); + DeviceEntry = (PUSBDEVICE_ENTRY)ExAllocatePoolWithTag(NonPagedPool, sizeof(USBDEVICE_ENTRY), TAG_USBUHCI); if (!DeviceEntry) { // @@ -3693,7 +3693,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CHubController(0); + This = new(NonPagedPool, TAG_USBUHCI) CHubController(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/memory… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/memory_manager.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/memory_manager.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/memory_manager.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -90,7 +90,7 @@ // // allocate bitmap buffer // - m_BitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, BitmapLength, TAG_USBOHCI); + m_BitmapBuffer = (PULONG)ExAllocatePoolWithTag(NonPagedPool, BitmapLength, TAG_USBUHCI); if (!m_BitmapBuffer) { // @@ -342,7 +342,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CDMAMemoryManager(0); + This = new(NonPagedPool, TAG_USBUHCI) CDMAMemoryManager(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/misc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/misc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/misc.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/misc.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/misc.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/drivers/usb/usbuhci/purecall.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/pureca… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/purecall.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/purecall.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/purecall.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/purecall.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/drivers/usb/usbuhci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_de… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_device.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usb_device.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usb_device.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -115,7 +115,7 @@ // abort pipe // //Status = AbortPipe((PUSB_ENDPOINT_DESCRIPTOR)&m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints[EndpointIndex]); - //DPRINT1("[USBOHCI] Deleting Device Abort Pipe Status %x\n", Status); + //DPRINT1("[USBUHCI] Deleting Device Abort Pipe Status %x\n", Status); } if (m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].InterfaceDescriptor.bNumEndpoints) @@ -373,7 +373,7 @@ DPRINT1("CUSBDevice::SetDeviceAddress Address %d\n", DeviceAddress); - CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBOHCI); + CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBUHCI); if (!CtrlSetup) return STATUS_INSUFFICIENT_RESOURCES; @@ -396,7 +396,7 @@ // // free setup packet // - ExFreePoolWithTag(CtrlSetup, TAG_USBOHCI); + ExFreePoolWithTag(CtrlSetup, TAG_USBUHCI); // // check for success @@ -451,7 +451,7 @@ // // allocate configuration descriptor // - m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBOHCI); + m_ConfigurationDescriptors = (PUSB_CONFIGURATION) ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_CONFIGURATION) * m_DeviceDescriptor.bNumConfigurations, TAG_USBUHCI); // // zero configuration descriptor @@ -767,7 +767,7 @@ // // first allocate a buffer which should be enough to store all different interfaces and endpoints // - Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_USBOHCI); + Buffer = ExAllocatePoolWithTag(NonPagedPool, PAGE_SIZE, TAG_USBUHCI); if (!Buffer) { // @@ -798,7 +798,7 @@ // // failed to allocate mdl // - ExFreePoolWithTag(Buffer, TAG_USBOHCI); + ExFreePoolWithTag(Buffer, TAG_USBUHCI); return STATUS_INSUFFICIENT_RESOURCES; } @@ -891,7 +891,7 @@ // // now allocate interface descriptors // - m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBOHCI); + m_ConfigurationDescriptors[Index].Interfaces = (PUSB_INTERFACE)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_INTERFACE) * ConfigurationDescriptor->bNumInterfaces, TAG_USBUHCI); if (!m_ConfigurationDescriptors[Index].Interfaces) { // @@ -940,7 +940,7 @@ // // allocate end point descriptors // - m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBOHCI); + m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints = (PUSB_ENDPOINT)ExAllocatePoolWithTag(NonPagedPool, sizeof(USB_ENDPOINT) * InterfaceDescriptor->bNumEndpoints, TAG_USBUHCI); if (!m_ConfigurationDescriptors[Index].Interfaces[InterfaceIndex].EndPoints) { // @@ -1408,7 +1408,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CUSBDevice(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBDevice(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_qu… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_queue.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usb_queue.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usb_queue.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -544,7 +544,7 @@ // // allocate controller // - This = new(NonPagedPool, TAG_USBOHCI) CUSBQueue(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBQueue(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/usb_request.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usb_re… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usb_request.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usb_request.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usb_request.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) @@ -192,7 +192,7 @@ // // allocate completion event // - m_CompletionEvent = (PKEVENT)ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_USBOHCI); + m_CompletionEvent = (PKEVENT)ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_USBUHCI); if (!m_CompletionEvent) { // @@ -1395,7 +1395,7 @@ // // allocate requests // - This = new(NonPagedPool, TAG_USBOHCI) CUSBRequest(0); + This = new(NonPagedPool, TAG_USBUHCI) CUSBRequest(0); if (!This) { // Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.cpp [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,8 +1,8 @@ /* - * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * PROJECT: ReactOS Universal Serial Bus Host Controller Interface * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/usb/usbohci/usbohci.cpp - * PURPOSE: USB OHCI device driver. + * FILE: drivers/usb/usbuhci/usbohci.cpp + * PURPOSE: USB UHCI device driver. * PROGRAMMERS: * Michael Martin (michael.martin(a)reactos.org) * Johannes Anderwald (johannes.anderwald(a)reactos.org) Modified: trunk/reactos/drivers/usb/usbuhci/usbuhci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/usbuhc… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/usbuhci.h [iso-8859-1] Thu Feb 23 01:27:19 2012 @@ -1,5 +1,5 @@ -#ifndef USBOHCI_H__ -#define USBOHCI_H__ +#ifndef USBUHCI_H__ +#define USBUHCI_H__ #include <ntddk.h> #define NDEBUG @@ -56,7 +56,7 @@ // // tag for allocations // -#define TAG_USBOHCI 'ICHO' +#define TAG_USBUHCI 'ICHO' // // assert for c++ - taken from portcls

1 0

[cgutman] 55827: [NTOSKRNL] - Reenable and fix the correct reset code [HIDCLASS] - Disable removal of PDOs due to IRP cancellation issues [USBEHCI][USBOHCI][USBUHCI] - Disable removal of FDOs due t...
by cgutman＠svn.reactos.org 23 Feb '12

23 Feb '12

Author: cgutman Date: Thu Feb 23 01:23:30 2012 New Revision: 55827 URL: http://svn.reactos.org/svn/reactos?rev=55827&view=rev Log: [NTOSKRNL] - Reenable and fix the correct reset code [HIDCLASS] - Disable removal of PDOs due to IRP cancellation issues [USBEHCI][USBOHCI][USBUHCI] - Disable removal of FDOs due to reinitialization issues Modified: trunk/reactos/drivers/hid/hidclass/pdo.c trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c Modified: trunk/reactos/drivers/hid/hidclass/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/hid/hidclass/pdo.c… ============================================================================== --- trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/hid/hidclass/pdo.c [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -580,7 +580,12 @@ // // no/op // +#if 0 Status = STATUS_SUCCESS; +#else + DPRINT1("Denying removal of HID device due to IRP cancellation bugs\n"); + Status = STATUS_UNSUCCESSFUL; +#endif break; } default: Modified: trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -537,6 +537,7 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // sure // @@ -547,6 +548,12 @@ // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); +#else + DPRINT1("Denying controller removal due to reinitialization bugs\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +#endif } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -537,6 +537,7 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // sure // @@ -547,6 +548,12 @@ // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); +#else + DPRINT1("Denying controller removal due to reinitialization bugs\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +#endif } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hcd_co… ============================================================================== --- trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbuhci/hcd_controller.cpp [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -537,6 +537,7 @@ case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { +#if 0 // // sure // @@ -547,6 +548,12 @@ // IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(m_NextDeviceObject, Irp); +#else + DPRINT1("Denying controller removal due to reinitialization bugs\n"); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_UNSUCCESSFUL; +#endif } case IRP_MN_REMOVE_DEVICE: { Modified: trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/plugpla… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Thu Feb 23 01:23:30 2012 @@ -555,38 +555,37 @@ ASSERT(DeviceNode->Flags & DNF_ENUMERATED); ASSERT(DeviceNode->Flags & DNF_PROCESSED); -#if 0 - /* Remove the device node */ - Status = IopRemoveDevice(DeviceNode); - if (NT_SUCCESS(Status)) - { - /* Invalidate device relations for the parent to reenumerate the device */ - Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); - DPRINT1("A new driver has been loaded for '%wZ'\n", &DeviceInstance); - } -#else - /* FIXME: We might clear some important flags */ - DeviceNode->Flags &= ~DNF_DISABLED; - - /* Load service data from the registry */ - Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); - - if (NT_SUCCESS(Status)) - { - /* Start the service and begin PnP initialization of the device again */ - Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); - DPRINT1("HACK: A new driver has been loaded for '%wZ' WITHOUT removing the old one\n", &DeviceInstance); - } -#endif - else if (DeviceNode->Flags & DNF_ADDED) - { - /* A driver has already been loaded for this device */ - DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceInstance); + /* Check if there's already a driver loaded for this device */ + if (DeviceNode->Flags & DNF_ADDED) + { + /* Remove the device node */ + Status = IopRemoveDevice(DeviceNode); + if (NT_SUCCESS(Status)) + { + /* Invalidate device relations for the parent to reenumerate the device */ + Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); + DPRINT1("A new driver has been loaded for '%wZ' (FDO above removed)\n", &DeviceNode->InstancePath); + } + else + { + /* A driver has already been loaded for this device */ + DPRINT1("A reboot is required for the current driver for '%wZ' to be replaced\n", &DeviceNode->InstancePath); + } } else { - /* This device needs a driver */ - DPRINT1("A reboot is required for the new driver for '%wZ' to load\n", &DeviceInstance); + /* FIXME: What if the device really is disabled? */ + DeviceNode->Flags &= ~DNF_DISABLED; + + /* Load service data from the registry */ + Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + if (NT_SUCCESS(Status)) + { + /* Start the service and begin PnP initialization of the device again */ + Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); + DPRINT1("A new driver will be loaded for '%wZ' (no FDO above)\n", &DeviceNode->InstancePath); + } } ObDereferenceObject(DeviceObject);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs