Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 55403: [NTOSKRNL/MM/AMD64] - Add MI_REAL_SYSTEM_RANGE_START, which is the canonical system space base address, while MmSystemRangeStart variable contains a broken value, like on Windows....
by tkreuzer＠svn.reactos.org 04 Feb '12

04 Feb '12

Author: tkreuzer Date: Sat Feb 4 10:40:27 2012 New Revision: 55403 URL: http://svn.reactos.org/svn/reactos?rev=55403&view=rev Log: [NTOSKRNL/MM/AMD64] - Add MI_REAL_SYSTEM_RANGE_START, which is the canonical system space base address, while MmSystemRangeStart variable contains a broken value, like on Windows. - Define MmSystemRangeStart to MI_REAL_SYSTEM_RANGE_START, since on amd64 there is no dynamic system space start address and we don't want to use the broken address anywhere - Add some more address layout definitions - Add MiIsPteOnP*eBoundary() macro - Add MMPPE, MI_WRITE_VALID_PPE and ValidKernelPpe definitions - Fix initialization of PrototypePte - Add mappings for VAD bitmap and working set list to MiInitializePageTable - Fix calculations in MiBuildNonPagedPool - Improve MiBuildSystemPteSpace - Implement MiBuildPfnDatabase, MiAddDescriptorToDatabase, MiBuildPfnDatabaseFromPageTables, MiSetupPfnForPageTable all of these are written to be portable, yet they are untested on anything else than amd64 builds - Mostly finish MiInitMachineDependent Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/mm/amd64/init.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat Feb 4 10:40:27 2012 @@ -8,29 +8,39 @@ #define MI_HIGHEST_USER_ADDRESS (PVOID)0x000007FFFFFEFFFFULL #define MI_USER_PROBE_ADDRESS (PVOID)0x000007FFFFFF0000ULL #define MI_DEFAULT_SYSTEM_RANGE_START (PVOID)0xFFFF080000000000ULL +#define MI_REAL_SYSTEM_RANGE_START 0xFFFF800000000000ULL +#define MI_PAGE_TABLE_BASE 0xFFFFF68000000000ULL #define HYPER_SPACE 0xFFFFF70000000000ULL #define HYPER_SPACE_END 0xFFFFF77FFFFFFFFFULL -#define MI_SESSION_SPACE_MINIMUM (PVOID)0xFFFFF90000000000ULL -#define MI_SESSION_VIEW_END (PVOID)0xFFFFF97FFF000000ULL -#define MI_SESSION_SPACE_END (PVOID)0xFFFFF98000000000ULL -#define MI_SYSTEM_PTE_START (PVOID)0xFFFFFAA000000000ULL -#define MI_PAGED_POOL_START (PVOID)0xFFFFFA8000000000ULL -#define MI_NON_PAGED_SYSTEM_START_MIN 0xFFFFFAA000000000ULL -#define MI_PFN_DATABASE (PVOID)0xFFFFFAC000000000ULL -#define MI_NONPAGED_POOL_END (PVOID)0xFFFFFAE000000000ULL -#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME +#define MI_SHARED_SYSTEM_PAGE 0xFFFFF78000000000ULL +#define MI_SYSTEM_CACHE_WS_START 0xFFFFF78000001000ULL +#define MI_LOADER_MAPPINGS 0xFFFFF80000000000ULL +#define MI_PAGED_SYSTEM_START 0xFFFFF88000000000ULL +#define MI_PAGED_POOL_START (PVOID)0xFFFFF8A000000000ULL +#define MI_PAGED_POOL_END 0xFFFFF8BFFFFFFFFFULL +#define MI_SESSION_SPACE_START 0xFFFFF90000000000ULL +#define MI_SESSION_VIEW_END 0xFFFFF97FFF000000ULL +#define MI_SESSION_SPACE_END 0xFFFFF97FFFFFFFFFULL +#define MM_SYSTEM_SPACE_START 0xFFFFF98000000000ULL +#define MI_PFN_DATABASE 0xFFFFFA8000000000ULL #define MI_HIGHEST_SYSTEM_ADDRESS (PVOID)0xFFFFFFFFFFFFFFFFULL -#define MI_SYSTEM_CACHE_WS_START (PVOID)0xFFFFF78000001000ULL // CHECKME - + +/* WOW64 address definitions */ #define MM_HIGHEST_USER_ADDRESS_WOW64 0x7FFEFFFF #define MM_SYSTEM_RANGE_START_WOW64 0x80000000 - -#define MI_SYSTEM_PTE_END (PVOID)((ULONG64)MI_SYSTEM_PTE_START + MI_NUMBER_SYSTEM_PTES * PAGE_SIZE - 1) +#define MI_DEBUG_MAPPING (PVOID)0xFFFFFFFF80000000ULL // FIXME +#define MI_NON_PAGED_SYSTEM_START_MIN MM_SYSTEM_SPACE_START // FIXME +#define MI_SYSTEM_PTE_START MM_SYSTEM_SPACE_START +#define MI_SYSTEM_PTE_END (MI_SYSTEM_PTE_START + MI_NUMBER_SYSTEM_PTES * PAGE_SIZE - 1) #define MI_SYSTEM_PTE_BASE (PVOID)MiAddressToPte(KSEG0_BASE) #define MM_HIGHEST_VAD_ADDRESS (PVOID)((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (16 * PAGE_SIZE)) -#define MI_MAPPING_RANGE_START (ULONG64)HYPER_SPACE +#define MI_MAPPING_RANGE_START HYPER_SPACE #define MI_MAPPING_RANGE_END (MI_MAPPING_RANGE_START + MI_HYPERSPACE_PTES * PAGE_SIZE) +#define MI_DUMMY_PTE (MI_MAPPING_RANGE_END + PAGE_SIZE) +#define MI_VAD_BITMAP (MI_DUMMY_PTE + PAGE_SIZE) +#define MI_WORKING_SET_LIST (MI_VAD_BITMAP + PAGE_SIZE) +#define MI_NONPAGED_POOL_END 0 /* Memory sizes */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) @@ -55,6 +65,8 @@ MI_SESSION_IMAGE_SIZE + \ MI_SESSION_WORKING_SET_SIZE) +#define MmSystemRangeStart ((PVOID)MI_REAL_SYSTEM_RANGE_START) + /* Misc constants */ #define _MI_PAGING_LEVELS 4 #define MI_NUMBER_SYSTEM_PTES 22000 @@ -63,9 +75,6 @@ #define NR_SECTION_PAGE_ENTRIES 1024 #define MI_HYPERSPACE_PTES (256 - 1) #define MI_ZERO_PTES (32) -#define MI_DUMMY_PTE (PMMPTE)(MI_MAPPING_RANGE_END + PAGE_SIZE) -#define MI_VAD_BITMAP (PMMPTE)(MI_DUMMY_PTE + PAGE_SIZE) -#define MI_WORKING_SET_LIST (PMMPTE)(MI_VAD_BITMAP + PAGE_SIZE) /* FIXME - different architectures have different cache line sizes... */ #define MM_CACHE_LINE_SIZE 32 @@ -74,6 +83,13 @@ #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) #define IS_ALIGNED(addr, align) (((ULONG64)(addr) & (align - 1)) == 0) #define IS_PAGE_ALIGNED(addr) IS_ALIGNED(addr, PAGE_SIZE) + +#define MiIsPteOnPdeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PAGE_SIZE - 1)) == 0) +#define MiIsPteOnPpeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PDE_PER_PAGE * PAGE_SIZE - 1)) == 0) +#define MiIsPteOnPxeBoundary(PointerPte) \ + ((((ULONG_PTR)PointerPte) & (PPE_PER_PAGE * PDE_PER_PAGE * PAGE_SIZE - 1)) == 0) /* MMPTE related defines */ #define MM_EMPTY_PTE_LIST ((ULONG64)0xFFFFFFFF) @@ -129,6 +145,11 @@ /* On x86, these two are the same */ #define MMPDE MMPTE #define PMMPDE PMMPTE +#define MMPPE MMPTE +#define PMMPPE PMMPTE +#define MI_WRITE_VALID_PPE MI_WRITE_VALID_PTE + +#define ValidKernelPpe ValidKernelPde PULONG64 FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sat Feb 4 10:40:27 2012 @@ -32,13 +32,12 @@ /* Template PTE for prototype page */ MMPTE PrototypePte = {{(MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS) | - PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << PAGE_SHIFT)}}; - -/* Sizes */ -SIZE_T MiNonPagedSystemSize; + PTE_PROTOTYPE | (MI_PTE_LOOKUP_NEEDED << 32)}}; /* Address ranges */ PVOID MiSessionViewEnd; +PVOID MiSystemPteSpaceStart; +PVOID MiSystemPteSpaceEnd; ULONG64 MxPfnSizeInBytes; BOOLEAN MiIncludeType[LoaderMaximum]; @@ -69,7 +68,7 @@ /* The view starts right below the session working set (itself below * the image area) */ - MiSessionViewEnd = MI_SESSION_VIEW_END; + MiSessionViewEnd = (PVOID)MI_SESSION_VIEW_END; MiSessionViewStart = (PCHAR)MiSessionViewEnd - MmSessionViewSize; ASSERT(IS_PAGE_ALIGNED(MiSessionViewStart)); @@ -110,7 +109,7 @@ { /* No, map it! */ TmplPde.u.Hard.PageFrameNumber = MxGetNextPage(1); - *PointerPpe = TmplPde; + MI_WRITE_VALID_PTE(PointerPpe, TmplPde); /* Zero out the page table */ RtlZeroMemory(MiPteToAddress(PointerPpe), PAGE_SIZE); @@ -137,7 +136,7 @@ { /* No, map it! */ TmplPde.u.Hard.PageFrameNumber = MxGetNextPage(1); - *PointerPde = TmplPde; + MI_WRITE_VALID_PTE(PointerPde, TmplPde); /* Zero out the page table */ RtlZeroMemory(MiPteToAddress(PointerPde), PAGE_SIZE); @@ -164,7 +163,10 @@ { /* No, map it! */ TmplPte.u.Hard.PageFrameNumber = MxGetNextPage(1); - *PointerPte = TmplPte; + MI_WRITE_VALID_PTE(PointerPte, TmplPte); + + /* Zero out the page (FIXME: not always neccessary) */ + RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); } } } @@ -212,10 +214,10 @@ HyperTemplatePte = TmplPte; /* Create PDPTs (72 KB) for shared system address space, - * skip page tables and hyperspace */ + * skip page tables TODO: use global pages. */ /* Loop the PXEs */ - for (PointerPxe = MiAddressToPxe((PVOID)(HYPER_SPACE_END + 1)); + for (PointerPxe = MiAddressToPxe((PVOID)HYPER_SPACE); PointerPxe <= MiAddressToPxe(MI_HIGHEST_SYSTEM_ADDRESS); PointerPxe++) { @@ -231,8 +233,13 @@ } } - /* Setup the mapping PPEs and PDEs */ - MiMapPPEs((PVOID)MI_MAPPING_RANGE_START, (PVOID)MI_MAPPING_RANGE_END); + /* Map PPEs for paged pool */ + MiMapPPEs(MmPagedPoolStart, MmPagedPoolEnd); + + /* Setup 1 PPE for hyper space */ + MiMapPPEs((PVOID)HYPER_SPACE, (PVOID)HYPER_SPACE_END); + + /* Setup the mapping PDEs */ MiMapPDEs((PVOID)MI_MAPPING_RANGE_START, (PVOID)MI_MAPPING_RANGE_END); /* Setup the mapping PTEs */ @@ -246,6 +253,10 @@ MiMapPDEs((PVOID)MI_DEBUG_MAPPING, (PVOID)MI_DEBUG_MAPPING); MmDebugPte = MiAddressToPte((PVOID)MI_DEBUG_MAPPING); #endif + + /* Setup PDE and PTEs for VAD bitmap and working set list */ + MiMapPDEs((PVOID)MI_VAD_BITMAP, (PVOID)(MI_WORKING_SET_LIST + PAGE_SIZE - 1)); + MiMapPTEs((PVOID)MI_VAD_BITMAP, (PVOID)(MI_WORKING_SET_LIST + PAGE_SIZE - 1)); } VOID @@ -311,34 +322,31 @@ MmMaximumNonPagedPoolInBytes = MI_MAX_NONPAGED_POOL_SIZE; } - /* Put non paged pool to the end of the region */ - MmNonPagedPoolStart = (PCHAR)MmNonPagedPoolEnd - MmMaximumNonPagedPoolInBytes; - - /* Make sure it doesn't collide with the PFN database */ - if ((PCHAR)MmNonPagedPoolStart < (PCHAR)MmPfnDatabase + MxPfnSizeInBytes) - { - /* Put non paged pool after the PFN database */ - MmNonPagedPoolStart = (PCHAR)MmPfnDatabase + MxPfnSizeInBytes; - MmMaximumNonPagedPoolInBytes = (ULONG64)MmNonPagedPoolEnd - - (ULONG64)MmNonPagedPoolStart; - } - - ASSERT(IS_PAGE_ALIGNED(MmNonPagedPoolStart)); + /* Convert nonpaged pool size from bytes to pages */ + MmMaximumNonPagedPoolInPages = MmMaximumNonPagedPoolInBytes >> PAGE_SHIFT; + + /* Non paged pool starts after the PFN database */ + MmNonPagedPoolStart = MmPfnDatabase + MxPfnAllocation * PAGE_SIZE; /* Calculate the nonpaged pool expansion start region */ MmNonPagedPoolExpansionStart = (PCHAR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes; ASSERT(IS_PAGE_ALIGNED(MmNonPagedPoolExpansionStart)); + /* And this is where the none paged pool ends */ + MmNonPagedPoolEnd = (PCHAR)MmNonPagedPoolStart + MmMaximumNonPagedPoolInBytes; + ASSERT(MmNonPagedPoolEnd < (PVOID)MM_HAL_VA_START); + /* Map PPEs and PDEs for non paged pool (including expansion) */ MiMapPPEs(MmNonPagedPoolStart, MmNonPagedPoolEnd); MiMapPDEs(MmNonPagedPoolStart, MmNonPagedPoolEnd); /* Map the nonpaged pool PTEs (without expansion) */ - MiMapPTEs(MmNonPagedPoolStart, (PUCHAR)MmNonPagedPoolExpansionStart - 1); + MiMapPTEs(MmNonPagedPoolStart, (PCHAR)MmNonPagedPoolExpansionStart - 1); /* Initialize the ARM3 nonpaged pool */ MiInitializeNonPagedPool(); + MiInitializeNonPagedPoolThresholds(); /* Initialize the nonpaged pool */ InitializePool(NonPagedPool, 0); @@ -353,32 +361,18 @@ /* Use the default numer of system PTEs */ MmNumberOfSystemPtes = MI_NUMBER_SYSTEM_PTES; - - /* System PTE pool is below the PFN database */ MiNonPagedSystemSize = (MmNumberOfSystemPtes + 1) * PAGE_SIZE; - MmNonPagedSystemStart = (PCHAR)MmPfnDatabase - MiNonPagedSystemSize; - MmNonPagedSystemStart = MM_ROUND_DOWN(MmNonPagedSystemStart, 512 * PAGE_SIZE); - - /* Don't let it go below the minimum */ - if (MmNonPagedSystemStart < (PVOID)MI_NON_PAGED_SYSTEM_START_MIN) - { - /* This is a hard-coded limit in the Windows NT address space */ - MmNonPagedSystemStart = (PVOID)MI_NON_PAGED_SYSTEM_START_MIN; - - /* Reduce the amount of system PTEs to reach this point */ - MmNumberOfSystemPtes = (ULONG)(((ULONG64)MmPfnDatabase - - (ULONG64)MmNonPagedSystemStart) >> - PAGE_SHIFT); - MmNumberOfSystemPtes--; - ASSERT(MmNumberOfSystemPtes > 1000); - } - - /* Map the PDEs and PPEs for the system PTEs */ - MiMapPPEs(MI_SYSTEM_PTE_START, MI_SYSTEM_PTE_END); - MiMapPDEs(MI_SYSTEM_PTE_START, MI_SYSTEM_PTE_END); - - /* Create the system PTE space */ - PointerPte = MiAddressToPte(MI_SYSTEM_PTE_START); + + /* Put system PTEs at the start of the system VA space */ + MiSystemPteSpaceStart = MmNonPagedSystemStart; + MiSystemPteSpaceEnd = (PUCHAR)MiSystemPteSpaceStart + MiNonPagedSystemSize; + + /* Map the PPEs and PDEs for the system PTEs */ + MiMapPPEs(MiSystemPteSpaceStart, MiSystemPteSpaceEnd); + MiMapPDEs(MiSystemPteSpaceStart, MiSystemPteSpaceEnd); + + /* Initialize the system PTE space */ + PointerPte = MiAddressToPte(MiSystemPteSpaceStart); MiInitializeSystemPtes(PointerPte, MmNumberOfSystemPtes, SystemPteSpace); /* Reserve system PTEs for zeroing PTEs and clear them */ @@ -389,13 +383,302 @@ MiFirstReservedZeroingPte->u.Hard.PageFrameNumber = MI_ZERO_PTES - 1; } +static +VOID +MiSetupPfnForPageTable( + PFN_NUMBER PageFrameIndex, + PMMPTE PointerPte) +{ + PMMPFN Pfn; + PMMPDE PointerPde; + + /* Get the pfn entry for this page */ + Pfn = MiGetPfnEntry(PageFrameIndex); + + /* Check if it's valid memory */ + if ((PageFrameIndex <= MmHighestPhysicalPage) && + (MmIsAddressValid(Pfn)) && + (Pfn->u3.e1.PageLocation == ActiveAndValid)) + { + /* Setup the PFN entry */ + Pfn->u1.WsIndex = 0; + Pfn->u2.ShareCount++; + Pfn->PteAddress = PointerPte; + Pfn->OriginalPte = *PointerPte; + Pfn->u3.e1.PageLocation = ActiveAndValid; + Pfn->u3.e1.CacheAttribute = MiNonCached; + Pfn->u3.e2.ReferenceCount = 1; + Pfn->u4.PteFrame = PFN_FROM_PTE(MiAddressToPte(PointerPte)); + } + + /* Increase the shared count of the PFN entry for the PDE */ + PointerPde = MiAddressToPde(MiPteToAddress(PointerPte)); + Pfn = MiGetPfnEntry(PFN_FROM_PTE(PointerPde)); + Pfn->u2.ShareCount++; +} + +VOID +NTAPI +MiBuildPfnDatabaseFromPageTables(VOID) +{ + PVOID Address = NULL; + PFN_NUMBER PageFrameIndex; + PMMPDE PointerPde; + PMMPTE PointerPte; + ULONG k, l; + PMMPFN Pfn; +#if (_MI_PAGING_LEVELS >= 3) + PMMPDE PointerPpe; + ULONG j; +#endif +#if (_MI_PAGING_LEVELS == 4) + PMMPDE PointerPxe; + ULONG i; +#endif + + /* Manual setup of the top level page directory */ +#if (_MI_PAGING_LEVELS == 4) + PageFrameIndex = PFN_FROM_PTE(MiAddressToPte(PXE_BASE)); +#elif (_MI_PAGING_LEVELS == 3) + PageFrameIndex = PFN_FROM_PTE(MiAddressToPte(PPE_BASE)); +#else + PageFrameIndex = PFN_FROM_PTE(MiAddressToPte(PDE_BASE)); +#endif + Pfn = MiGetPfnEntry(PageFrameIndex); + ASSERT(Pfn->u3.e1.PageLocation == ActiveAndValid); + Pfn->u1.WsIndex = 0; + Pfn->u2.ShareCount = 1; + Pfn->PteAddress = NULL; + Pfn->u3.e1.CacheAttribute = MiNonCached; + Pfn->u3.e2.ReferenceCount = 1; + Pfn->u4.PteFrame = 0; + +#if (_MI_PAGING_LEVELS == 4) + /* Loop all PXEs in the PML4 */ + PointerPxe = MiAddressToPxe(Address); + for (i = 0; i < PXE_PER_PAGE; i++, PointerPxe++) + { + /* Skip invalid PXEs */ + if (!PointerPxe->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PXE(PointerPxe); + MiSetupPfnForPageTable(PageFrameIndex, PointerPxe); + + /* Get starting VA for this PXE */ + Address = MiPxeToAddress(PointerPxe); +#endif +#if (_MI_PAGING_LEVELS >= 3) + /* Loop all PPEs in this PDP */ + PointerPpe = MiAddressToPpe(Address); + for (j = 0; j < PPE_PER_PAGE; j++, PointerPpe++) + { + /* Skip invalid PPEs */ + if (!PointerPpe->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PPE(PointerPpe); + MiSetupPfnForPageTable(PageFrameIndex, PointerPpe); + + /* Get starting VA for this PPE */ + Address = MiPpeToAddress(PointerPpe); +#endif + /* Loop all PDEs in this PD */ + PointerPde = MiAddressToPde(Address); + for (k = 0; k < PDE_PER_PAGE; k++, PointerPde++) + { + /* Skip invalid PDEs */ + if (!PointerPde->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PDE(PointerPde); + MiSetupPfnForPageTable(PageFrameIndex, PointerPde); + + /* Get starting VA for this PDE */ + Address = MiPdeToAddress(PointerPde); + + /* Loop all PTEs in this PT */ + PointerPte = MiAddressToPte(Address); + for (l = 0; l < PTE_PER_PAGE; l++, PointerPte++) + { + /* Skip invalid PTEs */ + if (!PointerPte->u.Hard.Valid) continue; + + /* Handle the PFN */ + PageFrameIndex = PFN_FROM_PTE(PointerPte); + MiSetupPfnForPageTable(PageFrameIndex, PointerPte); + } + } +#if (_MI_PAGING_LEVELS >= 3) + } +#endif +#if (_MI_PAGING_LEVELS == 4) + } +#endif +} + +VOID +NTAPI +INIT_FUNCTION +MiAddDescriptorToDatabase( + PFN_NUMBER BasePage, + PFN_NUMBER PageCount, + TYPE_OF_MEMORY MemoryType) +{ + PMMPFN Pfn; + + ASSERT(!MiIsMemoryTypeInvisible(MemoryType)); + + /* Check if the memory is free */ + if (MiIsMemoryTypeFree(MemoryType)) + { + /* Get the last pfn of this descriptor. Note we loop backwards */ + Pfn = &MmPfnDatabase[BasePage + PageCount - 1]; + + /* Loop all pages */ + while (PageCount--) + { + /* Add it to the free list */ + Pfn->u3.e1.CacheAttribute = MiNonCached; + MiInsertPageInFreeList(BasePage + PageCount); + + /* Go to the previous page */ + Pfn--; + } + } + else if (MemoryType == LoaderXIPRom) + { + Pfn = &MmPfnDatabase[BasePage]; + while (PageCount--) + { + /* Make it a pseudo-I/O ROM mapping */ + Pfn->PteAddress = 0; + Pfn->u1.Flink = 0; + Pfn->u2.ShareCount = 0; + Pfn->u3.e1.PageLocation = 0; + Pfn->u3.e1.CacheAttribute = MiNonCached; + Pfn->u3.e1.Rom = 1; + Pfn->u3.e1.PrototypePte = 1; + Pfn->u3.e2.ReferenceCount = 0; + Pfn->u4.InPageError = 0; + Pfn->u4.PteFrame = 0; + + /* Advance one */ + Pfn++; + } + } + else if (MemoryType == LoaderBad) + { + // FIXME: later + ASSERT(FALSE); + } + else + { + /* For now skip it */ + DbgPrint("Skipping BasePage=0x%lx, PageCount=0x%lx, MemoryType=%lx\n", + BasePage, PageCount, MemoryType); + Pfn = &MmPfnDatabase[BasePage]; + while (PageCount--) + { + /* Make an active PFN */ + Pfn->u3.e1.PageLocation = ActiveAndValid; + + /* Advance one */ + Pfn++; + } + } +} + +VOID +NTAPI +INIT_FUNCTION +MiBuildPfnDatabase(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY ListEntry; + PMEMORY_ALLOCATION_DESCRIPTOR Descriptor; + PFN_NUMBER BasePage, PageCount; + + /* Map the PDEs and PPEs for the pfn database (ignore holes) */ +#if (_MI_PAGING_LEVELS >= 3) + MiMapPPEs(MmPfnDatabase, (PUCHAR)MmPfnDatabase + MxPfnAllocation - 1); +#endif + MiMapPDEs(MmPfnDatabase, (PUCHAR)MmPfnDatabase + MxPfnAllocation - 1); + + /* First initialize the color tables */ + MiInitializeColorTables(); + + /* Loop the memory descriptors */ + for (ListEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + ListEntry != &LoaderBlock->MemoryDescriptorListHead; + ListEntry = ListEntry->Flink) + { + /* Get the descriptor */ + Descriptor = CONTAINING_RECORD(ListEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + /* Skip invisible memory */ + if (MiIsMemoryTypeInvisible(Descriptor->MemoryType)) continue; + + /* If this is the free descriptor, use the copy instead */ + if (Descriptor == MxFreeDescriptor) Descriptor = &MxOldFreeDescriptor; + + /* Get the range for this descriptor */ + BasePage = Descriptor->BasePage; + PageCount = Descriptor->PageCount; + + /* Map the pages for the database */ + MiMapPTEs(&MmPfnDatabase[BasePage], + (PUCHAR)(&MmPfnDatabase[BasePage + PageCount]) - 1); + + /* If this was the free descriptor, skip the next step */ + if (Descriptor == &MxOldFreeDescriptor) continue; + + /* Add this descriptor to the database */ + MiAddDescriptorToDatabase(BasePage, PageCount, Descriptor->MemoryType); + } + + /* At this point the whole pfn database is mapped. We are about to add the + pages from the free descriptor to the database, so from now on we cannot + use it anymore. */ + + /* Now add the free descriptor */ + BasePage = MxFreeDescriptor->BasePage; + PageCount = MxFreeDescriptor->PageCount; + MiAddDescriptorToDatabase(BasePage, PageCount, LoaderFree); + + /* And finally the memory we used */ + BasePage = MxOldFreeDescriptor.BasePage; + PageCount = MxFreeDescriptor->BasePage - BasePage; + MiAddDescriptorToDatabase(BasePage, PageCount, LoaderMemoryData); + + // Reset the descriptor back so we can create the correct memory blocks + *MxFreeDescriptor = MxOldFreeDescriptor; +} + NTSTATUS NTAPI INIT_FUNCTION MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - + KIRQL OldIrql; + + ASSERT(MxPfnAllocation != 0); + + /* Set some hardcoded addresses */ MmHyperSpaceEnd = (PVOID)HYPER_SPACE_END; + MmNonPagedSystemStart = (PVOID)MM_SYSTEM_SPACE_START; + MmPfnDatabase = (PVOID)MI_PFN_DATABASE; + MmWorkingSetList = (PVOID)MI_WORKING_SET_LIST; + + +// PrototypePte.u.Proto.Valid = 1 +// PrototypePte.u.ReadOnly +// PrototypePte.u.Prototype +// PrototypePte.u.Protection = MM_READWRITE; +// PrototypePte.u.ProtoAddress + PrototypePte.u.Soft.PageFileHigh = MI_PTE_LOOKUP_NEEDED; + MiInitializePageTable(); @@ -403,5 +686,33 @@ MiBuildSystemPteSpace(); + /* Need to be at DISPATCH_LEVEL for MiInsertPageInFreeList */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Map the PFN database pages */ + MiBuildPfnDatabase(LoaderBlock); + + /* Now process the page tables */ + MiBuildPfnDatabaseFromPageTables(); + + MiPfnsInitialized = TRUE; + + KeLowerIrql(OldIrql); + + /* Initialize the balancer */ + MmInitializeBalancer((ULONG)MmAvailablePages, 0); + + /* Make sure we have everything we need */ + ASSERT(MmPfnDatabase); + ASSERT(MmNonPagedSystemStart); + ASSERT(MmNonPagedPoolStart); + ASSERT(MmSizeOfNonPagedPoolInBytes); + ASSERT(MmMaximumNonPagedPoolInBytes); + ASSERT(MmNonPagedPoolExpansionStart); + ASSERT(MmHyperSpaceEnd); + ASSERT(MmNumberOfSystemPtes); + ASSERT(MiAddressToPde(MmNonPagedPoolStart)->u.Hard.Valid); + ASSERT(MiAddressToPte(MmNonPagedPoolStart)->u.Hard.Valid); + return STATUS_SUCCESS; }

