Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 23896: Allow setup to detect extended partitions
by hpoussin＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: hpoussin Date: Sun Sep 3 16:32:15 2006 New Revision: 23896 URL: http://svn.reactos.org/svn/reactos?rev=23896&view=rev Log: Allow setup to detect extended partitions Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Sun Sep 3 16:32:15 2006 @@ -214,8 +214,8 @@ { for (j = 0; j < 4; j++) { - if (LayoutBuffer->PartitionEntry[j].PartitionType != PARTITION_ENTRY_UNUSED || - LayoutBuffer->PartitionEntry[j].PartitionLength.QuadPart != 0ULL) + if (LayoutBuffer->PartitionEntry[i+j].PartitionType != PARTITION_ENTRY_UNUSED || + LayoutBuffer->PartitionEntry[i+j].PartitionLength.QuadPart != 0ULL) { break; }

1 0

[ion] 23895: - Remove LDT initialization, LDT shouldn't be initialized at bootup. - Move LDT-only GDT routines to ldt.c - Cleanup formatting of GDT-related exported function stubs in gdt.c and rename file to abios.c. Those routines deal specifically with the ABIOS GDT selectors and are for ABIOS support. - Move the lone 2 routines in fpu.c to cpu.c.
by ion＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: ion Date: Sun Sep 3 11:13:02 2006 New Revision: 23895 URL: http://svn.reactos.org/svn/reactos?rev=23895&view=rev Log: - Remove LDT initialization, LDT shouldn't be initialized at bootup. - Move LDT-only GDT routines to ldt.c - Cleanup formatting of GDT-related exported function stubs in gdt.c and rename file to abios.c. Those routines deal specifically with the ABIOS GDT selectors and are for ABIOS support. - Move the lone 2 routines in fpu.c to cpu.c. Added: trunk/reactos/ntoskrnl/ke/i386/abios.c - copied, changed from r23894, trunk/reactos/ntoskrnl/ke/i386/gdt.c Removed: trunk/reactos/ntoskrnl/ke/i386/fpu.c trunk/reactos/ntoskrnl/ke/i386/gdt.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ke/i386/ldt.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sun Sep 3 11:13:02 2006 @@ -96,6 +96,7 @@ extern BOOLEAN KeI386VirtualIntExtensions; extern KIDTENTRY KiIdt[]; extern KGDTENTRY KiBootGdt[]; +extern KTSS KiBootTss; extern FAST_MUTEX KernelAddressSpaceLock; extern ULONG KiMaximumDpcQueueDepth; extern ULONG KiMinimumDpcRate; @@ -111,6 +112,7 @@ extern KMUTEX KiGenericCallDpcMutex; extern LIST_ENTRY KiProfileListHead, KiProfileSourceListHead; extern KSPIN_LOCK KiProfileLock; +extern LIST_ENTRY KiProcessListHead; extern LIST_ENTRY KiProcessInSwapListHead, KiProcessOutSwapListHead; extern LIST_ENTRY KiStackInSwapListHead; extern KEVENT KiSwapEvent; Copied: trunk/reactos/ntoskrnl/ke/i386/abios.c (from r23894, trunk/reactos/ntoskrnl/ke/i386/gdt.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/abios.c?p… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/gdt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/abios.c Sun Sep 3 11:13:02 2006 @@ -1,11 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/gdt.c - * PURPOSE: GDT managment - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ke/i386/abios.c + * PURPOSE: Routines for ABIOS Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,127 +12,43 @@ #define NDEBUG #include <debug.h> -/* GLOBALS *******************************************************************/ - -KGDTENTRY KiBootGdt[11] = -{ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* Null */ - {0xffff, 0x0000, {{0x00, 0x9a, 0xcf, 0x00}}}, /* Kernel CS */ - {0xffff, 0x0000, {{0x00, 0x92, 0xcf, 0x00}}}, /* Kernel DS */ - {0xffff, 0x0000, {{0x00, 0xfa, 0xcf, 0x00}}}, /* User CS */ - {0xffff, 0x0000, {{0x00, 0xf2, 0xcf, 0x00}}}, /* User DS */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* TSS */ - {0x0fff, 0x0000, {{0x00, 0x92, 0x00, 0xff}}}, /* PCR */ - {0x0fff, 0x0000, {{0x00, 0xf2, 0x00, 0x00}}}, /* TEB */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* Reserved */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* LDT */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}} /* Trap TSS */ -}; - -KDESCRIPTOR KiGdtDescriptor = {sizeof(KiBootGdt), (ULONG)KiBootGdt}; - -static KSPIN_LOCK GdtLock; - /* FUNCTIONS *****************************************************************/ /* * @unimplemented */ -NTSTATUS STDCALL -KeI386FlatToGdtSelector( - IN ULONG Base, - IN USHORT Length, - IN USHORT Selector -) +NTSTATUS +STDCALL +KeI386FlatToGdtSelector(IN ULONG Base, + IN USHORT Length, + IN USHORT Selector) { - UNIMPLEMENTED; - return 0; + UNIMPLEMENTED; + return 0; } /* * @unimplemented */ -NTSTATUS STDCALL -KeI386ReleaseGdtSelectors( - OUT PULONG SelArray, - IN ULONG NumOfSelectors -) +NTSTATUS +NTAPI +KeI386ReleaseGdtSelectors(OUT PULONG SelArray, + IN ULONG NumOfSelectors) { - UNIMPLEMENTED; - return 0; + UNIMPLEMENTED; + return 0; } /* * @unimplemented */ -NTSTATUS STDCALL -KeI386AllocateGdtSelectors( - OUT PULONG SelArray, - IN ULONG NumOfSelectors -) +NTSTATUS +NTAPI +KeI386AllocateGdtSelectors(OUT PULONG SelArray, + IN ULONG NumOfSelectors) { - UNIMPLEMENTED; - return 0; -} - -VOID -KeSetBaseGdtSelector(ULONG Entry, - PVOID Base) -{ - KIRQL oldIrql; - PUSHORT Gdt; - - DPRINT("KeSetBaseGdtSelector(Entry %x, Base %x)\n", - Entry, Base); - - KeAcquireSpinLock(&GdtLock, &oldIrql); - - Gdt = KeGetCurrentKPCR()->GDT; - Entry = (Entry & (~0x3)) / 2; - - Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); - - Gdt[Entry + 2] = Gdt[Entry + 2] & ~(0xff); - Gdt[Entry + 2] = (USHORT)(Gdt[Entry + 2] | - ((((ULONG)Base) & 0xff0000) >> 16)); - - Gdt[Entry + 3] = Gdt[Entry + 3] & ~(0xff00); - Gdt[Entry + 3] = (USHORT)(Gdt[Entry + 3] | - ((((ULONG)Base) & 0xff000000) >> 16)); - - DPRINT("%x %x %x %x\n", - Gdt[Entry + 0], - Gdt[Entry + 1], - Gdt[Entry + 2], - Gdt[Entry + 3]); - - KeReleaseSpinLock(&GdtLock, oldIrql); -} - -VOID -KeSetGdtSelector(ULONG Entry, - ULONG Value1, - ULONG Value2) -{ - KIRQL oldIrql; - PULONG Gdt; - - DPRINT("KeSetGdtSelector(Entry %x, Value1 %x, Value2 %x)\n", - Entry, Value1, Value2); - - KeAcquireSpinLock(&GdtLock, &oldIrql); - - Gdt = (PULONG) KeGetCurrentKPCR()->GDT; - Entry = (Entry & (~0x3)) / 4; - - Gdt[Entry] = Value1; - Gdt[Entry + 1] = Value2; - - DPRINT("%x %x\n", - Gdt[Entry + 0], - Gdt[Entry + 1]); - - KeReleaseSpinLock(&GdtLock, oldIrql); + UNIMPLEMENTED; + return 0; } /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sun Sep 3 11:13:02 2006 @@ -26,6 +26,27 @@ /* The TSS to use for Double Fault Traps (INT 0x9) */ UCHAR KiDoubleFaultTSS[KTSS_IO_MAPS]; +/* The Boot GDT (FIXME: should have more entries */ +KGDTENTRY KiBootGdt[12] = +{ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_NULL */ + {0xffff, 0x0000, {{0x00, 0x9a, 0xcf, 0x00}}}, /* KGDT_R0_CODE */ + {0xffff, 0x0000, {{0x00, 0x92, 0xcf, 0x00}}}, /* KGDT_R0_DATA */ + {0xffff, 0x0000, {{0x00, 0xfa, 0xcf, 0x00}}}, /* KGDT_R3_CODE */ + {0xffff, 0x0000, {{0x00, 0xf2, 0xcf, 0x00}}}, /* KGDT_R3_DATA*/ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_TSS */ + {0x0fff, 0x0000, {{0x00, 0x92, 0x00, 0xff}}}, /* KGDT_R0_PCR */ + {0x0fff, 0x0000, {{0x00, 0xf2, 0x00, 0x00}}}, /* KGDT_R3_TEB */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_UNUSED */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_LDT */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* KGDT_DF_TSS */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}} /* KGDT_NMI_TSS */ +}; + +/* GDT Descriptor */ +KDESCRIPTOR KiGdtDescriptor = {sizeof(KiBootGdt), (ULONG)KiBootGdt}; + +/* CPU Features and Flags */ ULONG KeI386CpuType; ULONG KeI386CpuStep; ULONG KeProcessorArchitecture; @@ -42,6 +63,7 @@ ULONG Ke386NoExecute = FALSE; BOOLEAN KiI386PentiumLockErrataPresent; +/* CPU Signatures */ CHAR CmpIntelID[] = "GenuineIntel"; CHAR CmpAmdID[] = "AuthenticAMD"; CHAR CmpCyrixID[] = "CyrixInstead"; @@ -576,7 +598,45 @@ TssEntry->LimitLow = KTSS_IO_MAPS; } -VOID INIT_FUNCTION +/* This is a rather naive implementation of Ke(Save/Restore)FloatingPointState + which will not work for WDM drivers. Please feel free to improve */ +NTSTATUS +NTAPI +KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) +{ + PFNSAVE_FORMAT FpState; + ASSERT_IRQL(DISPATCH_LEVEL); + + /* check if we are doing software emulation */ + if (!KeI386NpxPresent) return STATUS_ILLEGAL_FLOAT_CONTEXT; + + FpState = ExAllocatePool(NonPagedPool, sizeof (FNSAVE_FORMAT)); + if (!FpState) return STATUS_INSUFFICIENT_RESOURCES; + + *((PVOID *) Save) = FpState; + asm volatile("fnsave %0\n\t" : "=m" (*FpState)); + + KeGetCurrentThread()->DispatcherHeader.NpxIrql = KeGetCurrentIrql(); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) +{ + PFNSAVE_FORMAT FpState = *((PVOID *) Save); + + ASSERT(KeGetCurrentThread()->DispatcherHeader.NpxIrql == KeGetCurrentIrql()); + + asm volatile("fnclex\n\t"); + asm volatile("frstor %0\n\t" : "=m" (*FpState)); + + ExFreePool(FpState); + return STATUS_SUCCESS; +} + +VOID +INIT_FUNCTION Ki386SetProcessorFeatures(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -667,7 +727,6 @@ } } - VOID NTAPI KeFlushCurrentTb(VOID) Removed: trunk/reactos/ntoskrnl/ke/i386/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/fpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/fpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/fpu.c (removed) @@ -1,80 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/fpu.c - * PURPOSE: Handles the FPU - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - * Gregor Anich - */ - -/* INCLUDES *****************************************************************/ - -#include <roscfg.h> -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* FUNCTIONS *****************************************************************/ - -/* This is a rather naive implementation of Ke(Save/Restore)FloatingPointState - which will not work for WDM drivers. Please feel free to improve */ - -NTSTATUS STDCALL -KeSaveFloatingPointState(OUT PKFLOATING_SAVE Save) -{ - PFNSAVE_FORMAT FpState; - - ASSERT_IRQL(DISPATCH_LEVEL); - - /* check if we are doing software emulation */ - if (!KeI386NpxPresent) - { - return STATUS_ILLEGAL_FLOAT_CONTEXT; - } - - FpState = ExAllocatePool(NonPagedPool, sizeof (FNSAVE_FORMAT)); - if (NULL == FpState) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - *((PVOID *) Save) = FpState; - -#if defined(__GNUC__) - asm volatile("fnsave %0\n\t" : "=m" (*FpState)); -#elif defined(_MSC_VER) - __asm mov eax, FpState; - __asm fsave [eax]; -#else -#error Unknown compiler for inline assembler -#endif - - KeGetCurrentThread()->DispatcherHeader.NpxIrql = KeGetCurrentIrql(); - - return STATUS_SUCCESS; -} - - -NTSTATUS STDCALL -KeRestoreFloatingPointState(IN PKFLOATING_SAVE Save) -{ - PFNSAVE_FORMAT FpState = *((PVOID *) Save); - - if (KeGetCurrentThread()->DispatcherHeader.NpxIrql != KeGetCurrentIrql()) - { - KEBUGCHECK(UNDEFINED_BUG_CODE); - } - -#if defined(__GNUC__) - asm volatile("fnclex\n\t"); - asm volatile("frstor %0\n\t" : "=m" (*FpState)); -#elif defined(_MSC_VER) - __asm mov eax, FpState; - __asm frstor [eax]; -#else -#error Unknown compiler for inline assembler -#endif - - ExFreePool(FpState); - - return STATUS_SUCCESS; -} Removed: trunk/reactos/ntoskrnl/ke/i386/gdt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/gdt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/gdt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c (removed) @@ -1,140 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/gdt.c - * PURPOSE: GDT managment - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <debug.h> - -/* GLOBALS *******************************************************************/ - -KGDTENTRY KiBootGdt[11] = -{ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* Null */ - {0xffff, 0x0000, {{0x00, 0x9a, 0xcf, 0x00}}}, /* Kernel CS */ - {0xffff, 0x0000, {{0x00, 0x92, 0xcf, 0x00}}}, /* Kernel DS */ - {0xffff, 0x0000, {{0x00, 0xfa, 0xcf, 0x00}}}, /* User CS */ - {0xffff, 0x0000, {{0x00, 0xf2, 0xcf, 0x00}}}, /* User DS */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* TSS */ - {0x0fff, 0x0000, {{0x00, 0x92, 0x00, 0xff}}}, /* PCR */ - {0x0fff, 0x0000, {{0x00, 0xf2, 0x00, 0x00}}}, /* TEB */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* Reserved */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* LDT */ - {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}} /* Trap TSS */ -}; - -KDESCRIPTOR KiGdtDescriptor = {sizeof(KiBootGdt), (ULONG)KiBootGdt}; - -static KSPIN_LOCK GdtLock; - -/* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -NTSTATUS STDCALL -KeI386FlatToGdtSelector( - IN ULONG Base, - IN USHORT Length, - IN USHORT Selector -) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -KeI386ReleaseGdtSelectors( - OUT PULONG SelArray, - IN ULONG NumOfSelectors -) -{ - UNIMPLEMENTED; - return 0; -} - -/* - * @unimplemented - */ -NTSTATUS STDCALL -KeI386AllocateGdtSelectors( - OUT PULONG SelArray, - IN ULONG NumOfSelectors -) -{ - UNIMPLEMENTED; - return 0; -} - -VOID -KeSetBaseGdtSelector(ULONG Entry, - PVOID Base) -{ - KIRQL oldIrql; - PUSHORT Gdt; - - DPRINT("KeSetBaseGdtSelector(Entry %x, Base %x)\n", - Entry, Base); - - KeAcquireSpinLock(&GdtLock, &oldIrql); - - Gdt = KeGetCurrentKPCR()->GDT; - Entry = (Entry & (~0x3)) / 2; - - Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); - - Gdt[Entry + 2] = Gdt[Entry + 2] & ~(0xff); - Gdt[Entry + 2] = (USHORT)(Gdt[Entry + 2] | - ((((ULONG)Base) & 0xff0000) >> 16)); - - Gdt[Entry + 3] = Gdt[Entry + 3] & ~(0xff00); - Gdt[Entry + 3] = (USHORT)(Gdt[Entry + 3] | - ((((ULONG)Base) & 0xff000000) >> 16)); - - DPRINT("%x %x %x %x\n", - Gdt[Entry + 0], - Gdt[Entry + 1], - Gdt[Entry + 2], - Gdt[Entry + 3]); - - KeReleaseSpinLock(&GdtLock, oldIrql); -} - -VOID -KeSetGdtSelector(ULONG Entry, - ULONG Value1, - ULONG Value2) -{ - KIRQL oldIrql; - PULONG Gdt; - - DPRINT("KeSetGdtSelector(Entry %x, Value1 %x, Value2 %x)\n", - Entry, Value1, Value2); - - KeAcquireSpinLock(&GdtLock, &oldIrql); - - Gdt = (PULONG) KeGetCurrentKPCR()->GDT; - Entry = (Entry & (~0x3)) / 4; - - Gdt[Entry] = Value1; - Gdt[Entry + 1] = Value2; - - DPRINT("%x %x\n", - Gdt[Entry + 0], - Gdt[Entry + 1]); - - KeReleaseSpinLock(&GdtLock, oldIrql); -} - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sun Sep 3 11:13:02 2006 @@ -25,11 +25,8 @@ ETHREAD KiInitialThread; EPROCESS KiInitialProcess; -extern LIST_ENTRY KiProcessListHead; extern ULONG Ke386GlobalPagesEnabled; -extern KGDTENTRY KiBootGdt[]; extern PVOID trap_stack, init_stack; -extern KTSS KiBootTss; /* System-defined Spinlocks */ KSPIN_LOCK KiDispatcherLock; @@ -518,9 +515,6 @@ /* Setup the boot (Freeldr should've done), double fault and NMI TSS */ Ki386InitializeTss(); - /* Setup the LDT */ - Ki386InitializeLdt(); - /* Setup CPU-related fields */ Pcr->Number = Cpu; Pcr->SetMember = 1 << Cpu; Modified: trunk/reactos/ntoskrnl/ke/i386/ldt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ldt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ldt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/ldt.c Sun Sep 3 11:13:02 2006 @@ -17,11 +17,69 @@ /* GLOBALS *******************************************************************/ static KSPIN_LOCK LdtLock; +static KSPIN_LOCK GdtLock; /* FUNCTIONS *****************************************************************/ -/* gdt.c */ -extern VOID KeSetGdtSelector(ULONG Entry, ULONG Value1, ULONG Value2); +VOID +KeSetBaseGdtSelector(ULONG Entry, + PVOID Base) +{ + KIRQL oldIrql; + PUSHORT Gdt; + + DPRINT("KeSetBaseGdtSelector(Entry %x, Base %x)\n", + Entry, Base); + + KeAcquireSpinLock(&GdtLock, &oldIrql); + + Gdt = KeGetCurrentKPCR()->GDT; + Entry = (Entry & (~0x3)) / 2; + + Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); + + Gdt[Entry + 2] = Gdt[Entry + 2] & ~(0xff); + Gdt[Entry + 2] = (USHORT)(Gdt[Entry + 2] | + ((((ULONG)Base) & 0xff0000) >> 16)); + + Gdt[Entry + 3] = Gdt[Entry + 3] & ~(0xff00); + Gdt[Entry + 3] = (USHORT)(Gdt[Entry + 3] | + ((((ULONG)Base) & 0xff000000) >> 16)); + + DPRINT("%x %x %x %x\n", + Gdt[Entry + 0], + Gdt[Entry + 1], + Gdt[Entry + 2], + Gdt[Entry + 3]); + + KeReleaseSpinLock(&GdtLock, oldIrql); +} + +VOID +KeSetGdtSelector(ULONG Entry, + ULONG Value1, + ULONG Value2) +{ + KIRQL oldIrql; + PULONG Gdt; + + DPRINT("KeSetGdtSelector(Entry %x, Value1 %x, Value2 %x)\n", + Entry, Value1, Value2); + + KeAcquireSpinLock(&GdtLock, &oldIrql); + + Gdt = (PULONG) KeGetCurrentKPCR()->GDT; + Entry = (Entry & (~0x3)) / 4; + + Gdt[Entry] = Value1; + Gdt[Entry + 1] = Value2; + + DPRINT("%x %x\n", + Gdt[Entry + 0], + Gdt[Entry + 1]); + + KeReleaseSpinLock(&GdtLock, oldIrql); +} BOOL PspIsDescriptorValid(PLDT_ENTRY ldt_entry) { @@ -172,20 +230,3 @@ return STATUS_SUCCESS; } -VOID -Ki386InitializeLdt(VOID) -{ - PUSHORT Gdt = KeGetCurrentKPCR()->GDT; - unsigned int base, length; - - /* - * Set up an a descriptor for the LDT - */ - base = length = 0; - - Gdt[(KGDT_LDT / 2) + 0] = (length & 0xFFFF); - Gdt[(KGDT_LDT / 2) + 1] = (base & 0xFFFF); - Gdt[(KGDT_LDT / 2) + 2] = ((base & 0xFF0000) >> 16) | 0x8200; - Gdt[(KGDT_LDT / 2) + 3] = ((length & 0xF0000) >> 16) | - ((base & 0xFF000000) >> 16); -} Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Sep 3 11:13:02 2006 @@ -27,12 +27,11 @@ <if property="ARCH" value="i386"> <directory name="i386"> <file first="true">main_asm.S</file> + <file>abios.c</file> <file>cpu.c</file> <file>ctxswitch.S</file> <file>clock.S</file> <file>exp.c</file> - <file>fpu.c</file> - <file>gdt.c</file>  <file>kernel.c</file> <file>ldt.c</file>

