Ros-diffs February 2010

ros-diffs@reactos.org

22 participants
365 discussions

[dreimer] 45561: Experimental try to get Itunes Setup start. By Samuel Serapion
by dreimer＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: dreimer Date: Wed Feb 10 20:50:30 2010 New Revision: 45561 URL: http://svn.reactos.org/svn/reactos?rev=45561&view=rev Log: Experimental try to get Itunes Setup start. By Samuel Serapion Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec Modified: trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cfgmgr32/cfgmgr3… ============================================================================== --- trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cfgmgr32/cfgmgr32.spec [iso-8859-1] Wed Feb 10 20:50:30 2010 @@ -140,6 +140,8 @@ @ stdcall CM_Open_Class_Key_ExW(ptr wstr long long ptr long long) setupapi.CM_Open_Class_Key_ExW @ stdcall CM_Open_DevNode_Key(ptr long long long ptr long) setupapi.CM_Open_DevNode_Key @ stdcall CM_Open_DevNode_Key_Ex(ptr long long long ptr long long) setupapi.CM_Open_DevNode_Key_Ex +@ stub CM_Query_And_Remove_SubTreeA +@ stub CM_Query_And_Remove_SubTreeW @ stub CM_Query_Arbitrator_Free_Data # setupapi.CM_Query_Arbitrator_Free_Data @ stub CM_Query_Arbitrator_Free_Data_Ex # setupapi.CM_Query_Arbitrator_Free_Data_Ex @ stub CM_Query_Arbitrator_Free_Size # setupapi.CM_Query_Arbitrator_Free_Size

1 0

[ekohl] 45560: Add device location information override PS/2 keyboards. Please translate the location override string.
by ekohl＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: ekohl Date: Wed Feb 10 20:35:13 2010 New Revision: 45560 URL: http://svn.reactos.org/svn/reactos?rev=45560&view=rev Log: Add device location information override PS/2 keyboards. Please translate the location override string. Modified: trunk/reactos/media/inf/keyboard.inf Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== Binary files - no diff available.

1 0

[dreimer] 45559: Update Rapps Links and add the two RosBE Addons.
by dreimer＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: dreimer Date: Wed Feb 10 20:33:10 2010 New Revision: 45559 URL: http://svn.reactos.org/svn/reactos?rev=45559&view=rev Log: Update Rapps Links and add the two RosBE Addons. Added: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt (with props) trunk/reactos/base/applications/rapps/rapps/rosbearm.txt (with props) Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/rosbe.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/thunderbird.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vlc.txt Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mirandaim.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -2,13 +2,13 @@ [Section] Name = Miranda IM -Version = 0.8.12 +Version = 0.8.13 Licence = GPL Description = Open source multiprotocol instant messaging application - May not work completely. Size = 1.6MB Category = 5 URLSite = http://www.miranda-im.org/ -URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.12-unicode.exe +URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.13-unicode.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/rosbe.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbe.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -2,17 +2,17 @@ [Section] Name = ReactOS Build Environment -Version = 1.4.5 +Version = 1.5 Licence = GPL Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. -Size = 14.9MB +Size = 13.5MB Category = 7 URLSite = http://reactos.org/wiki/Build_Environment/ -URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.5.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.exe CDPath = none [Section.0407] -Description = Erlaubt es Ihnen ReactOS aus den Quellen zu bauen. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. +Description = Erlaubt es Ihnen den ReactOS Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. [Section.040a] Description = Te permite compilar el cÃ³digo de ReactOS. Para mÃ¡s instrucciones consulta la wiki de ReactOS. Added: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -1,0 +1,21 @@ +ï»¿; UTF-8 + +[Section] +Name = ReactOS Build Environment AMD64 Addon +Version = 1.3 +Licence = GPL +Description = Allows you to build the ReactOS AMD64 Source. For more instructions see ReactOS wiki. +Size = 15.8MB +Category = 7 +URLSite = http://reactos.org/wiki/Build_Environment/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE64-1.3.exe +CDPath = none + +[Section.0407] +Description = Erlaubt es Ihnen den ReactOS AMD64 Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. + +[Section.040a] +Description = Te permite compilar el cÃ³digo de ReactOS AMD64. Para mÃ¡s instrucciones consulta la wiki de ReactOS. + +[Section.0415] +Description = Pozwala zbudowaÄ obraz pÅyty ReactOS AMD64 ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. Propchange: trunk/reactos/base/applications/rapps/rapps/rosbeamd64.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -1,0 +1,21 @@ +ï»¿; UTF-8 + +[Section] +Name = ReactOS Build Environment ARM Addon +Version = 1.0 +Licence = GPL +Description = Allows you to build the ReactOS ARM Source. For more instructions see ReactOS wiki. +Size = 11.1MB +Category = 7 +URLSite = http://reactos.org/wiki/Build_Environment/ +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-ARM-1.0.exe +CDPath = none + +[Section.0407] +Description = Erlaubt es Ihnen den ReactOS ARM Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. + +[Section.040a] +Description = Te permite compilar el cÃ³digo de ReactOS ARM. Para mÃ¡s instrucciones consulta la wiki de ReactOS. + +[Section.0415] +Description = Pozwala zbudowaÄ obraz pÅyty ReactOS ARM ze ÅºrÃ³deÅ. WiÄcej informacji na Wiki ReactOS. Propchange: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -2,13 +2,13 @@ [Section] Name = SciTE -Version = 2.01 +Version = 2.02 Licence = Freeware Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs. Size = 0.6M Category = 7 URLSite = http://www.scintilla.org/ -URLDownload = http://fastbull.dl.sourceforge.net/sourceforge/scintilla/Sc201.exe +URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scintilla/Sc202.exe CDPath = none [Section.0407] Modified: trunk/reactos/base/applications/rapps/rapps/thunderbird.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/thunderbird.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -2,35 +2,35 @@ [Section] Name = Mozilla Thunderbird -Version = 3.0 +Version = 3.0.1 Licence = MPL/GPL/LGPL Description = The most popular and one of the best free Mail Clients out there. Size = 8.6M Category = 5 URLSite = http://www.mozilla-europe.org/en/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.1/win3… CDPath = none [Section.0407] Description = Der populÃ¤rste und einer der besten freien Mail-Clients. Size = 8.4M URLSite = http://www.mozilla-europe.org/de/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.1/win3… [Section.040a] Description = El mÃ¡s popular y uno de los mejores clientes mail que hay. Size = 8.4M URLSite = http://www.mozilla-europe.org/es/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.1/win3… [Section.0415] Description = Najpopularniejszy i jeden z najlepszych darmowych klientÃ³w poczty. Size = 9.2M URLSite = http://www.mozilla-europe.org/pl/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.1/win3… [Section.0419] Description = ÐÐ´Ð¸Ð½ Ð¸Ð· ÑÐ°Ð¼ÑÑ Ð¿Ð¾Ð¿ÑÐ»ÑÑÐ½ÑÑ Ð¸ Ð»ÑÑÑÐ¸Ñ Ð±ÐµÑÐ¿Ð»Ð°ÑÐ½ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²ÑÑ ÐºÐ»Ð¸ÐµÐ½ÑÐ¾Ð². Size = 8.8M URLSite = http://www.mozilla-europe.org/ru/products/thunderbird/ -URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/latest-3.0… +URLDownload = http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.0.1/win3… Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -2,13 +2,13 @@ [Section] Name = ÂµTorrent -Version = 1.8.5 +Version = 2.0 Licence = Freeware for non-commercial uses Description = Small and fast BitTorrent Client. -Size = 282K +Size = 312K Category = 5 URLSite = http://www.utorrent.com/ -URLDownload = http://download.utorrent.com/1.8.5/utorrent.exe +URLDownload = http://download.utorrent.com/2.0/utorrent.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Wed Feb 10 20:33:10 2010 @@ -2,13 +2,13 @@ [Section] Name = VLC media player -Version = 1.0.3 +Version = 1.0.5 Licence = GPL Description = A media player. Size = 17.2MB Category = 1 URLSite = http://www.videolan.org/vlc/ -URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.3/win32/vlc-1.0.3-… +URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.5/win32/vlc-1.0.5-… CDPath = none [Section.0407]

1 0

[sir_richard] 45558: [NTOS]: Allocate and initialize color tables based on MmSecondaryColors (MiInitializeColorTables). [NTOS]: These come after the PFN database, so modify the MmPfnAllocation to account for them.
by sir_richard＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: sir_richard Date: Wed Feb 10 19:44:30 2010 New Revision: 45558 URL: http://svn.reactos.org/svn/reactos?rev=45558&view=rev Log: [NTOS]: Allocate and initialize color tables based on MmSecondaryColors (MiInitializeColorTables). [NTOS]: These come after the PFN database, so modify the MmPfnAllocation to account for them. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Feb 10 19:44:30 2010 @@ -33,6 +33,19 @@ MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +/* + * For each page's worth bytes of L2 cache in a given set/way line, the zero and + * free lists are organized in what is called a "color". + * + * This array points to the two lists, so it can be thought of as a multi-dimensional + * array of MmFreePagesByColor[2][MmSecondaryColors]. Since the number is dynamic, + * we describe the array in pointer form instead. + * + * On a final note, the color tables themselves are right after the PFN database. + */ +C_ASSERT(FreePageList == 1); +PMMCOLOR_TABLES MmFreePagesByColor[FreePageList + 1]; + /* Make the code cleaner with some definitions for size multiples */ #define _1KB (1024) #define _1MB (1000 * _1KB) @@ -209,6 +222,56 @@ /* Compute the mask and store it */ MmSecondaryColorMask = MmSecondaryColors - 1; KeGetCurrentPrcb()->SecondaryColorMask = MmSecondaryColorMask; +} + +VOID +NTAPI +MiInitializeColorTables(VOID) +{ + ULONG i; + PMMPTE PointerPte, LastPte; + MMPTE TempPte = ValidKernelPte; + + /* The color table starts after the PFN database */ + MmFreePagesByColor[0] = (PMMCOLOR_TABLES)&MmPfnDatabase[MmHighestPhysicalPage + 1]; + + /* Loop the PTEs. We have two color tables for each secondary color */ + PointerPte = MiAddressToPte(&MmFreePagesByColor[0][0]); + LastPte = MiAddressToPte((ULONG_PTR)MmFreePagesByColor[0] + + (2 * MmSecondaryColors * sizeof(MMCOLOR_TABLES)) + - 1); + while (PointerPte <= LastPte) + { + /* Check for valid PTE */ + if (PointerPte->u.Hard.Valid == 0) + { + /* Get a page and map it */ + TempPte.u.Hard.PageFrameNumber = MxGetNextPage(1); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; + + /* Zero out the page */ + RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); + } + + /* Next */ + PointerPte++; + } + + /* Now set the address of the next list, right after this one */ + MmFreePagesByColor[1] = &MmFreePagesByColor[0][MmSecondaryColors]; + + /* Now loop the lists to set them up */ + for (i = 0; i < MmSecondaryColors; i++) + { + /* Set both free and zero lists for each color */ + MmFreePagesByColor[ZeroedPageList][i].Flink = 0xFFFFFFFF; + MmFreePagesByColor[ZeroedPageList][i].Blink = (PVOID)0xFFFFFFFF; + MmFreePagesByColor[ZeroedPageList][i].Count = 0; + MmFreePagesByColor[FreePageList][i].Flink = 0xFFFFFFFF; + MmFreePagesByColor[FreePageList][i].Blink = (PVOID)0xFFFFFFFF; + MmFreePagesByColor[FreePageList][i].Count = 0; + } } NTSTATUS @@ -373,10 +436,11 @@ MiComputeColorInformation(); // - // Calculate the number of bytes for the PFN database + // Calculate the number of bytes for the PFN database, and the color tables, // and then convert to pages // MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); + MxPfnAllocation += (MmSecondaryColors * sizeof(MMCOLOR_TABLES) * 2); MxPfnAllocation >>= PAGE_SHIFT; // @@ -688,6 +752,9 @@ // MxFreeDescriptor->BasePage = FreePage; MxFreeDescriptor->PageCount = FreePageCount; + + /* Initialize the color tables */ + MiInitializeColorTables(); /* Call back into shitMM to setup the PFN database */ MmInitializePageList(); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Feb 10 19:44:30 2010 @@ -129,6 +129,13 @@ ULONG NumberOfPages; PHYSICAL_MEMORY_RUN Run[1]; } PHYSICAL_MEMORY_DESCRIPTOR, *PPHYSICAL_MEMORY_DESCRIPTOR; + +typedef struct _MMCOLOR_TABLES +{ + PFN_NUMBER Flink; + PVOID Blink; + PFN_NUMBER Count; +} MMCOLOR_TABLES, *PMMCOLOR_TABLES; extern MMPTE HyperTemplatePte; extern MMPTE ValidKernelPde;