1 0

[rharabien] 55402: [BOOTDATA] - Don't create paging files on livecd. Verified by Alex Ionescu.
by rharabien＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: rharabien Date: Fri Feb 3 23:43:42 2012 New Revision: 55402 URL: http://svn.reactos.org/svn/reactos?rev=55402&view=rev Log: [BOOTDATA] - Don't create paging files on livecd. Verified by Alex Ionescu. Modified: trunk/reactos/boot/bootdata/livecd.inf Modified: trunk/reactos/boot/bootdata/livecd.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd.inf?r… ============================================================================== --- trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd.inf [iso-8859-1] Fri Feb 3 23:43:42 2012 @@ -37,6 +37,7 @@ ; User Profile environment variables HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","USERPROFILE",0x00020000,"%SystemDrive%\Profiles\Default User" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ALLUSERSPROFILE",0x00020000,"%SystemDrive%\Profiles\All Users" +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Memory Management","PagingFiles",0x00000000,"" ; Font Substitution HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\SysFontSubstitutes","Arial",0x00000000,"Liberation Sans"

1 0

[cgutman] 55401: [HIVESYS] - Add HID devices to the critical device database - Fixes issues with mouse/keyboard not working until new device wizards are dismissed (USB drives work too) [UMPNPMGR] -...
by cgutman＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: cgutman Date: Fri Feb 3 23:34:21 2012 New Revision: 55401 URL: http://svn.reactos.org/svn/reactos?rev=55401&view=rev Log: [HIVESYS] - Add HID devices to the critical device database - Fixes issues with mouse/keyboard not working until new device wizards are dismissed (USB drives work too) [UMPNPMGR] - Fix install failure after the kernel detects a critical device [NTOSKRNL] - Finally enable the proper IopResetDevice code - Driver updating without a reboot for running devices is supported now (if someone will write the GUI) [USBEHCI][USBOHCI] - Fix removal bugs Modified: branches/usb-bringup-trunk/base/services/umpnpmgr/umpnpmgr.c branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/plugplay.c Modified: branches/usb-bringup-trunk/base/services/umpnpmgr/umpnpmgr.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/base/services… ============================================================================== --- branches/usb-bringup-trunk/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/base/services/umpnpmgr/umpnpmgr.c [iso-8859-1] Fri Feb 3 23:34:21 2012 @@ -2811,7 +2811,7 @@ &DeviceKey) == ERROR_SUCCESS) { if (RegQueryValueExW(DeviceKey, - L"ClassGUID", + L"Class", NULL, NULL, NULL, Modified: branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/boot/bootdata… ============================================================================== --- branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ branches/usb-bringup-trunk/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Feb 3 23:34:21 2012 @@ -11,6 +11,7 @@ ; Critical Device Database HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\acpipic_up","ClassGUID",0x00000000,"{4D36E966-E325-11CE-BFC1-08002BE10318}" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\e_isa_up","ClassGUID",0x00000000,"{4D36E966-E325-11CE-BFC1-08002BE10318}" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","Service",0x00000000,"pci" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\*PNP0A03","ClassGUID",0x00000000,"{4D36E97D-E325-11CE-BFC1-08002BE10318}" @@ -44,6 +45,19 @@ HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","Service",0x00000000,"disk" HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GenDisk","ClassGUID",0x00000000,"{4D36E967-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03","Service",0x00000000,"hidusb" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\USB#Class_03","ClassGUID",0x00000000,"{745a17a0-74d3-11d0-b6fe-00a0c90f57da}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE","Service",0x00000000,"hidusb" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\GENERIC_HID_DEVICE","ClassGUID",0x00000000,"{745a17a0-74d3-11d0-b6fe-00a0c90f57da}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_KEYBOARD","Service",0x00000000,"kbdhid" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_KEYBOARD","ClassGUID",0x00000000,"{4D36E96B-E325-11CE-BFC1-08002BE10318}" + +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","Service",0x00000000,"mouhid" +HKLM,"SYSTEM\CurrentControlSet\Control\CriticalDeviceDatabase\HID_DEVICE_SYSTEM_MOUSE","ClassGUID",0x00000000,"{4D36E96F-E325-11CE-BFC1-08002BE10318}" + HKLM,"SYSTEM\CurrentControlSet\Control\SafeBoot","AlternateShell",2,"cmd.exe" @@ -1451,26 +1465,44 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Type",0x00010001,0x00000001 +; USB HID driver +HKLM,"SYSTEM\CurrentControlSet\Services\hidusb","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\hidusb","Group",0x00000000,"Extended Base" +HKLM,"SYSTEM\CurrentControlSet\Services\hidusb","ImagePath",0x00020000,"system32\drivers\hidusb.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\hidusb","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\hidusb","Type",0x00010001,0x00000001 + +; HID keyboard driver +HKLM,"SYSTEM\CurrentControlSet\Services\kbdhid","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdhid","Group",0x00000000,"Keyboard Port" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdhid","ImagePath",0x00020000,"system32\drivers\kbdhid.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\kbdhid","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\kbdhid","Type",0x00010001,0x00000001 + +; HID mouse driver +HKLM,"SYSTEM\CurrentControlSet\Services\mouhid","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\mouhid","Group",0x00000000,"Pointer Port" +HKLM,"SYSTEM\CurrentControlSet\Services\mouhid","ImagePath",0x00020000,"system32\drivers\mouhid.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\mouhid","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\mouhid","Type",0x00010001,0x00000001 + ; USB hub driver HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","ImagePath",0x00020000,"system32\drivers\usbhub.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\usbhub","Type",0x00010001,0x00000001 ; EHCI controller driver HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","ImagePath",0x00020000,"system32\drivers\usbehci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\usbehci","Type",0x00010001,0x00000001 ; OHCI controller driver HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","ImagePath",0x00020000,"system32\drivers\usbohci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\usbohci","Type",0x00010001,0x00000001 @@ -1478,7 +1510,6 @@ ; UHCI controller driver ;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ErrorControl",0x00010001,0x00000001 ;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Group",0x00000000,"Boot Bus Extender" -;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Tag",0x00010001,0x00000002 ;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","ImagePath",0x00020000,"system32\drivers\usbuhci.sys" ;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Start",0x00010001,0x00000000 ;HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x00000001 @@ -1486,7 +1517,6 @@ ; USB storage driver HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Group",0x00000000,"Primary Disk" -HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","ImagePath",0x00020000,"system32\drivers\usbstor.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\usbstor","Type",0x00010001,0x00000001 @@ -1494,7 +1524,6 @@ ; USB composite generic parent HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","ImagePath",0x00020000,"system32\drivers\usbccgp.sys" HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\usbccgp","Type",0x00010001,0x00000001 @@ -1502,7 +1531,6 @@ ; ACPI driver HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","ImagePath",0x00020000,"system32\drivers\acpi.sys" HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\acpi","Type",0x00010001,0x00000001 @@ -1510,7 +1538,6 @@ ; PCI Bus driver HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Group",0x00000000,"Boot Bus Extender" -HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Tag",0x00010001,0x00000002 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","ImagePath",0x00020000,"system32\drivers\pci.sys" HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Pci","Type",0x00010001,0x00000001 Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hcd_controller.cpp [iso-8859-1] Fri Feb 3 23:34:21 2012 @@ -534,11 +534,36 @@ } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // sure + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } case IRP_MN_REMOVE_DEVICE: { DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); // + // delete the symbolic link + // + SetSymbolicLink(FALSE); + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + IoCallDriver(m_NextDeviceObject, Irp); + + // // detach device from device stack // IoDetachDevice(m_NextDeviceObject); @@ -548,8 +573,7 @@ // IoDeleteDevice(m_FunctionalDeviceObject); - Status = STATUS_SUCCESS; - break; + return STATUS_SUCCESS; } default: { Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hcd_controller.cpp [iso-8859-1] Fri Feb 3 23:34:21 2012 @@ -534,11 +534,36 @@ } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // sure + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(m_NextDeviceObject, Irp); + } case IRP_MN_REMOVE_DEVICE: { DPRINT1("CHCDController::HandlePnp IRP_MN_REMOVE_DEVICE FDO\n"); // + // delete the symbolic link + // + SetSymbolicLink(FALSE); + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + IoCallDriver(m_NextDeviceObject, Irp); + + // // detach device from device stack // IoDetachDevice(m_NextDeviceObject); @@ -548,8 +573,7 @@ // IoDeleteDevice(m_FunctionalDeviceObject); - Status = STATUS_SUCCESS; - break; + return STATUS_SUCCESS; } default: { Modified: branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/plugplay.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/ntoskrnl/io/p… ============================================================================== --- branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/ntoskrnl/io/pnpmgr/plugplay.c [iso-8859-1] Fri Feb 3 23:34:21 2012 @@ -549,26 +549,42 @@ if (DeviceObject == NULL) return STATUS_NO_SUCH_DEVICE; + /* Get the device node */ DeviceNode = IopGetDeviceNode(DeviceObject); -#if 0 - /* Remove the device */ - if (DeviceNode->Flags & DNF_ENUMERATED) - { + /* Check if an FDO has been added to the stack */ + if (DeviceNode->Flags & DNF_ADDED) + { + /* Remove the device node */ Status = IopRemoveDevice(DeviceNode); if (!NT_SUCCESS(Status)) { DPRINT1("WARNING: Ignoring failed IopRemoveDevice() for %wZ (likely a driver bug)\n", &DeviceNode->InstancePath); } - } -#endif - - /* Reenumerate the device and its children */ - DeviceNode->Flags &= ~DNF_DISABLED; - Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); - - if (NT_SUCCESS(Status)) - Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); + + /* Invalidate device relations for the parent to reenumerate the device */ + Status = IoSynchronousInvalidateDeviceRelations(DeviceNode->Parent->PhysicalDeviceObject, BusRelations); + + DPRINT1("Reset PDO with FDO present: 0x%x\n", Status); + } + else + { + /* FIXME: We might clear some important flags */ + ASSERT(DeviceNode->Flags & DNF_ENUMERATED); + ASSERT(DeviceNode->Flags & DNF_PROCESSED); + DeviceNode->Flags = DNF_ENUMERATED | DNF_PROCESSED; + + /* Load service data from the registry */ + Status = IopActionConfigureChildServices(DeviceNode, DeviceNode->Parent); + + if (NT_SUCCESS(Status)) + { + /* Start the service and begin PnP initialization of the device again */ + Status = IopActionInitChildServices(DeviceNode, DeviceNode->Parent); + } + + DPRINT1("Reset PDO with no FDO present: 0x%x\n", Status); + } ObDereferenceObject(DeviceObject);