1 0

[ion] 23894: - Fix KTSS definition. - Add GetSegment inlines (ie: GetSs, GetDs, etc) - Fix up definition of KiBootGdt to use KGDTENTRY instead of USHORT. Also define KiGdtDescriptor using KDESCRIPTOR. - Remove GDT initialization code completely. The GDT is already initialized on boot. - Remove tss.c and add KiInitializeTss(2) to setup a TSS and proper IOPM/Interrupt Direction map settings for V86/VDM. - Copy the TSS code over but prettyify it to use NT/NDK structures instead of ugly USHORT typec
by ion＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: ion Date: Sun Sep 3 10:51:03 2006 New Revision: 23894 URL: http://svn.reactos.org/svn/reactos?rev=23894&view=rev Log: - Fix KTSS definition. - Add GetSegment inlines (ie: GetSs, GetDs, etc) - Fix up definition of KiBootGdt to use KGDTENTRY instead of USHORT. Also define KiGdtDescriptor using KDESCRIPTOR. - Remove GDT initialization code completely. The GDT is already initialized on boot. - Remove tss.c and add KiInitializeTss(2) to setup a TSS and proper IOPM/Interrupt Direction map settings for V86/VDM. - Copy the TSS code over but prettyify it to use NT/NDK structures instead of ugly USHORT typecasts. Removed: trunk/reactos/ntoskrnl/ke/i386/tss.c Modified: trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/gdt.c trunk/reactos/ntoskrnl/ke/i386/kernel.c trunk/reactos/ntoskrnl/ntoskrnl.rbuild Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Sun Sep 3 10:51:03 2006 @@ -647,7 +647,6 @@ UCHAR IoMap[8196]; } KIIO_ACCESS_MAP; -#include <pshpack1.h> typedef struct _KTSS { USHORT Backlink; @@ -658,7 +657,15 @@ ULONG NotUsed1[4]; ULONG CR3; ULONG Eip; - ULONG NotUsed2[9]; + ULONG EFlags; + ULONG Eax; + ULONG Ecx; + ULONG Edx; + ULONG Ebx; + ULONG Esp; + ULONG Ebp; + ULONG Esi; + ULONG Edi; USHORT Es; USHORT Reserved2; USHORT Cs; @@ -678,7 +685,6 @@ KIIO_ACCESS_MAP IoMaps[1]; UCHAR IntDirectionMap[32]; } KTSS, *PKTSS; -#include <poppack.h> // // i386 CPUs don't have exception frames Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Sun Sep 3 10:51:03 2006 @@ -57,7 +57,8 @@ VOID Ki386ApplicationProcessorInitializeTSS(VOID); VOID -Ki386BootInitializeTSS(VOID); +NTAPI +Ki386InitializeTss(VOID); VOID KiGdtPrepareForApplicationProcessorInit(ULONG Id); VOID @@ -151,6 +152,12 @@ #define Ke386SaveFlags(x) __asm__ __volatile__("pushfl ; popl %0":"=g" (x): /* no input */) #define Ke386RestoreFlags(x) __asm__ __volatile__("pushl %0 ; popfl": /* no output */ :"g" (x):"memory") +#define _Ke386GetSeg(N) ({ \ + unsigned int __d; \ + __asm__("movl %%" #N ",%0\n\t" :"=r" (__d)); \ + __d; \ + }) + #define _Ke386GetCr(N) ({ \ unsigned int __d; \ __asm__("movl %%cr" #N ",%0\n\t" :"=r" (__d)); \ @@ -164,6 +171,7 @@ #define Ke386SetCr2(X) _Ke386SetCr(2,X) #define Ke386GetCr4() _Ke386GetCr(4) #define Ke386SetCr4(X) _Ke386SetCr(4,X) +#define Ke386GetSs() _Ke386GetSeg(ss) static inline LONG Ke386TestAndClearBit(ULONG BitPos, volatile PULONG Addr) { Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Sun Sep 3 10:51:03 2006 @@ -95,6 +95,7 @@ extern ULONG KeI386EFlagsOrMaskV86; extern BOOLEAN KeI386VirtualIntExtensions; extern KIDTENTRY KiIdt[]; +extern KGDTENTRY KiBootGdt[]; extern FAST_MUTEX KernelAddressSpaceLock; extern ULONG KiMaximumDpcQueueDepth; extern ULONG KiMinimumDpcRate; @@ -116,6 +117,8 @@ extern PKPRCB KiProcessorBlock[]; extern ULONG KiMask32Array[MAXIMUM_PRIORITY]; extern ULONG IdleProcessorMask; +extern ULONG trap_stack_top; +extern VOID KiTrap8(VOID); /* MACROS *************************************************************************/ @@ -184,7 +187,13 @@ /* One of the Reserved Wait Blocks, this one is for the Thread's Timer */ #define TIMER_WAIT_BLOCK 0x3L +/* IOPM Definitions */ +#define IO_ACCESS_MAP_NONE 0 #define IOPM_OFFSET FIELD_OFFSET(KTSS, IoMaps[0].IoMap) +#define KiComputeIopmOffset(MapNumber) \ + (MapNumber == IO_ACCESS_MAP_NONE) ? \ + (USHORT)(sizeof(KTSS)) : \ + (USHORT)(FIELD_OFFSET(KTSS, IoMaps[MapNumber-1].IoMap)) #define SIZE_OF_FX_REGISTERS 32 Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sun Sep 3 10:51:03 2006 @@ -19,6 +19,12 @@ #define EFLAGS_ID 0x200000 /* GLOBALS *******************************************************************/ + +/* The Boot TSS */ +KTSS KiBootTss; + +/* The TSS to use for Double Fault Traps (INT 0x9) */ +UCHAR KiDoubleFaultTSS[KTSS_IO_MAPS]; ULONG KeI386CpuType; ULONG KeI386CpuStep; @@ -457,6 +463,117 @@ /* Set new Cr0 */ Ke386SetCr0(Cr0); +} + +VOID +NTAPI +KiInitializeTSS2(IN PKTSS Tss, + IN PKGDTENTRY TssEntry OPTIONAL) +{ + PUCHAR p; + + /* Make sure the GDT Entry is valid */ + if (TssEntry) + { + /* Set the Limit */ + TssEntry->LimitLow = sizeof(KTSS) - 1; + TssEntry->HighWord.Bits.LimitHi &= 0xF0; + } + + /* Now clear the I/O Map */ + RtlFillMemory(Tss->IoMaps[0].IoMap, 8096, -1); + + /* Initialize Interrupt Direction Maps */ + p = (PUCHAR)(Tss->IoMaps[0].DirectionMap); + RtlZeroMemory(p, 32); + + /* Add DPMI support for interrupts */ + p[0] = 4; + p[3] = 0x18; + p[4] = 0x18; + + /* Initialize the default Interrupt Direction Map */ + p = Tss->IntDirectionMap; + RtlZeroMemory(Tss->IntDirectionMap, 32); + + /* Add DPMI support */ + p[0] = 4; + p[3] = 0x18; + p[4] = 0x18; +} + +VOID +NTAPI +KiInitializeTSS(IN PKTSS Tss) +{ + /* Set an invalid map base */ + Tss->IoMapBase = KiComputeIopmOffset(IO_ACCESS_MAP_NONE); + + /* Disable traps during Task Switches */ + Tss->Flags = 0; + + /* Set LDT and Ring 0 SS */ + Tss->LDT = 0; + Tss->Ss0 = KGDT_R0_DATA; +} + +VOID +NTAPI +Ki386InitializeTss(VOID) +{ + PKTSS Tss; + PKGDTENTRY TssEntry; + PKIDTENTRY TaskGateEntry; + PKIDT_ACCESS TaskGateAccess; + + /* Initialize the boot TSS. */ + Tss = &KiBootTss; + TssEntry = &KiBootGdt[KGDT_TSS / sizeof(KGDTENTRY)]; + KiInitializeTSS2(Tss, TssEntry); + KiInitializeTSS(Tss); + + /* Initialize a descriptor for the TSS */ + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); + + /* Load the task register */ + __asm__("ltr %%ax":: "a" (KGDT_TSS)); + + /* Setup the Task Gate for Double Fault Traps */ + TaskGateEntry = &KiIdt[8]; + TaskGateAccess = (PKIDT_ACCESS)&TaskGateEntry->Access; +#if 0 + TaskGateAccess->SegmentType = I386_TASK_GATE; + TaskGateAccess->Present = 1; + TaskGateAccess->Dpl = 0; + TaskGateEntry->Selector = KGDT_DF_TSS; +#endif + + /* Initialize the TSS used for handling double faults. */ + Tss = (PKTSS)KiDoubleFaultTSS; + KiInitializeTSS(Tss); + Tss->CR3 = _Ke386GetCr(3); + Tss->Esp0 = trap_stack_top; + Tss->Eip = PtrToUlong(KiTrap8); + Tss->Cs = KGDT_R0_CODE; + Tss->Fs = KGDT_R0_PCR; + Tss->Ss = Ke386GetSs(); + Tss->Es = KGDT_R3_DATA | RPL_MASK; + Tss->Ds = KGDT_R3_DATA | RPL_MASK; + + /* Setup the Double Trap TSS entry in the GDT */ + TssEntry = &KiBootGdt[KGDT_DF_TSS / sizeof(KGDTENTRY)]; + TssEntry->HighWord.Bits.Type = I386_TSS; + TssEntry->HighWord.Bits.Pres = 1; + TssEntry->HighWord.Bits.Dpl = 0; + TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); + TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); + TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); + TssEntry->LimitLow = KTSS_IO_MAPS; } VOID INIT_FUNCTION Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/gdt.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/gdt.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c Sun Sep 3 10:51:03 2006 @@ -12,134 +12,30 @@ #include <ntoskrnl.h> #define NDEBUG -#include <internal/debug.h> +#include <debug.h> /* GLOBALS *******************************************************************/ -PUSHORT KiGdtArray[MAXIMUM_PROCESSORS]; - -USHORT KiBootGdt[11 * 4] = +KGDTENTRY KiBootGdt[11] = { - 0x0, 0x0, 0x0, 0x0, /* Null */ - 0xffff, 0x0, 0x9a00, 0xcf, /* Kernel CS */ - 0xffff, 0x0, 0x9200, 0xcf, /* Kernel DS */ - 0xffff, 0x0, 0xfa00, 0xcf, /* User CS */ - 0xffff, 0x0, 0xf200, 0xcf, /* User DS */ - 0x0, 0x0, 0x0, 0x0, /* TSS */ - 0x0fff, 0x0000, 0x9200, 0xff00, /* PCR */ - 0x0fff, 0x0, 0xf200, 0x0, /* TEB */ - 0x0, 0x0, 0x0, 0x0, /* Reserved */ - 0x0, 0x0, 0x0, 0x0, /* LDT */ - 0x0, 0x0, 0x0, 0x0 /* Trap TSS */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* Null */ + {0xffff, 0x0000, {{0x00, 0x9a, 0xcf, 0x00}}}, /* Kernel CS */ + {0xffff, 0x0000, {{0x00, 0x92, 0xcf, 0x00}}}, /* Kernel DS */ + {0xffff, 0x0000, {{0x00, 0xfa, 0xcf, 0x00}}}, /* User CS */ + {0xffff, 0x0000, {{0x00, 0xf2, 0xcf, 0x00}}}, /* User DS */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* TSS */ + {0x0fff, 0x0000, {{0x00, 0x92, 0x00, 0xff}}}, /* PCR */ + {0x0fff, 0x0000, {{0x00, 0xf2, 0x00, 0x00}}}, /* TEB */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* Reserved */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}}, /* LDT */ + {0x0000, 0x0000, {{0x00, 0x00, 0x00, 0x00}}} /* Trap TSS */ }; - -#include <pshpack1.h> - -struct LocalGdtDescriptor_t -{ - USHORT Length; - ULONG Base; -} KiGdtDescriptor = { 11 * 8, (ULONG)KiBootGdt }; - -#include <poppack.h> - +KDESCRIPTOR KiGdtDescriptor = {sizeof(KiBootGdt), (ULONG)KiBootGdt}; static KSPIN_LOCK GdtLock; /* FUNCTIONS *****************************************************************/ - -VOID -KiInitializeGdt(PKPCR Pcr) -{ - PUSHORT Gdt; - struct LocalGdtDescriptor_t Descriptor; - ULONG Entry; - ULONG Base; - - if (Pcr == NULL) - { - KiGdtArray[0] = KiBootGdt; - return; - } - - /* - * Allocate a GDT - */ - Gdt = KiGdtArray[Pcr->Number]; - if (Gdt == NULL) - { - DbgPrint("No GDT (%d)\n", Pcr->Number); - KEBUGCHECK(0); - } - - /* - * Copy the boot processor's GDT onto this processor's GDT. Note that - * the only entries that can change are the PCR, TEB and LDT descriptors. - * We will be initializing these later so their current values are - * irrelevant. - */ - memcpy(Gdt, KiBootGdt, sizeof(USHORT) * 4 * 11); - Pcr->GDT = Gdt; - - /* - * Set the base address of the PCR - */ - Base = (ULONG)Pcr; - Entry = KGDT_R0_PCR / 2; - Gdt[Entry + 1] = (USHORT)(((ULONG)Base) & 0xffff); - - Gdt[Entry + 2] = Gdt[Entry + 2] & ~(0xff); - Gdt[Entry + 2] = (USHORT)(Gdt[Entry + 2] | ((((ULONG)Base) & 0xff0000) >> 16)); - - Gdt[Entry + 3] = Gdt[Entry + 3] & ~(0xff00); - Gdt[Entry + 3] = (USHORT)(Gdt[Entry + 3] | ((((ULONG)Base) & 0xff000000) >> 16)); - - /* - * Load the GDT - */ - Descriptor.Length = 8 * 11; - Descriptor.Base = (ULONG)Gdt; -#if defined(__GNUC__) - __asm__ ("lgdt %0\n\t" : /* no output */ : "m" (Descriptor)); - - /* - * Reload the selectors - */ - __asm__ ("movl %0, %%ds\n\t" - "movl %0, %%es\n\t" - "movl %1, %%fs\n\t" - "xor %%ax, %%ax\n\t" - "movw %%ax, %%gs\n\t" - : /* no output */ - : "a" (KGDT_R3_DATA | RPL_MASK), "d" (KGDT_R0_PCR)); - __asm__ ("pushl %0\n\t" - "pushl $.l4\n\t" - "lret\n\t" - ".l4:\n\t" - : /* no output */ - : "a" (KGDT_R0_CODE)); -#elif defined(_MSC_VER) - __asm - { - lgdt Descriptor; - mov ax, KGDT_R3_DATA | RPL_MASK; - mov dx, KGDT_R0_PCR; - mov ds, ax; - mov es, ax; - mov fs, dx; - xor ax, ax - mov gs, ax; - push KGDT_R0_CODE; - push offset l4 ; - retf -l4: - } -#else -#error Unknown compiler for inline assembler -#endif -} - /* * @unimplemented Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kernel.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kernel.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c Sun Sep 3 10:51:03 2006 @@ -515,13 +515,10 @@ Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr6 = 0; Pcr->PrcbData.ProcessorState.SpecialRegisters.KernelDr7 = 0; - /* - * Low-level GDT, TSS and LDT Setup, most of which Freeldr should have done - * instead, and we should only add some extra information. This would be - * required for future NTLDR compatibility. - */ - KiInitializeGdt(NULL); - Ki386BootInitializeTSS(); + /* Setup the boot (Freeldr should've done), double fault and NMI TSS */ + Ki386InitializeTss(); + + /* Setup the LDT */ Ki386InitializeLdt(); /* Setup CPU-related fields */ Removed: trunk/reactos/ntoskrnl/ke/i386/tss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/tss.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/tss.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/tss.c (removed) @@ -1,119 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ke/i386/tss.c - * PURPOSE: TSS managment - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, Ki386BootInitializeTSS) -#endif - -/* GLOBALS *******************************************************************/ - -typedef struct _KTSSNOIOPM -{ - UCHAR TssData[KTSS_IO_MAPS]; -} KTSSNOIOPM; - -static KTSS* Ki386TssArray[MAXIMUM_PROCESSORS]; -PVOID Ki386InitialStackArray[MAXIMUM_PROCESSORS]; -static KTSSNOIOPM* Ki386TrapTssArray[MAXIMUM_PROCESSORS]; -static PVOID Ki386TrapStackArray[MAXIMUM_PROCESSORS]; - -KTSS KiBootTss; -static KTSSNOIOPM KiBootTrapTss; - -extern USHORT KiBootGdt[]; -extern ULONG init_stack; -extern ULONG init_stack_top; -extern VOID KiTrap8(VOID); - -/* FUNCTIONS *****************************************************************/ - -VOID INIT_FUNCTION -Ki386BootInitializeTSS(VOID) -{ - ULONG cr3_; - extern unsigned int trap_stack, trap_stack_top; - unsigned int base, length; - PKTSS Tss; - - Ke386GetPageTableDirectory(cr3_); - - Ki386TssArray[0] = &KiBootTss; - Ki386TrapTssArray[0] = &KiBootTrapTss; - Ki386TrapStackArray[0] = (PVOID)trap_stack; - Ki386InitialStackArray[0] = (PVOID)init_stack; - - /* Initialize the boot TSS. */ - KiBootTss.Esp0 = (ULONG)init_stack_top - sizeof(FX_SAVE_AREA); - KiBootTss.Ss0 = KGDT_R0_DATA; - KiBootTss.IoMapBase = 0xFFFF; /* No i/o bitmap */ - KiBootTss.LDT = KGDT_LDT; - - /* - * Initialize a descriptor for the TSS - */ - base = (unsigned int)&KiBootTss; - length = sizeof(KiBootTss) - 1; - - KiBootGdt[(KGDT_TSS / 2) + 0] = (length & 0xFFFF); - KiBootGdt[(KGDT_TSS / 2) + 1] = (base & 0xFFFF); - KiBootGdt[(KGDT_TSS / 2) + 2] = ((base & 0xFF0000) >> 16) | 0x8900; - KiBootGdt[(KGDT_TSS / 2) + 3] = ((length & 0xF0000) >> 16) | - ((base & 0xFF000000) >> 16); - - /* Initialize the TSS used for handling double faults. */ - Tss = (PKTSS)&KiBootTrapTss; - Tss->Flags = 0; - Tss->Esp0 = (ULONG)trap_stack_top; /* FIXME: - sizeof(FX_SAVE_AREA)? */ - Tss->Ss0 = KGDT_R0_DATA; - Tss->Cs = KGDT_R0_CODE; - Tss->Eip = (ULONG)KiTrap8; - Tss->Ds = KGDT_R0_DATA; - Tss->Es = KGDT_R0_DATA; - Tss->Fs = KGDT_R0_PCR; - Tss->IoMapBase = 0xFFFF; /* No i/o bitmap */ - Tss->LDT = 0x0; - - /* - * Initialize a descriptor for the trap TSS. - */ - base = (unsigned int)&KiBootTrapTss; - length = sizeof(KiBootTrapTss) - 1; - - KiBootGdt[(KGDT_DF_TSS / 2) + 0] = (length & 0xFFFF); - KiBootGdt[(KGDT_DF_TSS / 2) + 1] = (base & 0xFFFF); - KiBootGdt[(KGDT_DF_TSS / 2) + 2] = ((base & 0xFF0000) >> 16) | 0x8900; - KiBootGdt[(KGDT_DF_TSS / 2) + 3] = ((length & 0xF0000) >> 16) | - ((base & 0xFF000000) >> 16); - - /* - * Load the task register - */ -#if defined(__GNUC__) - __asm__("ltr %%ax" - : /* no output */ - : "a" (KGDT_TSS)); -#elif defined(_MSC_VER) - __asm mov ax, KGDT_TSS - __asm ltr ax -#else -#error Unknown compiler for inline assembler -#endif -} - - - - - Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Sun Sep 3 10:51:03 2006 @@ -38,7 +38,6 @@ <file>ldt.c</file> <file>thread.c</file> <file>trap.s</file> - <file>tss.c</file> <file>usercall_asm.S</file> <file>v86vdm.c</file> <file>v86m_sup.S</file>