1 0

[sir_richard] 45557: [NTOS]: Factor out SecondaryColor computations into MiComputeColorInformation. [NTOS]: Fix SecondaryColor computations. If the KPCR has no deta, use the default colors of 8, not just 1. Also handle cases where there is more L2 cache than we'd like -- set the secondary colors to a maximum of 1024 in that case. Finally, if the colors are not a power of two, or there are not enough (due to a registry setting), use the default of 8.
by sir_richard＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: sir_richard Date: Wed Feb 10 19:10:04 2010 New Revision: 45557 URL: http://svn.reactos.org/svn/reactos?rev=45557&view=rev Log: [NTOS]: Factor out SecondaryColor computations into MiComputeColorInformation. [NTOS]: Fix SecondaryColor computations. If the KPCR has no deta, use the default colors of 8, not just 1. Also handle cases where there is more L2 cache than we'd like -- set the secondary colors to a maximum of 1024 in that case. Finally, if the colors are not a power of two, or there are not enough (due to a registry setting), use the default of 8. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Feb 10 19:10:04 2010 @@ -156,6 +156,59 @@ } } } +} + +VOID +NTAPI +MiComputeColorInformation(VOID) +{ + ULONG L2Associativity; + + /* Check if no setting was provided already */ + if (!MmSecondaryColors) + { + /* Get L2 cache information */ + L2Associativity = KeGetPcr()->SecondLevelCacheAssociativity; + + /* The number of colors is the number of cache bytes by set/way */ + MmSecondaryColors = KeGetPcr()->SecondLevelCacheSize; + if (L2Associativity) MmSecondaryColors /= L2Associativity; + } + + /* Now convert cache bytes into pages */ + MmSecondaryColors >>= PAGE_SHIFT; + if (!MmSecondaryColors) + { + /* If there was no cache data from the KPCR, use the default colors */ + MmSecondaryColors = MI_SECONDARY_COLORS; + } + else + { + /* Otherwise, make sure there aren't too many colors */ + if (MmSecondaryColors > MI_MAX_SECONDARY_COLORS) + { + /* Set the maximum */ + MmSecondaryColors = MI_MAX_SECONDARY_COLORS; + } + + /* Make sure there aren't too little colors */ + if (MmSecondaryColors < MI_MIN_SECONDARY_COLORS) + { + /* Set the default */ + MmSecondaryColors = MI_SECONDARY_COLORS; + } + + /* Finally make sure the colors are a power of two */ + if (MmSecondaryColors & (MmSecondaryColors - 1)) + { + /* Set the default */ + MmSecondaryColors = MI_SECONDARY_COLORS; + } + } + + /* Compute the mask and store it */ + MmSecondaryColorMask = MmSecondaryColors - 1; + KeGetCurrentPrcb()->SecondaryColorMask = MmSecondaryColorMask; } NTSTATUS @@ -169,7 +222,7 @@ PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; PVOID NonPagedPoolExpansionVa; - ULONG OldCount, L2Associativity; + ULONG OldCount; PFN_NUMBER FreePage, FreePageCount, PagesLeft, BasePage, PageCount; /* Check for kernel stack size that's too big */ @@ -316,24 +369,8 @@ /* Compute non paged pool limits and size */ MiComputeNonPagedPoolVa(FreePages); - // - // Get L2 cache information - // - L2Associativity = KeGetPcr()->SecondLevelCacheAssociativity; - MmSecondaryColors = KeGetPcr()->SecondLevelCacheSize; - if (L2Associativity) MmSecondaryColors /= L2Associativity; - - // - // Compute final color mask and count - // - MmSecondaryColors >>= PAGE_SHIFT; - if (!MmSecondaryColors) MmSecondaryColors = 1; - MmSecondaryColorMask = MmSecondaryColors - 1; - - // - // Store it - // - KeGetCurrentPrcb()->SecondaryColorMask = MmSecondaryColorMask; + /* Compute color information (L2 cache-separated paging lists) */ + MiComputeColorInformation(); // // Calculate the number of bytes for the PFN database Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Feb 10 19:10:04 2010 @@ -30,6 +30,10 @@ #define MI_PAGED_POOL_START (PVOID)0xE1000000 #define MI_NONPAGED_POOL_END (PVOID)0xFFBE0000 #define MI_DEBUG_MAPPING (PVOID)0xFFBFF000 + +#define MI_MIN_SECONDARY_COLORS 8 +#define MI_SECONDARY_COLORS 64 +#define MI_MAX_SECONDARY_COLORS 1024 #define MM_HIGHEST_VAD_ADDRESS \ (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE))

1 0

[sir_richard] 45556: [NTOS]: MxGetNextPage is not platform-specific, so share it. [NTOS]: Factor out computations of NP sizes and limits into MiComputeNonPagedPoolVa. [NTOS]: Fix NP size/limit calculations to use the amount of FREE RAM, not the amount of INSTALLED RAM. [NTOS]: Use Windows 2003's algorithm for NP size on machines with more than 512MB of FREE RAM. [NTOS]: Partly handle the case of machines with NP over 128MB.
by sir_richard＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: sir_richard Date: Wed Feb 10 18:42:07 2010 New Revision: 45556 URL: http://svn.reactos.org/svn/reactos?rev=45556&view=rev Log: [NTOS]: MxGetNextPage is not platform-specific, so share it. [NTOS]: Factor out computations of NP sizes and limits into MiComputeNonPagedPoolVa. [NTOS]: Fix NP size/limit calculations to use the amount of FREE RAM, not the amount of INSTALLED RAM. [NTOS]: Use Windows 2003's algorithm for NP size on machines with more than 512MB of FREE RAM. [NTOS]: Partly handle the case of machines with NP over 128MB. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Feb 10 18:42:07 2010 @@ -29,39 +29,133 @@ PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; +/* Template PTE and PDE for a kernel page */ MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +/* Make the code cleaner with some definitions for size multiples */ +#define _1KB (1024) +#define _1MB (1000 * _1KB) + +/* Architecture specific size of a PDE directory, and size of a page table */ +#define PDE_SIZE (4096 * sizeof(MMPDE)) +#define PT_SIZE (1024 * sizeof(MMPTE)) + /* PRIVATE FUNCTIONS **********************************************************/ -PFN_NUMBER +VOID NTAPI -MxGetNextPage(IN PFN_NUMBER PageCount) +MiComputeNonPagedPoolVa(IN ULONG FreePages) { - PFN_NUMBER Pfn; - - // - // Make sure we have enough pages - // - if (PageCount > MxFreeDescriptor->PageCount) - { - // - // Crash the system - // - KeBugCheckEx(INSTALL_MORE_MEMORY, - MmNumberOfPhysicalPages, - MxFreeDescriptor->PageCount, - MxOldFreeDescriptor.PageCount, - PageCount); - } - - // - // Use our lowest usable free pages - // - Pfn = MxFreeDescriptor->BasePage; - MxFreeDescriptor->BasePage += PageCount; - MxFreeDescriptor->PageCount -= PageCount; - return Pfn; + IN PFN_NUMBER PoolPages; + + /* Check if this is a machine with less than 256MB of RAM, and no overide */ + if ((MmNumberOfPhysicalPages <= MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING) && + !(MmSizeOfNonPagedPoolInBytes)) + { + /* Force the non paged pool to be 2MB so we can reduce RAM usage */ + MmSizeOfNonPagedPoolInBytes = 2 * _1MB; + } + + /* Hyperspace ends here */ + MmHyperSpaceEnd = (PVOID)((ULONG_PTR)MmSystemCacheWorkingSetList - 1); + + /* Check if the user gave a ridicuously large nonpaged pool RAM size */ + if ((MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT) > (FreePages * 7 / 8)) + { + /* More than 7/8ths of RAM was dedicated to nonpaged pool, ignore! */ + MmSizeOfNonPagedPoolInBytes = 0; + } + + /* Check if no registry setting was set, or if the setting was too low */ + if (MmSizeOfNonPagedPoolInBytes < MmMinimumNonPagedPoolSize) + { + /* Start with the minimum (256 KB) and add 32 KB for each MB above 4 */ + MmSizeOfNonPagedPoolInBytes = MmMinimumNonPagedPoolSize; + MmSizeOfNonPagedPoolInBytes += (FreePages - 1024) / 256 * MmMinAdditionNonPagedPoolPerMb; + } + + /* Check if the registy setting or our dynamic calculation was too high */ + if (MmSizeOfNonPagedPoolInBytes > MI_MAX_INIT_NONPAGED_POOL_SIZE) + { + /* Set it to the maximum */ + MmSizeOfNonPagedPoolInBytes = MI_MAX_INIT_NONPAGED_POOL_SIZE; + } + + /* Check if a percentage cap was set through the registry */ + if (MmMaximumNonPagedPoolPercent) UNIMPLEMENTED; + + /* Page-align the nonpaged pool size */ + MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); + + /* Now, check if there was a registry size for the maximum size */ + if (!MmMaximumNonPagedPoolInBytes) + { + /* Start with the default (1MB) */ + MmMaximumNonPagedPoolInBytes = MmDefaultMaximumNonPagedPool; + + /* Add space for PFN database */ + MmMaximumNonPagedPoolInBytes += (ULONG) + PAGE_ALIGN((MmHighestPhysicalPage + 1) * sizeof(MMPFN)); + + /* Check if the machine has more than 512MB of free RAM */ + if (FreePages >= 0x1F000) + { + /* Add 200KB for each MB above 4 */ + MmMaximumNonPagedPoolInBytes += (FreePages - 1024) / 256 * + (MmMaxAdditionNonPagedPoolPerMb / 2); + if (MmMaximumNonPagedPoolInBytes < MI_MAX_NONPAGED_POOL_SIZE) + { + /* Make it at least 128MB since this machine has a lot of RAM */ + MmMaximumNonPagedPoolInBytes = MI_MAX_NONPAGED_POOL_SIZE; + } + } + else + { + /* Add 400KB for each MB above 4 */ + MmMaximumNonPagedPoolInBytes += (FreePages - 1024) / 256 * + MmMaxAdditionNonPagedPoolPerMb; + } + } + + /* Make sure there's at least 16 pages + the PFN available for expansion */ + PoolPages = MmSizeOfNonPagedPoolInBytes + (PAGE_SIZE * 16) + + ((ULONG)PAGE_ALIGN(MmHighestPhysicalPage + 1) * sizeof(MMPFN)); + if (MmMaximumNonPagedPoolInBytes < PoolPages) + { + /* The maximum should be at least high enough to cover all the above */ + MmMaximumNonPagedPoolInBytes = PoolPages; + } + + /* Systems with 2GB of kernel address space get double the size */ + PoolPages = MI_MAX_NONPAGED_POOL_SIZE * 2; + + /* On the other hand, make sure that PFN + nonpaged pool doesn't get too big */ + if (MmMaximumNonPagedPoolInBytes > PoolPages) + { + /* Trim it down to the maximum architectural limit (256MB) */ + MmMaximumNonPagedPoolInBytes = PoolPages; + } + + /* Check if this is a system with > 128MB of non paged pool */ + if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) + { + /* Check if the initial size is less than the extra 128MB boost */ + if (MmSizeOfNonPagedPoolInBytes < (MmMaximumNonPagedPoolInBytes - + MI_MAX_NONPAGED_POOL_SIZE)) + { + /* FIXME: Should check if the initial pool can be expanded */ + + /* Assume no expansion possible, check ift he maximum is too large */ + if (MmMaximumNonPagedPoolInBytes > (MmSizeOfNonPagedPoolInBytes + + MI_MAX_NONPAGED_POOL_SIZE)) + { + /* Set it to the initial value plus the boost */ + MmMaximumNonPagedPoolInBytes = MmSizeOfNonPagedPoolInBytes + + MI_MAX_NONPAGED_POOL_SIZE; + } + } + } } NTSTATUS @@ -71,7 +165,7 @@ PLIST_ENTRY NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; ULONG FreePages = 0; - PFN_NUMBER PageFrameIndex, PoolPages; + PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde, TempPte; PVOID NonPagedPoolExpansionVa; @@ -79,7 +173,7 @@ PFN_NUMBER FreePage, FreePageCount, PagesLeft, BasePage, PageCount; /* Check for kernel stack size that's too big */ - if (MmLargeStackSize > (KERNEL_LARGE_STACK_SIZE / 1024)) + if (MmLargeStackSize > (KERNEL_LARGE_STACK_SIZE / _1KB)) { /* Sanitize to default value */ MmLargeStackSize = KERNEL_LARGE_STACK_SIZE; @@ -87,7 +181,7 @@ else { /* Take the registry setting, and convert it into bytes */ - MmLargeStackSize *= 1024; + MmLargeStackSize *= _1KB; /* Now align it to a page boundary */ MmLargeStackSize = PAGE_ROUND_UP(MmLargeStackSize); @@ -219,138 +313,8 @@ // MxOldFreeDescriptor = *MxFreeDescriptor; - // - // Check if this is a machine with less than 256MB of RAM, and no overide - // - if ((MmNumberOfPhysicalPages <= MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING) && - !(MmSizeOfNonPagedPoolInBytes)) - { - // - // Force the non paged pool to be 2MB so we can reduce RAM usage - // - MmSizeOfNonPagedPoolInBytes = 2 * 1024 * 1024; - } - - // - // Hyperspace ends here - // - MmHyperSpaceEnd = (PVOID)((ULONG_PTR)MmSystemCacheWorkingSetList - 1); - - // - // Check if the user gave a ridicuously large nonpaged pool RAM size - // - if ((MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT) > - (MmNumberOfPhysicalPages * 7 / 8)) - { - // - // More than 7/8ths of RAM was dedicated to nonpaged pool, ignore! - // - MmSizeOfNonPagedPoolInBytes = 0; - } - - // - // Check if no registry setting was set, or if the setting was too low - // - if (MmSizeOfNonPagedPoolInBytes < MmMinimumNonPagedPoolSize) - { - // - // Start with the minimum (256 KB) and add 32 KB for each MB above 4 - // - MmSizeOfNonPagedPoolInBytes = MmMinimumNonPagedPoolSize; - MmSizeOfNonPagedPoolInBytes += (MmNumberOfPhysicalPages - 1024) / - 256 * MmMinAdditionNonPagedPoolPerMb; - } - - // - // Check if the registy setting or our dynamic calculation was too high - // - if (MmSizeOfNonPagedPoolInBytes > MI_MAX_INIT_NONPAGED_POOL_SIZE) - { - // - // Set it to the maximum - // - MmSizeOfNonPagedPoolInBytes = MI_MAX_INIT_NONPAGED_POOL_SIZE; - } - - // - // Check if a percentage cap was set through the registry - // - if (MmMaximumNonPagedPoolPercent) - { - // - // Don't feel like supporting this right now - // - UNIMPLEMENTED; - } - - // - // Page-align the nonpaged pool size - // - MmSizeOfNonPagedPoolInBytes &= ~(PAGE_SIZE - 1); - - // - // Now, check if there was a registry size for the maximum size - // - if (!MmMaximumNonPagedPoolInBytes) - { - // - // Start with the default (1MB) - // - MmMaximumNonPagedPoolInBytes = MmDefaultMaximumNonPagedPool; - - // - // Add space for PFN database - // - MmMaximumNonPagedPoolInBytes += (ULONG) - PAGE_ALIGN((MmHighestPhysicalPage + 1) * sizeof(MMPFN)); - - // - // Add 400KB for each MB above 4 - // - MmMaximumNonPagedPoolInBytes += (FreePages - 1024) / 256 * - MmMaxAdditionNonPagedPoolPerMb; - } - - // - // Make sure there's at least 16 pages + the PFN available for expansion - // - PoolPages = MmSizeOfNonPagedPoolInBytes + (PAGE_SIZE * 16) + - ((ULONG)PAGE_ALIGN(MmHighestPhysicalPage + 1) * - sizeof(MMPFN)); - if (MmMaximumNonPagedPoolInBytes < PoolPages) - { - // - // Set it to the minimum value for the maximum (yuck!) - // - MmMaximumNonPagedPoolInBytes = PoolPages; - } - - // - // Systems with 2GB of kernel address space get double the size - // - PoolPages = MI_MAX_NONPAGED_POOL_SIZE * 2; - - // - // Don't let the maximum go too high - // - if (MmMaximumNonPagedPoolInBytes > PoolPages) - { - // - // Set it to the upper limit - // - MmMaximumNonPagedPoolInBytes = PoolPages; - } - - // - // Check if this is a system with > 128MB of non paged pool - // - if (MmMaximumNonPagedPoolInBytes > MI_MAX_NONPAGED_POOL_SIZE) - { - // - // FIXME: Unsure about additional checks needed - // - DPRINT1("Untested path\n"); - } + /* Compute non paged pool limits and size */ + MiComputeNonPagedPoolVa(FreePages); // // Get L2 cache information Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Feb 10 18:42:07 2010 @@ -198,6 +198,12 @@ IN PLOADER_PARAMETER_BLOCK LoaderBlock ); +PFN_NUMBER +NTAPI +MxGetNextPage( + IN PFN_NUMBER PageCount +); + PPHYSICAL_MEMORY_DESCRIPTOR NTAPI MmInitializeMemoryLimits( Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Feb 10 18:42:07 2010 @@ -261,6 +261,30 @@ PFN_NUMBER NTAPI +MxGetNextPage(IN PFN_NUMBER PageCount) +{ + PFN_NUMBER Pfn; + + /* Make sure we have enough pages */ + if (PageCount > MxFreeDescriptor->PageCount) + { + /* Crash the system */ + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + MxFreeDescriptor->PageCount, + MxOldFreeDescriptor.PageCount, + PageCount); + } + + /* Use our lowest usable free pages */ + Pfn = MxFreeDescriptor->BasePage; + MxFreeDescriptor->BasePage += PageCount; + MxFreeDescriptor->PageCount -= PageCount; + return Pfn; +} + +PFN_NUMBER +NTAPI MiPagesInLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock, IN PBOOLEAN IncludeType) {