1 0

[ion] 55400: [SMSS2]: Implement the rest of the code to create page files. All that's missing is the actual call to NtCreatePagingFile.
by ion＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: ion Date: Fri Feb 3 23:11:28 2012 New Revision: 55400 URL: http://svn.reactos.org/svn/reactos?rev=55400&view=rev Log: [SMSS2]: Implement the rest of the code to create page files. All that's missing is the actual call to NtCreatePagingFile. Modified: trunk/reactos/base/system/smss2/crashdmp.c trunk/reactos/base/system/smss2/pagefile.c trunk/reactos/base/system/smss2/smss.h Modified: trunk/reactos/base/system/smss2/crashdmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/crashdmp… ============================================================================== --- trunk/reactos/base/system/smss2/crashdmp.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/crashdmp.c [iso-8859-1] Fri Feb 3 23:11:28 2012 @@ -15,3 +15,12 @@ /* GLOBALS ********************************************************************/ /* FUNCTIONS ******************************************************************/ + +BOOLEAN +NTAPI +SmpCheckForCrashDump(IN PUNICODE_STRING FileName) +{ + return FALSE; +} + + Modified: trunk/reactos/base/system/smss2/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/pagefile… ============================================================================== --- trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/pagefile.c [iso-8859-1] Fri Feb 3 23:11:28 2012 @@ -46,11 +46,13 @@ // Structure and flags describing each volume // #define SMP_VOLUME_INSERTED 0x01 +#define SMP_VOLUME_PAGEFILE_CREATED 0x04 #define SMP_VOLUME_IS_BOOT 0x08 typedef struct _SMP_VOLUME_DESCRIPTOR { LIST_ENTRY Entry; - ULONG Flags; + USHORT Flags; + USHORT PageFileCount; WCHAR DriveLetter; LARGE_INTEGER FreeSpace; FILE_FS_DEVICE_INFORMATION DeviceInfo; @@ -230,13 +232,369 @@ NTSTATUS NTAPI +SmpGetPagingFileSize(IN PUNICODE_STRING FileName, + OUT PLARGE_INTEGER Size) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + FILE_STANDARD_INFORMATION StandardInfo; + + DPRINT1("SMSS:PFILE: Trying to get size for `%wZ'\n", FileName); + Size->QuadPart = 0; + + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, + FILE_READ_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT); + if (!NT_SUCCESS(Status)) return Status; + + Status = NtQueryInformationFile(FileHandle, + &IoStatusBlock, + &StandardInfo, + sizeof(StandardInfo), + FileStandardInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: Failed query for size potential pagefile `%wZ' with status %X \n", + FileName, Status); + NtClose(FileHandle); + return Status; + } + + NtClose(FileHandle); + Size->LowPart = StandardInfo.AllocationSize.LowPart; + Size->HighPart = StandardInfo.AllocationSize.HighPart; + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +SmpDeletePagingFile(IN PUNICODE_STRING FileName) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle; + FILE_DISPOSITION_INFORMATION Disposition; + + /* Open the page file */ + InitializeObjectAttributes(&ObjectAttributes, + FileName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&FileHandle, + DELETE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_NON_DIRECTORY_FILE); + if (NT_SUCCESS(Status)) + { + /* Delete it */ + Disposition.DeleteFile = TRUE; + Status = NtSetInformationFile(FileHandle, + &IoStatusBlock, + &Disposition, + sizeof(Disposition), + FileDispositionInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: Failed to delete page file `%wZ' (status %X)\n", + FileName, Status); + } + else + { + DPRINT1("SMSS:PFILE: Deleted stale paging file - %wZ\n", FileName); + } + + /* Close the handle */ + NtClose(FileHandle); + } + else + { + DPRINT1("SMSS:PFILE: Failed to open for deletion page file `%wZ' (status %X)\n", + FileName, Status); + } + + /* All done */ + return Status; +} + +NTSTATUS +NTAPI +SmpGetVolumeFreeSpace(IN PSMP_VOLUME_DESCRIPTOR Volume) +{ + NTSTATUS Status; + LARGE_INTEGER FreeSpace, FinalFreeSpace; + FILE_FS_SIZE_INFORMATION SizeInfo; + IO_STATUS_BLOCK IoStatusBlock; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING VolumeName; + HANDLE VolumeHandle; + WCHAR PathString[32]; + ASSERT(Volume->Flags & SMP_VOLUME_IS_BOOT); // ASSERT says "BootVolume == 1" + + /* Build the standard path */ + wcscpy(PathString, L"\\??\\A:\\"); + VolumeName.Buffer = PathString; + VolumeName.Length = wcslen(PathString) * sizeof(WCHAR); + VolumeName.MaximumLength = VolumeName.Length + sizeof(UNICODE_NULL); + VolumeName.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; + DPRINT1("SMSS:PFILE: Querying volume `%wZ' for free space \n", &VolumeName); + + /* Open the volume */ + InitializeObjectAttributes(&ObjectAttributes, + &VolumeName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL); + Status = NtOpenFile(&VolumeHandle, + FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: Open volume `%wZ' failed with status %X \n", &VolumeName, Status); + return Status; + } + + /* Now get size information on the volume */ + Status = NtQueryVolumeInformationFile(VolumeHandle, + &IoStatusBlock, + &SizeInfo, + sizeof(SizeInfo), + FileFsSizeInformation); + if (!NT_SUCCESS(Status)) + { + /* We failed -- keep going */ + DPRINT1("SMSS:PFILE: Query volume `%wZ' (handle %p) for size failed" + " with status %X \n", + &VolumeName, + VolumeHandle, + Status); + RtlFreeHeap(RtlGetProcessHeap(), 0, Volume); + NtClose(VolumeHandle); + return Status; + } + NtClose(VolumeHandle); + + /* Compute how much free space we have */ + FreeSpace.QuadPart = SizeInfo.AvailableAllocationUnits.QuadPart * + SizeInfo.SectorsPerAllocationUnit; + FinalFreeSpace.QuadPart = FreeSpace.QuadPart * SizeInfo.BytesPerSector; + Volume->FreeSpace = FinalFreeSpace; + + /* Check if there's less than 32MB free so we don't starve the disk */ + if (FinalFreeSpace.QuadPart <= 0x2000000) + { + /* In this case, act as if there's no free space */ + Volume->FreeSpace.QuadPart = 0; + } + else + { + /* Trim off 32MB to give the disk a bit of breathing room */ + Volume->FreeSpace.QuadPart = FinalFreeSpace.QuadPart - 0x2000000; + } + + return STATUS_SUCCESS; +} + +PSMP_VOLUME_DESCRIPTOR +NTAPI +SmpSearchVolumeDescriptor(IN WCHAR DriveLetter) +{ + WCHAR UpLetter; + PSMP_VOLUME_DESCRIPTOR Volume = NULL; + PLIST_ENTRY NextEntry; + + /* Use upper case to reduce differences */ + UpLetter = RtlUpcaseUnicodeChar(DriveLetter); + + /* Loop each volume */ + NextEntry = SmpVolumeDescriptorList.Flink; + while (NextEntry != &SmpVolumeDescriptorList) + { + /* Grab the entry */ + Volume = CONTAINING_RECORD(NextEntry, SMP_VOLUME_DESCRIPTOR, Entry); + + /* Make sure it's a valid entry with an uppcase drive letter */ + ASSERT(Volume->Flags & SMP_VOLUME_INSERTED); // Volume->Initialized in ASSERT + ASSERT(Volume->DriveLetter >= L'A' && Volume->DriveLetter <= L'Z'); + + /* Break if it matches, if not, keep going */ + if (Volume->DriveLetter == UpLetter) break; + NextEntry = NextEntry->Flink; + } + + /* Return the volume if one was found */ + if (NextEntry == &SmpVolumeDescriptorList) Volume = NULL; + return Volume; +} + +NTSTATUS +NTAPI +SmpCreatePagingFile(IN PUNICODE_STRING Name, + IN PLARGE_INTEGER MinSize, + IN PLARGE_INTEGER MaxSize, + IN ULONG Priority) +{ + NTSTATUS Status; + DPRINT1("Should request pagefile: %wZ with size %I64x and %I64x\n", Name, MinSize->QuadPart, MaxSize->QuadPart); + + /* Tell the kernel to create the pagefile */ + Status = STATUS_SUCCESS; + //Status = NtCreatePagingFile(Name, MinSize, MaxSize, Priority); + if (NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) succeeded. \n", + Name, + MinSize->QuadPart, + MaxSize->QuadPart); + } + else + { + DPRINT1("SMSS:PFILE: NtCreatePagingFile (%wZ, %I64X, %I64X) failed with %X \n", + Name, + MinSize->QuadPart, + MaxSize->QuadPart, + Status); + } + + /* Return the status */ + return Status; +} + +NTSTATUS +NTAPI SmpCreatePagingFileOnFixedDrive(IN PSMP_PAGEFILE_DESCRIPTOR Descriptor, IN PLARGE_INTEGER FuzzFactor, IN PLARGE_INTEGER MinimumSize) { - DPRINT1("Should create fixed pagefile of sizes: %I64d %I64d\n", - FuzzFactor->QuadPart, MinimumSize->QuadPart); - return STATUS_SUCCESS; + PSMP_VOLUME_DESCRIPTOR Volume; + BOOLEAN ShouldDelete; + NTSTATUS Status; + LARGE_INTEGER PageFileSize; + ASSERT(Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] != L'?'); + + /* Try to find the volume descriptor for this drive letter */ + ShouldDelete = FALSE; + Volume = SmpSearchVolumeDescriptor(Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET]); + if (!Volume) + { + /* Couldn't find it, fail */ + DPRINT1("SMSS:PFILE: No volume descriptor for `%wZ' \n", + &Descriptor->Name); + return STATUS_INVALID_PARAMETER; + } + + /* Check if this is the boot volume */ + if (Volume->Flags & SMP_VOLUME_IS_BOOT) + { + /* Check if we haven't yet processed a crash dump on this volume */ + if (!(Descriptor->Flags & SMP_PAGEFILE_DUMP_PROCESSED)) + { + /* Try to find a crash dump and extract it */ + DPRINT1("SMSS:PFILE: Checking for crash dump in `%wZ' on boot volume \n", + &Descriptor->Name); + SmpCheckForCrashDump(&Descriptor->Name); + + /* Update how much free space we have now that we extracted a dump */ + Status = SmpGetVolumeFreeSpace(Volume); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SMSS:PFILE: Failed to query free space for boot volume `%wC'\n", + Volume->DriveLetter); + } + + /* Don't process crashdump on this volume anymore */ + Descriptor->Flags |= SMP_PAGEFILE_DUMP_PROCESSED; + } + } + else + { + /* Crashdumps can only be on the boot volume */ + DPRINT1("SMSS:PFILE: Skipping crash dump checking for `%wZ' on non boot" + "volume `%wC' \n", + &Descriptor->Name, + Volume->DriveLetter); + } + + /* Update the size after dump extraction */ + Descriptor->ActualMinSize = Descriptor->MinSize; + Descriptor->ActualMaxSize = Descriptor->MaxSize; + + /* Check how big we can make the pagefile */ + Status = SmpGetPagingFileSize(&Descriptor->Name, &PageFileSize); + if (PageFileSize.QuadPart > 0) ShouldDelete = TRUE; + DPRINT1("SMSS:PFILE: Detected size %I64X for future paging file `%wZ'\n", + PageFileSize, + &Descriptor->Name); + DPRINT1("SMSS:PFILE: Free space on volume `%wC' is %I64X \n", + Volume->DriveLetter, + Volume->FreeSpace.QuadPart); + + /* Now update our size and make sure none of these are too big */ + PageFileSize.QuadPart += Volume->FreeSpace.QuadPart; + if (Descriptor->ActualMinSize.QuadPart > PageFileSize.QuadPart) + { + Descriptor->ActualMinSize = PageFileSize; + } + if (Descriptor->ActualMaxSize.QuadPart > PageFileSize.QuadPart) + { + Descriptor->ActualMaxSize = PageFileSize; + } + DPRINT1("SMSS:PFILE: min %I64X, max %I64X, real min %I64X \n", + Descriptor->ActualMinSize.QuadPart, + Descriptor->ActualMaxSize.QuadPart, + MinimumSize->QuadPart); + + /* Keep going until we've created a pagefile of the right size */ + while (Descriptor->ActualMinSize.QuadPart >= MinimumSize->QuadPart) + { + /* Call NT to do it */ + Status = SmpCreatePagingFile(&Descriptor->Name, + &Descriptor->ActualMinSize, + &Descriptor->ActualMaxSize, + 0); + if (NT_SUCCESS(Status)) + { + /* We're done, update flags and increase the count */ + Descriptor->Flags |= SMP_PAGEFILE_CREATED; + Volume->Flags |= SMP_VOLUME_PAGEFILE_CREATED; + Volume->PageFileCount++; + break; + } + + /* We failed, try a slighly smaller pagefile */ + Descriptor->ActualMinSize.QuadPart -= FuzzFactor->QuadPart; + } + + /* Check if we weren't able to create it */ + if (Descriptor->ActualMinSize.QuadPart < MinimumSize->QuadPart) + { + /* Delete the current page file and fail */ + if (ShouldDelete) SmpDeletePagingFile(&Descriptor->Name); + DPRINT1("SMSS:PFILE: Failing for min %I64X, max %I64X, real min %I64X \n", + Descriptor->ActualMinSize.QuadPart, + Descriptor->ActualMaxSize.QuadPart, + MinimumSize->QuadPart); + Status = STATUS_DISK_FULL; + } + + /* Return the status */ + return Status; } NTSTATUS @@ -245,9 +603,36 @@ IN PLARGE_INTEGER FuzzFactor, IN PLARGE_INTEGER MinimumSize) { - DPRINT1("Should create 'any' pagefile of sizes: %I64d %I64d\n", - FuzzFactor->QuadPart, MinimumSize->QuadPart); - return STATUS_SUCCESS; + PSMP_VOLUME_DESCRIPTOR Volume; + NTSTATUS Status = STATUS_DISK_FULL; + PLIST_ENTRY NextEntry; + ASSERT(Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] == L'?'); + + /* Loop the volume list */ + NextEntry = SmpVolumeDescriptorList.Flink; + while (NextEntry != &SmpVolumeDescriptorList) + { + /* Get the volume */ + Volume = CONTAINING_RECORD(NextEntry, SMP_VOLUME_DESCRIPTOR, Entry); + + /* Make sure it's inserted and on a valid drive letter */ + ASSERT(Volume->Flags & SMP_VOLUME_INSERTED); // Volume->Initialized in ASSERT + ASSERT(Volume->DriveLetter >= L'A' && Volume->DriveLetter <= L'Z'); + + /* Write the drive letter to try creating it on this volume */ + Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = Volume->DriveLetter; + Status = SmpCreatePagingFileOnFixedDrive(Descriptor, + FuzzFactor, + MinimumSize); + if (NT_SUCCESS(Status)) break; + + /* It didn't work, make it an any pagefile again and keep going */ + Descriptor->Name.Buffer[STANDARD_DRIVE_LETTER_OFFSET] = L'?'; + NextEntry = NextEntry->Flink; + } + + /* Return disk full or success */ + return Status; } VOID Modified: trunk/reactos/base/system/smss2/smss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss2/smss.h?r… ============================================================================== --- trunk/reactos/base/system/smss2/smss.h [iso-8859-1] (original) +++ trunk/reactos/base/system/smss2/smss.h [iso-8859-1] Fri Feb 3 23:11:28 2012 @@ -181,4 +181,10 @@ IN BOOLEAN ShutdownOkay ); +BOOLEAN +NTAPI +SmpCheckForCrashDump( + IN PUNICODE_STRING FileName +); +