1 0

[arty] 23893: Fixed, separated mmu related functions. We now get correct translations in every case. fat.c: workaround for now. Need to figure out why the fs is b0rked.
by arty＠svn.reactos.org 03 Sep '06

03 Sep '06

Author: arty Date: Sun Sep 3 07:37:20 2006 New Revision: 23893 URL: http://svn.reactos.org/svn/reactos?rev=23893&view=rev Log: Fixed, separated mmu related functions. We now get correct translations in every case. fat.c: workaround for now. Need to figure out why the fs is b0rked. Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s Sun Sep 3 07:37:20 2006 @@ -27,6 +27,19 @@ bl ofw_print_eol /* Claim enough bytes to place freeldr at 0x8000 */ + lis %r3,0x8000@ha + li %r3,0x8000@l + + lis %r4,_binary_freeldr_tmp_end@ha + addi %r4,%r4,_binary_freeldr_tmp_end@l + lis %r5,_binary_freeldr_tmp_start@ha + addi %r5,%r5,_binary_freeldr_tmp_start@l + sub %r4,%r4,%r5 + li %r5,0x1000 + + bl ofw_claim + + /* Now copy freeldr */ lis %r3,0x8000@ha addi %r3,%r3,0x8000@l Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Sun Sep 3 07:37:20 2006 @@ -19,6 +19,7 @@ #include "freeldr.h" #include "machine.h" #include "of.h" +#include "mmu.h" #define TOTAL_HEAP_NEEDED (16 * 1024 * 1024) /* 16 megs */ @@ -223,10 +224,6 @@ BiosMemoryMap[num_mem].Length = TOTAL_HEAP_NEEDED; ofw_claim(BiosMemoryMap[num_mem].BaseAddress, BiosMemoryMap[num_mem].Length, 0x1000); /* claim it */ - printf("virt2phys(%x)->%x\n", - BiosMemoryMap[num_mem].BaseAddress, - ofw_virt2phys - (mmuhandle, BiosMemoryMap[num_mem].BaseAddress)); total += BiosMemoryMap[0].Length; num_mem++; } @@ -378,197 +375,8 @@ typedef unsigned int uint32_t; -int GetMSR() { - register int res asm ("r3"); - __asm__("mfmsr 3"); - return res; -} - -int GetPhys( int addr ) { - register int res asm ("r3"); - __asm__("mfmsr 5\n\t" - "mr 4,5\n\t" - "xor 1,1,1\n\t" - "addi 1,1,-1\n\t" - "xori 1,1,0x10\n\t" - "and 5,1,5\n\t" - "mtmsr 5\n\t" - "lwz 3,0(3)\n\t" - "mtmsr 4"); - return res; -} - -int GetSR(int n) { - register int res asm ("r3"); - switch( n ) { - case 0: - __asm__("mfsr 3,0"); - break; - case 1: - __asm__("mfsr 3,1"); - break; - case 2: - __asm__("mfsr 3,2"); - break; - case 3: - __asm__("mfsr 3,3"); - break; - case 4: - __asm__("mfsr 3,4"); - break; - case 5: - __asm__("mfsr 3,5"); - break; - case 6: - __asm__("mfsr 3,6"); - break; - case 7: - __asm__("mfsr 3,7"); - break; - case 8: - __asm__("mfsr 3,8"); - break; - case 9: - __asm__("mfsr 3,9"); - break; - case 10: - __asm__("mfsr 3,10"); - break; - case 11: - __asm__("mfsr 3,11"); - break; - case 12: - __asm__("mfsr 3,12"); - break; - case 13: - __asm__("mfsr 3,13"); - break; - case 14: - __asm__("mfsr 3,14"); - break; - case 15: - __asm__("mfsr 3,15"); - break; - } - return res; -} - -void GetBat( int bat, int inst, int *batHi, int *batLo ) { - register int bh asm("r3"), bl asm("r4"); - if( inst ) { - switch( bat ) { - case 0: - __asm__("mfibatu 3,0"); - __asm__("mfibatl 4,0"); - break; - case 1: - __asm__("mfibatu 3,1"); - __asm__("mfibatl 4,1"); - break; - case 2: - __asm__("mfibatu 3,2"); - __asm__("mfibatl 4,2"); - break; - case 3: - __asm__("mfibatu 3,3"); - __asm__("mfibatl 4,3"); - break; - } - } else { - switch( bat ) { - case 0: - __asm__("mfdbatu 3,0"); - __asm__("mfdbatl 4,0"); - break; - case 1: - __asm__("mfdbatu 3,1"); - __asm__("mfdbatl 4,1"); - break; - case 2: - __asm__("mfdbatu 3,2"); - __asm__("mfdbatl 4,2"); - break; - case 3: - __asm__("mfdbatu 3,3"); - __asm__("mfdbatl 4,3"); - break; - } - } - *batHi = bh; - *batLo = bl; -} - -int GetSDR1() { - register int res asm("r3"); - __asm__("mfsdr1 3"); - return res; -} - -int BatHit( int bath, int batl, int virt ) { - return (virt & 0xfffc0000) == (bath & 0xfffc0000); -} - -int BatTranslate( int bath, int batl, int virt ) { - return (virt & 0x3ffff) | (batl & 0xfffc0000); -} - -/* translate address */ -int virt2phys( int virt, int inst ) { - int msr = GetMSR(); - int txmask = inst ? 0x20 : 0x10; - if( msr & txmask ) { - int i, bath, batl, sr, sdr1, physbase, vahi, valo; - int npteg, hash, ptegaddr, hashmask, ptehi, ptelo; - int vsid, pteh; - for( i = 0; i < 4; i++ ) { - GetBat( i, inst, &bath, &batl ); - if( BatHit( bath, batl, virt ) ) { - return BatTranslate( bath, batl, virt ); - } - } - - sr = GetSR( virt >> 28 ); - vsid = sr & 0xfffffff; - valo = (vsid << 28) | (virt & 0xfffffff); - if( sr & 0x80000000 ) - return valo; - - sdr1 = GetSDR1(); - - physbase = sdr1 & ~0xffff; - vahi = vsid >> 4; - npteg = ((sdr1 & 0x1ff) << 10); - hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); - - hashmask = ((sdr1 & 0xffff) << 12) | 0x3ff; - - for( pteh = 0; pteh < 0xff; pteh += 64, hash ^= ~0 ) { - ptegaddr = ((hashmask & hash) * 64) + physbase; - - for( i = 0; i < 8; i++ ) { - int ptevsid, pteapi; - - ptehi = GetPhys( ptegaddr + (i * 8) ); - ptelo = GetPhys( ptegaddr + (i * 8) + 4 ); - ptevsid = (ptehi >> 8) & 0x7fffff; - pteapi = ptehi & 0x3f; - - //printf("pte[%d] @ %x = %x:%x\n", - //i, ptegaddr + (i * 8), ptehi, ptelo); - - if( (ptehi & 64) != pteh ) continue; - if( ptevsid != (vsid & 0x7fffff) ) continue; - if( pteapi != ((virt >> 22) & 0x3f) ) continue; - - return (ptelo & 0xfffff000) | (virt & 0xfff); - } - } - return -1; - } else return virt; -} - void PpcInit( of_proxy the_ofproxy ) { - int i, len, stdin_handle_chosen, bathi, batlo; + int len, stdin_handle_chosen; ofproxy = the_ofproxy; ofw_print_string("Freeldr PowerPC Init\n"); @@ -595,25 +403,8 @@ MachVtbl.ConsGetCh = PpcConsGetCh; printf( "stdin_handle is %x\n", stdin_handle ); - /* List MMU Status */ - printf("MSR %x\n", GetMSR()); - - for( i = 0; i < 16; i++ ) { - printf("SR%d %x\n", i, GetSR(i)); - } - - for( i = 0; i < 4; i++ ) { - GetBat( i, 0, &bathi, &batlo ); - printf("DBAT%d %x:%x\n", i, bathi, batlo); - } - - for( i = 0; i < 4; i++ ) { - GetBat( i, 1, &bathi, &batlo ); - printf("IBAT%d %x:%x\n", i, bathi, batlo); - } - - printf("virt2phys (0x8000,I) -> %x\n", virt2phys(0x8000,1)); - printf("virt2phys (0xe00000,D) -> %x\n", virt2phys(0x60000000,0)); + printf("virt2phys (0xe00000,D) -> %x\n", PpcVirt2phys(0xe00000,0)); + printf("virt2phys (0xe01000,D) -> %x\n", PpcVirt2phys(0xe01000,0)); MachVtbl.VideoClearScreen = PpcVideoClearScreen; MachVtbl.VideoSetDisplayMode = PpcVideoSetDisplayMode; Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c Sun Sep 3 07:37:20 2006 @@ -19,8 +19,8 @@ */ #include <freeldr.h> - #include <of_call.h> +#include "mmu.h" #define NDEBUG #include <debug.h> @@ -37,7 +37,7 @@ /* Converts a Relative Address read from the Kernel into a Physical Address */ ULONG RaToPa(ULONG p) { - return ofw_virt2phys((ULONG)(p + KernelMemory), 1); + return PpcVirt2phys((ULONG)(KernelMemory) + p, 0); } /* Converts a Phsyical Address Pointer into a Page Frame Number */ @@ -284,23 +284,24 @@ KernelBase = NtHeader->OptionalHeader.ImageBase; FrLdrGetKernelBase(); - printf("About to do RaToPa(%x)\n", - NtHeader->OptionalHeader.AddressOfEntryPoint); + /* Save the Image Size */ + ImageSize = NtHeader->OptionalHeader.SizeOfImage; + + /* Free the Header */ + MmFreeMemory(ImageHeader); + + /* Set the file pointer to zero */ + FsSetFilePointer(KernelImage, 0); + + /* Allocate kernel memory */ + KernelMemory = MmAllocateMemory(ImageSize); + /* Save Entrypoint */ KernelEntry = RaToPa(NtHeader->OptionalHeader.AddressOfEntryPoint); - printf("RaToPa -> %x\n", KernelEntry); - - /* Save the Image Size */ - ImageSize = NtHeader->OptionalHeader.SizeOfImage; - - /* Free the Header */ - MmFreeMemory(ImageHeader); - - /* Set the file pointer to zero */ - FsSetFilePointer(KernelImage, 0); - - /* Allocate kernel memory */ - KernelMemory = MmAllocateMemory(ImageSize); + printf("RaToPa(%x + %x) -> %x\n", + KernelMemory, + NtHeader->OptionalHeader.AddressOfEntryPoint, + KernelEntry); /* Load the file image */ FsReadFile(KernelImage, ImageSize, NULL, KernelMemory); Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c Sun Sep 3 07:37:20 2006 @@ -1,0 +1,193 @@ +#include <freeldr.h> +#include "mmu.h" + +inline int GetMSR() { + register int res asm ("r3"); + __asm__("mfmsr 3"); + return res; +} + +__asm__("\t.globl GetPhys\n" + "GetPhys:\t\n" + "mflr 0\n\t" + "stwu 0,-16(1)\n\t" + "mfmsr 5\n\t" + "xori 3,3,4\n\t" /* Undo effects of LE without swapping */ + "andi. 6,5,0xffef\n\t"/* turn off MSR[DR] */ + "mtmsr 6\n\t" + "lwz 3,0(3)\n\t" /* Get actual value at phys addr r3 */ + "mtmsr 5\n\t" + "lwz 0,0(1)\n\t" + "addi 1,1,16\n\t" + "mtlr 0\n\t" + "blr" + ); + +inline int GetSR(int n) { + register int res asm ("r3"); + switch( n ) { + case 0: + __asm__("mfsr 3,0"); + break; + case 1: + __asm__("mfsr 3,1"); + break; + case 2: + __asm__("mfsr 3,2"); + break; + case 3: + __asm__("mfsr 3,3"); + break; + case 4: + __asm__("mfsr 3,4"); + break; + case 5: + __asm__("mfsr 3,5"); + break; + case 6: + __asm__("mfsr 3,6"); + break; + case 7: + __asm__("mfsr 3,7"); + break; + case 8: + __asm__("mfsr 3,8"); + break; + case 9: + __asm__("mfsr 3,9"); + break; + case 10: + __asm__("mfsr 3,10"); + break; + case 11: + __asm__("mfsr 3,11"); + break; + case 12: + __asm__("mfsr 3,12"); + break; + case 13: + __asm__("mfsr 3,13"); + break; + case 14: + __asm__("mfsr 3,14"); + break; + case 15: + __asm__("mfsr 3,15"); + break; + } + return res; +} + +inline void GetBat( int bat, int inst, int *batHi, int *batLo ) { + register int bh asm("r3"), bl asm("r4"); + if( inst ) { + switch( bat ) { + case 0: + __asm__("mfibatu 3,0"); + __asm__("mfibatl 4,0"); + break; + case 1: + __asm__("mfibatu 3,1"); + __asm__("mfibatl 4,1"); + break; + case 2: + __asm__("mfibatu 3,2"); + __asm__("mfibatl 4,2"); + break; + case 3: + __asm__("mfibatu 3,3"); + __asm__("mfibatl 4,3"); + break; + } + } else { + switch( bat ) { + case 0: + __asm__("mfdbatu 3,0"); + __asm__("mfdbatl 4,0"); + break; + case 1: + __asm__("mfdbatu 3,1"); + __asm__("mfdbatl 4,1"); + break; + case 2: + __asm__("mfdbatu 3,2"); + __asm__("mfdbatl 4,2"); + break; + case 3: + __asm__("mfdbatu 3,3"); + __asm__("mfdbatl 4,3"); + break; + } + } + *batHi = bh; + *batLo = bl; +} + +inline int GetSDR1() { + register int res asm("r3"); + __asm__("mfsdr1 3"); + return res; +} + +inline int BatHit( int bath, int batl, int virt ) { + int mask = 0xfffe0000 & ~((batl & 0x3f) << 17); + return (batl & 0x40) && ((virt & mask) == (bath & mask)); +} + +inline int BatTranslate( int bath, int batl, int virt ) { + return (virt & 0x007fffff) | (batl & 0xfffe0000); +} + +/* translate address */ +int PpcVirt2phys( int virt, int inst ) { + int msr = GetMSR(); + int txmask = inst ? 0x20 : 0x10; + int i, bath, batl, sr, sdr1, physbase, vahi, valo; + int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; + int vsid, pteh, ptevsid, pteapi; + + if( msr & txmask ) { + sr = GetSR( virt >> 28 ); + vsid = sr & 0xfffffff; + vahi = vsid >> 4; + valo = (vsid << 28) | (virt & 0xfffffff); + if( sr & 0x80000000 ) { + return valo; + } + + for( i = 0; i < 4; i++ ) { + GetBat( i, inst, &bath, &batl ); + if( BatHit( bath, batl, virt ) ) { + return BatTranslate( bath, batl, virt ); + } + } + + sdr1 = GetSDR1(); + + physbase = sdr1 & ~0xffff; + hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; + hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); + npteg = hashmask + 1; + + for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) { + ptegaddr = ((hashmask & hash) * 64) + physbase; + + for( i = 0; i < 8; i++ ) { + ptehi = GetPhys( ptegaddr + (i * 8) ); + ptelo = GetPhys( ptegaddr + (i * 8) + 4 ); + + ptevsid = (ptehi >> 7) & 0xffffff; + pteapi = ptehi & 0x3f; + + if( (ptehi & 64) != pteh ) continue; + if( ptevsid != (vsid & 0xffffff) ) continue; + if( pteapi != ((virt >> 22) & 0x3f) ) continue; + + return (ptelo & 0xfffff000) | (virt & 0xfff); + } + } + return -1; + } else { + return virt; + } +} Added: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h (added) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.h Sun Sep 3 07:37:20 2006 @@ -1,0 +1,14 @@ +#ifndef FREELDR_MMU_H +#define FREELDR_MMU_H + +int GetMSR(); +int GetPhys( int addr ); +int GetSR(int n); +void GetBat( int bat, int inst, int *batHi, int *batLo ); +int GetSDR1(); +int BatHit( int bath, int batl, int virt ); +int BatTranslate( int bath, int batl, int virt ); +/* translate address */ +int PpcVirt2phys( int virt, int inst ); + +#endif/*FREELDR_MMU_H*/ Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Sun Sep 3 07:37:20 2006 @@ -66,6 +66,7 @@ <compilerflag>-meabi</compilerflag> <file>boot.s</file> <file>ofw.c</file> + <file>mmu.c</file> <file>mach.c</file> <file>mboot.c</file> </module> Modified: branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/fs/fat.c Sun Sep 3 07:37:20 2006 @@ -431,7 +431,11 @@ // if (DirEntry->FileName[0] == '\0') { - return FALSE; + /* A workaround for something I see ... there are + * zero entries in the middle of the dir. This is + * probably a bug in the way the fat fs was made. + */ + continue; //return FALSE; } // Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Sun Sep 3 07:37:20 2006 @@ -1,7 +1,7 @@ #!/bin/sh -v export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin -ld -EL -g -nostartfiles -nostdlib -N -Ttext=0x8000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a +ld -EL -g -nostartfiles -nostdlib -N -Ttext=0x8000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mmu.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a objcopy -O binary freeldr.elf freeldr.tmp.le output-ppc/tools/ppc-le2be freeldr.tmp.le freeldr.tmp objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload

1 0

[greatlrd] 23892: Fixed some more wine test for NtGdiGetDIBits FIxed so we can now create BITMAPCOREHEADER bitmap (Bugs in NtGdiGetDIBits did stop create of it)
by greatlrd＠svn.reactos.org 02 Sep '06

02 Sep '06

Author: greatlrd Date: Sun Sep 3 03:58:53 2006 New Revision: 23892 URL: http://svn.reactos.org/svn/reactos?rev=23892&view=rev Log: Fixed some more wine test for NtGdiGetDIBits FIxed so we can now create BITMAPCOREHEADER bitmap (Bugs in NtGdiGetDIBits did stop create of it) Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sun Sep 3 03:58:53 2006 @@ -401,10 +401,14 @@ { BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; - coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; coreheader->bcPlanes = 1; coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); - Result = BitmapObj->SurfObj.sizlBitmap.cy; + + coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + if (BitmapObj->SurfObj.lDelta > 0) + coreheader->bcHeight = -coreheader->bcHeight; + + Result = BitmapObj->SurfObj.sizlBitmap.cy; } if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) @@ -457,12 +461,28 @@ ScanLines = min(ScanLines, BitmapObj->SurfObj.sizlBitmap.cy - StartScan); DestSize.cx = BitmapObj->SurfObj.sizlBitmap.cx; DestSize.cy = ScanLines; - DestBitmap = EngCreateBitmap( - DestSize, DIB_GetDIBWidthBytes(DestSize.cx, - Info->bmiHeader.biBitCount), - BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), - 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, - Bits); + + DestBitmap = NULL; + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { + DestBitmap = EngCreateBitmap( DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, Info->bmiHeader.biBitCount), + BitmapFormat(Info->bmiHeader.biBitCount, Info->bmiHeader.biCompression), + 0 < Info->bmiHeader.biHeight ? 0 : BMF_TOPDOWN, + Bits); + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + + DestBitmap = EngCreateBitmap( DestSize, + DIB_GetDIBWidthBytes(DestSize.cx, coreheader->bcBitCount), + BitmapFormat(coreheader->bcBitCount, BI_RGB), + 0 < coreheader->bcHeight ? 0 : BMF_TOPDOWN, + Bits); + } + if(DestBitmap == NULL) { @@ -504,7 +524,7 @@ } if (Usage == DIB_PAL_COLORS) { - DbgPrint("GetDIBits with DIB_PAL_COLORS isn't implemented yet."); + DPRINT1("GetDIBits with DIB_PAL_COLORS isn't implemented yet."); } }

1 0

[greatlrd] 23891: 1. Copy DIB_GetBitmapInfo from wine cvs (date 2/9-2006) 2. Bugfix NtGdiGetDIBits the BITMAPCOREHEADER is not same as BITMAPINFOHEADER we now separate it in if(Bits==NULL) that will allow us pass two more wine tests follow winetest is working now 1. bitmap.c 227 Test failed: GetDIBits doesn't work with a BITMAPCOREHEADER 2. bitmap.c 233 GetDIBits doesn't work with a BITMAPCOREHEADER both of them are fixed now
by greatlrd＠svn.reactos.org 02 Sep '06

02 Sep '06

Author: greatlrd Date: Sun Sep 3 01:02:03 2006 New Revision: 23891 URL: http://svn.reactos.org/svn/reactos?rev=23891&view=rev Log: 1. Copy DIB_GetBitmapInfo from wine cvs (date 2/9-2006) 2. Bugfix NtGdiGetDIBits the BITMAPCOREHEADER is not same as BITMAPINFOHEADER we now separate it in if(Bits==NULL) that will allow us pass two more wine tests follow winetest is working now 1. bitmap.c 227 Test failed: GetDIBits doesn't work with a BITMAPCOREHEADER 2. bitmap.c 233 GetDIBits doesn't work with a BITMAPCOREHEADER both of them are fixed now Modified: trunk/reactos/subsystems/win32/win32k/include/dib.h trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/include/dib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dib.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dib.h Sun Sep 3 01:02:03 2006 @@ -8,7 +8,7 @@ HBITMAP STDCALL DIB_CreateDIBSection (PDC dc, PBITMAPINFO bmi, UINT usage, LPVOID *bits, HANDLE section, DWORD offset, DWORD ovr_pitch); INT STDCALL -DIB_GetBitmapInfo (const BITMAPINFOHEADER *header, PDWORD width, PINT height, PWORD bpp, PWORD compr); +DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, PLONG width, PLONG height, PWORD planes, PWORD bpp, PLONG compr, PLONG size ); INT STDCALL DIB_GetDIBImageBytes (INT width, INT height, INT depth); INT FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Sun Sep 3 01:02:03 2006 @@ -396,10 +396,19 @@ } if (Bits == NULL) - { - if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER) || - Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) - { + { + if (Info->bmiHeader.biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER* coreheader = (BITMAPCOREHEADER*) Info; + coreheader->bcWidth =BitmapObj->SurfObj.sizlBitmap.cx; + coreheader->bcHeight = BitmapObj->SurfObj.sizlBitmap.cy; + coreheader->bcPlanes = 1; + coreheader->bcBitCount = BitsPerFormat(BitmapObj->SurfObj.iBitmapFormat); + Result = BitmapObj->SurfObj.sizlBitmap.cy; + } + + if (Info->bmiHeader.biSize == sizeof(BITMAPINFOHEADER)) + { Info->bmiHeader.biWidth = BitmapObj->SurfObj.sizlBitmap.cx; Info->bmiHeader.biHeight = BitmapObj->SurfObj.sizlBitmap.cy; /* Report negtive height for top-down bitmaps. */ @@ -440,7 +449,7 @@ else { if (StartScan > BitmapObj->SurfObj.sizlBitmap.cy) - { + { Result = 0; } else @@ -671,15 +680,20 @@ UINT coloruse) { HBITMAP handle; + + LONG width; + LONG height; + WORD planes; + WORD bpp; + DWORD compr; + DWORD dibsize; BOOL fColor; - DWORD width; - int height; - WORD bpp; - WORD compr; SIZEL size; - if (DIB_GetBitmapInfo( header, &width, &height, &bpp, &compr ) == -1) return 0; - + + if (DIB_GetBitmapInfo( header, &width, &height, &planes, &bpp, &compr, &dibsize ) == -1) return 0; + + // Check if we should create a monochrome or color bitmap. We create a monochrome bitmap only if it has exactly 2 // colors, which are black followed by white, nothing else. In all other cases, we create a color bitmap. @@ -1068,28 +1082,67 @@ } } -INT STDCALL DIB_GetBitmapInfo (const BITMAPINFOHEADER *header, - PDWORD width, - PINT height, - PWORD bpp, - PWORD compr) -{ +/* + * DIB_GetBitmapInfo is complete copy of wine cvs 2/9-2006 + * from file dib.c from gdi32.dll or orginal version + * did not calc the info right for some headers. + */ + +INT STDCALL +DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, + PLONG width, + PLONG height, + PWORD planes, + PWORD bpp, + PLONG compr, + PLONG size ) +{ + + if (header->biSize == sizeof(BITMAPCOREHEADER)) + { + BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; + *width = core->bcWidth; + *height = core->bcHeight; + *planes = core->bcPlanes; + *bpp = core->bcBitCount; + *compr = 0; + *size = 0; + return 0; + } + if (header->biSize == sizeof(BITMAPINFOHEADER)) { - *width = header->biWidth; - *height = header->biHeight; - *bpp = header->biBitCount; - *compr = header->biCompression; - return 1; - } - if (header->biSize == sizeof(BITMAPCOREHEADER)) - { - BITMAPCOREHEADER *core = (BITMAPCOREHEADER *)header; - *width = core->bcWidth; - *height = core->bcHeight; - *bpp = core->bcBitCount; - *compr = 0; - return 0; + *width = header->biWidth; + *height = header->biHeight; + *planes = header->biPlanes; + *bpp = header->biBitCount; + *compr = header->biCompression; + *size = header->biSizeImage; + return 1; + } + + if (header->biSize == sizeof(BITMAPV4HEADER)) + { + BITMAPV4HEADER *v4hdr = (BITMAPV4HEADER *)header; + *width = v4hdr->bV4Width; + *height = v4hdr->bV4Height; + *planes = v4hdr->bV4Planes; + *bpp = v4hdr->bV4BitCount; + *compr = v4hdr->bV4V4Compression; + *size = v4hdr->bV4SizeImage; + return 4; + } + + if (header->biSize == sizeof(BITMAPV5HEADER)) + { + BITMAPV5HEADER *v5hdr = (BITMAPV5HEADER *)header; + *width = v5hdr->bV5Width; + *height = v5hdr->bV5Height; + *planes = v5hdr->bV5Planes; + *bpp = v5hdr->bV5BitCount; + *compr = v5hdr->bV5Compression; + *size = v5hdr->bV5SizeImage; + return 5; } DPRINT("(%ld): wrong size for header\n", header->biSize ); return -1;

1 0

[fireball] 23890: Separate Device Manager code (what was left from it in hub.c) from Hub code
by fireball＠svn.reactos.org 02 Sep '06

02 Sep '06