1 0

[dgorbachev] 45555: Do not crash, use valid kernel PTE.
by dgorbachev＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: dgorbachev Date: Wed Feb 10 14:56:54 2010 New Revision: 45555 URL: http://svn.reactos.org/svn/reactos?rev=45555&view=rev Log: Do not crash, use valid kernel PTE. Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/ARM3/iosup.c trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/ncache.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mmdbg.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -45,7 +45,7 @@ // // Build the PTE // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; TempPte.u.Hard.PageFrameNumber = Page; MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local! @@ -157,7 +157,7 @@ // Write the current PTE // PointerPte += (Offset + 1); - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local! do { Modified: trunk/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/iosup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -122,7 +122,7 @@ // // Get the template and configure caching // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; switch (CacheAttribute) { case MiNonCached: Modified: trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -372,7 +372,7 @@ // // Get the template // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; switch (CacheAttribute) { case MiNonCached: Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -127,6 +127,8 @@ } PHYSICAL_MEMORY_DESCRIPTOR, *PPHYSICAL_MEMORY_DESCRIPTOR; extern MMPTE HyperTemplatePte; +extern MMPTE ValidKernelPde; +extern MMPTE ValidKernelPte; extern ULONG MmSizeOfNonPagedPoolInBytes; extern ULONG MmMaximumNonPagedPoolInBytes; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -442,7 +442,7 @@ MiBuildPagedPool(VOID) { PMMPTE PointerPte, PointerPde; - MMPTE TempPte = HyperTemplatePte; + MMPTE TempPte = ValidKernelPte; PFN_NUMBER PageFrameIndex; KIRQL OldIrql; ULONG Size, BitMapSize; @@ -467,7 +467,7 @@ // page directory array in the old ReactOS Mm is used (but in a less hacky // way). // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory; ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); Modified: trunk/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/ncache.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -108,7 +108,7 @@ // // Setup the template PTE // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; // // Now check what kind of caching we should use Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -113,7 +113,7 @@ // // Build the PTE // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; TempPte.u.Hard.PageFrameNumber = PageFrameNumber; *PointerPte = TempPte; ASSERT(PointerPte->u.Hard.Valid == 1); Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -213,7 +213,7 @@ // // Get the template PTE we'll use to expand // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; // // Get the first PTE in expansion space @@ -493,7 +493,7 @@ // // Loop the pages // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; do { // Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -134,7 +134,7 @@ // // Setup the template stack PTE // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; MI_MAKE_LOCAL_PAGE(&TempPte); MI_MAKE_DIRTY_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = 0; @@ -234,7 +234,7 @@ // // Setup the template stack PTE // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; MI_MAKE_LOCAL_PAGE(&TempPte); MI_MAKE_DIRTY_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = 0; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -1000,8 +1000,6 @@ } } -extern MMPTE HyperTemplatePte; - VOID INIT_FUNCTION NTAPI Modified: trunk/reactos/ntoskrnl/mm/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmdbg.c?rev=45… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmdbg.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -35,6 +35,7 @@ MiDbgTranslatePhysicalAddress(IN ULONG64 PhysicalAddress, IN ULONG Flags) { + extern MMPTE ValidKernelPte; PFN_NUMBER Pfn; MMPTE TempPte; PVOID MappingBaseAddress; @@ -77,7 +78,7 @@ // // // - TempPte = HyperTemplatePte; + TempPte = ValidKernelPte; // // Convert physical address to PFN Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Feb 10 14:56:54 2010 @@ -354,9 +354,9 @@ MmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - extern MMPTE HyperTemplatePte; + extern MMPTE ValidKernelPte; PMMPTE PointerPte; - MMPTE TempPte = HyperTemplatePte; + MMPTE TempPte = ValidKernelPte; PFN_NUMBER PageFrameNumber; if (Phase == 0)

1 0