1 0

[cgutman] 55399: [PCI][HIDCLASS][HIDUSB][KBDHID][MOUHID][USBCCGP][USBOHCI][USBEHCI][USBHUB][USBSTOR] - Handle query remove IRPs - Fix some other removal bugs
by cgutman＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: cgutman Date: Fri Feb 3 22:59:53 2012 New Revision: 55399 URL: http://svn.reactos.org/svn/reactos?rev=55399&view=rev Log: [PCI][HIDCLASS][HIDUSB][KBDHID][MOUHID][USBCCGP][USBOHCI][USBEHCI][USBHUB][USBSTOR] - Handle query remove IRPs - Fix some other removal bugs Modified: branches/usb-bringup-trunk/drivers/bus/pci/fdo.c branches/usb-bringup-trunk/drivers/bus/pci/pdo.c branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c Modified: branches/usb-bringup-trunk/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pci/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pci/fdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -96,7 +96,6 @@ { PFDO_DEVICE_EXTENSION DeviceExtension; PCI_COMMON_CONFIG PciConfig; - PLIST_ENTRY CurrentEntry; PPCI_DEVICE Device; PCI_SLOT_NUMBER SlotNumber; ULONG DeviceNumber; @@ -107,15 +106,6 @@ DPRINT("Called\n"); DeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - /* Mark all devices to be removed. If we don't discover them again during - enumeration, assume that they have been surprise removed */ - CurrentEntry = DeviceExtension->DeviceListHead.Flink; - while (CurrentEntry != &DeviceExtension->DeviceListHead) { - Device = CONTAINING_RECORD(CurrentEntry, PCI_DEVICE, ListEntry); - Device->RemovePending = TRUE; - CurrentEntry = CurrentEntry->Flink; - } DeviceExtension->DeviceListCount = 0; @@ -189,9 +179,6 @@ &Device->ListEntry, &DeviceExtension->DeviceListLock); } - - /* Don't remove this device */ - Device->RemovePending = FALSE; DeviceExtension->DeviceListCount++; Modified: branches/usb-bringup-trunk/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/bus/p… ============================================================================== --- branches/usb-bringup-trunk/drivers/bus/pci/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/bus/pci/pdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -1443,10 +1443,33 @@ case IRP_MN_STOP_DEVICE: case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_CANCEL_REMOVE_DEVICE: - case IRP_MN_REMOVE_DEVICE: case IRP_MN_SURPRISE_REMOVAL: Status = STATUS_SUCCESS; break; + + case IRP_MN_REMOVE_DEVICE: + { + PPDO_DEVICE_EXTENSION DeviceExtension = DeviceObject->DeviceExtension; + PFDO_DEVICE_EXTENSION FdoDeviceExtension = DeviceExtension->Fdo->DeviceExtension; + KIRQL OldIrql; + + /* Remove it from the device list */ + KeAcquireSpinLock(&FdoDeviceExtension->DeviceListLock, &OldIrql); + RemoveEntryList(&DeviceExtension->PciDevice->ListEntry); + FdoDeviceExtension->DeviceListCount--; + KeReleaseSpinLock(&FdoDeviceExtension->DeviceListLock, OldIrql); + + /* Free the device */ + ExFreePool(DeviceExtension->PciDevice); + + /* Complete the IRP */ + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + /* Delete the DO */ + IoDeleteDevice(DeviceObject); + return STATUS_SUCCESS; + } case IRP_MN_QUERY_INTERFACE: DPRINT("IRP_MN_QUERY_INTERFACE received\n"); Modified: branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidclass/fdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -554,6 +554,7 @@ { return HidClassFDO_RemoveDevice(DeviceObject, Irp); } + case IRP_MN_QUERY_REMOVE_DEVICE: case IRP_MN_QUERY_STOP_DEVICE: { // @@ -567,6 +568,7 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(FDODeviceExtension->Common.HidDeviceExtension.NextDeviceObject, Irp); } + case IRP_MN_CANCEL_REMOVE_DEVICE: case IRP_MN_CANCEL_STOP_DEVICE: { // Modified: branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/h… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/hidusb/hidusb.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -1561,19 +1561,41 @@ } // + // delete and detach device + // + IoDetachDevice(DeviceExtension->NextDeviceObject); + IoDeleteDevice(DeviceObject); + + return Status; + } + case IRP_MN_QUERY_PNP_DEVICE_STATE: + { + // + // device can not be disabled + // + Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; + + // + // pass request to next request + // + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); + + // // done // return Status; } - case IRP_MN_QUERY_PNP_DEVICE_STATE: - { - // - // device can not be disabled - // - Irp->IoStatus.Information |= PNP_DEVICE_NOT_DISABLEABLE; - - // - // pass request to next request + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + { + // + // we're fine with it + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // pass request to next driver // IoSkipCurrentIrpStackLocation(Irp); Status = IoCallDriver(DeviceExtension->NextDeviceObject, Irp); Modified: branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/k… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/kbdhid/kbdhid.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -737,7 +737,11 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT1("[KBDHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); - if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) + if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || + IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || + IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || + IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE || + IoStack->MinorFunction == IRP_MN_QUERY_REMOVE_DEVICE) { /* indicate success */ Irp->IoStatus.Status = STATUS_SUCCESS; Modified: branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/hid/m… ============================================================================== --- branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/hid/mouhid/mouhid.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -788,7 +788,11 @@ IoStack = IoGetCurrentIrpStackLocation(Irp); DPRINT1("[MOUHID] IRP_MJ_PNP Request: %x\n", IoStack->MinorFunction); - if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE) + if (IoStack->MinorFunction == IRP_MN_STOP_DEVICE || + IoStack->MinorFunction == IRP_MN_CANCEL_REMOVE_DEVICE || + IoStack->MinorFunction == IRP_MN_QUERY_STOP_DEVICE || + IoStack->MinorFunction == IRP_MN_CANCEL_STOP_DEVICE || + IoStack->MinorFunction == IRP_MN_QUERY_REMOVE_DEVICE) { /* indicate success */ Irp->IoStatus.Status = STATUS_SUCCESS; Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -481,6 +481,20 @@ } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // sure + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // forward irp to next device object + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); + } default: { // Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -391,6 +391,15 @@ IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // sure + // + Status = STATUS_SUCCESS; + break; + } case IRP_MN_START_DEVICE: { // @@ -406,6 +415,7 @@ // do nothing // Status = Irp->IoStatus.Status; + break; } } Modified: branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -432,6 +432,15 @@ // register device interface // Status = SetDeviceInterface(TRUE); + break; + } + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + { + // + // sure + // + Status = STATUS_SUCCESS; break; } case IRP_MN_QUERY_ID: Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/fdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -1883,6 +1883,22 @@ } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + Irp->IoStatus.Status = STATUS_SUCCESS; + return ForwardIrpAndForget(DeviceObject, Irp); + } + case IRP_MN_REMOVE_DEVICE: + { + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + IoDetachDevice(HubDeviceExtension->LowerDeviceObject); + IoDeleteDevice(DeviceObject); + + return STATUS_SUCCESS; + } case IRP_MN_QUERY_BUS_INFORMATION: { DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); Modified: branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbhub_new/pdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -586,6 +586,14 @@ IoDeleteDevice(DeviceObject); return STATUS_SUCCESS; } + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + { + /* Sure, no problem */ + Status = STATUS_SUCCESS; + Information = 0; + break; + } default: { DPRINT1("PDO IRP_MJ_PNP / unknown minor function 0x%lx\n", MinorFunction); Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -435,6 +435,15 @@ // register device interface // Status = SetDeviceInterface(TRUE); + break; + } + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + { + // + // sure + // + Status = STATUS_SUCCESS; break; } case IRP_MN_QUERY_ID: Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/fdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -339,9 +339,11 @@ break; } case IRP_MN_STOP_DEVICE: + { DPRINT1("USBSTOR_FdoHandlePnp: IRP_MN_STOP_DEVICE unimplemented\n"); Status = STATUS_NOT_SUPPORTED; break; + } case IRP_MN_REMOVE_DEVICE: { DPRINT1("IRP_MN_REMOVE_DEVICE\n"); @@ -356,6 +358,29 @@ IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); } + case IRP_MN_QUERY_STOP_DEVICE: + case IRP_MN_QUERY_REMOVE_DEVICE: + { + // + // we can if nothing is pending + // + if (DeviceExtension->IrpPendingCount != 0 || + DeviceExtension->ActiveSrb != NULL) + { + /* We have pending requests */ + DPRINT1("Failing removal/stop request due to pending requests present\n"); + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* We're all clear */ + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(DeviceExtension->LowerDeviceObject, Irp); + } + break; + } case IRP_MN_START_DEVICE: { Status = USBSTOR_FdoHandleStartDevice(DeviceObject, DeviceExtension, Irp); Modified: branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbstor/pdo.c [iso-8859-1] Fri Feb 3 22:59:53 2012 @@ -873,6 +873,18 @@ } break; } + case IRP_MN_QUERY_REMOVE_DEVICE: + case IRP_MN_QUERY_STOP_DEVICE: + { + // + // if we're not claimed it's ok + // + if (DeviceExtension->Claimed) + Status = STATUS_UNSUCCESSFUL; + else + Status = STATUS_SUCCESS; + break; + } case IRP_MN_START_DEVICE: { //