Author: fireball Date: Sun Sep 3 00:32:50 2006 New Revision: 23890 URL: http://svn.reactos.org/svn/reactos?rev=23890&view=rev Log: Separate Device Manager code (what was left from it in hub.c) from Hub code Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c Sun Sep 3 00:32:50 2006 @@ -21,6 +21,23 @@ #include "usbdriver.h" +#define realloc_buf( pdEV, puRB ) \ +{\ + PBYTE data_buf;\ + int i;\ + data_buf = usb_alloc_mem( NonPagedPool, ( pdEV )->desc_buf_size += 1024 );\ + RtlZeroMemory( data_buf, ( pdEV )->desc_buf_size );\ + for( i = 0; i < ( LONG )( puRB )->context; i++ )\ + {\ + data_buf[ i ] = ( pdEV )->desc_buf[ i ];\ + }\ + usb_free_mem( ( pdEV )->desc_buf );\ + ( pdEV )->desc_buf = data_buf;\ + ( pdEV )->pusb_dev_desc = ( PUSB_DEVICE_DESC )( pdEV )->desc_buf;\ + ( puRB )->data_buffer = &data_buf[ ( LONG ) ( puRB )->context ];\ +} + + //---------------------------------------------------------- USB_DRIVER g_driver_list[DEVMGR_MAX_DRIVERS]; @@ -742,3 +759,758 @@ return; } + +//called in hub_set_address_completion +BOOLEAN +dev_mgr_start_config_dev(PUSB_DEV pdev) +{ + PBYTE data_buf; + PUSB_CTRL_SETUP_PACKET psetup; + PURB purb; + PHCD hcd; + USE_BASIC_NON_PENDING_IRQL; + + hcd_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_start_config_dev: pdev=%p\n", pdev)); + + if (pdev == NULL) + return FALSE; + + lock_dev(pdev, TRUE); + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + unlock_dev(pdev, TRUE); + return FALSE; + } + + hcd = pdev->hcd; + + //first, get device descriptor + purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); + data_buf = usb_alloc_mem(NonPagedPool, 512); + if (purb == NULL) + { + unlock_dev(pdev, TRUE); + return FALSE; + } + + RtlZeroMemory(purb, sizeof(URB)); + RtlZeroMemory(data_buf, 512); + + psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; + + purb->data_buffer = data_buf; // user data + purb->data_length = 8; // get partial desc + + pdev->desc_buf = data_buf; + pdev->desc_buf_size = 512; + + purb->pdev = pdev; + purb->pendp = &pdev->default_endp; //pipe for current transfer + + purb->completion = dev_mgr_get_desc_completion; + purb->reference = 0; + + InitializeListHead(&purb->trasac_list); + + psetup->bmRequestType = 0x80; + psetup->bRequest = USB_REQ_GET_DESCRIPTOR; + psetup->wValue = (USB_DT_DEVICE << 8) | 0; + psetup->wIndex = 0; + psetup->wLength = 8; //sizeof( USB_DEVICE_DESC ); + unlock_dev(pdev, TRUE); + + if (hcd->hcd_submit_urb(hcd, pdev, purb->pendp, purb) != STATUS_PENDING) + { + usb_free_mem(purb); + usb_free_mem(data_buf); + return FALSE; + } + return TRUE; +} + +VOID +dev_mgr_get_desc_completion(PURB purb, PVOID context) +{ + PUSB_DEV pdev; + PUSB_CONFIGURATION_DESC pconfig_desc; + PUSB_ENDPOINT pendp; + PUSB_DEV_MANAGER dev_mgr; + NTSTATUS status; + PUSB_CTRL_SETUP_PACKET psetup; + PHCD hcd; + + USE_BASIC_NON_PENDING_IRQL;; + + if (purb == NULL) + return; + + hcd_dbg_print(DBGLVL_MAXIMUM, + ("dev_mgr_get_desc_completion: purb->reference=%d\n", purb->reference)); + + pdev = purb->pdev; + pendp = purb->pendp; + + if (pdev == NULL || pendp == NULL) + { + usb_free_mem(purb); + purb = NULL; + return; + } + + lock_dev(pdev, TRUE); + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + unlock_dev(pdev, TRUE); + goto LBL_OUT; + } + + pendp = &pdev->default_endp; + dev_mgr = dev_mgr_from_dev(pdev); + hcd = pdev->hcd; + psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; + + if (usb_error(purb->status)) + { + unlock_dev(pdev, TRUE); + hcd_dbg_print(DBGLVL_MAXIMUM, + ("dev_mgr_get_desc_completion: can not get dev desc ref=0x%x, status=0x%x\n", + purb->reference, purb->status)); + goto LBL_OUT; + } + + switch (purb->reference) + { + case 0: + { + //only partial dev_desc + //enable the dev specific default endp maxpacketsize + pdev->pusb_dev_desc = (PUSB_DEVICE_DESC) purb->data_buffer; + + psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; + psetup->wLength = sizeof(USB_DEVICE_DESC); + + //get the complete dev_desc + purb->reference = 1; + purb->status = 0; + purb->data_length = sizeof(USB_DEVICE_DESC); + + unlock_dev(pdev, TRUE); + + status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); + if (status != STATUS_PENDING) + { + goto LBL_OUT; + } + return; + } + case 1: + { + //let's begin to get config descriptors. + if (pdev->pusb_dev_desc->bNumConfigurations == 0) + { + unlock_dev(pdev, TRUE); + goto LBL_OUT; + } + + purb->data_buffer += sizeof(USB_DEVICE_DESC); + purb->data_length = 8; + purb->reference++; + purb->context = (PVOID) sizeof(USB_DEVICE_DESC); + purb->status = 0; + + psetup->wValue = (USB_DT_CONFIG << 8) | 0; + psetup->wLength = 8; + unlock_dev(pdev, TRUE); + + status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); + + if (status != STATUS_PENDING) + { + goto LBL_OUT; + } + return; + } + default: + { + LONG config_idx; + config_idx = (purb->reference >> 1) - 1; + if ((purb->reference & 1) == 0) + { + //partial config desc is obtained. + pconfig_desc = (PUSB_CONFIGURATION_DESC) purb->data_buffer; + if (pconfig_desc->wTotalLength >= 1024) + { + //treat as an error + unlock_dev(pdev, TRUE); + goto LBL_OUT; + + } + + if (pconfig_desc->wTotalLength > (USHORT) (pdev->desc_buf_size - (LONG) purb->context)) + { + //rewind the 8-byte hdr + *((PULONG) & context) -= 8; + realloc_buf(pdev, purb); + } + purb->data_length = pconfig_desc->wTotalLength; + psetup->wLength = pconfig_desc->wTotalLength; + purb->reference++; + unlock_dev(pdev, TRUE); + status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); + if (status != STATUS_PENDING) + goto LBL_OUT; + + } + else + { + //complete desc is returned. + if (config_idx + 1 < pdev->pusb_dev_desc->bNumConfigurations) + { + //still have configurations left + *((PULONG) & context) += psetup->wLength; + purb->data_buffer = &pdev->desc_buf[(LONG) context]; + purb->data_length = 8; + psetup->wLength = 8; + psetup->wValue = (((USB_DT_CONFIG) << 8) | (config_idx + 1)); + purb->reference++; + purb->context = context; + + if (((LONG) context) + 8 > pdev->desc_buf_size) + realloc_buf(pdev, purb); + + purb->status = 0; + unlock_dev(pdev, TRUE); + status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); + if (status != STATUS_PENDING) + goto LBL_OUT; + } + else + { + //config descriptors have all been fetched + unlock_dev(pdev, TRUE); + usb_free_mem(purb); + purb = NULL; + + // load driver for the device + dev_mgr_start_select_driver(pdev); + } + } + return; + } + } + +LBL_OUT: + usb_free_mem(purb); + purb = NULL; + + lock_dev(pdev, TRUE); + if (dev_state(pdev) != USB_DEV_STATE_ZOMB) + { + if (pdev->desc_buf) + { + usb_free_mem(pdev->desc_buf); + pdev->desc_buf_size = 0; + pdev->desc_buf = NULL; + pdev->pusb_dev_desc = NULL; + pdev->usb_config = NULL; + } + } + unlock_dev(pdev, TRUE); + + return; +} + +BOOLEAN +dev_mgr_start_select_driver(PUSB_DEV pdev) +{ + PUSB_DEV_MANAGER dev_mgr; + PUSB_EVENT pevent; + BOOLEAN bret; + + USE_BASIC_NON_PENDING_IRQL;; + + if (pdev == NULL) + return FALSE; + + dev_mgr = dev_mgr_from_dev(pdev); + KeAcquireSpinLockAtDpcLevel(&dev_mgr->event_list_lock); + lock_dev(pdev, TRUE); + + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + bret = FALSE; + goto LBL_OUT; + } + + pevent = alloc_event(&dev_mgr->event_pool, 1); + if (pevent == NULL) + { + bret = FALSE; + goto LBL_OUT; + } + pevent->flags = USB_EVENT_FLAG_ACTIVE; + pevent->event = USB_EVENT_DEFAULT; + pevent->pdev = pdev; + pevent->context = 0; + pevent->param = 0; + pevent->pnext = 0; //vertical queue for serialized operation + pevent->process_event = dev_mgr_event_select_driver; + pevent->process_queue = event_list_default_process_queue; + + InsertTailList(&dev_mgr->event_list, &pevent->event_link); + KeSetEvent(&dev_mgr->wake_up_event, 0, FALSE); + bret = TRUE; + +LBL_OUT: + unlock_dev(pdev, TRUE); + KeReleaseSpinLockFromDpcLevel(&dev_mgr->event_list_lock); + return bret; +} + +BOOLEAN +dev_mgr_connect_to_dev(PVOID Parameter) +{ + PUSB_DEV pdev; + DEV_HANDLE dev_handle; + NTSTATUS status; + PUSB_DRIVER pdriver; + PCONNECT_DATA pcd = (PCONNECT_DATA) Parameter; + PUSB_DEV_MANAGER dev_mgr; + CONNECT_DATA param; + + if (pcd == NULL) + return FALSE; + dev_handle = pcd->dev_handle; + pdriver = pcd->pdriver; + dev_mgr = pcd->dev_mgr; + + param.dev_mgr = dev_mgr; + param.pdriver = pdriver; + param.dev_handle = 0; //not used + + status = usb_query_and_lock_dev(dev_mgr, dev_handle, &pdev); + if (status != STATUS_SUCCESS) + return FALSE; + + usb_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_connect_to_dev(): about to call driver's dev_connect\n")); + status = pdriver->disp_tbl.dev_connect(&param, dev_handle); + usb_unlock_dev(pdev); + return status; +} + +VOID +dev_mgr_event_select_driver(PUSB_DEV pdev, ULONG event, ULONG context, ULONG param) +{ + PUSB_DEV_MANAGER dev_mgr; + PUSB_DRIVER pdriver, pcand; + LONG credit, match, i; + DEV_HANDLE handle = 0; + CONNECT_DATA cd; + + USE_BASIC_NON_PENDING_IRQL; + + UNREFERENCED_PARAMETER(param); + UNREFERENCED_PARAMETER(context); + + usb_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_event_select_driver(): pdev=%p event=0x%x\n", pdev, event)); + + if (pdev == NULL) + return; + + lock_dev(pdev, FALSE); + if (dev_state(pdev) == USB_DEV_STATE_ZOMB) + { + unlock_dev(pdev, FALSE); + return; + } + dev_mgr = dev_mgr_from_dev(pdev); + + pcand = NULL; + match = 0; + for(i = HUB_DRIVER_IDX; i < DEVMGR_MAX_DRIVERS; i++) + { + //bypass root-hub driver with idx zero + pdriver = (PUSB_DRIVER) & dev_mgr->driver_list[i]; + + if (pdriver->driver_desc.flags & USB_DRIVER_FLAG_DEV_CAPABLE) + credit = dev_mgr_score_driver_for_dev(dev_mgr, pdriver, pdev->pusb_dev_desc); + else + { + continue; + } + if (credit > match) + pcand = pdriver, match = credit; + + } + + if (match) + { + // we set class driver here + // pdev->dev_driver = pcand; + handle = usb_make_handle(pdev->dev_id, 0, 0); + } + unlock_dev(pdev, FALSE); + + if (match) + { + + cd.dev_handle = handle; + cd.pdriver = pcand; + cd.dev_mgr = dev_mgr; + + if (dev_mgr_connect_to_dev(&cd)) + return; + + // ExInitializeWorkItem( pwork_item, dev_mgr_connect_to_dev, ( PVOID )pcd ); + // ExQueueWorkItem( pwork_item, DelayedWorkQueue ); + } + cd.dev_handle = handle; + cd.pdriver = &dev_mgr->driver_list[GEN_DRIVER_IDX]; + cd.dev_mgr = dev_mgr; + dev_mgr_connect_to_dev(&cd); + return; +} + +BOOLEAN +dev_mgr_build_usb_endp(PUSB_INTERFACE pif, PUSB_ENDPOINT pendp, PUSB_ENDPOINT_DESC pendp_desc) +{ + if (pendp == NULL || pif == NULL || pendp_desc == NULL) + return FALSE; + + pendp->flags = 0; + InitializeListHead(&pendp->urb_list); //pending urb queue + pendp->pusb_if = pif; + pendp->pusb_endp_desc = pendp_desc; + return TRUE; +} + +BOOLEAN +dev_mgr_build_usb_if(PUSB_CONFIGURATION pcfg, PUSB_INTERFACE pif, PUSB_INTERFACE_DESC pif_desc, BOOLEAN alt_if) +{ + LONG i; + PUSB_ENDPOINT_DESC pendp_desc; + + if (pcfg == NULL || pif == NULL || pif_desc == NULL) + return FALSE; + + if (alt_if == FALSE) + { + pif->endp_count = pif_desc->bNumEndpoints > MAX_ENDPS_PER_IF + ? MAX_ENDPS_PER_IF : pif_desc->bNumEndpoints; + + pif->pif_drv = NULL; + pif->pusb_config = pcfg; + pif->pusb_if_desc = pif_desc; + pif->if_ext_size = 0; + pif->if_ext = NULL; + + InitializeListHead(&pif->altif_list); + pif->altif_count = 0; + + pendp_desc = (PUSB_ENDPOINT_DESC) (&((PBYTE) pif_desc)[sizeof(USB_INTERFACE_DESC)]); + + for(i = 0; i < pif->endp_count; i++, pendp_desc++) + { + dev_mgr_build_usb_endp(pif, &pif->endp[i], pendp_desc); + } + } + else + { + PUSB_INTERFACE paltif; + PLIST_ENTRY pthis, pnext; + + pif->altif_count++; + paltif = usb_alloc_mem(NonPagedPool, sizeof(USB_INTERFACE)); + RtlZeroMemory(paltif, sizeof(USB_INTERFACE)); + InsertTailList(&pif->altif_list, &paltif->altif_list); + paltif->pif_drv = NULL; + paltif->pusb_config = pcfg; + paltif->pusb_if_desc = pif_desc; + paltif->if_ext_size = 0; + paltif->if_ext = NULL; + paltif->endp_count = pif_desc->bNumEndpoints > MAX_ENDPS_PER_IF + ? MAX_ENDPS_PER_IF : pif_desc->bNumEndpoints; + + ListFirst(&pif->altif_list, pthis); + + while (pthis) + { + //synchronize the altif_count; + PUSB_INTERFACE pthis_if; + pthis_if = (PUSB_INTERFACE) (((PBYTE) pthis) - offsetof(USB_INTERFACE, altif_list)); + pthis_if->altif_count = pif->altif_count; + ListNext(&pif->altif_list, pthis, pnext); + } + + } + return TRUE; +} + +NTSTATUS +dev_mgr_build_usb_config(PUSB_DEV pdev, PBYTE pbuf, ULONG config_val, LONG config_count) +{ + PUSB_CONFIGURATION pcfg; + PUSB_INTERFACE_DESC pif_desc; + PUSB_INTERFACE pif; + int i; + LONG if_count; + + if (pdev == NULL || pbuf == NULL) + return STATUS_INVALID_PARAMETER; + + + pdev->usb_config = usb_alloc_mem(NonPagedPool, sizeof(USB_CONFIGURATION)); + pcfg = pdev->usb_config; + + if (pdev->usb_config == NULL) + return STATUS_NO_MEMORY; + + RtlZeroMemory(pcfg, sizeof(USB_CONFIGURATION)); + pcfg->pusb_config_desc = usb_find_config_desc_by_val(pbuf, config_val, config_count); + + if (pcfg->pusb_config_desc == NULL) + { + usb_free_mem(pcfg); + pdev->usb_config = NULL; + return STATUS_UNSUCCESSFUL; + } + pcfg->if_count = pcfg->pusb_config_desc->bNumInterfaces; + pcfg->pusb_dev = pdev; + pif_desc = (PUSB_INTERFACE_DESC) & ((PBYTE) pcfg->pusb_config_desc)[sizeof(USB_CONFIGURATION_DESC)]; + if_count = pcfg->if_count; + + for(i = 0; i < if_count; i++, pif_desc++) + { + if (pif_desc->bAlternateSetting == 0) + { + dev_mgr_build_usb_if(pcfg, &pcfg->interf[i], pif_desc, FALSE); + } + else + { + i--; + pif = &pcfg->interf[i]; + dev_mgr_build_usb_if(pcfg, pif, pif_desc, TRUE); + } + } + return STATUS_SUCCESS; +} + +NTSTATUS +dev_mgr_destroy_usb_config(PUSB_CONFIGURATION pcfg) +{ + long i; + PLIST_ENTRY pthis; + PUSB_INTERFACE pif; + + if (pcfg == NULL) + return FALSE; + + for(i = 0; i < pcfg->if_count; i++) + { + pif = &pcfg->interf[i]; + + if (pif->altif_count) + { + ListFirst(&pif->altif_list, pthis); + while (pthis) + { + PUSB_INTERFACE pthis_if; + pthis_if = (PUSB_INTERFACE) (((PBYTE) pthis) - offsetof(USB_INTERFACE, altif_list)); + RemoveEntryList(pthis); + usb_free_mem(pthis_if); + if (IsListEmpty(&pif->altif_list) == TRUE) + break; + + ListFirst(&pif->altif_list, pthis); + } + } + } + usb_free_mem(pcfg); + return TRUE; +} + +#define is_dev_product_match( pdriVER, pdev_DESC ) \ +( ( pdriVER )->driver_desc.vendor_id == ( pdev_DESC )->idVendor \ + && ( pdriVER )->driver_desc.product_id == ( pdev_DESC )->idProduct ) + +LONG +dev_mgr_score_driver_for_dev(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver, PUSB_DEVICE_DESC pdev_desc) +{ + LONG credit = 0; + + UNREFERENCED_PARAMETER(dev_mgr); + + //assume supports all the sub_class are supported if sub_class is zero + if (pdriver->driver_desc.dev_class == pdev_desc->bDeviceClass) + { + if (pdriver->driver_desc.dev_sub_class == 0 && pdriver->driver_desc.dev_protocol == 0) + credit = 3; + else if (pdriver->driver_desc.dev_sub_class == pdev_desc->bDeviceSubClass) + { + if (pdriver->driver_desc.dev_protocol == 0) + credit = 6; + else if (pdriver->driver_desc.dev_protocol == pdev_desc->bDeviceProtocol) + credit = 9; + } + } + + if (is_dev_product_match(pdriver, pdev_desc)) + credit += 20; + + return credit; +} + +LONG +dev_mgr_score_driver_for_if(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver, PUSB_INTERFACE_DESC pif_desc) +{ + LONG credit; + + if (pdriver == NULL + || !(pdriver->driver_desc.flags & USB_DRIVER_FLAG_IF_CAPABLE) || pif_desc == NULL || dev_mgr == NULL) + return 0; + + if (is_header_match((PBYTE) pif_desc, USB_DT_INTERFACE) == FALSE) + { + return 0; + } + + credit = 0; + if ((pdriver->driver_desc.if_class == pif_desc->bInterfaceClass)) + { + if (pdriver->driver_desc.if_sub_class == 0 && pdriver->driver_desc.if_protocol == 0) + credit = 2; + if (pdriver->driver_desc.if_sub_class == pif_desc->bInterfaceSubClass) + { + if (pdriver->driver_desc.if_protocol == 0) + credit = 4; + if (pdriver->driver_desc.if_protocol == pif_desc->bInterfaceProtocol) + credit = 6; + } + } + else + credit = 1; + + return credit; +} + +#define is_equal_driver( pd1, pd2, ret ) \ +{\ + int i;\ + ret = TRUE;\ + PUSB_DRIVER pdr1, pdr2;\ + pdr1 = ( PUSB_DRIVER )( pd1 );\ + pdr2 = ( PUSB_DRIVER ) ( pd2 );\ + for( i = 0; i < 16; i++ )\ + {\ + if( pdr1->driver_name[ i ] != pdr2->driver_name[ i ] )\ + {\ + ret = FALSE;\ + break;\ + }\ + }\ +} + +//return value is the hcd id +UCHAR +dev_mgr_register_hcd(PUSB_DEV_MANAGER dev_mgr, PHCD hcd) +{ + if (dev_mgr == NULL || hcd == NULL) + return 0xff; + + if (dev_mgr->hcd_count >= MAX_HCDS) + return 0xff; + + dev_mgr->hcd_array[dev_mgr->hcd_count++] = hcd; + return dev_mgr->hcd_count - 1; +} + +BOOLEAN +dev_mgr_register_irp(PUSB_DEV_MANAGER dev_mgr, PIRP pirp, PURB purb) +{ + if (dev_mgr == NULL) + return FALSE; + + if (add_irp_to_list(&dev_mgr->irp_list, pirp, purb)) + { + return TRUE; + } + TRAP(); + return FALSE; +} + +//caller must guarantee that when this func is called, +//the urb associated must exist. +PURB +dev_mgr_remove_irp(PUSB_DEV_MANAGER dev_mgr, PIRP pirp) +{ + PURB purb; + if (dev_mgr == NULL) + return NULL; + + purb = remove_irp_from_list(&dev_mgr->irp_list, pirp, NULL); + return purb; +} + +VOID +dev_mgr_cancel_irp(PDEVICE_OBJECT dev_obj, PIRP pirp) +{ + PUSB_DEV_MANAGER dev_mgr; + PDEVEXT_HEADER pdev_ext_hdr; + + pdev_ext_hdr = (PDEVEXT_HEADER) dev_obj->DeviceExtension; + dev_mgr = pdev_ext_hdr->dev_mgr; + + if (dev_obj->CurrentIrp == pirp) + { + IoReleaseCancelSpinLock(pirp->CancelIrql); + // we did not IoStartNextPacket, leave it for the urb completion + } + else + { + KeRemoveEntryDeviceQueue(&dev_obj->DeviceQueue, &pirp->Tail.Overlay.DeviceQueueEntry); + IoReleaseCancelSpinLock(pirp->CancelIrql); + + pirp->IoStatus.Information = 0; + pirp->IoStatus.Status = STATUS_CANCELLED; + IoCompleteRequest(pirp, IO_NO_INCREMENT); + // the device queue is moved on, no need to call IoStartNextPacket + return; + } + + // + // remove the irp and call the dev_mgr_cancel_irp + // the completion will be done in urb completion + // + remove_irp_from_list(&dev_mgr->irp_list, pirp, dev_mgr); + return; + +} + +// release the hcd +VOID +dev_mgr_release_hcd(PUSB_DEV_MANAGER dev_mgr) +{ + LONG i; + PHCD hcd; + for(i = 0; i < dev_mgr->hcd_count; i++) + { + hcd = dev_mgr->hcd_array[i]; + hcd->hcd_release(hcd); + dev_mgr->hcd_array[i] = 0; + } + dev_mgr->hcd_count = 0; + return; +} + +VOID +dev_mgr_start_hcd(PUSB_DEV_MANAGER dev_mgr) +{ + LONG i; + PHCD hcd; + for(i = 0; i < dev_mgr->hcd_count; i++) + { + hcd = dev_mgr->hcd_array[i]; + hcd->hcd_start(hcd); + } + return; +} Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/hub.c Sun Sep 3 00:32:50 2006 @@ -45,22 +45,6 @@ \ } -#define realloc_buf( pdEV, puRB ) \ -{\ - PBYTE data_buf;\ - int i;\ - data_buf = usb_alloc_mem( NonPagedPool, ( pdEV )->desc_buf_size += 1024 );\ - RtlZeroMemory( data_buf, ( pdEV )->desc_buf_size );\ - for( i = 0; i < ( LONG )( puRB )->context; i++ )\ - {\ - data_buf[ i ] = ( pdEV )->desc_buf[ i ];\ - }\ - usb_free_mem( ( pdEV )->desc_buf );\ - ( pdEV )->desc_buf = data_buf;\ - ( pdEV )->pusb_dev_desc = ( PUSB_DEVICE_DESC )( pdEV )->desc_buf;\ - ( puRB )->data_buffer = &data_buf[ ( LONG ) ( puRB )->context ];\ -} - extern ULONG cpu_clock_freq; BOOLEAN hub_check_reset_port_status(PUSB_DEV pdev, LONG port_idx); @@ -1923,761 +1907,6 @@ return; } -//called in hub_set_address_completion -BOOLEAN -dev_mgr_start_config_dev(PUSB_DEV pdev) -{ - PBYTE data_buf; - PUSB_CTRL_SETUP_PACKET psetup; - PURB purb; - PHCD hcd; - USE_BASIC_NON_PENDING_IRQL; - - hcd_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_start_config_dev: pdev=%p\n", pdev)); - - if (pdev == NULL) - return FALSE; - - lock_dev(pdev, TRUE); - if (dev_state(pdev) == USB_DEV_STATE_ZOMB) - { - unlock_dev(pdev, TRUE); - return FALSE; - } - - hcd = pdev->hcd; - - //first, get device descriptor - purb = usb_alloc_mem(NonPagedPool, sizeof(URB)); - data_buf = usb_alloc_mem(NonPagedPool, 512); - if (purb == NULL) - { - unlock_dev(pdev, TRUE); - return FALSE; - } - - RtlZeroMemory(purb, sizeof(URB)); - RtlZeroMemory(data_buf, 512); - - psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; - - purb->data_buffer = data_buf; // user data - purb->data_length = 8; // get partial desc - - pdev->desc_buf = data_buf; - pdev->desc_buf_size = 512; - - purb->pdev = pdev; - purb->pendp = &pdev->default_endp; //pipe for current transfer - - purb->completion = dev_mgr_get_desc_completion; - purb->reference = 0; - - InitializeListHead(&purb->trasac_list); - - psetup->bmRequestType = 0x80; - psetup->bRequest = USB_REQ_GET_DESCRIPTOR; - psetup->wValue = (USB_DT_DEVICE << 8) | 0; - psetup->wIndex = 0; - psetup->wLength = 8; //sizeof( USB_DEVICE_DESC ); - unlock_dev(pdev, TRUE); - - if (hcd->hcd_submit_urb(hcd, pdev, purb->pendp, purb) != STATUS_PENDING) - { - usb_free_mem(purb); - usb_free_mem(data_buf); - return FALSE; - } - return TRUE; -} - -VOID -dev_mgr_get_desc_completion(PURB purb, PVOID context) -{ - PUSB_DEV pdev; - PUSB_CONFIGURATION_DESC pconfig_desc; - PUSB_ENDPOINT pendp; - PUSB_DEV_MANAGER dev_mgr; - NTSTATUS status; - PUSB_CTRL_SETUP_PACKET psetup; - PHCD hcd; - - USE_BASIC_NON_PENDING_IRQL;; - - if (purb == NULL) - return; - - hcd_dbg_print(DBGLVL_MAXIMUM, - ("dev_mgr_get_desc_completion: purb->reference=%d\n", purb->reference)); - - pdev = purb->pdev; - pendp = purb->pendp; - - if (pdev == NULL || pendp == NULL) - { - usb_free_mem(purb); - purb = NULL; - return; - } - - lock_dev(pdev, TRUE); - if (dev_state(pdev) == USB_DEV_STATE_ZOMB) - { - unlock_dev(pdev, TRUE); - goto LBL_OUT; - } - - pendp = &pdev->default_endp; - dev_mgr = dev_mgr_from_dev(pdev); - hcd = pdev->hcd; - psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; - - if (usb_error(purb->status)) - { - unlock_dev(pdev, TRUE); - hcd_dbg_print(DBGLVL_MAXIMUM, - ("dev_mgr_get_desc_completion: can not get dev desc ref=0x%x, status=0x%x\n", - purb->reference, purb->status)); - goto LBL_OUT; - } - - switch (purb->reference) - { - case 0: - { - //only partial dev_desc - //enable the dev specific default endp maxpacketsize - pdev->pusb_dev_desc = (PUSB_DEVICE_DESC) purb->data_buffer; - - psetup = (PUSB_CTRL_SETUP_PACKET) purb->setup_packet; - psetup->wLength = sizeof(USB_DEVICE_DESC); - - //get the complete dev_desc - purb->reference = 1; - purb->status = 0; - purb->data_length = sizeof(USB_DEVICE_DESC); - - unlock_dev(pdev, TRUE); - - status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); - if (status != STATUS_PENDING) - { - goto LBL_OUT; - } - return; - } - case 1: - { - //let's begin to get config descriptors. - if (pdev->pusb_dev_desc->bNumConfigurations == 0) - { - unlock_dev(pdev, TRUE); - goto LBL_OUT; - } - - purb->data_buffer += sizeof(USB_DEVICE_DESC); - purb->data_length = 8; - purb->reference++; - purb->context = (PVOID) sizeof(USB_DEVICE_DESC); - purb->status = 0; - - psetup->wValue = (USB_DT_CONFIG << 8) | 0; - psetup->wLength = 8; - unlock_dev(pdev, TRUE); - - status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); - - if (status != STATUS_PENDING) - { - goto LBL_OUT; - } - return; - } - default: - { - LONG config_idx; - config_idx = (purb->reference >> 1) - 1; - if ((purb->reference & 1) == 0) - { - //partial config desc is obtained. - pconfig_desc = (PUSB_CONFIGURATION_DESC) purb->data_buffer; - if (pconfig_desc->wTotalLength >= 1024) - { - //treat as an error - unlock_dev(pdev, TRUE); - goto LBL_OUT; - - } - - if (pconfig_desc->wTotalLength > (USHORT) (pdev->desc_buf_size - (LONG) purb->context)) - { - //rewind the 8-byte hdr - *((PULONG) & context) -= 8; - realloc_buf(pdev, purb); - } - purb->data_length = pconfig_desc->wTotalLength; - psetup->wLength = pconfig_desc->wTotalLength; - purb->reference++; - unlock_dev(pdev, TRUE); - status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); - if (status != STATUS_PENDING) - goto LBL_OUT; - - } - else - { - //complete desc is returned. - if (config_idx + 1 < pdev->pusb_dev_desc->bNumConfigurations) - { - //still have configurations left - *((PULONG) & context) += psetup->wLength; - purb->data_buffer = &pdev->desc_buf[(LONG) context]; - purb->data_length = 8; - psetup->wLength = 8; - psetup->wValue = (((USB_DT_CONFIG) << 8) | (config_idx + 1)); - purb->reference++; - purb->context = context; - - if (((LONG) context) + 8 > pdev->desc_buf_size) - realloc_buf(pdev, purb); - - purb->status = 0; - unlock_dev(pdev, TRUE); - status = hcd->hcd_submit_urb(hcd, pdev, pendp, purb); - if (status != STATUS_PENDING) - goto LBL_OUT; - } - else - { - //config descriptors have all been fetched - unlock_dev(pdev, TRUE); - usb_free_mem(purb); - purb = NULL; - - // load driver for the device - dev_mgr_start_select_driver(pdev); - } - } - return; - } - } - -LBL_OUT: - usb_free_mem(purb); - purb = NULL; - - lock_dev(pdev, TRUE); - if (dev_state(pdev) != USB_DEV_STATE_ZOMB) - { - if (pdev->desc_buf) - { - usb_free_mem(pdev->desc_buf); - pdev->desc_buf_size = 0; - pdev->desc_buf = NULL; - pdev->pusb_dev_desc = NULL; - pdev->usb_config = NULL; - } - } - unlock_dev(pdev, TRUE); - - return; -} - -BOOLEAN -dev_mgr_start_select_driver(PUSB_DEV pdev) -{ - PUSB_DEV_MANAGER dev_mgr; - PUSB_EVENT pevent; - BOOLEAN bret; - - USE_BASIC_NON_PENDING_IRQL;; - - if (pdev == NULL) - return FALSE; - - dev_mgr = dev_mgr_from_dev(pdev); - KeAcquireSpinLockAtDpcLevel(&dev_mgr->event_list_lock); - lock_dev(pdev, TRUE); - - if (dev_state(pdev) == USB_DEV_STATE_ZOMB) - { - bret = FALSE; - goto LBL_OUT; - } - - pevent = alloc_event(&dev_mgr->event_pool, 1); - if (pevent == NULL) - { - bret = FALSE; - goto LBL_OUT; - } - pevent->flags = USB_EVENT_FLAG_ACTIVE; - pevent->event = USB_EVENT_DEFAULT; - pevent->pdev = pdev; - pevent->context = 0; - pevent->param = 0; - pevent->pnext = 0; //vertical queue for serialized operation - pevent->process_event = dev_mgr_event_select_driver; - pevent->process_queue = event_list_default_process_queue; - - InsertTailList(&dev_mgr->event_list, &pevent->event_link); - KeSetEvent(&dev_mgr->wake_up_event, 0, FALSE); - bret = TRUE; - -LBL_OUT: - unlock_dev(pdev, TRUE); - KeReleaseSpinLockFromDpcLevel(&dev_mgr->event_list_lock); - return bret; -} - -BOOLEAN -dev_mgr_connect_to_dev(PVOID Parameter) -{ - PUSB_DEV pdev; - DEV_HANDLE dev_handle; - NTSTATUS status; - PUSB_DRIVER pdriver; - PCONNECT_DATA pcd = (PCONNECT_DATA) Parameter; - PUSB_DEV_MANAGER dev_mgr; - CONNECT_DATA param; - - if (pcd == NULL) - return FALSE; - dev_handle = pcd->dev_handle; - pdriver = pcd->pdriver; - dev_mgr = pcd->dev_mgr; - - param.dev_mgr = dev_mgr; - param.pdriver = pdriver; - param.dev_handle = 0; //not used - - status = usb_query_and_lock_dev(dev_mgr, dev_handle, &pdev); - if (status != STATUS_SUCCESS) - return FALSE; - - usb_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_connect_to_dev(): about to call driver's dev_connect\n")); - status = pdriver->disp_tbl.dev_connect(&param, dev_handle); - usb_unlock_dev(pdev); - return status; -} - -VOID -dev_mgr_event_select_driver(PUSB_DEV pdev, ULONG event, ULONG context, ULONG param) -{ - PUSB_DEV_MANAGER dev_mgr; - PUSB_DRIVER pdriver, pcand; - LONG credit, match, i; - DEV_HANDLE handle = 0; - CONNECT_DATA cd; - - USE_BASIC_NON_PENDING_IRQL; - - UNREFERENCED_PARAMETER(param); - UNREFERENCED_PARAMETER(context); - - usb_dbg_print(DBGLVL_MAXIMUM, ("dev_mgr_event_select_driver(): pdev=%p event=0x%x\n", pdev, event)); - - if (pdev == NULL) - return; - - lock_dev(pdev, FALSE); - if (dev_state(pdev) == USB_DEV_STATE_ZOMB) - { - unlock_dev(pdev, FALSE); - return; - } - dev_mgr = dev_mgr_from_dev(pdev); - - pcand = NULL; - match = 0; - for(i = HUB_DRIVER_IDX; i < DEVMGR_MAX_DRIVERS; i++) - { - //bypass root-hub driver with idx zero - pdriver = (PUSB_DRIVER) & dev_mgr->driver_list[i]; - - if (pdriver->driver_desc.flags & USB_DRIVER_FLAG_DEV_CAPABLE) - credit = dev_mgr_score_driver_for_dev(dev_mgr, pdriver, pdev->pusb_dev_desc); - else - { - continue; - } - if (credit > match) - pcand = pdriver, match = credit; - - } - - if (match) - { - // we set class driver here - // pdev->dev_driver = pcand; - handle = usb_make_handle(pdev->dev_id, 0, 0); - } - unlock_dev(pdev, FALSE); - - if (match) - { - - cd.dev_handle = handle; - cd.pdriver = pcand; - cd.dev_mgr = dev_mgr; - - if (dev_mgr_connect_to_dev(&cd)) - return; - - // ExInitializeWorkItem( pwork_item, dev_mgr_connect_to_dev, ( PVOID )pcd ); - // ExQueueWorkItem( pwork_item, DelayedWorkQueue ); - } - cd.dev_handle = handle; - cd.pdriver = &dev_mgr->driver_list[GEN_DRIVER_IDX]; - cd.dev_mgr = dev_mgr; - dev_mgr_connect_to_dev(&cd); - return; -} - -BOOLEAN -dev_mgr_build_usb_endp(PUSB_INTERFACE pif, PUSB_ENDPOINT pendp, PUSB_ENDPOINT_DESC pendp_desc) -{ - if (pendp == NULL || pif == NULL || pendp_desc == NULL) - return FALSE; - - pendp->flags = 0; - InitializeListHead(&pendp->urb_list); //pending urb queue - pendp->pusb_if = pif; - pendp->pusb_endp_desc = pendp_desc; - return TRUE; -} - -BOOLEAN -dev_mgr_build_usb_if(PUSB_CONFIGURATION pcfg, PUSB_INTERFACE pif, PUSB_INTERFACE_DESC pif_desc, BOOLEAN alt_if) -{ - LONG i; - PUSB_ENDPOINT_DESC pendp_desc; - - if (pcfg == NULL || pif == NULL || pif_desc == NULL) - return FALSE; - - if (alt_if == FALSE) - { - pif->endp_count = pif_desc->bNumEndpoints > MAX_ENDPS_PER_IF - ? MAX_ENDPS_PER_IF : pif_desc->bNumEndpoints; - - pif->pif_drv = NULL; - pif->pusb_config = pcfg; - pif->pusb_if_desc = pif_desc; - pif->if_ext_size = 0; - pif->if_ext = NULL; - - InitializeListHead(&pif->altif_list); - pif->altif_count = 0; - - pendp_desc = (PUSB_ENDPOINT_DESC) (&((PBYTE) pif_desc)[sizeof(USB_INTERFACE_DESC)]); - - for(i = 0; i < pif->endp_count; i++, pendp_desc++) - { - dev_mgr_build_usb_endp(pif, &pif->endp[i], pendp_desc); - } - } - else - { - PUSB_INTERFACE paltif; - PLIST_ENTRY pthis, pnext; - - pif->altif_count++; - paltif = usb_alloc_mem(NonPagedPool, sizeof(USB_INTERFACE)); - RtlZeroMemory(paltif, sizeof(USB_INTERFACE)); - InsertTailList(&pif->altif_list, &paltif->altif_list); - paltif->pif_drv = NULL; - paltif->pusb_config = pcfg; - paltif->pusb_if_desc = pif_desc; - paltif->if_ext_size = 0; - paltif->if_ext = NULL; - paltif->endp_count = pif_desc->bNumEndpoints > MAX_ENDPS_PER_IF - ? MAX_ENDPS_PER_IF : pif_desc->bNumEndpoints; - - ListFirst(&pif->altif_list, pthis); - - while (pthis) - { - //synchronize the altif_count; - PUSB_INTERFACE pthis_if; - pthis_if = (PUSB_INTERFACE) (((PBYTE) pthis) - offsetof(USB_INTERFACE, altif_list)); - pthis_if->altif_count = pif->altif_count; - ListNext(&pif->altif_list, pthis, pnext); - } - - } - return TRUE; -} - -NTSTATUS -dev_mgr_build_usb_config(PUSB_DEV pdev, PBYTE pbuf, ULONG config_val, LONG config_count) -{ - PUSB_CONFIGURATION pcfg; - PUSB_INTERFACE_DESC pif_desc; - PUSB_INTERFACE pif; - int i; - LONG if_count; - - if (pdev == NULL || pbuf == NULL) - return STATUS_INVALID_PARAMETER; - - - pdev->usb_config = usb_alloc_mem(NonPagedPool, sizeof(USB_CONFIGURATION)); - pcfg = pdev->usb_config; - - if (pdev->usb_config == NULL) - return STATUS_NO_MEMORY; - - RtlZeroMemory(pcfg, sizeof(USB_CONFIGURATION)); - pcfg->pusb_config_desc = usb_find_config_desc_by_val(pbuf, config_val, config_count); - - if (pcfg->pusb_config_desc == NULL) - { - usb_free_mem(pcfg); - pdev->usb_config = NULL; - return STATUS_UNSUCCESSFUL; - } - pcfg->if_count = pcfg->pusb_config_desc->bNumInterfaces; - pcfg->pusb_dev = pdev; - pif_desc = (PUSB_INTERFACE_DESC) & ((PBYTE) pcfg->pusb_config_desc)[sizeof(USB_CONFIGURATION_DESC)]; - if_count = pcfg->if_count; - - for(i = 0; i < if_count; i++, pif_desc++) - { - if (pif_desc->bAlternateSetting == 0) - { - dev_mgr_build_usb_if(pcfg, &pcfg->interf[i], pif_desc, FALSE); - } - else - { - i--; - pif = &pcfg->interf[i]; - dev_mgr_build_usb_if(pcfg, pif, pif_desc, TRUE); - } - } - return STATUS_SUCCESS; -} - -NTSTATUS -dev_mgr_destroy_usb_config(PUSB_CONFIGURATION pcfg) -{ - long i; - PLIST_ENTRY pthis; - PUSB_INTERFACE pif; - - if (pcfg == NULL) - return FALSE; - - for(i = 0; i < pcfg->if_count; i++) - { - pif = &pcfg->interf[i]; - - if (pif->altif_count) - { - ListFirst(&pif->altif_list, pthis); - while (pthis) - { - PUSB_INTERFACE pthis_if; - pthis_if = (PUSB_INTERFACE) (((PBYTE) pthis) - offsetof(USB_INTERFACE, altif_list)); - RemoveEntryList(pthis); - usb_free_mem(pthis_if); - if (IsListEmpty(&pif->altif_list) == TRUE) - break; - - ListFirst(&pif->altif_list, pthis); - } - } - } - usb_free_mem(pcfg); - return TRUE; -} - -#define is_dev_product_match( pdriVER, pdev_DESC ) \ -( ( pdriVER )->driver_desc.vendor_id == ( pdev_DESC )->idVendor \ - && ( pdriVER )->driver_desc.product_id == ( pdev_DESC )->idProduct ) - -LONG -dev_mgr_score_driver_for_dev(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver, PUSB_DEVICE_DESC pdev_desc) -{ - LONG credit = 0; - - UNREFERENCED_PARAMETER(dev_mgr); - - //assume supports all the sub_class are supported if sub_class is zero - if (pdriver->driver_desc.dev_class == pdev_desc->bDeviceClass) - { - if (pdriver->driver_desc.dev_sub_class == 0 && pdriver->driver_desc.dev_protocol == 0) - credit = 3; - else if (pdriver->driver_desc.dev_sub_class == pdev_desc->bDeviceSubClass) - { - if (pdriver->driver_desc.dev_protocol == 0) - credit = 6; - else if (pdriver->driver_desc.dev_protocol == pdev_desc->bDeviceProtocol) - credit = 9; - } - } - - if (is_dev_product_match(pdriver, pdev_desc)) - credit += 20; - - return credit; -} - -LONG -dev_mgr_score_driver_for_if(PUSB_DEV_MANAGER dev_mgr, PUSB_DRIVER pdriver, PUSB_INTERFACE_DESC pif_desc) -{ - LONG credit; - - if (pdriver == NULL - || !(pdriver->driver_desc.flags & USB_DRIVER_FLAG_IF_CAPABLE) || pif_desc == NULL || dev_mgr == NULL) - return 0; - - if (is_header_match((PBYTE) pif_desc, USB_DT_INTERFACE) == FALSE) - { - return 0; - } - - credit = 0; - if ((pdriver->driver_desc.if_class == pif_desc->bInterfaceClass)) - { - if (pdriver->driver_desc.if_sub_class == 0 && pdriver->driver_desc.if_protocol == 0) - credit = 2; - if (pdriver->driver_desc.if_sub_class == pif_desc->bInterfaceSubClass) - { - if (pdriver->driver_desc.if_protocol == 0) - credit = 4; - if (pdriver->driver_desc.if_protocol == pif_desc->bInterfaceProtocol) - credit = 6; - } - } - else - credit = 1; - - return credit; -} - -#define is_equal_driver( pd1, pd2, ret ) \ -{\ - int i;\ - ret = TRUE;\ - PUSB_DRIVER pdr1, pdr2;\ - pdr1 = ( PUSB_DRIVER )( pd1 );\ - pdr2 = ( PUSB_DRIVER ) ( pd2 );\ - for( i = 0; i < 16; i++ )\ - {\ - if( pdr1->driver_name[ i ] != pdr2->driver_name[ i ] )\ - {\ - ret = FALSE;\ - break;\ - }\ - }\ -} - -//return value is the hcd id -UCHAR -dev_mgr_register_hcd(PUSB_DEV_MANAGER dev_mgr, PHCD hcd) -{ - if (dev_mgr == NULL || hcd == NULL) - return 0xff; - - if (dev_mgr->hcd_count >= MAX_HCDS) - return 0xff; - - dev_mgr->hcd_array[dev_mgr->hcd_count++] = hcd; - return dev_mgr->hcd_count - 1; -} - -BOOLEAN -dev_mgr_register_irp(PUSB_DEV_MANAGER dev_mgr, PIRP pirp, PURB purb) -{ - if (dev_mgr == NULL) - return FALSE; - - if (add_irp_to_list(&dev_mgr->irp_list, pirp, purb)) - { - return TRUE; - } - TRAP(); - return FALSE; -} - -//caller must guarantee that when this func is called, -//the urb associated must exist. -PURB -dev_mgr_remove_irp(PUSB_DEV_MANAGER dev_mgr, PIRP pirp) -{ - PURB purb; - if (dev_mgr == NULL) - return NULL; - - purb = remove_irp_from_list(&dev_mgr->irp_list, pirp, NULL); - return purb; -} - -VOID -dev_mgr_cancel_irp(PDEVICE_OBJECT dev_obj, PIRP pirp) -{ - PUSB_DEV_MANAGER dev_mgr; - PDEVEXT_HEADER pdev_ext_hdr; - - pdev_ext_hdr = (PDEVEXT_HEADER) dev_obj->DeviceExtension; - dev_mgr = pdev_ext_hdr->dev_mgr; - - if (dev_obj->CurrentIrp == pirp) - { - IoReleaseCancelSpinLock(pirp->CancelIrql); - // we did not IoStartNextPacket, leave it for the urb completion - } - else - { - KeRemoveEntryDeviceQueue(&dev_obj->DeviceQueue, &pirp->Tail.Overlay.DeviceQueueEntry); - IoReleaseCancelSpinLock(pirp->CancelIrql); - - pirp->IoStatus.Information = 0; - pirp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(pirp, IO_NO_INCREMENT); - // the device queue is moved on, no need to call IoStartNextPacket - return; - } - - // - // remove the irp and call the dev_mgr_cancel_irp - // the completion will be done in urb completion - // - remove_irp_from_list(&dev_mgr->irp_list, pirp, dev_mgr); - return; - -} - -// release the hcd -VOID -dev_mgr_release_hcd(PUSB_DEV_MANAGER dev_mgr) -{ - LONG i; - PHCD hcd; - for(i = 0; i < dev_mgr->hcd_count; i++) - { - hcd = dev_mgr->hcd_array[i]; - hcd->hcd_release(hcd); - dev_mgr->hcd_array[i] = 0; - } - dev_mgr->hcd_count = 0; - return; -} - -VOID -dev_mgr_start_hcd(PUSB_DEV_MANAGER dev_mgr) -{ - LONG i; - PHCD hcd; - for(i = 0; i < dev_mgr->hcd_count; i++) - { - hcd = dev_mgr->hcd_array[i]; - hcd->hcd_start(hcd); - } - return; -} - BOOLEAN hub_connect(PCONNECT_DATA param, DEV_HANDLE dev_handle) {