[mjmartin] 45554: [usb/usbehci] - Remove WorkItem code as its not needed. UsbHub driver polls the hubs for device connects. - Register USB Host Controller Device Interface during AddDevice.- Implement more URB's USB_DEVICE_DESCRIPTOR_TYPE, USB_CONFIGURATION_DESCRIPTOR_TYPE, URB_FUNCTION_SELECT_CONFIGURATION, URB_FUNCTION_CLASS_DEVICE/USB_DEVICE_CLASS_HUB. - Implement returning generic UsbdDeviceHandle in URB struct.
by mjmartin＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: mjmartin Date: Wed Feb 10 13:38:18 2010 New Revision: 45554 URL: http://svn.reactos.org/svn/reactos?rev=45554&view=rev Log: [usb/usbehci] - Remove WorkItem code as its not needed. UsbHub driver polls the hubs for device connects. - Register USB Host Controller Device Interface during AddDevice.- Implement more URB's USB_DEVICE_DESCRIPTOR_TYPE, USB_CONFIGURATION_DESCRIPTOR_TYPE, URB_FUNCTION_SELECT_CONFIGURATION, URB_FUNCTION_CLASS_DEVICE/USB_DEVICE_CLASS_HUB. - Implement returning generic UsbdDeviceHandle in URB struct. Modified: trunk/reactos/drivers/usb/usbehci/fdo.c trunk/reactos/drivers/usb/usbehci/irp.c trunk/reactos/drivers/usb/usbehci/urbreq.c Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/fdo.c [iso-8859-1] Wed Feb 10 13:38:18 2010 @@ -10,15 +10,18 @@ /* 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; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; ULONG CStatus; FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) DeferredContext; + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) FdoDeviceExtension->Pdo->DeviceExtension; CStatus = (ULONG) SystemArgument2; @@ -39,8 +42,6 @@ /* Check for port change on this port */ if (tmp & 0x02) { - PWORKITEM_DATA WorkItemData = NULL; - /* Connect or Disconnect? */ if (tmp & 0x01) { @@ -81,31 +82,9 @@ tmp = READ_REGISTER_ULONG((PULONG)((Base + EHCI_PORTSC) + (4 * i))); DPRINT("port tmp %x\n", tmp); - GetDeviceDescriptor(FdoDeviceExtension, 0); - FdoDeviceExtension->ChildDeviceCount++; - CompletePendingRequest(FdoDeviceExtension); - - WorkItemData = ExAllocatePool(NonPagedPool, sizeof(WORKITEM_DATA)); - if (!WorkItemData) - { - DPRINT1("No memory\n"); - break; - } - - WorkItemData->IoWorkItem = IoAllocateWorkItem(FdoDeviceExtension->Pdo); - if (!WorkItemData->IoWorkItem) - { - DPRINT1("WorkItem allocation failed!\n"); - break; - } - - - WorkItemData->FdoDeviceExtension = FdoDeviceExtension; - - IoQueueWorkItem(WorkItemData->IoWorkItem, - (PIO_WORKITEM_ROUTINE)DeviceArrivalWorkItem, - DelayedWorkQueue, - WorkItemData); + GetDeviceDescriptor(FdoDeviceExtension, 0, 0, FALSE); + PdoDeviceExtension->ChildDeviceCount++; + //CompletePendingURBRequest(PdoDeviceExtension); } else { @@ -116,7 +95,6 @@ tmp |= 0x02; WRITE_REGISTER_ULONG((PULONG) ((Base + EHCI_PORTSC) + (4 * i)), tmp); } - } } } @@ -180,7 +158,6 @@ BOOLEAN ResetPort(PDEVICE_OBJECT DeviceObject) { - /*FIXME: Implement me */ return TRUE; @@ -310,8 +287,6 @@ 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); @@ -351,13 +326,11 @@ 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"); @@ -412,8 +385,8 @@ DeviceDescription.MaximumLength = EHCI_MAX_SIZE_TRANSFER; FdoDeviceExtension->pDmaAdapter = IoGetDmaAdapter(FdoDeviceExtension->LowerDevice, - &DeviceDescription, - &FdoDeviceExtension->MapRegisters); + &DeviceDescription, + &FdoDeviceExtension->MapRegisters); if (FdoDeviceExtension->pDmaAdapter == NULL) { @@ -561,14 +534,16 @@ NTSTATUS Status; ULONG UsbDeviceNumber = 0; WCHAR CharDeviceName[64]; + UNICODE_STRING DeviceName; DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - /* Create the PDO */ + + /* Create the PDO with the next available number */ while (TRUE) { - /* FIXME: Use safe string sprintf*/ - /* RtlStringCchPrintfW(CharDeviceName, 64, L"USBFDO-%d", UsbDeviceNumber); */ + /* FIXME: Use safe string */ + /* RtlStringCchPrintfW(CharDeviceName, 64, L"USBPDO-%d", UsbDeviceNumber); */ swprintf(CharDeviceName, L"\\Device\\USBPDO-%d", UsbDeviceNumber); RtlInitUnicodeString(&DeviceName, CharDeviceName); DPRINT("DeviceName %wZ\n", &DeviceName); @@ -604,20 +579,17 @@ PdoDeviceExtension->Common.IsFdo = FALSE; PdoDeviceExtension->ControllerFdo = DeviceObject; + PdoDeviceExtension->DeviceObject = Pdo; + + InitializeListHead(&PdoDeviceExtension->IrpQueue); + KeInitializeSpinLock(&PdoDeviceExtension->IrpQueueLock); 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; @@ -646,7 +618,7 @@ { case IRP_MN_START_DEVICE: { - DPRINT("START_DEVICE\n"); + DPRINT1("START_DEVICE\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Status = ForwardAndWait(DeviceObject, Irp); @@ -657,7 +629,7 @@ } case IRP_MN_QUERY_DEVICE_RELATIONS: { - DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS\n"); + DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS\n"); switch(Stack->Parameters.QueryDeviceRelations.Type) { case BusRelations: @@ -687,6 +659,14 @@ { DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); } + case IRP_MN_QUERY_INTERFACE: + { + Status = STATUS_SUCCESS; + Information = 0; + Status = ForwardIrpAndForget(DeviceObject, Irp); + return Status; + break; + } default: { DPRINT1("IRP_MJ_PNP / Unhandled minor function 0x%lx\n", Stack->MinorFunction); @@ -710,21 +690,22 @@ WCHAR CharSymLinkName[64]; UNICODE_STRING DeviceName; UNICODE_STRING SymLinkName; + UNICODE_STRING InterfaceSymLinkName; ULONG BytesRead; PCI_COMMON_CONFIG PciConfig; PFDO_DEVICE_EXTENSION FdoDeviceExtension; - DPRINT1("Ehci AddDevice\n"); - - /* Create the FDO */ + DPRINT("Ehci AddDevice\n"); + + /* Create the FDO with next available number */ 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); + DPRINT("DeviceName %wZ\n", &DeviceName); Status = IoCreateDevice(DriverObject, sizeof(FDO_DEVICE_EXTENSION), @@ -734,8 +715,8 @@ FALSE, &Fdo); - if (NT_SUCCESS(Status)) - break; + if (NT_SUCCESS(Status)) + break; if ((Status == STATUS_OBJECT_NAME_EXISTS) || (Status == STATUS_OBJECT_NAME_COLLISION)) { @@ -758,21 +739,17 @@ 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); + DPRINT1("Warning: Unable to create symbolic link for ehci host controller!\n"); + } 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"); @@ -782,10 +759,10 @@ return STATUS_NO_SUCH_DEVICE; } - Fdo->Flags |= DO_BUFFERED_IO | DO_POWER_PAGABLE; - - DPRINT("Attached %x!\n", FdoDeviceExtension->LowerDevice); + Fdo->Flags |= DO_BUFFERED_IO;// | DO_POWER_PAGABLE; + ASSERT(FdoDeviceExtension->LowerDevice == Pdo); + Status = GetBusInterface(FdoDeviceExtension->LowerDevice, &FdoDeviceExtension->BusInterface); if (!NT_SUCCESS(Status)) @@ -796,8 +773,6 @@ IoDeleteDevice(Fdo); return Status; } - - DPRINT("Context %x\n", FdoDeviceExtension->BusInterface.Context); BytesRead = (*FdoDeviceExtension->BusInterface.GetBusData)( FdoDeviceExtension->BusInterface.Context, @@ -827,15 +802,24 @@ 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); + DPRINT1("Vendor %x\n", PciConfig.VendorID); + DPRINT1("Device %x\n", PciConfig.DeviceID); FdoDeviceExtension->VendorId = PciConfig.VendorID; FdoDeviceExtension->DeviceId = PciConfig.DeviceID; - DPRINT("FdoDeviceExtension->NextLowerDevice %x\n", FdoDeviceExtension->LowerDevice); FdoDeviceExtension->DeviceState = DEVICEINTIALIZED; + Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_USB_HOST_CONTROLLER, NULL, &InterfaceSymLinkName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Unable to register device interface!\n"); + } + else + { + Status = IoSetDeviceInterfaceState(&InterfaceSymLinkName, TRUE); + DPRINT1("SetInterfaceState %x\n", Status); + } Fdo->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/irp.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/irp.c [iso-8859-1] Wed Feb 10 13:38:18 2010 @@ -10,28 +10,26 @@ #include "usbehci.h" VOID -RequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp) +RequestURBCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp) { PPDO_DEVICE_EXTENSION PdoDeviceExtension; - PFDO_DEVICE_EXTENSION FdoDeviceExtension; PdoDeviceExtension = (PPDO_DEVICE_EXTENSION) DeviceObject->DeviceExtension; - FdoDeviceExtension = (PFDO_DEVICE_EXTENSION) PdoDeviceExtension->ControllerFdo->DeviceExtension; KIRQL OldIrql = Irp->CancelIrql; IoReleaseCancelSpinLock(DISPATCH_LEVEL); - KeAcquireSpinLockAtDpcLevel(&FdoDeviceExtension->IrpQueueLock); + KeAcquireSpinLockAtDpcLevel(&PdoDeviceExtension->IrpQueueLock); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); - KeReleaseSpinLock(&FdoDeviceExtension->IrpQueueLock, OldIrql); - - Irp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + KeReleaseSpinLock(&PdoDeviceExtension->IrpQueueLock, OldIrql); + + Irp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); } VOID -QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp) +QueueURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp) { KIRQL OldIrql; @@ -51,10 +49,13 @@ } VOID -CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension) +CompletePendingURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension) { PLIST_ENTRY NextIrp = NULL; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + ULONG_PTR Information = 0; PIO_STACK_LOCATION Stack; + PUSB_DEVICE UsbDevice = NULL; KIRQL oldIrql; PIRP Irp = NULL; URB *Urb; @@ -75,83 +76,275 @@ 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); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; + Information = 0; + Status = STATUS_SUCCESS; + + DPRINT1("TransferBuffer %x\n", Urb->UrbControlDescriptorRequest.TransferBuffer); + DPRINT1("TransferBufferLength %x\n", Urb->UrbControlDescriptorRequest.TransferBufferLength); + + UsbDevice = Urb->UrbHeader.UsbdDeviceHandle; + /* UsbdDeviceHandle of 0 is root hub */ + if (UsbDevice == NULL) + UsbDevice = DeviceExtension->UsbDevices[0]; + + switch (Urb->UrbHeader.Function) + { + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + { + /* We should not get here yet! */ + ASSERT(FALSE); + } + case URB_FUNCTION_GET_STATUS_FROM_DEVICE: + { + DPRINT1("Get Status from Device\n"); + } + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + { + Urb->UrbHeader.Function = 0x08; + Urb->UrbHeader.UsbdFlags = 0; + Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; + + switch(Urb->UrbControlDescriptorRequest.DescriptorType) + { + case USB_DEVICE_DESCRIPTOR_TYPE: + { + DPRINT1("USB DEVICE DESC\n"); + if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= sizeof(USB_DEVICE_DESCRIPTOR)) + { + Urb->UrbControlDescriptorRequest.TransferBufferLength = sizeof(USB_DEVICE_DESCRIPTOR); + } + + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, + &UsbDevice->DeviceDescriptor, + Urb->UrbControlDescriptorRequest.TransferBufferLength); + + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + + break; + } + case USB_CONFIGURATION_DESCRIPTOR_TYPE: + { + DPRINT1("USB CONFIG DESC\n"); + ULONG FullDescriptorLength = sizeof(USB_CONFIGURATION_DESCRIPTOR) + + sizeof(USB_INTERFACE_DESCRIPTOR) + + sizeof(USB_ENDPOINT_DESCRIPTOR); + + if (Urb->UrbControlDescriptorRequest.TransferBufferLength >= FullDescriptorLength) + { + Urb->UrbControlDescriptorRequest.TransferBufferLength = FullDescriptorLength; + } + + RtlCopyMemory(Urb->UrbControlDescriptorRequest.TransferBuffer, + &UsbDevice->ConfigurationDescriptor, + Urb->UrbControlDescriptorRequest.TransferBufferLength); + + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + + break; + } + case USB_STRING_DESCRIPTOR_TYPE: + { + DPRINT1("Usb String Descriptor not implemented\n"); + } + default: + { + DPRINT1("Descriptor Type %x not supported!\n", Urb->UrbControlDescriptorRequest.DescriptorType); + } + } + } + case URB_FUNCTION_SELECT_CONFIGURATION: + { + PUSBD_INTERFACE_INFORMATION InterfaceInfo; + LONG iCount, pCount; + + DPRINT("Selecting Configuration\n"); + DPRINT("Length %x\n", Urb->UrbHeader.Length); + DPRINT("Urb->UrbSelectConfiguration.ConfigurationHandle %x\n",Urb->UrbSelectConfiguration.ConfigurationHandle); + + if (Urb->UrbSelectConfiguration.ConfigurationDescriptor) + { + DPRINT("ConfigurationDescriptor = %p\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor); + DPRINT(" bLength = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bLength); + DPRINT(" bDescriptorType = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bDescriptorType); + DPRINT(" wTotalLength = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->wTotalLength); + DPRINT(" bNumInterfaces = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bNumInterfaces); + DPRINT(" bConfigurationValue = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bConfigurationValue); + DPRINT(" iConfiguration = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->iConfiguration); + DPRINT(" bmAttributes = %04x\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->bmAttributes); + DPRINT(" MaxPower = %d\n", Urb->UrbSelectConfiguration.ConfigurationDescriptor->MaxPower); + + + Urb->UrbSelectConfiguration.ConfigurationHandle = (PVOID)&DeviceExtension->UsbDevices[0]->ConfigurationDescriptor; + DPRINT("ConfigHandle %x\n", Urb->UrbSelectConfiguration.ConfigurationHandle); + InterfaceInfo = &Urb->UrbSelectConfiguration.Interface; + + for (iCount = 0; iCount < Urb->UrbSelectConfiguration.ConfigurationDescriptor->bNumInterfaces; iCount++) + { + DPRINT("InterfaceInformation[%d]\n", iCount); + DPRINT(" Length = %d\n", InterfaceInfo->Length); + DPRINT(" InterfaceNumber = %d\n", InterfaceInfo->InterfaceNumber); + DPRINT(" AlternateSetting = %d\n", InterfaceInfo->AlternateSetting); + DPRINT(" Class = %02x\n", (ULONG)InterfaceInfo->Class); + DPRINT(" SubClass = %02x\n", (ULONG)InterfaceInfo->SubClass); + DPRINT(" Protocol = %02x\n", (ULONG)InterfaceInfo->Protocol); + DPRINT(" Reserved = %02x\n", (ULONG)InterfaceInfo->Reserved); + DPRINT(" InterfaceHandle = %p\n", InterfaceInfo->InterfaceHandle); + DPRINT(" NumberOfPipes = %d\n", InterfaceInfo->NumberOfPipes); + InterfaceInfo->InterfaceHandle = (PVOID)&UsbDevice->InterfaceDescriptor; + InterfaceInfo->Class = UsbDevice->InterfaceDescriptor.bInterfaceClass; + InterfaceInfo->SubClass = UsbDevice->InterfaceDescriptor.bInterfaceSubClass; + InterfaceInfo->Protocol = UsbDevice->InterfaceDescriptor.bInterfaceProtocol; + InterfaceInfo->Reserved = 0; + + for (pCount = 0; pCount < InterfaceInfo->NumberOfPipes; pCount++) + { + DPRINT("Pipe[%d]\n", pCount); + DPRINT(" MaximumPacketSize = %d\n", InterfaceInfo->Pipes[pCount].MaximumPacketSize); + DPRINT(" EndpointAddress = %d\n", InterfaceInfo->Pipes[pCount].EndpointAddress); + DPRINT(" Interval = %d\n", InterfaceInfo->Pipes[pCount].Interval); + DPRINT(" PipeType = %d\n", InterfaceInfo->Pipes[pCount].PipeType); + DPRINT(" PipeHandle = %x\n", InterfaceInfo->Pipes[pCount].PipeHandle); + DPRINT(" MaximumTransferSize = %d\n", InterfaceInfo->Pipes[pCount].MaximumTransferSize); + DPRINT(" PipeFlags = %08x\n", InterfaceInfo->Pipes[pCount].PipeFlags); + InterfaceInfo->Pipes[pCount].MaximumPacketSize = UsbDevice->EndPointDescriptor.wMaxPacketSize; + InterfaceInfo->Pipes[pCount].EndpointAddress = UsbDevice->EndPointDescriptor.bEndpointAddress; + InterfaceInfo->Pipes[pCount].Interval = UsbDevice->EndPointDescriptor.bInterval; + InterfaceInfo->Pipes[pCount].PipeType = UsbdPipeTypeInterrupt; + InterfaceInfo->Pipes[pCount].PipeHandle = (PVOID)&UsbDevice->EndPointDescriptor; + if (InterfaceInfo->Pipes[pCount].MaximumTransferSize == 0) + InterfaceInfo->Pipes[pCount].MaximumTransferSize = 4096; + /* InterfaceInfo->Pipes[j].PipeFlags = 0; */ + } + InterfaceInfo = (PUSBD_INTERFACE_INFORMATION)((PUCHAR)InterfaceInfo + InterfaceInfo->Length); + } + + Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; + Urb->UrbHeader.UsbdFlags = 0; + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + } + else + { + /* FIXME: Set device to unconfigured state */ + } + break; + } + case URB_FUNCTION_CLASS_DEVICE: + { + switch (Urb->UrbControlVendorClassRequest.Request) + { + case USB_REQUEST_GET_DESCRIPTOR: + { + DPRINT1("TransferFlags %x\n", Urb->UrbControlVendorClassRequest.TransferFlags); + DPRINT1("Urb->UrbControlVendorClassRequest.Value %x\n", Urb->UrbControlVendorClassRequest.Value); + + + switch (Urb->UrbControlVendorClassRequest.Value >> 8) + { + case USB_DEVICE_CLASS_AUDIO: + { + DPRINT1("USB_DEVICE_CLASS_AUDIO\n"); + break; + } + case USB_DEVICE_CLASS_COMMUNICATIONS: + { + DPRINT1("USB_DEVICE_CLASS_COMMUNICATIONS\n"); + break; + } + case USB_DEVICE_CLASS_HUMAN_INTERFACE: + { + DPRINT1("USB_DEVICE_CLASS_HUMAN_INTERFACE\n"); + break; + } + case USB_DEVICE_CLASS_MONITOR: + { + DPRINT1("USB_DEVICE_CLASS_MONITOR\n"); + break; + } + case USB_DEVICE_CLASS_PHYSICAL_INTERFACE: + { + DPRINT1("USB_DEVICE_CLASS_PHYSICAL_INTERFACE\n"); + break; + } + case USB_DEVICE_CLASS_POWER: + { + DPRINT1("USB_DEVICE_CLASS_POWER\n"); + break; + } + case USB_DEVICE_CLASS_PRINTER: + { + DPRINT1("USB_DEVICE_CLASS_PRINTER\n"); + break; + } + case USB_DEVICE_CLASS_STORAGE: + { + DPRINT1("USB_DEVICE_CLASS_STORAGE\n"); + break; + } + case USB_DEVICE_CLASS_RESERVED: + case USB_DEVICE_CLASS_HUB: + { + PUSB_HUB_DESCRIPTOR UsbHubDescr = Urb->UrbControlVendorClassRequest.TransferBuffer; + /* FIXME: Handle more than root hub? */ + if(Urb->UrbControlVendorClassRequest.TransferBufferLength >= sizeof(USB_HUB_DESCRIPTOR)) + { + Urb->UrbControlVendorClassRequest.TransferBufferLength = sizeof(USB_HUB_DESCRIPTOR); + } + else + { + /* FIXME: Handle this correctly */ + UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + UsbHubDescr->bDescriptorType = 0x29; + return; + } + DPRINT1("USB_DEVICE_CLASS_HUB request\n"); + UsbHubDescr->bDescriptorLength = sizeof(USB_HUB_DESCRIPTOR); + UsbHubDescr->bDescriptorType = 0x29; + UsbHubDescr->bNumberOfPorts = 0x08; + UsbHubDescr->wHubCharacteristics = 0x0012; + UsbHubDescr->bPowerOnToPowerGood = 0x01; + UsbHubDescr->bHubControlCurrent = 0x00; + UsbHubDescr->bRemoveAndPowerMask[0] = 0x00; + UsbHubDescr->bRemoveAndPowerMask[1] = 0x00; + UsbHubDescr->bRemoveAndPowerMask[2] = 0xff; + break; + } + default: + { + DPRINT1("Unknown UrbControlVendorClassRequest Value\n"); + } + } + Urb->UrbHeader.Function = 0x08; + Urb->UrbHeader.Status = USBD_STATUS_SUCCESS; + Urb->UrbHeader.UsbdDeviceHandle = UsbDevice; + Urb->UrbHeader.UsbdFlags = 0; + /* Stop handling the URBs now as its not coded yet */ + DeviceExtension->HaltUrbHandling = TRUE; + break; + } + default: + { + DPRINT1("Unhandled URB request for class device\n"); + Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + } + } + break; + } + default: + { + DPRINT1("Unhandled URB %x\n", Urb->UrbHeader.Function); + Urb->UrbHeader.Status = USBD_STATUS_INVALID_URB_FUNCTION; + } + + } KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); KeAcquireSpinLock(&DeviceExtension->IrpQueueLock, &oldIrql); } KeReleaseSpinLock(&DeviceExtension->IrpQueueLock, oldIrql); } - -NTSTATUS -NTAPI -ArrivalNotificationCompletion(PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID PContext) -{ - PDEVICE_OBJECT PortDeviceObject = (PDEVICE_OBJECT) PContext; - IoFreeIrp(Irp); - ObDereferenceObject(PortDeviceObject); - return STATUS_MORE_PROCESSING_REQUIRED; -} - -VOID -DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context) -{ - PWORKITEM_DATA WorkItemData; - PIO_STACK_LOCATION IrpStack = NULL; - PDEVICE_OBJECT PortDeviceObject = NULL; - PIRP Irp = NULL; - - WorkItemData = (PWORKITEM_DATA)Context; - - PortDeviceObject = IoGetAttachedDeviceReference(WorkItemData->FdoDeviceExtension->Pdo); - - if (!PortDeviceObject) - { - DPRINT1("Unable to notify Pdos parent of device arrival.\n"); - goto Cleanup; - } - - if (PortDeviceObject == DeviceObject) - { - /* Piontless to send query relations to ourself */ - ObDereferenceObject(PortDeviceObject); - goto Cleanup; - } - - Irp = IoAllocateIrp(PortDeviceObject->StackSize, FALSE); - - if (!Irp) - { - DPRINT1("Unable to allocate IRP\n"); - } - - IoSetCompletionRoutine(Irp, - (PIO_COMPLETION_ROUTINE)ArrivalNotificationCompletion, - (PVOID) PortDeviceObject, - 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); - -Cleanup: - IoFreeWorkItem(WorkItemData->IoWorkItem); - ExFreePool(WorkItemData); -} - Modified: trunk/reactos/drivers/usb/usbehci/urbreq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/urbreq… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/urbreq.c [iso-8859-1] Wed Feb 10 13:38:18 2010 @@ -68,7 +68,7 @@ /* Must be Page aligned */ *CtrlSetup = (PEHCI_SETUP_FORMAT) (( (ULONG)(*CtrlTD3) + sizeof(QUEUE_TRANSFER_DESCRIPTOR) + 0xFFF) & ~0xFFF); - *CtrlData = (PSTANDARD_DEVICE_DESC) (( (ULONG)(*CtrlSetup) + sizeof(EHCI_SETUP_FORMAT) + 0xFFF) & ~0xFFF); + *CtrlData = (PUSB_DEVICE_DESCRIPTOR) (( (ULONG)(*CtrlSetup) + sizeof(EHCI_SETUP_FORMAT) + 0xFFF) & ~0xFFF); (*CtrlTD1)->NextPointer = TERMINATE_POINTER; (*CtrlTD1)->AlternateNextPointer = TERMINATE_POINTER; @@ -105,10 +105,10 @@ } BOOLEAN -GetDeviceDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index) +GetDeviceDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index, PUSB_DEVICE_DESCRIPTOR OutBuffer, BOOLEAN Hub) { PEHCI_SETUP_FORMAT CtrlSetup = NULL; - PSTANDARD_DEVICE_DESC CtrlData = NULL; + PUSB_DEVICE_DESCRIPTOR CtrlData = NULL; PQUEUE_TRANSFER_DESCRIPTOR CtrlTD1 = NULL; PQUEUE_TRANSFER_DESCRIPTOR CtrlTD2 = NULL; PQUEUE_TRANSFER_DESCRIPTOR CtrlTD3 = NULL; @@ -129,14 +129,22 @@ &CtrlTD3, &CtrlSetup, (PVOID)&CtrlData, - sizeof(STANDARD_DEVICE_DESC)); + sizeof(USB_DEVICE_DESCRIPTOR)); /* FIXME: Use defines and handle other than Device Desciptors */ - CtrlSetup->bmRequestType = 0x80; + if (Hub) + { + CtrlSetup->bmRequestType = 0x80; + CtrlSetup->wValue = 0x0600; + } + else + { + CtrlSetup->bmRequestType = 0x80; + CtrlSetup->wValue = 0x0100; + } CtrlSetup->bRequest = 0x06; - CtrlSetup->wValue = 0x0100; CtrlSetup->wIndex = 0; - CtrlSetup->wLength = sizeof(STANDARD_DEVICE_DESC); + CtrlSetup->wLength = sizeof(USB_DEVICE_DESCRIPTOR); tmp = READ_REGISTER_ULONG((PULONG) (Base + EHCI_USBCMD)); UsbCmd = (PEHCI_USBCMD_CONTENT) &tmp; @@ -182,13 +190,31 @@ break; } + if (OutBuffer != NULL) + { + OutBuffer->bLength = CtrlData->bLength; + OutBuffer->bDescriptorType = CtrlData->bDescriptorType; + OutBuffer->bcdUSB = CtrlData->bcdUSB; + OutBuffer->bDeviceClass = CtrlData->bDeviceClass; + OutBuffer->bDeviceSubClass = CtrlData->bDeviceSubClass; + OutBuffer->bDeviceProtocol = CtrlData->bDeviceProtocol; + OutBuffer->bMaxPacketSize0 = CtrlData->bMaxPacketSize0; + OutBuffer->idVendor = CtrlData->idVendor; + OutBuffer->idProduct = CtrlData->idProduct; + OutBuffer->bcdDevice = CtrlData->bcdDevice; + OutBuffer->iManufacturer = CtrlData->iManufacturer; + OutBuffer->iProduct = CtrlData->iProduct; + OutBuffer->iSerialNumber = CtrlData->iSerialNumber; + OutBuffer->bNumConfigurations = CtrlData->bNumConfigurations; + } + DPRINT1("bLength %d\n", CtrlData->bLength); DPRINT1("bDescriptorType %x\n", CtrlData->bDescriptorType); DPRINT1("bcdUSB %x\n", CtrlData->bcdUSB); DPRINT1("CtrlData->bDeviceClass %x\n", CtrlData->bDeviceClass); DPRINT1("CtrlData->bDeviceSubClass %x\n", CtrlData->bDeviceSubClass); - DPRINT1("CtrlData->bDeviceProtocal %x\n", CtrlData->bDeviceProtocal); - DPRINT1("CtrlData->bMaxPacketSize %x\n", CtrlData->bMaxPacketSize); + DPRINT1("CtrlData->bDeviceProtocal %x\n", CtrlData->bDeviceProtocol); + DPRINT1("CtrlData->bMaxPacketSize %x\n", CtrlData->bMaxPacketSize0); DPRINT1("CtrlData->idVendor %x\n", CtrlData->idVendor); DPRINT1("CtrlData->idProduct %x\n", CtrlData->idProduct); DPRINT1("CtrlData->bcdDevice %x\n", CtrlData->bcdDevice); @@ -202,7 +228,7 @@ { /* We got valid data, try for strings */ UCHAR Manufacturer = CtrlData->iManufacturer; - UCHAR Product = CtrlData->iManufacturer; + UCHAR Product = CtrlData->iProduct; UCHAR SerialNumber = CtrlData->iSerialNumber; GetDeviceStringDescriptor(DeviceExtension, Manufacturer); @@ -228,7 +254,7 @@ LONG tmp; Base = (ULONG) DeviceExtension->ResourceMemory; -DPRINT1("Index: %d\n", Index); + /* Set up the QUEUE HEAD in memory */ QueueHead = (PQUEUE_HEAD) ((ULONG)DeviceExtension->AsyncListQueueHeadPtr);