1 0

[tkreuzer] 55398: Fix gcc build
by tkreuzer＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: tkreuzer Date: Fri Feb 3 21:12:18 2012 New Revision: 55398 URL: http://svn.reactos.org/svn/reactos?rev=55398&view=rev Log: Fix gcc build Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Feb 3 21:12:18 2012 @@ -462,7 +462,7 @@ /* Get the margins of the address space */ if (MmGetAddressSpaceOwner(AddressSpace) != NULL) { - LowestAddress = MM_LOWEST_USER_ADDRESS; + LowestAddress = (ULONG_PTR)MM_LOWEST_USER_ADDRESS; HighestAddress = (ULONG_PTR)MmHighestUserAddress; } else

1 0

[tkreuzer] 55397: [NTOSKRNL] - Rewrite MmFindGapBottomUp and MmFindGapTopDown, the old versions were broken and were first checking the address range after the first memory area and only used the a...
by tkreuzer＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: tkreuzer Date: Fri Feb 3 20:59:35 2012 New Revision: 55397 URL: http://svn.reactos.org/svn/reactos?rev=55397&view=rev Log: [NTOSKRNL] - Rewrite MmFindGapBottomUp and MmFindGapTopDown, the old versions were broken and were first checking the address range after the first memory area and only used the area below (above) the first memory are when nothing free was found. - Fix an ASSERT, that gets triggered now that the memory areas are created at the "right" locations - Create a memory are for the boot loaded images, which previously could be overwritten happily by new memory areas, which was only prevented by the brokenness of the code - Fix a few memory regions so that they are correct for amd64 builds as well Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=553… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Feb 3 20:59:35 2012 @@ -331,7 +331,7 @@ } /* Copy the codepage data in its new location. */ - ASSERT(SectionBase > MmSystemRangeStart); + ASSERT(SectionBase >= MmSystemRangeStart); RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); /* Free the previously allocated buffer and set the new location */ Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Fri Feb 3 20:59:35 2012 @@ -30,6 +30,7 @@ #define PDE_TOP 0xC0300FFF #define PTE_TOP 0xC03FFFFF #define HYPER_SPACE 0xC0400000 +#define HYPER_SPACE_END 0xC07FFFFF #define PTE_PER_PAGE 0x400 Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Feb 3 20:59:35 2012 @@ -456,78 +456,68 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; - PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? - MmHighestUserAddress : (PVOID)MAXULONG_PTR; - PVOID AlignedAddress; - PMEMORY_AREA Node; - PMEMORY_AREA FirstNode; - PMEMORY_AREA PreviousNode; - - DPRINT("LowestAddress: %p HighestAddress: %p\n", - LowestAddress, HighestAddress); - - AlignedAddress = MM_ROUND_UP(LowestAddress, Granularity); - - /* Special case for empty tree. */ - if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) - { - if ((ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - return AlignedAddress; - } - DPRINT("MmFindGapBottomUp: 0\n"); - return 0; - } - - /* Go to the node with lowest address in the tree. */ - FirstNode = Node = MmIterateFirstNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); - - /* Traverse the tree from left to right. */ - PreviousNode = Node; - for (;;) - { - Node = MmIterateNextNode(Node); - if (Node == NULL) - break; - - AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); - if (AlignedAddress >= LowestAddress) - { - if (Node->StartingAddress > AlignedAddress && - (ULONG_PTR)Node->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - ASSERT(AlignedAddress >= LowestAddress); - return AlignedAddress; - } - } - PreviousNode = Node; - } - - /* Check if there is enough space after the last memory area. */ - AlignedAddress = MM_ROUND_UP(PreviousNode->EndingAddress, Granularity); - if ((ULONG_PTR)HighestAddress > (ULONG_PTR)AlignedAddress && - (ULONG_PTR)HighestAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - ASSERT(AlignedAddress >= LowestAddress); - return AlignedAddress; - } - - /* Check if there is enough space before the first memory area. */ - AlignedAddress = MM_ROUND_UP(LowestAddress, Granularity); - if (FirstNode->StartingAddress > AlignedAddress && - (ULONG_PTR)FirstNode->StartingAddress - (ULONG_PTR)AlignedAddress >= Length) - { - DPRINT("MmFindGapBottomUp: %p\n", AlignedAddress); - ASSERT(AlignedAddress >= LowestAddress); - return AlignedAddress; - } - - DPRINT("MmFindGapBottomUp: 0\n"); - return 0; + ULONG_PTR LowestAddress, HighestAddress, Candidate; + PMEMORY_AREA Root, Node; + + /* Get the margins of the address space */ + if (MmGetAddressSpaceOwner(AddressSpace) != NULL) + { + LowestAddress = MM_LOWEST_USER_ADDRESS; + HighestAddress = (ULONG_PTR)MmHighestUserAddress; + } + else + { + LowestAddress = (ULONG_PTR)MmSystemRangeStart; + HighestAddress = MAXULONG_PTR; + } + + /* Start with the lowest address */ + Candidate = LowestAddress; + + /* Check for overflow */ + if ((Candidate + Length) < Candidate) return NULL; + + /* Get the root of the address space tree */ + Root = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; + + /* Go to the node with lowest address in the tree. */ + Node = Root ? MmIterateFirstNode(Root) : NULL; + while (Node && ((ULONG_PTR)Node->EndingAddress < LowestAddress)) + { + Node = MmIterateNextNode(Node); + } + + /* Traverse the tree from low to high addresses */ + while (Node && ((ULONG_PTR)Node->EndingAddress < HighestAddress)) + { + /* Check if the memory area fits before the current node */ + if ((ULONG_PTR)Node->StartingAddress >= (Candidate + Length)) + { + DPRINT("MmFindGapBottomUp: %p\n", Candidate); + ASSERT(Candidate >= LowestAddress); + return (PVOID)Candidate; + } + + /* Calculate next possible adress above this node */ + Candidate = ALIGN_UP_BY((ULONG_PTR)Node->EndingAddress, Granularity); + + /* Check for overflow */ + if ((Candidate + Length) < (ULONG_PTR)Node->EndingAddress) return NULL; + + /* Go to the next higher node */ + Node = MmIterateNextNode(Node); + } + + /* Check if there is enough space after the last memory area. */ + if ((Candidate + Length) <= HighestAddress) + { + DPRINT("MmFindGapBottomUp: %p\n", Candidate); + ASSERT(Candidate >= LowestAddress); + return (PVOID)Candidate; + } + + DPRINT("MmFindGapBottomUp: 0\n"); + return NULL; } @@ -537,81 +527,68 @@ ULONG_PTR Length, ULONG_PTR Granularity) { - PVOID LowestAddress = MmGetAddressSpaceOwner(AddressSpace) ? MM_LOWEST_USER_ADDRESS : MmSystemRangeStart; - PVOID HighestAddress = MmGetAddressSpaceOwner(AddressSpace) ? - (PVOID)((ULONG_PTR)MmSystemRangeStart - 1) : (PVOID)MAXULONG_PTR; - PVOID AlignedAddress; - PMEMORY_AREA Node; - PMEMORY_AREA PreviousNode; - - DPRINT("LowestAddress: %p HighestAddress: %p\n", - LowestAddress, HighestAddress); - - AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)HighestAddress - Length + 1, Granularity); - - /* Check for overflow. */ - if (AlignedAddress > HighestAddress) - return NULL; - - /* Special case for empty tree. */ - if (AddressSpace->WorkingSetExpansionLinks.Flink == NULL) - { - if (AlignedAddress >= LowestAddress) - { - DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); - return AlignedAddress; - } - DPRINT("MmFindGapTopDown: 0\n"); - return 0; - } - - /* Go to the node with highest address in the tree. */ - Node = MmIterateLastNode((PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink); - - /* Check if there is enough space after the last memory area. */ - if (Node->EndingAddress <= AlignedAddress) - { - DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); - return AlignedAddress; - } - - /* Traverse the tree from left to right. */ - PreviousNode = Node; - for (;;) - { - Node = MmIteratePrevNode(Node); - if (Node == NULL) - break; - - AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)PreviousNode->StartingAddress - Length + 1, Granularity); - - /* Check for overflow. */ - if (AlignedAddress > PreviousNode->StartingAddress) - return NULL; - - if (Node->EndingAddress <= AlignedAddress) - { - DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); - return AlignedAddress; - } - - PreviousNode = Node; - } - - AlignedAddress = MM_ROUND_DOWN((ULONG_PTR)PreviousNode->StartingAddress - Length + 1, Granularity); - - /* Check for overflow. */ - if (AlignedAddress > PreviousNode->StartingAddress) - return NULL; - - if (AlignedAddress >= LowestAddress) - { - DPRINT("MmFindGapTopDown: %p\n", AlignedAddress); - return AlignedAddress; - } - - DPRINT("MmFindGapTopDown: 0\n"); - return 0; + ULONG_PTR LowestAddress, HighestAddress, Candidate; + PMEMORY_AREA Root, Node; + + /* Get the margins of the address space */ + if (MmGetAddressSpaceOwner(AddressSpace) != NULL) + { + LowestAddress = (ULONG_PTR)MM_LOWEST_USER_ADDRESS; + HighestAddress = (ULONG_PTR)MmHighestUserAddress; + } + else + { + LowestAddress = (ULONG_PTR)MmSystemRangeStart; + HighestAddress = MAXULONG_PTR; + } + + /* Calculate the highest candidate */ + Candidate = ALIGN_DOWN_BY(HighestAddress + 1 - Length, Granularity); + + /* Check for overflow. */ + if (Candidate > HighestAddress) return NULL; + + /* Get the root of the address space tree */ + Root = (PMEMORY_AREA)AddressSpace->WorkingSetExpansionLinks.Flink; + + /* Go to the node with highest address in the tree. */ + Node = Root ? MmIterateLastNode(Root) : NULL; + while (Node && ((ULONG_PTR)Node->StartingAddress > HighestAddress)) + { + Node = MmIteratePrevNode(Node); + } + + /* Traverse the tree from high to low addresses */ + while (Node && ((ULONG_PTR)Node->StartingAddress > LowestAddress)) + { + /* Check if the memory area fits after the current node */ + if ((ULONG_PTR)Node->EndingAddress <= Candidate) + { + DPRINT("MmFindGapTopDown: %p\n", Candidate); + return (PVOID)Candidate; + } + + /* Calculate next possible adress below this node */ + Candidate = ALIGN_DOWN_BY((ULONG_PTR)Node->StartingAddress - Length, + Granularity); + + /* Check for overflow. */ + if (Candidate > (ULONG_PTR)Node->StartingAddress) + return NULL; + + /* Go to the next lower node */ + Node = MmIteratePrevNode(Node); + } + + /* Check if the last candidate is inside the given range */ + if (Candidate >= LowestAddress) + { + DPRINT("MmFindGapTopDown: %p\n", Candidate); + return (PVOID)Candidate; + } + + DPRINT("MmFindGapTopDown: 0\n"); + return NULL; } @@ -887,7 +864,7 @@ ULONG_PTR tmpLength; PMEMORY_AREA MemoryArea; - DPRINT("MmCreateMemoryArea(Type %d, BaseAddress %p, " + DPRINT("MmCreateMemoryArea(Type 0x%lx, BaseAddress %p, " "*BaseAddress %p, Length %p, AllocationFlags %x, " "FixedAddress %x, Result %p)\n", Type, BaseAddress, *BaseAddress, Length, AllocationFlags, @@ -922,6 +899,7 @@ if (MmGetAddressSpaceOwner(AddressSpace) && (ULONG_PTR)(*BaseAddress) + tmpLength > (ULONG_PTR)MmSystemRangeStart) { + DPRINT("Memory area for user mode address space exceeds MmSystemRangeStart\n"); return STATUS_ACCESS_VIOLATION; } @@ -1026,8 +1004,9 @@ DPRINT("MmDeleteProcessAddressSpace(Process %x (%s))\n", Process, Process->ImageFileName); +#ifndef _M_AMD64 RemoveEntryList(&Process->MmProcessLinks); - +#endif MmLockAddressSpace(&Process->Vm); while ((MemoryArea = (PMEMORY_AREA)Process->Vm.WorkingSetExpansionLinks.Flink) != NULL) Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Feb 3 20:59:35 2012 @@ -1,4 +1,4 @@ -/* +ï»¿/* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/mm/mminit.c @@ -45,13 +45,28 @@ BoundaryAddressMultiple.QuadPart = 0; // + // Create the memory area to define the loader mappings + // + BaseAddress = (PVOID)KSEG0_BASE; + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, + &BaseAddress, + MmBootImageSize, + PAGE_EXECUTE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + ASSERT(Status == STATUS_SUCCESS); + + // // Create the memory area to define the PTE base // BaseAddress = (PVOID)PTE_BASE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - 4 * 1024 * 1024, + PTE_TOP - PTE_BASE + 1, PAGE_READWRITE, &MArea, TRUE, @@ -66,7 +81,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_OWNED_BY_ARM3 | MEMORY_AREA_STATIC, &BaseAddress, - 4 * 1024 * 1024, + HYPER_SPACE_END - HYPER_SPACE + 1, PAGE_READWRITE, &MArea, TRUE, @@ -165,7 +180,7 @@ 0, BoundaryAddressMultiple); ASSERT(Status == STATUS_SUCCESS); - +#ifndef _M_AMD64 // // Next, the KPCR // @@ -180,7 +195,7 @@ 0, BoundaryAddressMultiple); ASSERT(Status == STATUS_SUCCESS); - +#endif // // Now the KUSER_SHARED_DATA // @@ -238,8 +253,8 @@ // Print the memory layout // DPRINT1(" 0x%p - 0x%p\t%s\n", - MmSystemRangeStart, - (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, + KSEG0_BASE, + (ULONG_PTR)KSEG0_BASE + MmBootImageSize, "Boot Loaded Image"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPfnDatabase, @@ -258,13 +273,13 @@ MiSessionSpaceEnd, "Session Space"); DPRINT1(" 0x%p - 0x%p\t%s\n", - PTE_BASE, PDE_BASE, + PTE_BASE, PTE_TOP, "Page Tables"); DPRINT1(" 0x%p - 0x%p\t%s\n", - PDE_BASE, HYPER_SPACE, + PDE_BASE, PDE_TOP, "Page Directories"); DPRINT1(" 0x%p - 0x%p\t%s\n", - HYPER_SPACE, HYPER_SPACE + (4 * 1024 * 1024), + HYPER_SPACE, HYPER_SPACE_END, "Hyperspace"); DPRINT1(" 0x%p - 0x%p\t%s\n", MmPagedPoolStart,