1 0

[ion] 23889: - Part 2 of 2: Implement KiDispatchInterrupt in assembly since it's 1) Perf-critical 2) Requires us to switch the stack to the DPC stack, which is unsafe (and impossible, unless inlining) in C.
by ion＠svn.reactos.org 02 Sep '06

02 Sep '06

Author: ion Date: Sat Sep 2 23:53:24 2006 New Revision: 23889 URL: http://svn.reactos.org/svn/reactos?rev=23889&view=rev Log: - Part 2 of 2: Implement KiDispatchInterrupt in assembly since it's 1) Perf-critical 2) Requires us to switch the stack to the DPC stack, which is unsafe (and impossible, unless inlining) in C. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2388… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sat Sep 2 23:53:24 2006 @@ -148,6 +148,7 @@ #define KPCR_SET_MEMBER 0x48 #define KPCR_NUMBER 0x51 #define KPCR_CURRENT_THREAD 0x124 +#define KPCR_PRCB_NEXT_THREAD 0x128 #define KPCR_PRCB_IDLE_THREAD 0x12C #define KPCR_PROCESSOR_NUMBER 0x130 #define KPCR_PRCB_SET_MEMBER 0x134 @@ -165,12 +166,15 @@ #define KPCR_SYSTEM_CALLS 0x6B8 #define KPCR_PRCB_DPC_QUEUE_DEPTH 0xA4C #define KPCR_PRCB_DPC_COUNT 0xA50 +#define KPCR_PRCB_DPC_STACK 0xA68 #define KPCR_PRCB_MAXIMUM_DPC_QUEUE_DEPTH 0xA6C #define KPCR_PRCB_DPC_REQUEST_RATE 0xA70 #define KPCR_PRCB_DPC_INTERRUPT_REQUESTED 0xA78 #define KPCR_PRCB_DPC_ROUTINE_ACTIVE 0xA7A #define KPCR_PRCB_DPC_LAST_COUNT 0xA80 +#define KPCR_PRCB_TIMER_REQUEST 0xA88 #define KPCR_PRCB_QUANTUM_END 0xAA1 +#define KPCR_PRCB_DEFERRED_READY_LIST_HEAD 0xC10 // // KINTERRUPT Offsets Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2388… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Sat Sep 2 23:53:24 2006 @@ -441,9 +441,22 @@ { PAGED_CODE(); - /* Request an interrupt if needed */ - DPRINT1("%s - FIXME!!!\n", __FUNCTION__); - if (KeGetCurrentPrcb()->DpcData[0].DpcQueueDepth) HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + /* Check if this is an UP machine */ + if (KeActiveProcessors == 1) + { + /* Check if there are DPCs on either queues */ + if ((KeGetCurrentPrcb()->DpcData[DPC_NORMAL].DpcQueueDepth) || + (KeGetCurrentPrcb()->DpcData[DPC_THREADED].DpcQueueDepth)) + { + /* Request an interrupt */ + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } + } + else + { + /* FIXME: SMP support required */ + ASSERT(FALSE); + } } /* @@ -483,53 +496,4 @@ Dpc->Number = Number + MAXIMUM_PROCESSORS; } -/* - * @implemented - */ -VOID -NTAPI -KiDispatchInterrupt(VOID) -{ - PKIPCR Pcr = (PKIPCR)KeGetPcr(); - PVOID ExceptionList; - - /* Disable interrupts */ - Ke386DisableInterrupts(); - - /* Check if we have to deliver DPCs, timers, or deferred threads */ - if ((Pcr->PrcbData.DpcData[DPC_NORMAL].DpcQueueDepth) || - (Pcr->PrcbData.TimerRequest) || - (Pcr->PrcbData.DeferredReadyListHead.Next)) - { - /* Save the exception list and clear it */ - ExceptionList = Pcr->NtTib.ExceptionList; - Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; - - /* FIXME: Switch to DPC Stack */ - - /* Deliver DPCs */ - KiRetireDpcList(Pcr->Prcb); - - /* FIXME: Restore stack */ - - /* Restore exception list */ - Pcr->NtTib.ExceptionList = ExceptionList; - } - - /* Re-enable interrupts */ - Ke386EnableInterrupts(); - - /* Check if we have quantum end */ - if (Pcr->PrcbData.QuantumEnd) - { - /* Process it */ - Pcr->PrcbData.QuantumEnd = FALSE; - KiQuantumEnd(); - } - else if (Pcr->PrcbData.NextThread) - { - /* FIXME: Schedule new thread */ - } -} - /* EOF */ Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sat Sep 2 23:53:24 2006 @@ -56,6 +56,7 @@ .globl _NtRaiseException@12 .globl _NtContinue@8 .globl _KiCoprocessorError@0 +.globl _KiDispatchInterrupt@0 /* Interrupt template entrypoints */ .globl _KiInterruptTemplate @@ -1558,6 +1559,65 @@ /* INTERRUPT HANDLERS ********************************************************/ +.func KiDispatchInterrupt@0 +_KiDispatchInterrupt@0: + + /* Get the PCR and disable interrupts */ + mov ebx, [fs:KPCR_SELF] + cli + + /* Check if we have to deliver DPCs, timers, or deferred threads */ + mov eax, [ebx+KPCR_PRCB_DPC_QUEUE_DEPTH] + or eax, [ebx+KPCR_PRCB_TIMER_REQUEST] + or eax, [ebx+KPCR_PRCB_DEFERRED_READY_LIST_HEAD] + jz CheckQuantum + + /* Save stack pointer and exception list, then clear it */ + push ebp + push dword ptr [ebx+KPCR_EXCEPTION_LIST] + mov dword ptr [ebx+KPCR_EXCEPTION_LIST], -1 + + /* Save the stack and switch to the DPC Stack */ + mov edx, esp + //mov esp, [ebx+KPCR_PRCB_DPC_STACK] + push edx + + /* Deliver DPCs */ + mov ecx, [ebx+KPCR_PRCB] + call @KiRetireDpcList@4 + + /* Restore stack and exception list */ + pop esp + pop dword ptr [ebx] + pop ebp + +CheckQuantum: + + /* Re-enable interrupts */ + sti + + /* Check if we have quantum end */ + cmp byte ptr [ebx+KPCR_PRCB_QUANTUM_END], 0 + jnz QuantumEnd + + /* Check if we have a thread to swap to */ + cmp byte ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 + jz Return + + /* FIXME: Schedule new thread */ + int 3 + +Return: + /* All done */ + ret + +QuantumEnd: + /* Disable quantum end and process it */ + mov byte ptr [ebx+KPCR_PRCB_QUANTUM_END], 0 + call _KiQuantumEnd@0 + ret +.endfunc + .func KiInterruptTemplate _KiInterruptTemplate:

1 0

[ion] 23888: - Part 1.5 of 2: Re-factor KiDispatchInterrupt to separate DPC delivery routine (so that it can stay in C, since KiDispatch should be done in ASM so we can switch stacks). - Use interrupt enable/disable instead of raising to HIGH_LEVEL. - Better use and pairing of locks. - Fix a lot of race conditions in DPC dispatching, due to the fact almost all data we're touching is ultra-volatile and can change at any time depending on various locks being held/released + interrupt state. - Add
by ion＠svn.reactos.org 02 Sep '06

02 Sep '06

Author: ion Date: Sat Sep 2 23:12:31 2006 New Revision: 23888 URL: http://svn.reactos.org/svn/reactos?rev=23888&view=rev Log: - Part 1.5 of 2: Re-factor KiDispatchInterrupt to separate DPC delivery routine (so that it can stay in C, since KiDispatch should be done in ASM so we can switch stacks). - Use interrupt enable/disable instead of raising to HIGH_LEVEL. - Better use and pairing of locks. - Fix a lot of race conditions in DPC dispatching, due to the fact almost all data we're touching is ultra-volatile and can change at any time depending on various locks being held/released + interrupt state. - Add stub code/support for tick-hased table-based timer implementation and deferred threads. Modified: trunk/reactos/ntoskrnl/ke/dpc.c Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2388… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Sat Sep 2 23:12:31 2006 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ke/i386/cpu.c + * FILE: ntoskrnl/ke/dpc.c * PURPOSE: Routines for CPU-level support * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Philip Susi (phreak(a)iag.net) @@ -25,6 +25,177 @@ KMUTEX KiGenericCallDpcMutex; /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KiQuantumEnd(VOID) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD CurrentThread = KeGetCurrentThread(); + KIRQL OldIrql; + PKPROCESS Process; + KPRIORITY OldPriority; + KPRIORITY NewPriority; + + /* Check if a DPC Event was requested to be signaled */ + if (InterlockedExchange(&Prcb->DpcSetEventRequest, 0)) + { + /* Signal it */ + KeSetEvent(&Prcb->DpcEvent, 0, 0); + } + + /* Lock dispatcher */ + OldIrql = KeRaiseIrqlToSynchLevel(); + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + + /* Get the Thread's Process */ + Process = CurrentThread->ApcState.Process; + + /* Check if Quantum expired */ + if (CurrentThread->Quantum <= 0) + { + /* Reset the new Quantum */ + CurrentThread->Quantum = CurrentThread->QuantumReset; + + /* Calculate new priority */ + OldPriority = CurrentThread->Priority; + if (OldPriority < LOW_REALTIME_PRIORITY) + { + /* Set the New Priority and add the Priority Decrement */ + NewPriority = OldPriority - CurrentThread->PriorityDecrement - 1; + + /* Don't go out of bounds */ + if (NewPriority < CurrentThread->BasePriority) + { + NewPriority = CurrentThread->BasePriority; + } + + /* Reset the priority decrement */ + CurrentThread->PriorityDecrement = 0; + + /* Set a new priority if needed */ + if (OldPriority != NewPriority) + { + /* Set new Priority */ + BOOLEAN Dummy; /* <- This is a hack anyways... */ + KiSetPriorityThread(CurrentThread, NewPriority, &Dummy); + } + else + { + /* Queue new thread if none is already */ + if (!Prcb->NextThread) + { + /* FIXME: Schedule a New Thread, when ROS will have NT Scheduler */ + } + else + { + /* Make the current thread non-premeptive if a new thread is queued */ + CurrentThread->Preempted = FALSE; + } + } + } + else + { + /* Set the Quantum back to Maximum */ + //if (CurrentThread->DisableQuantum) { + // CurrentThread->Quantum = MAX_QUANTUM; + //} + } + } + + /* Dispatch the Thread */ + KeLowerIrql(DISPATCH_LEVEL); + KiDispatchThread(Ready); +} + +VOID +FASTCALL +KiRetireDpcList(IN PKPRCB Prcb) +{ + PKDPC_DATA DpcData = Prcb->DpcData; + PLIST_ENTRY DpcEntry; + PKDPC Dpc; + PKDEFERRED_ROUTINE DeferredRoutine; + PVOID DeferredContext, SystemArgument1, SystemArgument2; + + /* Main outer loop */ + do + { + /* Set us as active */ + Prcb->DpcRoutineActive = TRUE; + + /* Check if this is a timer expiration request */ + if (Prcb->TimerRequest) + { + /* FIXME: Not yet implemented */ + ASSERT(FALSE); + } + + /* Loop while we have entries in the queue */ + while (DpcData->DpcQueueDepth) + { + /* Lock the DPC data */ + KefAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); + + /* Make sure we have an entry */ + if (!IsListEmpty(&DpcData->DpcListHead)) + { + /* Remove the DPC from the list */ + DpcEntry = RemoveHeadList(&DpcData->DpcListHead); + Dpc = CONTAINING_RECORD(DpcEntry, KDPC, DpcListEntry); + + /* Clear its DPC data and save its parameters */ + Dpc->DpcData = NULL; + DeferredRoutine = Dpc->DeferredRoutine; + DeferredContext = Dpc->DeferredContext; + SystemArgument1 = Dpc->SystemArgument1; + SystemArgument2 = Dpc->SystemArgument2; + + /* Decrease the queue depth */ + DpcData->DpcQueueDepth--; + + /* Clear DPC Time */ + Prcb->DebugDpcTime = 0; + + /* Release the lock */ + KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); + + /* Re-enable interrupts */ + Ke386EnableInterrupts(); + + /* Call the DPC */ + DeferredRoutine(Dpc, + DeferredContext, + SystemArgument1, + SystemArgument2); + ASSERT_IRQL(DISPATCH_LEVEL); + + /* Disable interrupts and keep looping */ + Ke386DisableInterrupts(); + } + else + { + /* The queue should be flushed now */ + ASSERT(DpcData->DpcQueueDepth == 0); + + /* Release DPC Lock */ + KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); + break; + } + } + + /* Clear DPC Flags */ + Prcb->DpcRoutineActive = FALSE; + Prcb->DpcInterruptRequested = FALSE; + + /* Check if we have deferred threads */ + if (Prcb->DeferredReadyListHead.Next) + { + /* FIXME: 2K3-style scheduling not implemeted */ + ASSERT(FALSE); + } + } while (DpcData->DpcQueueDepth); +} VOID NTAPI @@ -313,182 +484,52 @@ } /* - * FUNCTION: - * Called when a quantum end occurs to check if priority should be changed - * and wether a new thread should be dispatched. - * NOTES: - * Called when deleting a Driver. - */ -VOID -STDCALL -KiQuantumEnd(VOID) -{ - PKPRCB Prcb; - PKTHREAD CurrentThread; - KIRQL OldIrql; - PKPROCESS Process; - KPRIORITY OldPriority; - KPRIORITY NewPriority; - - /* Lock dispatcher, get current thread */ - Prcb = KeGetCurrentPrcb(); - CurrentThread = KeGetCurrentThread(); - OldIrql = KeRaiseIrqlToSynchLevel(); - - /* Get the Thread's Process */ - Process = CurrentThread->ApcState.Process; - - /* Set DPC Event if requested */ - if (Prcb->DpcSetEventRequest) - { - KeSetEvent(&Prcb->DpcEvent, 0, 0); - } - - /* Check if Quantum expired */ - if (CurrentThread->Quantum <= 0) { - - /* Reset the new Quantum */ - CurrentThread->Quantum = CurrentThread->QuantumReset; - - /* Calculate new priority */ - OldPriority = CurrentThread->Priority; - if (OldPriority < LOW_REALTIME_PRIORITY) { - - /* Set the New Priority and add the Priority Decrement */ - NewPriority = OldPriority - CurrentThread->PriorityDecrement - 1; - - /* Don't go out of bounds */ - if (NewPriority < CurrentThread->BasePriority) NewPriority = CurrentThread->BasePriority; - - /* Reset the priority decrement */ - CurrentThread->PriorityDecrement = 0; - - /* Set a new priority if needed */ - if (OldPriority != NewPriority) { - - /* Set new Priority */ - BOOLEAN Dummy; /* <- This is a hack anyways... */ - KiSetPriorityThread(CurrentThread, NewPriority, &Dummy); - - } else { - - /* Queue new thread if none is already */ - if (Prcb->NextThread == NULL) { - - /* FIXME: Schedule a New Thread, when ROS will have NT Scheduler */ - - } else { - - /* Make the current thread non-premeptive if a new thread is queued */ - CurrentThread->Preempted = FALSE; - } - } - - - } else { - /* Set the Quantum back to Maximum */ - //if (CurrentThread->DisableQuantum) { - // CurrentThread->Quantum = MAX_QUANTUM; - //} - } - } - - /* Dispatch the Thread */ - KeLowerIrql(DISPATCH_LEVEL); - KiDispatchThread(Ready); -} - -/* - * @implemented - * - * FUNCTION: - * Called whenever a system interrupt is generated at DISPATCH_LEVEL. - * It delivers queued DPCs and dispatches a new thread if need be. - */ -VOID -STDCALL + * @implemented + */ +VOID +NTAPI KiDispatchInterrupt(VOID) { - PLIST_ENTRY DpcEntry; - PKDPC Dpc; - KIRQL OldIrql; - PKPRCB Prcb; - - DPRINT("Dispatching Interrupts\n"); - ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - - /* Set DPC Deliver to Active */ - Prcb = KeGetCurrentPrcb(); - - if (Prcb->DpcData[0].DpcQueueDepth > 0) { - /* Raise IRQL */ - KeRaiseIrql(HIGH_LEVEL, &OldIrql); -#ifdef CONFIG_SMP - KiAcquireSpinLock(&Prcb->DpcData[0].DpcLock); -#endif - Prcb->DpcRoutineActive = TRUE; - - DPRINT("&Prcb->DpcData[0].DpcListHead: %x\n", &Prcb->DpcData[0].DpcListHead); - /* Loop while we have entries */ - while (!IsListEmpty(&Prcb->DpcData[0].DpcListHead)) { - - ASSERT(Prcb->DpcData[0].DpcQueueDepth > 0); - DPRINT("Queue Depth: %x\n", Prcb->DpcData[0].DpcQueueDepth); - - /* Get the DPC call it */ - DpcEntry = RemoveHeadList(&Prcb->DpcData[0].DpcListHead); - Dpc = CONTAINING_RECORD(DpcEntry, KDPC, DpcListEntry); - DPRINT("Dpc->DpcListEntry.Flink %x\n", Dpc->DpcListEntry.Flink); - Dpc->DpcData = NULL; - Prcb->DpcData[0].DpcQueueDepth--; -#ifdef CONFIG_SMP - KiReleaseSpinLock(&Prcb->DpcData[0].DpcLock); -#endif - /* Disable/Enabled Interrupts and Call the DPC */ - KeLowerIrql(OldIrql); - DPRINT("Calling DPC: %x\n", Dpc); - Dpc->DeferredRoutine(Dpc, - Dpc->DeferredContext, - Dpc->SystemArgument1, - Dpc->SystemArgument2); - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - -#ifdef CONFIG_SMP - KiAcquireSpinLock(&Prcb->DpcData[0].DpcLock); - /* - * If the dpc routine drops the irql below DISPATCH_LEVEL, - * a thread switch can occur and after the next thread switch - * the execution may start on an other processor. - */ - if (Prcb != KeGetCurrentPrcb()) { - - Prcb->DpcRoutineActive = FALSE; - KiReleaseSpinLock(&Prcb->DpcData[0].DpcLock); - Prcb = KeGetCurrentPrcb(); - KiAcquireSpinLock(&Prcb->DpcData[0].DpcLock); - Prcb->DpcRoutineActive = TRUE; - } -#endif - } - /* Clear DPC Flags */ - Prcb->DpcRoutineActive = FALSE; - Prcb->DpcInterruptRequested = FALSE; -#ifdef CONFIG_SMP - KiReleaseSpinLock(&Prcb->DpcData[0].DpcLock); -#endif - - /* DPC Dispatching Ended, re-enable interrupts */ - KeLowerIrql(OldIrql); - } - - DPRINT("Checking for Quantum End\n"); - - /* If we have Quantum End, call the function */ - if (Prcb->QuantumEnd) { - - Prcb->QuantumEnd = FALSE; + PKIPCR Pcr = (PKIPCR)KeGetPcr(); + PVOID ExceptionList; + + /* Disable interrupts */ + Ke386DisableInterrupts(); + + /* Check if we have to deliver DPCs, timers, or deferred threads */ + if ((Pcr->PrcbData.DpcData[DPC_NORMAL].DpcQueueDepth) || + (Pcr->PrcbData.TimerRequest) || + (Pcr->PrcbData.DeferredReadyListHead.Next)) + { + /* Save the exception list and clear it */ + ExceptionList = Pcr->NtTib.ExceptionList; + Pcr->NtTib.ExceptionList = EXCEPTION_CHAIN_END; + + /* FIXME: Switch to DPC Stack */ + + /* Deliver DPCs */ + KiRetireDpcList(Pcr->Prcb); + + /* FIXME: Restore stack */ + + /* Restore exception list */ + Pcr->NtTib.ExceptionList = ExceptionList; + } + + /* Re-enable interrupts */ + Ke386EnableInterrupts(); + + /* Check if we have quantum end */ + if (Pcr->PrcbData.QuantumEnd) + { + /* Process it */ + Pcr->PrcbData.QuantumEnd = FALSE; KiQuantumEnd(); } + else if (Pcr->PrcbData.NextThread) + { + /* FIXME: Schedule new thread */ + } } /* EOF */