1 0

[cwittich] 45553: [usb/usbehci] fix typo
by cwittich＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: cwittich Date: Wed Feb 10 13:25:35 2010 New Revision: 45553 URL: http://svn.reactos.org/svn/reactos?rev=45553&view=rev Log: [usb/usbehci] fix typo Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c Modified: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Wed Feb 10 13:25:35 2010 @@ -244,7 +244,7 @@ BOOLEAN USB_BUSIFFN -IsDeviceHighSpeed(PVOID BusCOntext) +IsDeviceHighSpeed(PVOID BusContext) { DPRINT1("IsDeviceHighSpeed called\n"); return TRUE;

1 0

[mjmartin] 45552: [usb/usbehci] - Define Device and Configuration Descriptors for RootHub20. - Queue all USB_SUBMIT_URBs and create a separate thread to handle them. - For PNP START_DEVICE, Create the internal RootHub usb device and register usb hub device interface. - Fill in direct call interface for USB_BUS_INTERFACE_USBDI_V2 and USB_BUS_INTERFACE_HUB_V5. - Implement Direct Call Interface function GetExtendedHubInformation. - Remove duplicate structures that are already defined in USB Headers
by mjmartin＠svn.reactos.org 10 Feb '10

10 Feb '10

Author: mjmartin Date: Wed Feb 10 13:21:23 2010 New Revision: 45552 URL: http://svn.reactos.org/svn/reactos?rev=45552&view=rev Log: [usb/usbehci] - Define Device and Configuration Descriptors for RootHub20. - Queue all USB_SUBMIT_URBs and create a separate thread to handle them. - For PNP START_DEVICE, Create the internal RootHub usb device and register usb hub device interface. - Fill in direct call interface for USB_BUS_INTERFACE_USBDI_V2 and USB_BUS_INTERFACE_HUB_V5. - Implement Direct Call Interface function GetExtendedHubInformation. - Remove duplicate structures that are already defined in USB Headers. Some reorganization. Added: trunk/reactos/drivers/usb/usbehci/usbiffn.c (with props) trunk/reactos/drivers/usb/usbehci/usbiffn.h (with props) Modified: trunk/reactos/drivers/usb/usbehci/pdo.c trunk/reactos/drivers/usb/usbehci/usbehci.h trunk/reactos/drivers/usb/usbehci/usbehci.rbuild Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/pdo.c [iso-8859-1] Wed Feb 10 13:21:23 2010 @@ -7,14 +7,107 @@ * Michael Martin */ -/* INCLUDES *******************************************************************/ #define INITGUID +#define NDEBUG + #include "usbehci.h" #include <wdmguid.h> +#include "usbiffn.h" #include <stdio.h> - -#define NDEBUG #include <debug.h> + +/* Lifted from Linux with slight changes */ +const UCHAR ROOTHUB2_DEVICE_DESCRIPTOR [] = +{ + 0x12, /* bLength; */ + USB_DEVICE_DESCRIPTOR_TYPE, /* bDescriptorType; Device */ + 0x00, 0x20, /* bcdUSB; v1.1 */ + USB_DEVICE_CLASS_HUB, /* bDeviceClass; HUB_CLASSCODE */ + 0x01, /* bDeviceSubClass; */ + 0x00, /* bDeviceProtocol; [ low/full speeds only ] */ + 0x08, /* bMaxPacketSize0; 8 Bytes */ + /* Fill Vendor and Product in when init root hub */ + 0x00, 0x00, /* idVendor; */ + 0x00, 0x00, /* idProduct; */ + 0x00, 0x00, /* bcdDevice */ + 0x00, /* iManufacturer; */ + 0x00, /* iProduct; */ + 0x00, /* iSerialNumber; */ + 0x01 /* bNumConfigurations; */ + +}; + +const UCHAR ROOTHUB2_CONFIGURATION_DESCRIPTOR [] = +{ + /* one configuration */ + 0x09, /* bLength; */ + 0x02, /* bDescriptorType; Configuration */ + 0x19, 0x00, /* wTotalLength; */ + 0x01, /* bNumInterfaces; (1) */ + 0x23, /* bConfigurationValue; */ + 0x00, /* iConfiguration; */ + 0x40, /* bmAttributes; + Bit 7: must be set, + 6: Self-powered, + 5: Remote wakeup, + 4..0: reserved */ + 0x00, /* MaxPower; */ + + /* one interface */ + 0x09, /* bLength: Interface; */ + 0x04, /* bDescriptorType; Interface */ + 0x00, /* bInterfaceNumber; */ + 0x00, /* bAlternateSetting; */ + 0x01, /* bNumEndpoints; */ + 0x09, /* bInterfaceClass; HUB_CLASSCODE */ + 0x01, /* bInterfaceSubClass; */ + 0x00, /* bInterfaceProtocol: */ + 0x00, /* iInterface; */ + + /* one endpoint (status change endpoint) */ + 0x07, /* bLength; */ + 0x05, /* bDescriptorType; Endpoint */ + 0x81, /* bEndpointAddress; IN Endpoint 1 */ + 0x03, /* bmAttributes; Interrupt */ + 0x08, 0x00, /* wMaxPacketSize; 1 + (MAX_ROOT_PORTS / 8) */ + 0xFF /* bInterval; (255ms -- usb 2.0 spec) */ +}; + +/* FIXME: Do something better */ +VOID NTAPI +UrbWorkerThread(PVOID Context) +{ + PPDO_DEVICE_EXTENSION PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)Context; + + while (PdoDeviceExtension->HaltUrbHandling == FALSE) + { + CompletePendingURBRequest(PdoDeviceExtension); + } + DPRINT1("Thread terminated\n"); +} + +/* FIXME: Do something better */ +PVOID InternalCreateUsbDevice(UCHAR DeviceNumber, ULONG Port, PUSB_DEVICE Parent, BOOLEAN Hub) +{ + PUSB_DEVICE UsbDevicePointer = NULL; + UsbDevicePointer = ExAllocatePool(NonPagedPool, sizeof(USB_DEVICE)); + if (!UsbDevicePointer) + { + DPRINT1("Out of memory\n"); + return NULL; + } + + if ((Hub) && (!Parent)) + { + DPRINT1("This is the root hub\n"); + } + + UsbDevicePointer->Address = DeviceNumber; + UsbDevicePointer->Port = Port; + UsbDevicePointer->ParentDevice = Parent; + + return UsbDevicePointer; +} NTSTATUS NTAPI PdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -24,125 +117,94 @@ 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; - - DPRINT1("Irp->CancelRoutine %x\n",Irp->CancelRoutine); - QueueRequest(FdoDeviceExtension, Irp); - - Information = 0; - - IoMarkIrpPending(Irp); - Status = STATUS_PENDING; - - break; - } - /* FIXME: Handle all other Functions */ - default: - DPRINT1("Not handled yet!\n"); - } + DPRINT("Header Length %d\n", Urb->UrbHeader.Length); + DPRINT("Header Function %d\n", Urb->UrbHeader.Function); + + /* Queue all request for now, kernel thread will complete them */ + QueueURBRequest(PdoDeviceExtension, Irp); + Information = 0; + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; break; } case IOCTL_INTERNAL_USB_CYCLE_PORT: { - DPRINT("IOCTL_INTERNAL_USB_CYCLE_PORT\n"); + DPRINT1("IOCTL_INTERNAL_USB_CYCLE_PORT\n"); break; } case IOCTL_INTERNAL_USB_ENABLE_PORT: { - DPRINT("IOCTL_INTERNAL_USB_ENABLE_PORT\n"); + DPRINT1("IOCTL_INTERNAL_USB_ENABLE_PORT\n"); break; } case IOCTL_INTERNAL_USB_GET_BUS_INFO: { - DPRINT("IOCTL_INTERNAL_USB_GET_BUS_INFO\n"); + DPRINT1("IOCTL_INTERNAL_USB_GET_BUS_INFO\n"); break; } case IOCTL_INTERNAL_USB_GET_BUSGUID_INFO: { - DPRINT("IOCTL_INTERNAL_USB_GET_BUSGUID_INFO\n"); + DPRINT1("IOCTL_INTERNAL_USB_GET_BUSGUID_INFO\n"); break; } case IOCTL_INTERNAL_USB_GET_CONTROLLER_NAME: { - DPRINT("IOCTL_INTERNAL_USB_GET_CONTROLLER_NAME\n"); + DPRINT1("IOCTL_INTERNAL_USB_GET_CONTROLLER_NAME\n"); break; } case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE: { - DPRINT("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); + DPRINT1("IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE\n"); break; } case IOCTL_INTERNAL_USB_GET_HUB_COUNT: { - DPRINT("IOCTL_INTERNAL_USB_GET_HUB_COUNT\n"); + DPRINT1("IOCTL_INTERNAL_USB_GET_HUB_COUNT\n"); break; } case IOCTL_INTERNAL_USB_GET_HUB_NAME: { - DPRINT("IOCTL_INTERNAL_USB_GET_HUB_NAME\n"); + DPRINT1("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"); + DPRINT1("IOCTL_INTERNAL_USB_GET_PARENT_HUB_INFO\n"); break; } case IOCTL_INTERNAL_USB_GET_PORT_STATUS: { - DPRINT("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); + DPRINT1("IOCTL_INTERNAL_USB_GET_PORT_STATUS\n"); break; } case IOCTL_INTERNAL_USB_RESET_PORT: { - DPRINT("IOCTL_INTERNAL_USB_RESET_PORT\n"); + DPRINT1("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 */ + DPRINT1("IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n"); + if (Stack->Parameters.Others.Argument1) - Stack->Parameters.Others.Argument1 = FdoDeviceExtension->DeviceObject; + *(PVOID *)Stack->Parameters.Others.Argument1 = FdoDeviceExtension->Pdo; if (Stack->Parameters.Others.Argument2) - Stack->Parameters.Others.Argument2 = FdoDeviceExtension->Pdo; + *(PVOID *)Stack->Parameters.Others.Argument2 = IoGetAttachedDevice(FdoDeviceExtension->DeviceObject); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; @@ -151,7 +213,7 @@ } case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION: { - DPRINT("IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION\n"); + DPRINT1("IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION\n"); break; } default: @@ -162,6 +224,7 @@ } Irp->IoStatus.Information = Information; + if (Status != STATUS_PENDING) IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -171,8 +234,6 @@ 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; @@ -181,25 +242,18 @@ 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&VID8086&PID265C") + 1; Index += swprintf(&Buffer[Index], L"USB\\ROOT_HUB20") + 1; Buffer[Index] = UNICODE_NULL; @@ -209,24 +263,12 @@ } case BusQueryCompatibleIDs: { - DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_ID / BusQueryCompatibleIDs\n"); - /* We have none */ + /* 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: { @@ -247,18 +289,15 @@ 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; + ObReferenceObject(DeviceObject); *pDeviceRelations = DeviceRelations; return STATUS_SUCCESS; @@ -271,8 +310,8 @@ { ULONG MinorFunction; PIO_STACK_LOCATION Stack; - ULONG_PTR Information = 0; - NTSTATUS Status; + ULONG_PTR Information = Irp->IoStatus.Information; + NTSTATUS Status = Irp->IoStatus.Status; Stack = IoGetCurrentIrpStackLocation(Irp); MinorFunction = Stack->MinorFunction; @@ -284,17 +323,70 @@ case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_STOP_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_CANCEL_STOP_DEVICE: case IRP_MN_QUERY_DEVICE_TEXT: case IRP_MN_SURPRISE_REMOVAL: - { - Information = Irp->IoStatus.Information; + case IRP_MN_QUERY_RESOURCES: + case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: + case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: + { Status = STATUS_SUCCESS; break; } case IRP_MN_START_DEVICE: { - DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + PUSB_DEVICE RootHubDevice; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + UNICODE_STRING InterfaceSymLinkName; + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; + + /* Create the root hub */ + RootHubDevice = InternalCreateUsbDevice(0, 0, NULL, TRUE); + + RootHubDevice->Address = 1; + RootHubDevice->Port = 0; + + RtlCopyMemory(&RootHubDevice->DeviceDescriptor, + ROOTHUB2_DEVICE_DESCRIPTOR, + sizeof(ROOTHUB2_DEVICE_DESCRIPTOR)); + + RootHubDevice->DeviceDescriptor.idVendor = FdoDeviceExtension->VendorId; + RootHubDevice->DeviceDescriptor.idProduct = FdoDeviceExtension->DeviceId; + + RtlCopyMemory(&RootHubDevice->ConfigurationDescriptor, + ROOTHUB2_CONFIGURATION_DESCRIPTOR, + sizeof(ROOTHUB2_CONFIGURATION_DESCRIPTOR)); + + PdoDeviceExtension->UsbDevices[0] = RootHubDevice; + + /* Create a thread to handle the URB's */ + Status = PsCreateSystemThread(&PdoDeviceExtension->ThreadHandle, + THREAD_ALL_ACCESS, + NULL, + NULL, + NULL, + UrbWorkerThread, + (PVOID)PdoDeviceExtension); + + if (!NT_SUCCESS(Status)) + DPRINT1("Failed Thread Creation with Status: %x\n", Status); + + Status = IoRegisterDeviceInterface(DeviceObject, &GUID_DEVINTERFACE_USB_HUB, NULL, &InterfaceSymLinkName); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to register interface\n"); + } + else + { + Status = IoSetDeviceInterfaceState(&InterfaceSymLinkName, TRUE); + DPRINT1("Set interface state %x\n", Status); + } + + Status = STATUS_SUCCESS; break; } @@ -305,16 +397,17 @@ 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; } + case BusRelations: + case RemovalRelations: + case EjectionRelations: 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; } @@ -325,17 +418,20 @@ { 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->UniqueID = FALSE; DeviceCapabilities->SilentInstall = FALSE; - DeviceCapabilities->RawDeviceOK = TRUE; + DeviceCapabilities->RawDeviceOK = FALSE; DeviceCapabilities->SurpriseRemovalOK = FALSE; + DeviceCapabilities->Address = 0; + DeviceCapabilities->UINumber = 0; + DeviceCapabilities->DeviceD2 = 1; /* FIXME */ DeviceCapabilities->HardwareDisabled = FALSE; @@ -343,47 +439,101 @@ DeviceCapabilities->DeviceState[0] = PowerDeviceD0; for (i = 0; i < PowerSystemMaximum; i++) DeviceCapabilities->DeviceState[i] = PowerDeviceD3; - //DeviceCapabilities->DeviceWake = PowerDeviceUndefined; + DeviceCapabilities->DeviceWake = 0; DeviceCapabilities->D1Latency = 0; DeviceCapabilities->D2Latency = 0; DeviceCapabilities->D3Latency = 0; + Information = 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_INTERFACE: + { + UNICODE_STRING GuidString; + PUSB_BUS_INTERFACE_HUB_V5 InterfaceHub; + PUSB_BUS_INTERFACE_USBDI_V2 InterfaceDI; + PPDO_DEVICE_EXTENSION PdoDeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension; + + PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; + + Status = RtlStringFromGUID(Stack->Parameters.QueryInterface.InterfaceType, &GuidString); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create string from GUID!\n"); + } + DPRINT1("Interface GUID requested %wZ\n", &GuidString); + DPRINT1("QueryInterface.Size %x\n", Stack->Parameters.QueryInterface.Size); + DPRINT1("QueryInterface.Version %x\n", Stack->Parameters.QueryInterface.Version); + + Status = STATUS_SUCCESS; + Information = 0; + + /* FIXME: Check the actual Guid */ + if (Stack->Parameters.QueryInterface.Size == sizeof(USB_BUS_INTERFACE_USBDI_V2) && (Stack->Parameters.QueryInterface.Version == 2)) + { + InterfaceDI = (PUSB_BUS_INTERFACE_USBDI_V2) Stack->Parameters.QueryInterface.Interface; + InterfaceDI->Size = sizeof(USB_BUS_INTERFACE_USBDI_V2); + InterfaceDI->Version = 2; + InterfaceDI->BusContext = PdoDeviceExtension->DeviceObject; + InterfaceDI->InterfaceReference = (PINTERFACE_REFERENCE)InterfaceReference; + InterfaceDI->InterfaceDereference = (PINTERFACE_DEREFERENCE)InterfaceDereference; + InterfaceDI->GetUSBDIVersion = GetUSBDIVersion; + InterfaceDI->QueryBusTime = QueryBusTime; + InterfaceDI->SubmitIsoOutUrb = SubmitIsoOutUrb; + InterfaceDI->QueryBusInformation = QueryBusInformation; + InterfaceDI->IsDeviceHighSpeed = IsDeviceHighSpeed; + InterfaceDI->EnumLogEntry = EnumLogEntry; + } + /* FIXME: Check the actual Guid */ + else if (Stack->Parameters.QueryInterface.Size == sizeof(USB_BUS_INTERFACE_HUB_V5) && + (Stack->Parameters.QueryInterface.Version == 5)) + { + InterfaceHub = (PUSB_BUS_INTERFACE_HUB_V5)Stack->Parameters.QueryInterface.Interface; + InterfaceHub->Version = 5; + InterfaceHub->Size = sizeof(USB_BUS_INTERFACE_HUB_V5); + InterfaceHub->BusContext = PdoDeviceExtension->DeviceObject; + InterfaceHub->InterfaceReference = (PINTERFACE_REFERENCE)InterfaceReference; + InterfaceHub->InterfaceDereference = (PINTERFACE_DEREFERENCE)InterfaceDereference; + InterfaceHub->CreateUsbDevice = CreateUsbDevice; + InterfaceHub->InitializeUsbDevice = InitializeUsbDevice; + InterfaceHub->GetUsbDescriptors = GetUsbDescriptors; + InterfaceHub->RemoveUsbDevice = RemoveUsbDevice; + InterfaceHub->RestoreUsbDevice = RestoreUsbDevice; + InterfaceHub->GetPortHackFlags = GetPortHackFlags; + InterfaceHub->QueryDeviceInformation = QueryDeviceInformation; + InterfaceHub->GetControllerInformation = GetControllerInformation; + InterfaceHub->ControllerSelectiveSuspend = ControllerSelectiveSuspend; + InterfaceHub->GetExtendedHubInformation = GetExtendedHubInformation; + InterfaceHub->GetRootHubSymbolicName = GetRootHubSymbolicName; + InterfaceHub->GetDeviceBusContext = GetDeviceBusContext; + InterfaceHub->Initialize20Hub = Initialize20Hub; + InterfaceHub->RootHubInitNotification = RootHubInitNotification; + InterfaceHub->FlushTransfers = FlushTransfers; + InterfaceHub->SetDeviceHandleData = SetDeviceHandleData; + } + else + { + DPRINT1("Not Supported\n"); + Status = STATUS_NOT_SUPPORTED; + } + 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) @@ -407,9 +557,6 @@ { /* 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; } } Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.h [iso-8859-1] Wed Feb 10 13:21:23 2010 @@ -176,30 +176,23 @@ USHORT wLength; } EHCI_SETUP_FORMAT, *PEHCI_SETUP_FORMAT; -typedef struct _STANDARD_DEVICE_DESC -{ - UCHAR bLength; - UCHAR bDescriptorType; - USHORT bcdUSB; - UCHAR bDeviceClass; - UCHAR bDeviceSubClass; - UCHAR bDeviceProtocal; - UCHAR bMaxPacketSize; - USHORT idVendor; - USHORT idProduct; - USHORT bcdDevice; - UCHAR iManufacturer; - UCHAR iProduct; - UCHAR iSerialNumber; - UCHAR bNumConfigurations; -} STANDARD_DEVICE_DESC, *PSTANDARD_DEVICE_DESC; - typedef struct _STRING_DESCRIPTOR { UCHAR bLength; /* Size of this descriptor in bytes */ UCHAR bDescriptorType; /* STRING Descriptor Type */ UCHAR bString[0]; /* UNICODE encoded string */ } STRING_DESCRIPTOR, *PSTRING_DESCRIPTOR; + +typedef struct _USB_DEVICE +{ + UCHAR Address; + ULONG Port; + PVOID ParentDevice; + USB_DEVICE_DESCRIPTOR DeviceDescriptor; + USB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor; + USB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + USB_ENDPOINT_DESCRIPTOR EndPointDescriptor; +} USB_DEVICE, *PUSB_DEVICE; /* USBCMD register 32 bits */ typedef struct _EHCI_USBCMD_CONTENT @@ -292,7 +285,6 @@ UCHAR PortRoute [8]; } EHCI_CAPS, *PEHCI_CAPS; - typedef struct _COMMON_DEVICE_EXTENSION { BOOLEAN IsFdo; @@ -309,9 +301,7 @@ PDEVICE_OBJECT Pdo; ULONG DeviceState; - /* USB Specs says a max of 127 devices */ - ULONG ChildDeviceCount; - + PVOID RootHubDeviceHandle; PDMA_ADAPTER pDmaAdapter; ULONG Vector; @@ -323,10 +313,6 @@ KDPC DpcObject; KAFFINITY Affinity; - LIST_ENTRY IrpQueue; - KSPIN_LOCK IrpQueueLock; - PIRP CurrentIrp; - ULONG MapRegisters; ULONG BusNumber; @@ -354,7 +340,6 @@ PULONG ResourceBase; ULONG Size; - } FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; typedef struct _PDO_DEVICE_EXTENSION @@ -362,15 +347,25 @@ COMMON_DEVICE_EXTENSION Common; PDEVICE_OBJECT DeviceObject; PDEVICE_OBJECT ControllerFdo; - + PUSB_DEVICE UsbDevices[127]; + LIST_ENTRY IrpQueue; + KSPIN_LOCK IrpQueueLock; + PIRP CurrentIrp; + HANDLE ThreadHandle; + ULONG ChildDeviceCount; + BOOLEAN HaltUrbHandling; } PDO_DEVICE_EXTENSION, *PPDO_DEVICE_EXTENSION; - typedef struct _WORKITEM_DATA { PIO_WORKITEM IoWorkItem; PFDO_DEVICE_EXTENSION FdoDeviceExtension; + PDEVICE_OBJECT PortDeviceObject; } WORKITEM_DATA, *PWORKITEM_DATA; + + +VOID NTAPI +UrbWorkerThread(PVOID Context); NTSTATUS NTAPI GetBusInterface(PDEVICE_OBJECT pcifido, PBUS_INTERFACE_STANDARD busInterface); @@ -406,27 +401,18 @@ PdoDispatchInternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); BOOLEAN -GetDeviceDescriptor (PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index); +GetDeviceDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index, PUSB_DEVICE_DESCRIPTOR OutBuffer, BOOLEAN Hub); BOOLEAN GetDeviceStringDescriptor(PFDO_DEVICE_EXTENSION DeviceExtension, UCHAR Index); VOID -CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension); +QueueURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); VOID -QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); +CompletePendingURBRequest(PPDO_DEVICE_EXTENSION DeviceExtension); VOID -QueueRequest(PFDO_DEVICE_EXTENSION DeviceExtension, PIRP Irp); - -VOID -CompletePendingRequest(PFDO_DEVICE_EXTENSION DeviceExtension); - -VOID -DeviceArrivalWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context); - -VOID -RequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); +URBRequestCancel (PDEVICE_OBJECT DeviceObject, PIRP Irp); #endif Modified: 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 [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/usbehci.rbuild [iso-8859-1] Wed Feb 10 13:21:23 2010 @@ -9,5 +9,6 @@ <file>common.c</file> <file>misc.c</file> <file>irp.c</file> + <file>usbiffn.c</file> <file>urbreq.c</file> </module> Added: trunk/reactos/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.c (added) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.c [iso-8859-1] Wed Feb 10 13:21:23 2010 @@ -1,0 +1,260 @@ +/* + * PROJECT: ReactOS Universal Serial Bus Bulk Enhanced Host Controller Interface + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/usb/usbehci/usbiffn.c + * PURPOSE: Direct Call Interface Functions. + * PROGRAMMERS: + * Michael Martin + */ + +/* usbbusif.h and hubbusif.h need to be imported */ +#include "usbehci.h" +#include "usbiffn.h" +#define NDEBUG +#include <debug.h> + +VOID +USB_BUSIFFN +InterfaceReference(PVOID BusContext) +{ + DPRINT1("InterfaceReference called\n"); +} + +VOID +USB_BUSIFFN +InterfaceDereference(PVOID BusContext) +{ + DPRINT1("InterfaceDereference called\n"); +} + +/* Bus Interface Hub V5 Functions */ + +NTSTATUS +USB_BUSIFFN +CreateUsbDevice(PVOID BusContext, + PUSB_DEVICE_HANDLE *NewDevice, + PUSB_DEVICE_HANDLE HubDeviceHandle, + USHORT PortStatus, USHORT PortNumber) +{ + DPRINT1("CreateUsbDevice called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +InitializeUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle) +{ + DPRINT1("InitializeUsbDevice called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +GetUsbDescriptors(PVOID BusContext, + PUSB_DEVICE_HANDLE DeviceHandle, + PUCHAR DeviceDescriptorBuffer, + PULONG DeviceDescriptorBufferLength, + PUCHAR ConfigurationBuffer, + PULONG ConfigDescriptorBufferLength) +{ + DPRINT1("GetUsbDescriptor called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +RemoveUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, ULONG Flags) +{ + DPRINT1("RemoveUsbDevice called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle) +{ + DPRINT1("RestoreUsbDevice called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +GetPortHackFlags(PVOID BusContext, PULONG Flags) +{ + DPRINT1("GetPortHackFlags called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +QueryDeviceInformation(PVOID BusContext, + PUSB_DEVICE_HANDLE DeviceHandle, + PVOID DeviceInformationBuffer, + ULONG DeviceInformationBufferLength, + PULONG LengthReturned) +{ + DPRINT1("QueryDeviceInformation called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +GetControllerInformation(PVOID BusContext, + PVOID ControllerInformationBuffer, + ULONG ControllerInformationBufferLength, + PULONG LengthReturned) +{ + DPRINT1("GetControllerInformation called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +ControllerSelectiveSuspend(PVOID BusContext, BOOLEAN Enable) +{ + DPRINT1("ControllerSelectiveSuspend called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +GetExtendedHubInformation(PVOID BusContext, + PDEVICE_OBJECT HubPhysicalDeviceObject, + PVOID HubInformationBuffer, + ULONG HubInformationBufferLength, + PULONG LengthReturned) +{ + + PUSB_EXTHUB_INFORMATION_0 UsbExtHubInfo = HubInformationBuffer; + PPDO_DEVICE_EXTENSION PdoDeviceExtension = (PPDO_DEVICE_EXTENSION)((PDEVICE_OBJECT)BusContext)->DeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExntension = (PFDO_DEVICE_EXTENSION)PdoDeviceExtension->ControllerFdo->DeviceExtension; + LONG i; + + /* Set the default return value */ + *LengthReturned = 0; + /* Caller must have set InformationLevel to 0 */ + if (UsbExtHubInfo->InformationLevel != 0) + { + return STATUS_NOT_SUPPORTED; + } + + UsbExtHubInfo->NumberOfPorts = 8; + + for (i=0; i < UsbExtHubInfo->NumberOfPorts; i++) + { + UsbExtHubInfo->Port[i].PhysicalPortNumber = i + 1; + UsbExtHubInfo->Port[i].PortLabelNumber = FdoDeviceExntension->ECHICaps.HCSParams.PortCount; + UsbExtHubInfo->Port[i].VidOverride = 0; + UsbExtHubInfo->Port[i].PidOverride = 0; + UsbExtHubInfo->Port[i].PortAttributes = USB_PORTATTR_SHARED_USB2; + } + + *LengthReturned = FIELD_OFFSET(USB_EXTHUB_INFORMATION_0, Port[8]); + + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +GetRootHubSymbolicName(PVOID BusContext, + PVOID HubSymNameBuffer, + ULONG HubSymNameBufferLength, + PULONG HubSymNameActualLength) +{ + DPRINT1("GetRootHubSymbolicName called\n"); + return STATUS_SUCCESS; +} + +PVOID +USB_BUSIFFN +GetDeviceBusContext(PVOID HubBusContext, PVOID DeviceHandle) +{ + DPRINT1("GetDeviceBusContext called\n"); + return NULL; +} + +NTSTATUS +USB_BUSIFFN +Initialize20Hub(PVOID BusContext, PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount) +{ + DPRINT1("Initialize20Hub called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +RootHubInitNotification(PVOID BusContext, PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine) +{ + DPRINT1("RootHubInitNotification\n"); + return STATUS_SUCCESS; +} + +VOID +USB_BUSIFFN +FlushTransfers(PVOID BusContext, PVOID DeviceHandle) +{ + DPRINT1("FlushTransfers\n"); +} + +VOID +USB_BUSIFFN +SetDeviceHandleData(PVOID BusContext, PVOID DeviceHandle, PDEVICE_OBJECT UsbDevicePdo) +{ + DPRINT1("SetDeviceHandleData called\n"); +} + + +/* USB_BUS_INTERFACE_USBDI_V2 Functions */ + +NTSTATUS +USB_BUSIFFN +GetUSBDIVersion(PVOID BusContext, PUSBD_VERSION_INFORMATION VersionInformation, PULONG HcdCapabilites) +{ + DPRINT1("GetUSBDIVersion called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +QueryBusTime(PVOID BusContext, PULONG CurrentFrame) +{ + DPRINT1("QueryBusTime called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +SubmitIsoOutUrb(PVOID BusContext, PURB Urb) +{ + DPRINT1("SubmitIsoOutUrb called\n"); + return STATUS_SUCCESS; +} + +NTSTATUS +USB_BUSIFFN +QueryBusInformation(PVOID BusContext, + ULONG Level, + PVOID BusInformationBuffer, + PULONG BusInformationBufferLength, + PULONG BusInformationActualLength) +{ + DPRINT1("QueryBusInformation called\n"); + return STATUS_SUCCESS; +} + +BOOLEAN +USB_BUSIFFN +IsDeviceHighSpeed(PVOID BusCOntext) +{ + DPRINT1("IsDeviceHighSpeed called\n"); + return TRUE; +} + +NTSTATUS +USB_BUSIFFN +EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2) +{ + DPRINT1("EnumLogEntry called\n"); + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/usb/usbehci/usbiffn.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/usb/usbehci/usbiffn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/usbiff… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/usbiffn.h (added) +++ trunk/reactos/drivers/usb/usbehci/usbiffn.h [iso-8859-1] Wed Feb 10 13:21:23 2010 @@ -1,0 +1,200 @@ +#ifndef __USBIFFN_H__ +#define __USBIFFN_H__ + +#define USB_BUSIFFN __stdcall +#include <ntifs.h> +#include <ntddk.h> +#include <usb.h> + +/* usbbusif.h and hubbusif.h need to be imported */ +typedef PVOID PUSB_DEVICE_HANDLE; + +typedef +VOID +USB_BUSIFFN +RH_INIT_CALLBACK (PVOID CallBackContext); + +typedef RH_INIT_CALLBACK *PRH_INIT_CALLBACK; + +typedef struct _USB_EXTPORT_INFORMATION_0 +{ + ULONG PhysicalPortNumber; + ULONG PortLabelNumber; + USHORT VidOverride; + USHORT PidOverride; + ULONG PortAttributes; +} USB_EXTPORT_INFORMATION_0, *PUSB_EXTPORT_INFORMATION; + +typedef struct _USB_EXTHUB_INFORMATION_0 +{ + ULONG InformationLevel; + ULONG NumberOfPorts; + USB_EXTPORT_INFORMATION_0 Port[255]; +} USB_EXTHUB_INFORMATION_0, *PUSB_EXTHUB_INFORMATION_0; + +typedef struct _USB_BUS_INTERFACE_USBDI_V2 +{ + USHORT Size; + USHORT Version; + PVOID BusContext; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + + PVOID GetUSBDIVersion; + PVOID QueryBusTime; + PVOID SubmitIsoOutUrb; + PVOID QueryBusInformation; + PVOID IsDeviceHighSpeed; + PVOID EnumLogEntry; +} USB_BUS_INTERFACE_USBDI_V2, *PUSB_BUS_INTERFACE_USBDI_V2; + +typedef struct _USB_BUS_INTERFACE_HUB_V5 +{ + USHORT Size; + USHORT Version; + PVOID BusContext; + PINTERFACE_REFERENCE InterfaceReference; + PINTERFACE_DEREFERENCE InterfaceDereference; + + PVOID CreateUsbDevice; + PVOID InitializeUsbDevice; + PVOID GetUsbDescriptors; + PVOID RemoveUsbDevice; + PVOID RestoreUsbDevice; + PVOID GetPortHackFlags; + PVOID QueryDeviceInformation; + PVOID GetControllerInformation; + PVOID ControllerSelectiveSuspend; + PVOID GetExtendedHubInformation; + PVOID GetRootHubSymbolicName; + PVOID GetDeviceBusContext; + PVOID Initialize20Hub; + PVOID RootHubInitNotification; + PVOID FlushTransfers; + PVOID SetDeviceHandleData; +} USB_BUS_INTERFACE_HUB_V5, *PUSB_BUS_INTERFACE_HUB_V5; + +VOID +USB_BUSIFFN +InterfaceReference(PVOID BusContext); + +VOID +USB_BUSIFFN +InterfaceDereference(PVOID BusContext); + +NTSTATUS +USB_BUSIFFN +CreateUsbDevice(PVOID BusContext, + PUSB_DEVICE_HANDLE *NewDevice, + PUSB_DEVICE_HANDLE HubDeviceHandle, + USHORT PortStatus, USHORT PortNumber); + +NTSTATUS +USB_BUSIFFN +InitializeUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle); + +NTSTATUS +USB_BUSIFFN +GetUsbDescriptors(PVOID BusContext, + PUSB_DEVICE_HANDLE DeviceHandle, + PUCHAR DeviceDescriptorBuffer, + PULONG DeviceDescriptorBufferLength, + PUCHAR ConfigurationBuffer, + PULONG ConfigDescriptorBufferLength); + +NTSTATUS +USB_BUSIFFN +RemoveUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE DeviceHandle, ULONG Flags); + +NTSTATUS +USB_BUSIFFN +RestoreUsbDevice(PVOID BusContext, PUSB_DEVICE_HANDLE OldDeviceHandle, PUSB_DEVICE_HANDLE NewDeviceHandle); + +NTSTATUS +USB_BUSIFFN +GetPortHackFlags(PVOID BusContext, PULONG Flags); + +NTSTATUS +USB_BUSIFFN +QueryDeviceInformation(PVOID BusContext, + PUSB_DEVICE_HANDLE DeviceHandle, + PVOID DeviceInformationBuffer, + ULONG DeviceInformationBufferLength, + PULONG LengthReturned); + +NTSTATUS +USB_BUSIFFN +GetControllerInformation(PVOID BusContext, + PVOID ControllerInformationBuffer, + ULONG ControllerInformationBufferLength, + PULONG LengthReturned); + +NTSTATUS +USB_BUSIFFN +ControllerSelectiveSuspend(PVOID BusContext, BOOLEAN Enable); + +NTSTATUS +USB_BUSIFFN +GetExtendedHubInformation(PVOID BusContext, + PDEVICE_OBJECT HubPhysicalDeviceObject, + PVOID HubInformationBuffer, + ULONG HubInformationBufferLength, + PULONG LengthReturned); + +NTSTATUS +USB_BUSIFFN +GetRootHubSymbolicName(PVOID BusContext, + PVOID HubSymNameBuffer, + ULONG HubSymNameBufferLength, + PULONG HubSymNameActualLength); + +PVOID +USB_BUSIFFN +GetDeviceBusContext(PVOID HubBusContext, PVOID DeviceHandle); + +NTSTATUS +USB_BUSIFFN +Initialize20Hub(PVOID BusContext, PUSB_DEVICE_HANDLE HubDeviceHandle, ULONG TtCount); + +NTSTATUS +USB_BUSIFFN +RootHubInitNotification(PVOID BusContext, PVOID CallbackContext, PRH_INIT_CALLBACK CallbackRoutine); + +VOID +USB_BUSIFFN +FlushTransfers(PVOID BusContext, PVOID DeviceHandle); + +VOID +USB_BUSIFFN +SetDeviceHandleData(PVOID BusContext, PVOID DeviceHandle, PDEVICE_OBJECT UsbDevicePdo); + +NTSTATUS +USB_BUSIFFN +GetUSBDIVersion(PVOID BusContext, PUSBD_VERSION_INFORMATION VersionInformation, PULONG HcdCapabilites); + +NTSTATUS +USB_BUSIFFN +QueryBusTime(PVOID BusContext, PULONG CurrentFrame); + +NTSTATUS +USB_BUSIFFN +SubmitIsoOutUrb(PVOID BusContext, PURB Urb); + +NTSTATUS +USB_BUSIFFN +QueryBusInformation(PVOID BusContext, + ULONG Level, + PVOID BusInformationBuffer, + PULONG BusInformationBufferLength, + PULONG BusInformationActualLength); + +BOOLEAN +USB_BUSIFFN +IsDeviceHighSpeed(PVOID BusCOntext); + +NTSTATUS +USB_BUSIFFN +EnumLogEntry(PVOID BusContext, ULONG DriverTag, ULONG EnumTag, ULONG P1, ULONG P2); + +#endif + Propchange: trunk/reactos/drivers/usb/usbehci/usbiffn.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
37
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 February 2010