1 0

[janderwald] 55396: [USBCCGP] - Remove hack of forwarding pdo requests to lower device object of fdo - Implement handling of reset port and cycle port - IOCTL_INTERNAL_USB_RESET_PORT / IOCTL_INTERN...
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 16:03:42 2012 New Revision: 55396 URL: http://svn.reactos.org/svn/reactos?rev=55396&view=rev Log: [USBCCGP] - Remove hack of forwarding pdo requests to lower device object of fdo - Implement handling of reset port and cycle port - IOCTL_INTERNAL_USB_RESET_PORT / IOCTL_INTERNAL_USB_CYCLE_PORT now need to be implemented in usbhub Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/fdo.c [iso-8859-1] Fri Feb 3 16:03:42 2012 @@ -277,7 +277,7 @@ // PDODeviceExtension->Common.IsFDO = FALSE; PDODeviceExtension->FunctionDescriptor = &FDODeviceExtension->FunctionDescriptor[Index]; - PDODeviceExtension->NextDeviceObject = FDODeviceExtension->NextDeviceObject; //DeviceObject; HACK + PDODeviceExtension->NextDeviceObject = DeviceObject; PDODeviceExtension->FunctionIndex = Index; PDODeviceExtension->FDODeviceExtension = FDODeviceExtension; PDODeviceExtension->InterfaceList = FDODeviceExtension->InterfaceList; @@ -498,8 +498,182 @@ Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; - - +} + +NTSTATUS +FDO_HandleResetCyclePort( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + PLIST_ENTRY ListHead, Entry; + LIST_ENTRY TempList; + PUCHAR ResetActive; + PIRP ListIrp; + KIRQL OldLevel; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + DPRINT1("FDO_HandleResetCyclePort IOCTL %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT) + { + // + // use reset port list + // + ListHead = &FDODeviceExtension->ResetPortListHead; + ResetActive = &FDODeviceExtension->ResetPortActive; + } + else + { + // + // use cycle port list + // + ListHead = &FDODeviceExtension->CyclePortListHead; + ResetActive = &FDODeviceExtension->CyclePortActive; + } + + // + // acquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->Lock, &OldLevel); + + if (*ResetActive) + { + // + // insert into pending list + // + InsertTailList(ListHead, &Irp->Tail.Overlay.ListEntry); + + // + // mark irp pending + // + IoMarkIrpPending(Irp); + Status = STATUS_PENDING; + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); + } + else + { + // + // mark reset active + // + *ResetActive = TRUE; + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); + + // + // forward request synchronized + // + USBCCGP_SyncForwardIrp(FDODeviceExtension->NextDeviceObject, Irp); + + // + // reacquire lock + // + KeAcquireSpinLock(&FDODeviceExtension->Lock, &OldLevel); + + // + // mark reset as completed + // + *ResetActive = FALSE; + + // + // move all requests into temporary list + // + InitializeListHead(&TempList); + while(!IsListEmpty(ListHead)) + { + Entry = RemoveHeadList(ListHead); + InsertTailList(&TempList, Entry); + } + + // + // release lock + // + KeReleaseSpinLock(&FDODeviceExtension->Lock, OldLevel); + + // + // complete pending irps + // + while(!IsListEmpty(&TempList)) + { + Entry = RemoveHeadList(&TempList); + ListIrp = (PIRP)CONTAINING_RECORD(Entry, IRP, Tail.Overlay.ListEntry); + + // + // complete request with status success + // + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + // + // status success + // + Status = STATUS_SUCCESS; + } + + return Status; +} + + + +NTSTATUS +FDO_HandleInternalDeviceControl( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PFDO_DEVICE_EXTENSION FDODeviceExtension; + + // + // get device extension + // + FDODeviceExtension = (PFDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(FDODeviceExtension->Common.IsFDO); + + // get stack location + IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT || + IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_CYCLE_PORT) + { + // + // handle reset / cycle ports + // + Status = FDO_HandleResetCyclePort(DeviceObject, Irp); + DPRINT1("FDO_HandleResetCyclePort Status %x\n", Status); + if (Status != STATUS_PENDING) + { + // + // complete request + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + return Status; + } + + // + // forward and forget request + // + IoSkipCurrentIrpStackLocation(Irp); + return IoCallDriver(FDODeviceExtension->NextDeviceObject, Irp); } NTSTATUS @@ -517,6 +691,8 @@ { case IRP_MJ_PNP: return FDO_HandlePnp(DeviceObject, Irp); + case IRP_MJ_INTERNAL_DEVICE_CONTROL: + return FDO_HandleInternalDeviceControl(DeviceObject, Irp); default: DPRINT1("FDO_Dispatch Function %x not implemented\n", IoStack->MajorFunction); ASSERT(FALSE); Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/pdo.c [iso-8859-1] Fri Feb 3 16:03:42 2012 @@ -925,6 +925,24 @@ return Status; } } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_GET_PORT_STATUS) + { + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); + return Status; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_RESET_PORT) + { + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); + return Status; + } + else if (IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_INTERNAL_USB_CYCLE_PORT) + { + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(PDODeviceExtension->NextDeviceObject, Irp); + return Status; + } Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.c [iso-8859-1] Fri Feb 3 16:03:42 2012 @@ -43,6 +43,10 @@ FDODeviceExtension->Common.IsFDO = TRUE; FDODeviceExtension->DriverObject = DriverObject; FDODeviceExtension->PhysicalDeviceObject = PhysicalDeviceObject; + InitializeListHead(&FDODeviceExtension->ResetPortListHead); + InitializeListHead(&FDODeviceExtension->CyclePortListHead); + KeInitializeSpinLock(&FDODeviceExtension->Lock); + FDODeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack(DeviceObject, PhysicalDeviceObject); if (!FDODeviceExtension->NextDeviceObject) { Modified: branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Fri Feb 3 16:03:42 2012 @@ -39,6 +39,11 @@ PUSBC_FUNCTION_DESCRIPTOR FunctionDescriptor; // usb function descriptor ULONG FunctionDescriptorCount; // number of function descriptor PDEVICE_OBJECT * ChildPDO; // child pdos + LIST_ENTRY ResetPortListHead; // reset port list head + LIST_ENTRY CyclePortListHead; // cycle port list head + UCHAR ResetPortActive; // reset port active + UCHAR CyclePortActive; // cycle port active + KSPIN_LOCK Lock; // reset / cycle port list lock }FDO_DEVICE_EXTENSION, *PFDO_DEVICE_EXTENSION; #define USBCCPG_TAG 'cbsu'