1 0

[ion] 23887: - Fix a bug in RtlFillMemory. - Fix overlap check comments.
by ion＠svn.reactos.org 02 Sep '06

02 Sep '06

Author: ion Date: Sat Sep 2 20:36:48 2006 New Revision: 23887 URL: http://svn.reactos.org/svn/reactos?rev=23887&view=rev Log: - Fix a bug in RtlFillMemory. - Fix overlap check comments. Modified: trunk/reactos/lib/rtl/i386/rtlmem.s Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s (original) +++ trunk/reactos/lib/rtl/i386/rtlmem.s Sat Sep 2 20:36:48 2006 @@ -110,7 +110,7 @@ /* Get pattern */ mov al, [esp+16] mov ah, al - shr eax, 16 + shl eax, 16 mov al, [esp+16] mov ah, al @@ -227,7 +227,7 @@ mov ecx, [esp+20] cld - /* Check for overlap */ + /* Check if the destination is higher (or equal) */ cmp esi, edi jbe Overlap @@ -252,15 +252,16 @@ rep stosb DoneMove: + /* Restore volatiles */ pop edi pop esi ret 12 Overlap: - /* Avoid full overlap */ + /* Don't copy if they're equal */ jz DoneMove - /* Remove overlap */ + /* Compare pointer distance with given length and check for overlap */ mov eax, edi sub eax, esi cmp ecx, eax @@ -269,7 +270,7 @@ /* Set direction flag for backward move */ std - /* Can only move some bytes, calculate how many */ + /* Copy byte-by-byte the non-overlapping distance */ add esi, ecx add edi, ecx dec esi

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