1 0

[janderwald] 55395: [USBOHCI] - Fix mingw build
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 15:55:04 2012 New Revision: 55395 URL: http://svn.reactos.org/svn/reactos?rev=55395&view=rev Log: [USBOHCI] - Fix mingw build Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 15:55:04 2012 @@ -1700,9 +1700,7 @@ IN OUT PIRP Irp, IN OUT PURB Urb) { - USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status = STATUS_SUCCESS; - PUSBDEVICE UsbDevice; PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; ULONG Type; @@ -1759,11 +1757,9 @@ IN OUT PIRP Irp, IN OUT PURB Urb) { - USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; NTSTATUS Status; PUSBDEVICE UsbDevice; PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; - // // sanity check

1 0

[janderwald] 55394: [USBOHCI] - Implement reseting pipe and clear pipe stall
by janderwald＠svn.reactos.org 03 Feb '12

03 Feb '12

Author: janderwald Date: Fri Feb 3 14:47:18 2012 New Revision: 55394 URL: http://svn.reactos.org/svn/reactos?rev=55394&view=rev Log: [USBOHCI] - Implement reseting pipe and clear pipe stall Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.h [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -229,6 +229,7 @@ #define OHCI_ENDPOINT_SKIP 0x00004000 #define OHCI_ENDPOINT_SET_DEVICE_ADDRESS(s) (s) +#define OHCI_ENDPOINT_GET_DEVICE_ADDRESS(s) ((s) & 0xFF) #define OHCI_ENDPOINT_GET_ENDPOINT_NUMBER(s) (((s) >> 7) & 0xf) #define OHCI_ENDPOINT_SET_ENDPOINT_NUMBER(s) ((s) << 7) #define OHCI_ENDPOINT_GET_MAX_PACKET_SIZE(s) (((s) >> 16) & 0x07ff) Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/hub_controller.cpp [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -70,6 +70,9 @@ NTSTATUS HandleClassEndpoint(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleBulkOrInterruptTransfer(IN OUT PIRP Irp, PURB Urb); NTSTATUS HandleIsochronousTransfer(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleClearStall(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleSyncResetAndClearStall(IN OUT PIRP Irp, PURB Urb); + NTSTATUS HandleAbortPipe(IN OUT PIRP Irp, PURB Urb); friend VOID StatusChangeEndpointCallBack(PVOID Context); @@ -1692,6 +1695,187 @@ return Status; } +NTSTATUS +CHubController::HandleSyncResetAndClearStall( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status = STATUS_SUCCESS; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + ULONG Type; + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get type + // + Type = (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + if (Type != USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + // + // clear stall + // + Status = HandleClearStall(Irp, Urb); + } + DPRINT1("URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n", Status); + + // + // FIXME reset data toggle + // + + // + // done + // + return Status; +} + +NTSTATUS +CHubController::HandleAbortPipe( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleAbortPipe invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + + + // + // issue request + // + Status = UsbDevice->AbortPipe(EndpointDescriptor); + DPRINT1("URB_FUNCTION_ABORT_PIPE Status %x\n", Status); + + // + // done + // + return Status; +} + + +//----------------------------------------------------------------------------------------- +NTSTATUS +CHubController::HandleClearStall( + IN OUT PIRP Irp, + IN OUT PURB Urb) +{ + USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup; + NTSTATUS Status; + PUSBDEVICE UsbDevice; + PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor; + + + // + // sanity check + // + PC_ASSERT(Urb->UrbHeader.UsbdDeviceHandle); + PC_ASSERT(Urb->UrbHeader.Length == sizeof(struct _URB_PIPE_REQUEST)); + PC_ASSERT(Urb->UrbPipeRequest.PipeHandle); + + // + // check if this is a valid usb device handle + // + if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle))) + { + DPRINT1("HandleClearStall invalid device handle %p\n", Urb->UrbHeader.UsbdDeviceHandle); + + // + // invalid device handle + // + return STATUS_DEVICE_NOT_CONNECTED; + } + + // + // get endpoint descriptor + // + EndpointDescriptor = (PUSB_ENDPOINT_DESCRIPTOR)Urb->UrbPipeRequest.PipeHandle; + + // + // get device + // + UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle); + DPRINT1("URB_FUNCTION_SYNC_CLEAR_STALL\n"); + + // + // initialize setup packet + // + CtrlSetup.bmRequestType.B = 0x02; + CtrlSetup.bRequest = USB_REQUEST_CLEAR_FEATURE; + CtrlSetup.wValue.W = USB_FEATURE_ENDPOINT_STALL; + CtrlSetup.wIndex.W = EndpointDescriptor->bEndpointAddress; + CtrlSetup.wLength = 0; + CtrlSetup.wValue.W = 0; + + // + // issue request + // + Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0); + + DPRINT1("URB_FUNCTION_CLEAR_STALL Status %x\n", Status); + + // + // done + // + return Status; +} + + //----------------------------------------------------------------------------------------- NTSTATUS CHubController::HandleClassInterface( @@ -1813,6 +1997,16 @@ switch (Urb->UrbHeader.Function) { + case URB_FUNCTION_SYNC_RESET_PIPE: + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + Status = HandleSyncResetAndClearStall(Irp, Urb); + break; + case URB_FUNCTION_ABORT_PIPE: + Status = HandleAbortPipe(Irp, Urb); + break; + case URB_FUNCTION_SYNC_CLEAR_STALL: + Status = HandleClearStall(Irp, Urb); + break; case URB_FUNCTION_GET_DESCRIPTOR_FROM_INTERFACE: Status = HandleGetDescriptorFromInterface(Irp, Urb); break; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/interfaces.h [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -556,6 +556,14 @@ virtual VOID TransferDescriptorCompletionCallback(ULONG TransferDescriptorLogicalAddress) = 0; + +//----------------------------------------------------------------------------------------- +// +// AbortDevicePipe +// +// Description: aborts all pending requsts of an device + + virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; }; typedef IUSBQueue *PUSBQUEUE; @@ -809,6 +817,16 @@ virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface) = 0; + + +//----------------------------------------------------------------------------------------- +// +// AbortPipe +// +// Description: aborts all pending requsts + + virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) = 0; + }; typedef IUSBDevice *PUSBDEVICE; Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -52,6 +52,7 @@ virtual NTSTATUS SubmitSetupPacket(IN PUSB_DEFAULT_PIPE_SETUP_PACKET SetupPacket, OUT ULONG BufferLength, OUT PVOID Buffer); virtual NTSTATUS SelectConfiguration(IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, IN PUSBD_INTERFACE_INFORMATION Interface, OUT USBD_CONFIGURATION_HANDLE *ConfigurationHandle); virtual NTSTATUS SelectInterface(IN USBD_CONFIGURATION_HANDLE ConfigurationHandle, IN OUT PUSBD_INTERFACE_INFORMATION Interface); + virtual NTSTATUS AbortPipe(IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor); // local function virtual NTSTATUS CommitIrp(PIRP Irp); @@ -1174,6 +1175,22 @@ return Status; } +NTSTATUS +CUSBDevice::AbortPipe( + IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) +{ + // + // let it handle usb queue + // + ASSERT(m_Queue); + ASSERT(m_DeviceAddress); + + // + // done + // + return m_Queue->AbortDevicePipe(m_DeviceAddress, EndpointDescriptor); +} + //---------------------------------------------------------------------------------------- NTSTATUS CreateUSBDevice( Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -40,6 +40,7 @@ virtual NTSTATUS CancelRequests(); virtual NTSTATUS CreateUSBRequest(IUSBRequest **OutRequest); virtual VOID TransferDescriptorCompletionCallback(ULONG TransferDescriptorLogicalAddress); + virtual NTSTATUS AbortDevicePipe(UCHAR DeviceAddress, IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor); // local functions BOOLEAN IsTransferDescriptorInEndpoint(IN POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor, IN ULONG TransferDescriptorLogicalAddress); @@ -741,6 +742,115 @@ } NTSTATUS +CUSBQueue::AbortDevicePipe( + IN UCHAR DeviceAddress, + IN PUSB_ENDPOINT_DESCRIPTOR EndpointDescriptor) +{ + POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor, CurrentDescriptor, PreviousDescriptor, TempDescriptor; + ULONG Type; + POHCI_GENERAL_TD TransferDescriptor; + + // + // get type + // + Type = (EndpointDescriptor->bmAttributes & USB_ENDPOINT_TYPE_MASK); + + // + // check type + // + if (Type == USB_ENDPOINT_TYPE_BULK) + { + // + // get head descriptor + // + HeadDescriptor = m_BulkHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_CONTROL) + { + // + // get head descriptor + // + HeadDescriptor = m_ControlHeadEndpointDescriptor; + } + else if (Type == USB_ENDPOINT_TYPE_INTERRUPT) + { + // + // get head descriptor + // + HeadDescriptor = FindInterruptEndpointDescriptor(EndpointDescriptor->bInterval); + ASSERT(HeadDescriptor); + } + else if (Type == USB_ENDPOINT_TYPE_ISOCHRONOUS) + { + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; + } + + // + // FIXME should disable list processing + // + + // + // now remove all endpoints + // + ASSERT(HeadDescriptor); + CurrentDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)HeadDescriptor->NextDescriptor; + PreviousDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)HeadDescriptor; + + while(CurrentDescriptor) + { + if ((CurrentDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HEAD_MASK) == CurrentDescriptor->TailPhysicalDescriptor || (CurrentDescriptor->HeadPhysicalDescriptor & OHCI_ENDPOINT_HALTED)) + { + // + // cleanup endpoint + // + TempDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentDescriptor->NextDescriptor; + CleanupEndpointDescriptor(CurrentDescriptor, PreviousDescriptor); + + // + // use next descriptor + // + CurrentDescriptor = TempDescriptor; + } + + if (!CurrentDescriptor) + break; + + if (CurrentDescriptor->HeadPhysicalDescriptor) + { + TransferDescriptor = (POHCI_GENERAL_TD)CurrentDescriptor->HeadLogicalDescriptor; + ASSERT(TransferDescriptor); + + if ((OHCI_ENDPOINT_GET_ENDPOINT_NUMBER(TransferDescriptor->Flags) == (EndpointDescriptor->bEndpointAddress & 0xF)) && + (OHCI_ENDPOINT_GET_DEVICE_ADDRESS(TransferDescriptor->Flags) == DeviceAddress)) + { + // + // cleanup endpoint + // + TempDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentDescriptor->NextDescriptor; + CleanupEndpointDescriptor(CurrentDescriptor, PreviousDescriptor); + // + // use next descriptor + // + CurrentDescriptor = TempDescriptor; + } + } + + if (!CurrentDescriptor) + break; + + PreviousDescriptor = CurrentDescriptor; + CurrentDescriptor = (POHCI_ENDPOINT_DESCRIPTOR)CurrentDescriptor->NextDescriptor; + } + + // + // done + // + return STATUS_SUCCESS; +} + + +NTSTATUS CreateUSBQueue( PUSBQUEUE *OutUsbQueue) { Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/u… ============================================================================== --- branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h [iso-8859-1] (original) +++ branches/usb-bringup-trunk/drivers/usb/usbohci/usbohci.h [iso-8859-1] Fri Feb 3 14:47:18 2012 @@ -7,6 +7,7 @@ #include <hubbusif.h> #include <usbbusif.h> #include <usbioctl.h> +#include <usb100.h> extern "C"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs