Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 43181: Give a name to a structure.
by dgorbachev＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: dgorbachev Date: Sun Sep 27 13:55:47 2009 New Revision: 43181 URL: http://svn.reactos.org/svn/reactos?rev=43181&view=rev Log: Give a name to a structure. Modified: trunk/reactos/include/psdk/rpcndr.h Modified: trunk/reactos/include/psdk/rpcndr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/rpcndr.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/rpcndr.h [iso-8859-1] Sun Sep 27 13:55:47 2009 @@ -128,7 +128,7 @@ (RpcExceptionCode() == RPC_X_BAD_STUB_DATA) || \ (RpcExceptionCode() == RPC_S_INVALID_BOUND)) -typedef struct +typedef struct _NDR_SCONTEXT { void *pad[2]; void *userContext;

1 0

[sginsberg] 43180: - Change CPUID to match the old Ki386Cpuid and take 4 output arguments instead of an array. This way we save some stack when using a dummy cpuid for synchronization and can query only the registers we want in the case we don't want all 4. - Simplify Ke386GetTr and Ke386GetLocalDescriptorTable to return by value instead of reference. - Make RDMSR smaller by making it fastcall as rdmsr takes its argument in ecx. - Fix KiGetCacheInformation -- it only handled the Intel and AMD ca
by sginsberg＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: sginsberg Date: Sun Sep 27 12:09:38 2009 New Revision: 43180 URL: http://svn.reactos.org/svn/reactos?rev=43180&view=rev Log: - Change CPUID to match the old Ki386Cpuid and take 4 output arguments instead of an array. This way we save some stack when using a dummy cpuid for synchronization and can query only the registers we want in the case we don't want all 4. - Simplify Ke386GetTr and Ke386GetLocalDescriptorTable to return by value instead of reference. - Make RDMSR smaller by making it fastcall as rdmsr takes its argument in ecx. - Fix KiGetCacheInformation -- it only handled the Intel and AMD case. - Replace Ke386HaltProcessor with __halt. - KiHaltProcessorDpcRoutine: Always halt the processor for the architectures we support for consistency. - Clean up x86 and PPC headers from deprecated stuff. - Fix broken LOCK undefine in v86m_sup.S -- LOCK is used both in a macro and the code, so only undefine it where required and redefine it after it is used (this worked because LOCK was interpreted as lock). Get rid of KeArch*: - Rename KeArchInitThreadWithContext to KiInitializeContextThread and use the same name for all architectures. - Kill KeArchHaltProcessor. Use __halt and KeArmHaltProcessor directly instead. - Use Ke386FnInit instead of KeArchFnInit -- it is only used for x86. Modified: trunk/reactos/hal/halx86/generic/processor.c trunk/reactos/hal/halx86/generic/reboot.c trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/msc/intrin.h trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/kdbg/kdb_cli.c trunk/reactos/ntoskrnl/ke/arm/thrdini.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/kiinit.c trunk/reactos/ntoskrnl/ke/i386/thrdini.c trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c trunk/reactos/ntoskrnl/ke/thrdobj.c Modified: trunk/reactos/hal/halx86/generic/processor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/process… ============================================================================== --- trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/processor.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -70,7 +70,7 @@ { /* Enable interrupts and halt the processor */ _enable(); - Ke386HaltProcessor(); + __halt(); } /* Modified: trunk/reactos/hal/halx86/generic/reboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.… ============================================================================== --- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -67,7 +67,7 @@ HalpWriteResetCommand(); /* Halt the CPU */ - Ke386HaltProcessor(); + __halt(); } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -1107,6 +1107,10 @@ __asm__("sti"); } +__INTRIN_INLINE void __halt(void) +{ + __asm__("hlt\n\t"); +} /*** Protected memory management ***/ Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -145,6 +145,7 @@ void __int2c(void); void _disable(void); void _enable(void); +void __halt(void); /*** Protected memory management ***/ void __writecr0(const unsigned __int64 Data); Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar… ============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -238,7 +238,7 @@ HANDLE KeyHandle, BiosHandle, SystemHandle, FpuHandle, SectionHandle; CONFIGURATION_COMPONENT_DATA ConfigData; CHAR Buffer[128]; - ULONG ExtendedId, CpuInfo[4]; + ULONG ExtendedId, Dummy; PKPRCB Prcb; USHORT IndexTable[MaximumType + 1] = {0}; ANSI_STRING TempString; @@ -428,8 +428,7 @@ else { /* Check if we have extended CPUID that supports name ID */ - CPUID(CpuInfo, 0x80000000); - ExtendedId = CpuInfo[0]; + CPUID(0x80000000, &ExtendedId, &Dummy, &Dummy, &Dummy); if (ExtendedId >= 0x80000004) { /* Do all the CPUIDs required to get the full name */ @@ -437,8 +436,11 @@ for (ExtendedId = 2; ExtendedId <= 4; ExtendedId++) { /* Do the CPUID and save the name string */ - CPUID((PULONG)PartialString, - 0x80000000 | ExtendedId); + CPUID(0x80000000 | ExtendedId, + (PULONG)PartialString, + (PULONG)PartialString + 1, + (PULONG)PartialString + 2, + (PULONG)PartialString + 3); /* Go to the next name string */ PartialString += 16; Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -14,26 +14,30 @@ /* FUNCTIONS *****************************************************************/ -VOID NTAPI +VOID +NTAPI KiHaltProcessorDpcRoutine(IN PKDPC Dpc, - IN PVOID DeferredContext, - IN PVOID SystemArgument1, - IN PVOID SystemArgument2) -{ - KIRQL OldIrql; - if (DeferredContext) - { - ExFreePool(DeferredContext); - } - while (TRUE) - { - KeRaiseIrql(SYNCH_LEVEL, &OldIrql); -#if defined(_M_IX86) - Ke386HaltProcessor(); + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + KIRQL OldIrql; + if (DeferredContext) + { + ExFreePool(DeferredContext); + } + + while (TRUE) + { + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); +#if defined(_M_IX86) || defined(_M_AMD64) + __halt(); +#elif defined(_M_ARM) + KeArmHaltProcessor(); #else - HalProcessorIdle(); + HalProcessorIdle(); #endif - } + } } VOID NTAPI Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -6,18 +6,6 @@ // #define PCR_ENTRY 0 #define PDR_ENTRY 2 - -#define KeArchHaltProcessor() KeArmHaltProcessor() - -VOID -NTAPI -KeArmInitThreadWithContext( - IN PKTHREAD Thread, - IN PKSYSTEM_ROUTINE SystemRoutine, - IN PKSTART_ROUTINE StartRoutine, - IN PVOID StartContext, - IN PCONTEXT Context -); VOID KiPassiveRelease( @@ -44,7 +32,6 @@ VOID ); -#define KeArchInitThreadWithContext KeArmInitThreadWithContext #define KiSystemStartupReal KiSystemStartup #define KiGetPreviousMode(tf) \ Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -1,11 +1,5 @@ #ifndef _INTRIN_INTERNAL_ #define _INTRIN_INTERNAL_ - -#ifdef CONFIG_SMP -#define LOCK "lock ; " -#else -#define LOCK "" -#endif #if defined(__GNUC__) @@ -20,11 +14,17 @@ : /* no input */ \ : "memory"); -#define Ke386GetLocalDescriptorTable(X) \ - __asm__("sldt %0\n\t" \ - : "=m" (*X) \ - : /* no input */ \ +FORCEINLINE +USHORT +Ke386GetLocalDescriptorTable() +{ + USHORT Ldt; + __asm__("sldt %0\n\t" + : "=m" (Ldt) + : /* no input */ : "memory"); + return Ldt; +} #define Ke386SetLocalDescriptorTable(X) \ __asm__("lldt %w0\n\t" \ @@ -33,19 +33,23 @@ #define Ke386SetTr(X) __asm__ __volatile__("ltr %%ax" : :"a" (X)); -#define Ke386GetTr(X) \ - __asm__("str %0\n\t" \ - : "=m" (*X)); +FORCEINLINE +USHORT +Ke386GetTr(VOID) +{ + USHORT Tr; + __asm__("str %0\n\t" + : "=m" (Tr)); + return Tr; +} #define _Ke386GetSeg(N) ({ \ unsigned int __d; \ __asm__("movl %%" #N ",%0\n\t" :"=r" (__d)); \ __d; \ - }) + }) #define _Ke386SetSeg(N,X) __asm__ __volatile__("movl %0,%%" #N : :"r" (X)); - -#define Ke386HaltProcessor() __asm__("hlt\n\t"); #define Ke386FnInit() __asm__("fninit\n\t"); @@ -77,13 +81,6 @@ FORCEINLINE VOID -Ke386HaltProcessor(VOID) -{ - __asm hlt; -} - -FORCEINLINE -VOID Ke386GetGlobalDescriptorTable(OUT PVOID Descriptor) { __asm sgdt [Descriptor]; @@ -97,12 +94,10 @@ } FORCEINLINE -VOID -Ke386GetLocalDescriptorTable(OUT PUSHORT Descriptor) -{ - USHORT _Descriptor; - __asm sldt _Descriptor; - *Descriptor = _Descriptor; +USHORT +Ke386GetLocalDescriptorTable(VOID) +{ + __asm sldt ax; } FORCEINLINE @@ -121,11 +116,9 @@ FORCEINLINE USHORT -Ke386GetTr(OUT PUSHORT Tr) -{ - USHORT _Tr; - __asm str _Tr; - *Tr = _Tr; +Ke386GetTr(VOID) +{ + __asm str ax; } // 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -1,23 +1,12 @@ #ifndef __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H #define __NTOSKRNL_INCLUDE_INTERNAL_I386_KE_H - -#define FRAME_EDITED 0xFFF8 #ifndef __ASM__ #include "intrin_i.h" #include "v86m.h" -#define KeArchFnInit() Ke386FnInit() -#define KeArchHaltProcessor() Ke386HaltProcessor() - extern ULONG Ke386CacheAlignment; - -struct _KPCR; -VOID -KiInitializeGdt(struct _KPCR* Pcr); -VOID -Ki386ApplicationProcessorInitializeTSS(VOID); VOID FASTCALL @@ -26,13 +15,6 @@ IN PKIDTENTRY Idt, IN PKGDTENTRY Gdt ); - -VOID -KiGdtPrepareForApplicationProcessorInit(ULONG Id); -VOID -Ki386InitializeLdt(VOID); -VOID -Ki386SetProcessorFeatures(VOID); VOID NTAPI @@ -62,23 +44,6 @@ NTAPI KiGetFeatureBits(VOID); -ULONG KeAllocateGdtSelector(ULONG Desc[2]); -VOID KeFreeGdtSelector(ULONG Entry); -VOID -KeApplicationProcessorInitDispatcher(VOID); -VOID -KeCreateApplicationProcessorIdleThread(ULONG Id); - -VOID -NTAPI -Ke386InitThreadWithContext(PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT Context); -#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ - Ke386InitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) - #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ VOID NTAPI 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -276,8 +276,11 @@ VOID NTAPI CPUID( - OUT ULONG CpuInfo[4], - IN ULONG InfoType + IN ULONG InfoType, + OUT PULONG CpuInfoEax, + OUT PULONG CpuInfoEbx, + OUT PULONG CpuInfoEcx, + OUT PULONG CpuInfoEdx ); BOOLEAN @@ -482,6 +485,16 @@ VOID NTAPI +KiInitializeContextThread( + PKTHREAD Thread, + PKSYSTEM_ROUTINE SystemRoutine, + PKSTART_ROUTINE StartRoutine, + PVOID StartContext, + PCONTEXT Context +); + +VOID +NTAPI KeStartThread( IN OUT PKTHREAD Thread ); Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -392,7 +392,7 @@ { /* Clear it */ KeGetCurrentPrcb()->NpxThread = NULL; - KeArchFnInit(); + Ke386FnInit(); } #endif } Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -35,96 +35,9 @@ extern ULONG KePPCCacheAlignment; -struct _KPCR; -VOID -KiInitializeGdt(struct _KPCR* Pcr); -VOID -KiPPCApplicationProcessorInitializeTSS(VOID); -VOID -KiPPCBootInitializeTSS(VOID); -VOID -KiGdtPrepareForApplicationProcessorInit(ULONG Id); -VOID -KiPPCInitializeLdt(VOID); -VOID -KiPPCSetProcessorFeatures(VOID); -ULONG KeAllocateGdtSelector(ULONG Desc[2]); -VOID KeFreeGdtSelector(ULONG Entry); - -#ifdef CONFIG_SMP -#define LOCK "isync ; " -#else -#define LOCK "" -#endif - - -static inline LONG KePPCTestAndClearBit(ULONG BitPos, volatile PULONG Addr) -{ - ULONG OldValue, NewValue; - - __asm__ __volatile__ ("lwarx %0,0,%1" - : "=r" (OldValue), "=r" (*Addr) - : - : "memory"); - - NewValue = OldValue & ~(1<<BitPos); - - __asm__ __volatile__ ("stwcx. %0,0,%3\n\t" - "beq success\n\t" - "add %2,0,%1\n" - "success:\n\t" - "isync\n\t" - : "=r" (NewValue), "=r" (OldValue) - : "w" (NewValue), "w" (*Addr) - : "memory"); - - return NewValue & (1 << BitPos); -} - -static inline LONG KePPCTestAndSetBit(ULONG BitPos, volatile PULONG Addr) -{ - ULONG OldValue, NewValue; - - __asm__ __volatile__ ("lwarx %0,0,%1" - : "=r" (OldValue), "=r" (*Addr) - : - : "memory"); - - NewValue = OldValue | (1<<BitPos); - - __asm__ __volatile__ ("stwcx. %0,0,%3\n\t" - "beq success\n\t" - "add %2,0,%1\n" - "success:\n\t" - "isync\n\t" - : "=r" (NewValue), "=r" (OldValue) - : "w" (NewValue), "w" (*Addr) - : "memory"); - - return NewValue & (1 << BitPos); -} - #define KePPCRdmsr(msr,val1,val2) __asm__ __volatile__("mfmsr 3") #define KePPCWrmsr(msr,val1,val2) __asm__ __volatile__("mtmsr 3") - - -#define KePPCDisableInterrupts() \ -__asm__ __volatile__("mfmsr 0\n\t" \ - "li 8,0x7fff\n\t" \ - "and 0,8,0\n\t" \ - "mtmsr 0\n\t") - -#define KePPCEnableInterrupts() \ - __asm__ __volatile__("mfmsr 0\n\t" \ - "lis 8,0x8000@ha\n\t" \ - "or 0,8,0\n\t" \ - "mtmsr 0\n\t") - -#define KePPCHaltProcessor() - -#define KeArchEraseFlags() -#define KeArchDisableInterrupts() KePPCDisableInterrupts() #define PPC_MIN_CACHE_LINE_SIZE 32 @@ -132,30 +45,6 @@ VOID) { return (struct _KPCR *)__readfsdword(0x1c); -} - -VOID -NTAPI -KePPCInitThreadWithContext( - PKTHREAD Thread, - PKSYSTEM_ROUTINE SystemRoutine, - PKSTART_ROUTINE StartRoutine, - PVOID StartContext, - PCONTEXT Context); - -VOID -NTAPI -KeApplicationProcessorInitDispatcher( - VOID); - -VOID -NTAPI -KeCreateApplicationProcessorIdleThread( - ULONG Id); - -static VOID KePPCFnInit() -{ - __asm__("mfmsr 0\n\tori 0,0,0x2000\n\tmtmsr 0"); } #ifdef _NTOSKRNL_ /* FIXME: Move flags above to NDK instead of here */ @@ -167,16 +56,8 @@ BOOLEAN UserThread, KTRAP_FRAME TrapFrame); #endif -VOID -NTAPI -KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState); #endif /* __ASM__ */ - -#define KeArchFnInit() KePPCFnInit() -#define KeArchHaltProcessor() KePPCHaltProcessor() -#define KeArchInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) \ - KePPCInitThreadWithContext(Thread,SystemRoutine,StartRoutine,StartContext,Context) #endif /* __NTOSKRNL_INCLUDE_INTERNAL_POWERPC_KE_H */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -648,8 +648,8 @@ else if (Argv[0][0] == 'c') /* cregs */ { ULONG Cr0, Cr2, Cr3, Cr4; - KDESCRIPTOR Gdtr, Ldtr, Idtr; - ULONG Tr; + KDESCRIPTOR Gdtr, Idtr; + USHORT Ldtr; static const PCHAR Cr0Bits[32] = { " PE", " MP", " EM", " TS", " ET", " NE", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, " WP", NULL, " AM", NULL, NULL, NULL, NULL, NULL, @@ -666,11 +666,8 @@ /* Get descriptor table regs */ Ke386GetGlobalDescriptorTable(&Gdtr.Limit); - Ke386GetLocalDescriptorTable(&Ldtr.Limit); + Ldtr = Ke386GetLocalDescriptorTable(); __sidt(&Idtr.Limit); - - /* Get the task register */ - Ke386GetTr((PUSHORT)&Tr); /* Display the control registers */ KdbpPrint("CR0 0x%08x ", Cr0); @@ -700,7 +697,7 @@ /* Display the descriptor table regs */ KdbpPrint("\nGDTR Base 0x%08x Size 0x%04x\n", Gdtr.Base, Gdtr.Limit); - KdbpPrint("LDTR Base 0x%08x Size 0x%04x\n", Ldtr.Base, Ldtr.Limit); + KdbpPrint("LDTR 0x%04x\n", Ldtr); KdbpPrint("IDTR Base 0x%08x Size 0x%04x\n", Idtr.Base, Idtr.Limit); } else if (Argv[0][0] == 's') /* sregs */ @@ -1619,7 +1616,8 @@ ASSERT(Argv[0][0] == 'l'); /* Read LDTR */ - Ke386GetLocalDescriptorTable(&Reg.Limit); + Reg.Limit = Ke386GetLocalDescriptorTable(); + Reg.Base = 0; i = 0; ul = 1 << 2; } Modified: trunk/reactos/ntoskrnl/ke/arm/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/arm/thrdini.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/arm/thrdini.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -34,11 +34,11 @@ VOID NTAPI -KeArmInitThreadWithContext(IN PKTHREAD Thread, - IN PKSYSTEM_ROUTINE SystemRoutine, - IN PKSTART_ROUTINE StartRoutine, - IN PVOID StartContext, - IN PCONTEXT ContextPointer) +KiInitializeContextThread(IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT ContextPointer) { PKTRAP_FRAME TrapFrame; PKEXCEPTION_FRAME ExceptionFrame = NULL, CtxSwitchFrame; Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4318… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -552,7 +552,13 @@ KiBugCheckDebugBreak(IN ULONG StatusCode) { /* If KDBG isn't connected, freeze the CPU, otherwise, break */ - if (KdDebuggerNotPresent) for (;;) KeArchHaltProcessor(); +#if defined(_M_IX86) || defined(_M_AMD64) + if (KdDebuggerNotPresent) for (;;) __halt(); +#elif defined(_M_ARM) + if (KdDebuggerNotPresent) for (;;) KeArmHaltProcessor(); +#else +#error +#endif DbgBreakPointWithStatus(StatusCode); while (TRUE); } @@ -1176,7 +1182,13 @@ else if (KeBugCheckOwnerRecursionCount > 2) { /* Halt the CPU */ - for (;;) KeArchHaltProcessor(); +#if defined(_M_IX86) || defined(_M_AMD64) + for (;;) __halt(); +#elif defined(_M_ARM) + for (;;) KeArmHaltProcessor(); +#else +#error +#endif } } 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -87,11 +87,22 @@ VOID NTAPI -CPUID(OUT ULONG CpuInfo[4], - IN ULONG InfoType) -{ +CPUID(IN ULONG InfoType, + OUT PULONG CpuInfoEax, + OUT PULONG CpuInfoEbx, + OUT PULONG CpuInfoEcx, + OUT PULONG CpuInfoEdx) +{ + ULONG CpuInfo[4]; + /* Perform the CPUID Operation */ __cpuid((int*)CpuInfo, InfoType); + + /* Return the results */ + *CpuInfoEax = CpuInfo[0]; + *CpuInfoEbx = CpuInfo[1]; + *CpuInfoEcx = CpuInfo[2]; + *CpuInfoEdx = CpuInfo[3]; } VOID @@ -104,7 +115,7 @@ } LONGLONG -NTAPI +FASTCALL RDMSR(IN ULONG Register) { /* Read from the MSR */ @@ -118,7 +129,7 @@ KiSetProcessorType(VOID) { ULONG EFlags, NewEFlags; - ULONG Reg[4]; + ULONG Reg, Dummy; ULONG Stepping, Type; /* Start by assuming no CPUID data */ @@ -140,11 +151,11 @@ __writeeflags(EFlags); /* Peform CPUID 0 to see if CPUID 1 is supported */ - CPUID(Reg, 0); - if (Reg[0] > 0) + CPUID(0, &Reg, &Dummy, &Dummy, &Dummy); + if (Reg > 0) { /* Do CPUID 1 now */ - CPUID(Reg, 1); + CPUID(1, &Reg, &Dummy, &Dummy, &Dummy); /* * Get the Stepping and Type. The stepping contains both the @@ -153,11 +164,11 @@ * * For the stepping, we convert this: zzzzzzxy into this: x0y */ - Stepping = Reg[0] & 0xF0; + Stepping = Reg & 0xF0; Stepping <<= 4; - Stepping += (Reg[0] & 0xFF); + Stepping += (Reg & 0xFF); Stepping &= 0xF0F; - Type = Reg[0] & 0xF00; + Type = Reg & 0xF00; Type >>= 8; /* Save them in the PRCB */ @@ -192,7 +203,7 @@ if (!Prcb->CpuID) return 0; /* Get the Vendor ID and null-terminate it */ - CPUID(Vendor, 0); + CPUID(0, &Vendor[0], &Vendor[1], &Vendor[2], &Vendor[3]); Vendor[4] = 0; /* Re-arrange vendor string */ @@ -247,7 +258,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; ULONG FeatureBits = KF_WORKING_PTE; - ULONG Reg[4]; + ULONG Reg[4], Dummy; BOOLEAN ExtendedCPUID = TRUE; ULONG CpuFeatures = 0; @@ -258,7 +269,7 @@ if (!Vendor) return FeatureBits; /* Get the CPUID Info. Features are in Reg[3]. */ - CPUID(Reg, 1); + CPUID(1, &Reg[0], &Reg[1], &Dummy, &Reg[3]); /* Set the initial APIC ID */ Prcb->InitialApicId = (UCHAR)(Reg[1] >> 24); @@ -267,12 +278,13 @@ { /* Intel CPUs */ case CPU_INTEL: - /* Check if it's a P6 */ + + /* Check if it's a P6 or higher */ if (Prcb->CpuType == 6) { /* Perform the special sequence to get the MicroCode Signature */ WRMSR(0x8B, 0); - CPUID(Reg, 1); + CPUID(1, &Dummy, &Dummy, &Dummy, &Dummy); Prcb->UpdateSignature.QuadPart = RDMSR(0x8B); } else if (Prcb->CpuType == 5) @@ -356,10 +368,14 @@ /* Cyrix CPUs */ case CPU_CYRIX: + + /* FIXME: CMPXCGH8B */ + break; /* Transmeta CPUs */ case CPU_TRANSMETA: + /* Enable CMPXCHG8B if the family (>= 5), model and stepping (>= 4.2) support it */ if ((Reg[0] & 0x0FFF) >= 0x0542) { @@ -372,6 +388,7 @@ /* Centaur, IDT, Rise and VIA CPUs */ case CPU_CENTAUR: case CPU_RISE: + /* These CPUs don't report the presence of CMPXCHG8B through CPUID. However, this feature exists and operates properly without any additional steps. */ FeatureBits |= KF_CMPXCHG8B; @@ -416,14 +433,14 @@ if (ExtendedCPUID) { /* Do the call */ - CPUID(Reg, 0x80000000); + CPUID(0x80000000, &Reg[0], &Dummy, &Dummy, &Dummy); if ((Reg[0] & 0xffffff00) == 0x80000000) { /* Check if CPUID 0x80000001 is supported */ if (Reg[0] >= 0x80000001) { /* Check which extended features are available. */ - CPUID(Reg, 0x80000001); + CPUID(0x80000001, &Dummy, &Dummy, &Dummy, &Reg[3]); /* Check if NX-bit is supported */ if (Reg[3] & 0x00100000) FeatureBits |= KF_NX_BIT; @@ -450,7 +467,7 @@ { PKIPCR Pcr = (PKIPCR)KeGetPcr(); ULONG Vendor; - ULONG Data[4]; + ULONG Data[4], Dummy; ULONG CacheRequests = 0, i; ULONG CurrentRegister; UCHAR RegisterByte; @@ -470,14 +487,14 @@ case CPU_INTEL: /*Check if we support CPUID 2 */ - CPUID(Data, 0); + CPUID(0, &Data[0], &Dummy, &Dummy, &Dummy); if (Data[0] >= 2) { /* We need to loop for the number of times CPUID will tell us to */ do { /* Do the CPUID call */ - CPUID(Data, 2); + CPUID(2, &Data[0], &Data[1], &Data[2], &Data[3]); /* Check if it was the first call */ if (FirstPass) @@ -539,15 +556,23 @@ case CPU_AMD: /* Check if we support CPUID 0x80000006 */ - CPUID(Data, 0x80000000); + CPUID(0x80000000, &Data[0], &Dummy, &Dummy, &Dummy); if (Data[0] >= 6) { /* Get 2nd level cache and tlb size */ - CPUID(Data, 0x80000006); + CPUID(0x80000006, &Dummy, &Dummy, &Data[2], &Dummy); /* Set the L2 Cache Size */ Pcr->SecondLevelCacheSize = (Data[2] & 0xFFFF0000) >> 6; } + break; + + case CPU_CYRIX: + case CPU_TRANSMETA: + case CPU_CENTAUR: + case CPU_RISE: + + /* FIXME */ break; } } @@ -760,8 +785,8 @@ /* Save GDT, IDT, LDT and TSS */ Ke386GetGlobalDescriptorTable(&ProcessorState->SpecialRegisters.Gdtr.Limit); __sidt(&ProcessorState->SpecialRegisters.Idtr.Limit); - Ke386GetTr(&ProcessorState->SpecialRegisters.Tr); - Ke386GetLocalDescriptorTable(&ProcessorState->SpecialRegisters.Ldtr); + ProcessorState->SpecialRegisters.Tr = Ke386GetTr(); + ProcessorState->SpecialRegisters.Ldtr = Ke386GetLocalDescriptorTable(); } VOID Modified: trunk/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/kiinit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -32,7 +32,7 @@ ULONG i, Affinity, Sample = 0; PFX_SAVE_AREA FxSaveArea; ULONG MXCsrMask = 0xFFBF; - ULONG Dummy[4]; + ULONG Dummy; KI_SAMPLE_MAP Samples[4]; PKI_SAMPLE_MAP CurrentSample = Samples; @@ -179,7 +179,7 @@ for (;;) { /* Do a dummy CPUID to start the sample */ - CPUID(Dummy, 0); + CPUID(0, &Dummy, &Dummy, &Dummy, &Dummy); /* Fill out the starting data */ CurrentSample->PerfStart = KeQueryPerformanceCounter(NULL); @@ -192,7 +192,7 @@ &CurrentSample->PerfFreq); /* Do another dummy CPUID */ - CPUID(Dummy, 0); + CPUID(0, &Dummy, &Dummy, &Dummy, &Dummy); /* Fill out the ending data */ CurrentSample->PerfEnd = @@ -620,7 +620,7 @@ *Idt = (PKIDTENTRY)IdtDescriptor.Base; /* Get TSS and FS Selectors */ - Ke386GetTr(&Tr); + Tr = Ke386GetTr(); if (Tr != KGDT_TSS) Tr = KGDT_TSS; // FIXME: HACKHACK Fs = Ke386GetFs(); Modified: trunk/reactos/ntoskrnl/ke/i386/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/thrdini.c… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/thrdini.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -46,11 +46,11 @@ VOID NTAPI -Ke386InitThreadWithContext(IN PKTHREAD Thread, - IN PKSYSTEM_ROUTINE SystemRoutine, - IN PKSTART_ROUTINE StartRoutine, - IN PVOID StartContext, - IN PCONTEXT ContextPointer) +KiInitializeContextThread(IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT ContextPointer) { PFX_SAVE_AREA FxSaveArea; PFXSAVE_FORMAT FxSaveFormat; Modified: trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/v86m_sup.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/v86m_sup.S [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -10,7 +10,6 @@ #include <asm.h> #include <internal/i386/asmmacro.S> -#undef LOCK .intel_syntax noprefix /* FIXME: Can we make a nice macro to generate V86 Opcode handlers? */ @@ -140,6 +139,8 @@ UNHANDLED_V86_OPCODE .endfunc +#undef LOCK + GENERATE_PREFIX_HANDLER ES GENERATE_PREFIX_HANDLER CS GENERATE_PREFIX_HANDLER DS @@ -151,6 +152,12 @@ GENERATE_PREFIX_HANDLER LOCK GENERATE_PREFIX_HANDLER REP GENERATE_PREFIX_HANDLER REPNE + +#ifdef CONFIG_SMP +#define LOCK lock +#else +#define LOCK +#endif .func OpcodeINSBV86 _OpcodeINSBV86: Modified: trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/powerpc/thrdin… ============================================================================== --- trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/powerpc/thrdini.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -50,11 +50,11 @@ VOID NTAPI -KePPCInitThreadWithContext(IN PKTHREAD Thread, - IN PKSYSTEM_ROUTINE SystemRoutine, - IN PKSTART_ROUTINE StartRoutine, - IN PVOID StartContext, - IN PCONTEXT ContextPointer) +KiInitializeContextThread(IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT ContextPointer) { PFX_SAVE_AREA FxSaveArea; PKSTART_FRAME StartFrame; Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Sun Sep 27 12:09:38 2009 @@ -818,11 +818,11 @@ _SEH2_TRY { /* Initalize the Thread Context */ - KeArchInitThreadWithContext(Thread, - SystemRoutine, - StartRoutine, - StartContext, - Context); + KiInitializeContextThread(Thread, + SystemRoutine, + StartRoutine, + StartContext, + Context); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

1 0

[fireball] 43179: [uniata] - Revert most of the 41684: "-fix support for ICH7, ICH7M, ICH8, ICH8M, ICH9, ICH9R, ICH9M and ICH10 in compat mode". Those controllers should be supported now, and when set to compat mode the driver falls back to UDMA automatically. - ICH7 real hw testing is required. ICH9 doesn't work in Enhanced mode, works in Compat mode.
by fireball＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: fireball Date: Sun Sep 27 12:04:21 2009 New Revision: 43179 URL: http://svn.reactos.org/svn/reactos?rev=43179&view=rev Log: [uniata] - Revert most of the 41684: "-fix support for ICH7,ICH7M,ICH8,ICH8M,ICH9,ICH9R,ICH9M and ICH10 in compat mode". Those controllers should be supported now, and when set to compat mode the driver falls back to UDMA automatically. - ICH7 real hw testing is required. ICH9 doesn't work in Enhanced mode, works in Compat mode. Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Sep 27 12:04:21 2009 @@ -558,18 +558,19 @@ PCI_DEV_HW_SPEC_BM( 2651, 8086, 0x00, ATA_SA150, "Intel ICH6" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2652, 8086, 0x00, ATA_SA150, "Intel ICH6" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2653, 8086, 0x00, ATA_SA150, "Intel ICH6M" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27c0, 8086, 0x00, ATA_UDMA5, "Intel ICH7" , 0 ), + PCI_DEV_HW_SPEC_BM( 27c0, 8086, 0x00, ATA_SA300, "Intel ICH7" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 27c1, 8086, 0x00, ATA_SA300, "Intel ICH7" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 27c3, 8086, 0x00, ATA_SA300, "Intel ICH7" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27c4, 8086, 0x00, ATA_UDMA5, "Intel ICH7M" , 0 ), - PCI_DEV_HW_SPEC_BM( 27c5, 8086, 0x00, ATA_SA150, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 27c6, 8086, 0x00, ATA_SA150, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27c4, 8086, 0x00, ATA_SA300, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27c5, 8086, 0x00, ATA_SA300, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 27c6, 8086, 0x00, ATA_SA300, "Intel ICH7M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 27df, 8086, 0x00, ATA_UDMA5, "Intel ICH7" , 0 ), PCI_DEV_HW_SPEC_BM( 269e, 8086, 0x00, ATA_UDMA5, "Intel 63XXESB2" , 0 ), PCI_DEV_HW_SPEC_BM( 2680, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2681, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2682, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2683, 8086, 0x00, ATA_SA300, "Intel 63XXESB2" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 2820, 8086, 0x00, ATA_UDMA5, "Intel ICH8" , 0 ), PCI_DEV_HW_SPEC_BM( 2821, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2822, 8086, 0x00, ATA_SA300, "Intel ICH8" , UNIATA_SATA | UNIATA_AHCI ), @@ -584,7 +585,7 @@ PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_UDMA5, "Intel ICH9" , 0 ), PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2923, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), - PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_UDMA5, "Intel ICH9" , 0 ), + PCI_DEV_HW_SPEC_BM( 2926, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2928, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ), PCI_DEV_HW_SPEC_BM( 2929, 8086, 0x00, ATA_SA300, "Intel ICH9M/M-E" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 292d, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ),

1 0

[janderwald] 43178: - Add a few nodetypes
by janderwald＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: janderwald Date: Sun Sep 27 11:56:14 2009 New Revision: 43178 URL: http://svn.reactos.org/svn/reactos?rev=43178&view=rev Log: - Add a few nodetypes Modified: trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Sun Sep 27 11:56:14 2009 @@ -132,6 +132,11 @@ DEFINE_GUIDSTRUCT("4D837FE0-C555-11D0-8A2B-00A0C9255AC1", KSNODETYPE_ADC); #define KSNODETYPE_ADC DEFINE_GUIDNAMED(KSNODETYPE_ADC) +#define STATIC_KSNODETYPE_AGC\ + 0xE88C9BA0L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("E88C9BA0-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_AGC); +#define KSNODETYPE_AGC DEFINE_GUIDNAMED(KSNODETYPE_AGC) + #define STATIC_KSNODETYPE_3D_EFFECTS\ 0x55515860L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 DEFINE_GUIDSTRUCT("55515860-C559-11D0-8A2B-00A0C9255AC1", KSNODETYPE_3D_EFFECTS); @@ -167,6 +172,17 @@ DEFINE_GUIDSTRUCT("DFF220E3-F70F-11D0-B917-00A0C9223196", KSNODETYPE_CD_PLAYER); #define KSNODETYPE_CD_PLAYER DEFINE_GUIDNAMED(KSNODETYPE_CD_PLAYER) +#define STATIC_KSNODETYPE_CHORUS\ + 0x20173F20L, 0xC559, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("20173F20-C559-11D0-8A2B-00A0C9255AC1", KSNODETYPE_CHORUS); +#define KSNODETYPE_CHORUS DEFINE_GUIDNAMED(KSNODETYPE_CHORUS) + +#define STATIC_KSNODETYPE_REVERB\ + 0xEF0328E0L, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("EF0328E0-C558-11D0-8A2B-00A0C9255AC1", KSNODETYPE_REVERB); +#define KSNODETYPE_REVERB DEFINE_GUIDNAMED(KSNODETYPE_REVERB) + + #define STATIC_KSNODETYPE_LINE_CONNECTOR\ DEFINE_USB_TERMINAL_GUID(0x0603) DEFINE_GUIDSTRUCT("DFF21FE3-F70F-11D0-B917-00A0C9223196", KSNODETYPE_LINE_CONNECTOR); @@ -292,6 +308,20 @@ DEFINE_GUIDSTRUCT("185FEDE4-9905-11D1-95A9-00C04FB925D3", KSAUDFNAME_MASTER_MUTE); #define KSAUDFNAME_MASTER_MUTE DEFINE_GUIDNAMED(KSAUDFNAME_MASTER_MUTE) +#define STATIC_KSNODETYPE_PEAKMETER\ + 0xa085651eL, 0x5f0d, 0x4b36, 0xa8, 0x69, 0xd1, 0x95, 0xd6, 0xab, 0x4b, 0x9e +DEFINE_GUIDSTRUCT("A085651E-5F0D-4b36-A869-D195D6AB4B9E", KSNODETYPE_PEAKMETER); +#define KSNODETYPE_PEAKMETER DEFINE_GUIDNAMED(KSNODETYPE_PEAKMETER) + +#define STATIC_KSNODETYPE_STEREO_WIDE\ + 0xA9E69800L, 0xC558, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("A9E69800-C558-11D0-8A2B-00A0C9255AC1", KSNODETYPE_STEREO_WIDE); +#define KSNODETYPE_STEREO_WIDE DEFINE_GUIDNAMED(KSNODETYPE_STEREO_WIDE) + +#define STATIC_KSNODETYPE_TONE\ + 0x7607E580L, 0xC557, 0x11D0, 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1 +DEFINE_GUIDSTRUCT("7607E580-C557-11D0-8A2B-00A0C9255AC1", KSNODETYPE_TONE); +#define KSNODETYPE_TONE DEFINE_GUIDNAMED(KSNODETYPE_TONE) /* Pins

1 0

[fireball] 43177: - Add more supported ICH/PCH ids, confirmed by bearwindows.
by fireball＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: fireball Date: Sun Sep 27 11:26:59 2009 New Revision: 43177 URL: http://svn.reactos.org/svn/reactos?rev=43177&view=rev Log: - Add more supported ICH/PCH ids, confirmed by bearwindows. Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/bm_devs.h [iso-8859-1] Sun Sep 27 11:26:59 2009 @@ -579,6 +579,7 @@ PCI_DEV_HW_SPEC_BM( 2829, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 282a, 8086, 0x00, ATA_SA300, "Intel ICH8M" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 2850, 8086, 0x00, ATA_UDMA5, "Intel ICH8M" , 0 ), + PCI_DEV_HW_SPEC_BM( 2920, 8086, 0x00, ATA_UDMA5, "Intel ICH9R/DO/DH", 0 ), PCI_DEV_HW_SPEC_BM( 2921, 8086, 0x00, ATA_UDMA5, "Intel ICH9" , 0 ), PCI_DEV_HW_SPEC_BM( 2922, 8086, 0x00, ATA_SA300, "Intel ICH9" , UNIATA_SATA | UNIATA_AHCI ), @@ -587,6 +588,8 @@ PCI_DEV_HW_SPEC_BM( 2928, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ), PCI_DEV_HW_SPEC_BM( 2929, 8086, 0x00, ATA_SA300, "Intel ICH9M/M-E" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 292d, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ), + PCI_DEV_HW_SPEC_BM( 292e, 8086, 0x00, ATA_UDMA5, "Intel ICH9M/M-E" , 0 ), + PCI_DEV_HW_SPEC_BM( 3a00, 8086, 0x00, ATA_UDMA5, "Intel ICH10" , 0 ), PCI_DEV_HW_SPEC_BM( 3a02, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 3a03, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), @@ -595,6 +598,17 @@ PCI_DEV_HW_SPEC_BM( 3a22, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 3a23, 8086, 0x00, ATA_SA300, "Intel ICH10" , UNIATA_SATA | UNIATA_AHCI ), PCI_DEV_HW_SPEC_BM( 3a26, 8086, 0x00, ATA_UDMA5, "Intel ICH10" , 0 ), + + PCI_DEV_HW_SPEC_BM( 3b20, 8086, 0x00, ATA_UDMA5, "Intel PCH" , 0 ), + PCI_DEV_HW_SPEC_BM( 3b21, 8086, 0x00, ATA_UDMA5, "Intel PCH" , 0 ), + PCI_DEV_HW_SPEC_BM( 3b22, 8086, 0x00, ATA_SA300, "Intel PCH" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b23, 8086, 0x00, ATA_SA300, "Intel PCH" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b26, 8086, 0x00, ATA_UDMA5, "Intel PCH" , 0 ), + PCI_DEV_HW_SPEC_BM( 3b28, 8086, 0x00, ATA_UDMA5, "Intel PCH" , 0 ), + PCI_DEV_HW_SPEC_BM( 3b29, 8086, 0x00, ATA_SA300, "Intel PCH" , UNIATA_SATA | UNIATA_AHCI ), + PCI_DEV_HW_SPEC_BM( 3b2D, 8086, 0x00, ATA_UDMA5, "Intel PCH" , 0 ), + PCI_DEV_HW_SPEC_BM( 3b2E, 8086, 0x00, ATA_UDMA5, "Intel PCH" , 0 ), + PCI_DEV_HW_SPEC_BM( 3b2F, 8086, 0x00, ATA_SA300, "Intel PCH" , UNIATA_SATA | UNIATA_AHCI ), // PCI_DEV_HW_SPEC_BM( 3200, 8086, 0x00, ATA_SA150, "Intel 31244" , UNIATA_SATA ), /*

1 0

[jimtabor] 43176: - [NtDDraw] - Export global DD context size. Create a container for both PDev and EDDG structures. When allocating PDev and add the DD context size if not zero.
by jimtabor＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: jimtabor Date: Sun Sep 27 05:12:02 2009 New Revision: 43176 URL: http://svn.reactos.org/svn/reactos?rev=43176&view=rev Log: - [NtDDraw] - Export global DD context size. Create a container for both PDev and EDDG structures. When allocating PDev and add the DD context size if not zero. Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/objects/device.c Modified: trunk/reactos/subsystems/win32/win32k/include/pdevobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/pdevobj.h [iso-8859-1] Sun Sep 27 05:12:02 2009 @@ -1,5 +1,7 @@ #ifndef __WIN32K_PDEVOBJ_H #define __WIN32K_PDEVOBJ_H + +#include <drivers/directx/directxint.h> /* PDEVOBJ flags */ #define PDEV_DISPLAY 0x00000001 /* Display device */ @@ -134,4 +136,13 @@ struct _EDD_DIRECTDRAW_GLOBAL * pEDDgpl; } PDEVOBJ, *PPDEVOBJ; +/* PDEV and EDDX extra data container.*/ +typedef struct _PDEVEDD +{ + PDEVOBJ pdevobj; + EDD_DIRECTDRAW_GLOBAL EDDgpl; +} PDEVEDD, *PPDEVEDD; + +extern ULONG gdwDirectDrawContext; + #endif /* !__WIN32K_PDEVOBJ_H */ Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Sep 27 05:12:02 2009 @@ -22,7 +22,7 @@ DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl]; HANDLE ghDxGraphics = NULL; -ULONG gdwDirectDrawContext; +ULONG gdwDirectDrawContext = 0; #define DXDBG 1 Modified: trunk/reactos/subsystems/win32/win32k/objects/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/device.c [iso-8859-1] Sun Sep 27 05:12:02 2009 @@ -229,7 +229,7 @@ RtlZeroMemory(&PrimarySurface, sizeof(PrimarySurface)); -// if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), TAG_GDIPDEV); +// if (!pPrimarySurface) pPrimarySurface = ExAllocatePoolWithTag(PagedPool, gdwDirectDrawContext + sizeof(PDEVOBJ), TAG_GDIPDEV); PrimarySurface.VideoFileObject = DRIVER_FindMPDriver(DisplayNumber);

1 0

[janderwald] 43175: - Rewrite registering physical connection handling to support KSPROPERTY_PIN_PHYSICALCONNECTION
by janderwald＠svn.reactos.org 27 Sep '09

27 Sep '09

Author: janderwald Date: Sun Sep 27 02:50:06 2009 New Revision: 43175 URL: http://svn.reactos.org/svn/reactos?rev=43175&view=rev Log: - Rewrite registering physical connection handling to support KSPROPERTY_PIN_PHYSICALCONNECTION Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -135,10 +135,6 @@ portcls_ext->PhysicalDeviceObject = PhysicalDeviceObject; // set up the start device function portcls_ext->StartDevice = StartDevice; - // prepare the subdevice list - InitializeListHead(&portcls_ext->SubDeviceList); - // prepare the physical connection list - InitializeListHead(&portcls_ext->PhysicalConnectionList); // initialize timer lock KeInitializeSpinLock(&portcls_ext->TimerListLock); // initialize timer list @@ -214,10 +210,9 @@ NTSTATUS Status; ISubdevice *SubDevice; UNICODE_STRING SymbolicLinkName; - SUBDEVICE_DESCRIPTOR * SubDeviceDescriptor; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; ULONG Index; UNICODE_STRING RefName; - PSUBDEVICE_ENTRY Entry; PSYMBOLICLINK_ENTRY SymEntry; DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); @@ -259,36 +254,19 @@ return STATUS_UNSUCCESSFUL; } - // allocate subdevice entry - Entry = (PSUBDEVICE_ENTRY)AllocateItem(NonPagedPool, sizeof(SUBDEVICE_ENTRY), TAG_PORTCLASS); - if (!Entry) - { - // Insufficient memory - SubDevice->Release(); - return STATUS_INSUFFICIENT_RESOURCES; - } - // add an create item to the device header Status = KsAddObjectCreateItemToDeviceHeader(DeviceExt->KsDeviceHeader, PcCreateItemDispatch, (PVOID)SubDevice, Name, NULL); if (!NT_SUCCESS(Status)) { // failed to attach SubDevice->Release(); - FreeItem(Entry, TAG_PORTCLASS); DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } // initialize reference string RtlInitUnicodeString(&RefName, Name); - - // initialize subdevice entry - Entry->SubDevice = SubDevice; - RtlInitUnicodeString(&Entry->Name, Name); - InitializeListHead(&Entry->SymbolicLinkList); - - // store subdevice entry - InsertTailList(&DeviceExt->SubDeviceList, &Entry->Entry); + RtlInitUnicodeString(&SubDeviceDescriptor->RefString, Name); for(Index = 0; Index < SubDeviceDescriptor->InterfaceCount; Index++) { @@ -311,7 +289,7 @@ // initialize symbolic link item RtlInitUnicodeString(&SymEntry->SymbolicLink, SymbolicLinkName.Buffer); // store item - InsertTailList(&Entry->SymbolicLinkList, &SymEntry->Entry); + InsertTailList(&SubDeviceDescriptor->SymbolicLinkList, &SymEntry->Entry); } else { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/connection.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -81,107 +81,8 @@ IN PUNICODE_STRING ToString, IN ULONG ToPin) { - PLIST_ENTRY Entry; - PPHYSICAL_CONNECTION Connection; - PPCLASS_DEVICE_EXTENSION DeviceExt; - NTSTATUS Status; - ISubdevice * FromSubDevice = NULL; - ISubdevice * ToSubDevice = NULL; - ULONG bFound; - - DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - if (FromUnknown) - { - // get our private interface - Status = FromUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&FromSubDevice); - if (!NT_SUCCESS(Status)) - return STATUS_INVALID_PARAMETER; - } - - if (ToUnknown) - { - Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); - if (!NT_SUCCESS(Status)) - goto cleanup; - } - - - Entry = DeviceExt->PhysicalConnectionList.Flink; - bFound = FALSE; - // loop physical connection list - while(Entry != &DeviceExt->PhysicalConnectionList) - { - Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); - // compare current entry - if (Connection->FromPin == FromPin && Connection->ToPin == ToPin && - Connection->FromSubDevice == FromSubDevice && Connection->ToSubDevice == ToSubDevice) - { - if (FromString && Connection->FromUnicodeString.Buffer) - { - if (!RtlCompareUnicodeString(FromString, &Connection->FromUnicodeString, TRUE)) - { - // UnregisterPhysicalConnectionFromExternal - bFound = TRUE; - break; - } - } - else if (ToString && Connection->ToUnicodeString.Buffer) - { - if (!RtlCompareUnicodeString(ToString, &Connection->ToUnicodeString, TRUE)) - { - // UnregisterPhysicalConnectionToExternal - bFound = TRUE; - break; - } - } - else - { - // UnregisterPhysicalConnection - bFound = TRUE; - break; - } - } - Entry = Entry->Flink; - } - - if (!bFound) - { - // not found - Status = STATUS_NOT_FOUND; - goto cleanup; - } - - // remove list entry - RemoveEntryList(&Connection->Entry); - - // release resources - if (Connection->FromSubDevice) - Connection->FromSubDevice->Release(); - - - if (Connection->ToSubDevice) - Connection->ToSubDevice->Release(); - - if (Connection->FromUnicodeString.Buffer) - RtlFreeUnicodeString(&Connection->FromUnicodeString); - - if (Connection->ToUnicodeString.Buffer) - RtlFreeUnicodeString(&Connection->ToUnicodeString); - - FreeItem(Connection, TAG_PORTCLASS); - Status = STATUS_SUCCESS; - -cleanup: - - if (FromSubDevice) - FromSubDevice->Release(); - - if (ToSubDevice) - ToSubDevice->Release(); - - return Status; - + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -255,67 +156,100 @@ IN PUNICODE_STRING ToString, IN ULONG ToPin) { - PHYSICAL_CONNECTION *NewConnection; - PPCLASS_DEVICE_EXTENSION DeviceExt; + PSUBDEVICE_DESCRIPTOR FromSubDeviceDescriptor, ToSubDeviceDescriptor; + PSYMBOLICLINK_ENTRY SymEntry; + ISubdevice * FromSubDevice = NULL, *ToSubDevice = NULL; NTSTATUS Status; - - DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - NewConnection = (PPHYSICAL_CONNECTION)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION), TAG_PORTCLASS); - if (!NewConnection) - { - return STATUS_INSUFFICIENT_RESOURCES; - } - + PPHYSICAL_CONNECTION_ENTRY FromEntry = NULL, ToEntry = NULL; if (FromUnknown) { - Status = FromUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&NewConnection->FromSubDevice); + Status = FromUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&FromSubDevice); if (!NT_SUCCESS(Status)) goto cleanup; - } - else - { - if (!RtlCreateUnicodeString(&NewConnection->FromUnicodeString, (PCWSTR)FromString)) + + Status = FromSubDevice->GetDescriptor(&FromSubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + goto cleanup; + + if (IsListEmpty(&FromSubDeviceDescriptor->SymbolicLinkList)) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_UNSUCCESSFUL; goto cleanup; } - } + + SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(FromSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); + FromString = &SymEntry->SymbolicLink; + } + if (ToUnknown) { - Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&NewConnection->ToSubDevice); + Status = ToUnknown->QueryInterface(IID_ISubdevice, (PVOID*)&ToSubDevice); if (!NT_SUCCESS(Status)) goto cleanup; - } - else - { - if (!RtlCreateUnicodeString(&NewConnection->ToUnicodeString, (PCWSTR)ToString)) + + Status = ToSubDevice->GetDescriptor(&ToSubDeviceDescriptor); + if (!NT_SUCCESS(Status)) + goto cleanup; + + if (IsListEmpty(&ToSubDeviceDescriptor->SymbolicLinkList)) { - Status = STATUS_INSUFFICIENT_RESOURCES; + Status = STATUS_UNSUCCESSFUL; goto cleanup; } - } - - InsertTailList(&DeviceExt->PhysicalConnectionList, &NewConnection->Entry); + + + SymEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(ToSubDeviceDescriptor->SymbolicLinkList.Flink, SYMBOLICLINK_ENTRY, Entry); + ToString = &SymEntry->SymbolicLink; + + } + + FromEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + ToString->MaximumLength, TAG_PORTCLASS); + if (!FromEntry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + ToEntry = (PPHYSICAL_CONNECTION_ENTRY)AllocateItem(NonPagedPool, sizeof(PHYSICAL_CONNECTION_ENTRY) + FromString->MaximumLength, TAG_PORTCLASS); + if (!ToEntry) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto cleanup; + } + + FromEntry->FromPin = FromPin; + FromEntry->Connection.Pin = ToPin; + FromEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + ToString->MaximumLength; + RtlMoveMemory(&FromEntry->Connection.SymbolicLinkName, ToString->Buffer, ToString->MaximumLength); + FromEntry->Connection.SymbolicLinkName[ToString->Length / sizeof(WCHAR)] = L'\0'; + + ToEntry->FromPin = ToPin; + ToEntry->Connection.Pin = FromPin; + ToEntry->Connection.Size = sizeof(KSPIN_PHYSICALCONNECTION) + FromString->MaximumLength; + RtlMoveMemory(&ToEntry->Connection.SymbolicLinkName, FromString->Buffer, FromString->MaximumLength); + ToEntry->Connection.SymbolicLinkName[FromString->Length / sizeof(WCHAR)] = L'\0'; + + + InsertTailList(&FromSubDeviceDescriptor->PhysicalConnectionList, &FromEntry->Entry); + InsertTailList(&ToSubDeviceDescriptor->PhysicalConnectionList, &ToEntry->Entry); + return STATUS_SUCCESS; cleanup: - if (NewConnection->FromSubDevice) - NewConnection->FromSubDevice->Release(); - - if (NewConnection->ToSubDevice) - NewConnection->ToSubDevice->Release(); - - if (NewConnection->FromUnicodeString.Buffer) - RtlFreeUnicodeString(&NewConnection->FromUnicodeString); - - if (NewConnection->ToUnicodeString.Buffer) - RtlFreeUnicodeString(&NewConnection->ToUnicodeString); - - FreeItem(NewConnection, TAG_PORTCLASS); + if (FromSubDevice) + FromSubDevice->Release(); + + if (ToSubDevice) + ToSubDevice->Release(); + + if (FromEntry) + FreeItem(FromEntry, TAG_PORTCLASS); + + if (ToEntry) + FreeItem(ToEntry, TAG_PORTCLASS); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -91,6 +91,17 @@ PIO_STACK_LOCATION IoStack; IoStack = IoGetCurrentIrpStackLocation(Irp); + + if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) + { + DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + + Irp->IoStatus.Status = STATUS_SUCCESS; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_SUCCESS; + } + PC_ASSERT(IoStack->Parameters.DeviceIoControl.IoControlCode == IOCTL_KS_PROPERTY); return PcPropertyHandler(Irp, m_Descriptor); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -170,6 +170,19 @@ typedef struct { + LIST_ENTRY Entry; + UNICODE_STRING SymbolicLink; +}SYMBOLICLINK_ENTRY, *PSYMBOLICLINK_ENTRY; + +typedef struct +{ + LIST_ENTRY Entry; + ULONG FromPin; + KSPIN_PHYSICALCONNECTION Connection; +}PHYSICAL_CONNECTION_ENTRY, *PPHYSICAL_CONNECTION_ENTRY; + +typedef struct +{ ULONG MaxGlobalInstanceCount; ULONG MaxFilterInstanceCount; ULONG MinFilterInstanceCount; @@ -202,6 +215,9 @@ PPCFILTER_DESCRIPTOR DeviceDescriptor; KSTOPOLOGY* Topology; + LIST_ENTRY SymbolicLinkList; + LIST_ENTRY PhysicalConnectionList; + UNICODE_STRING RefString; }SUBDEVICE_DESCRIPTOR, *PSUBDEVICE_DESCRIPTOR; #undef INTERFACE Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -174,32 +174,10 @@ IN PIRP Irp) { PPCLASS_DEVICE_EXTENSION DeviceExtension; - PLIST_ENTRY Entry; - PPHYSICAL_CONNECTION Connection; DPRINT("PortClsShutdown called\n"); // get device extension DeviceExtension = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - - while(!IsListEmpty(&DeviceExtension->PhysicalConnectionList)) - { - // get connection entry - Entry = RemoveHeadList(&DeviceExtension->PhysicalConnectionList); - Connection = (PPHYSICAL_CONNECTION)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION, Entry); - - if (Connection->FromSubDevice) - { - // release subdevice - Connection->FromSubDevice->Release(); - } - - if (Connection->ToSubDevice) - { - // release subdevice - Connection->ToSubDevice->Release(); - } - FreeItem(Connection, TAG_PORTCLASS); - } if (DeviceExtension->AdapterPowerManagement) { Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -25,7 +25,6 @@ STDMETHODIMP_(ULONG) Release() { InterlockedDecrement(&m_Ref); - DPRINT1("Release %u\n", m_Ref); if (!m_Ref) { //delete this; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -348,32 +348,6 @@ typedef struct { - LIST_ENTRY Entry; - UNICODE_STRING SymbolicLink; -}SYMBOLICLINK_ENTRY, *PSYMBOLICLINK_ENTRY; - - -typedef struct -{ - LIST_ENTRY Entry; - ISubdevice *SubDevice; - UNICODE_STRING Name; - LIST_ENTRY SymbolicLinkList; -}SUBDEVICE_ENTRY, *PSUBDEVICE_ENTRY; - -typedef struct -{ - LIST_ENTRY Entry; - ISubdevice * FromSubDevice; - UNICODE_STRING FromUnicodeString; - ULONG FromPin; - ISubdevice * ToSubDevice; - UNICODE_STRING ToUnicodeString; - ULONG ToPin; -}PHYSICAL_CONNECTION, *PPHYSICAL_CONNECTION; - -typedef struct -{ KSDEVICE_HEADER KsDeviceHeader; PDEVICE_OBJECT PhysicalDeviceObject; PDEVICE_OBJECT PrevDeviceObject; @@ -384,8 +358,6 @@ KSOBJECT_CREATE_ITEM * CreateItems; IResourceList* resources; - LIST_ENTRY SubDeviceList; - LIST_ENTRY PhysicalConnectionList; LIST_ENTRY TimerList; KSPIN_LOCK TimerListLock; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -114,6 +114,71 @@ return Status; } +NTSTATUS +HandlePhysicalConnection( + IN PIO_STATUS_BLOCK IoStatus, + IN PKSIDENTIFIER Request, + IN ULONG RequestLength, + IN OUT PVOID Data, + IN ULONG DataLength, + IN PSUBDEVICE_DESCRIPTOR Descriptor) +{ + PKSP_PIN Pin; + PLIST_ENTRY Entry; + PKSPIN_PHYSICALCONNECTION Connection; + PPHYSICAL_CONNECTION_ENTRY ConEntry; + + // get pin + Pin = (PKSP_PIN)Request; + + if (RequestLength < sizeof(KSP_PIN)) + { + // input buffer must be at least sizeof KSP_PIN + DPRINT1("input length too small\n"); + return STATUS_INVALID_PARAMETER; + } + + if (IsListEmpty(&Descriptor->PhysicalConnectionList)) + { + DPRINT1("no connection\n"); + return STATUS_NOT_FOUND; + } + + // get first item + Entry = Descriptor->PhysicalConnectionList.Flink; + + do + { + ConEntry = (PPHYSICAL_CONNECTION_ENTRY)CONTAINING_RECORD(Entry, PHYSICAL_CONNECTION_ENTRY, Entry); + + if (ConEntry->FromPin == Pin->PinId) + { + Connection = (PKSPIN_PHYSICALCONNECTION)Data; + DPRINT("FoundEntry %S Size %u\n", ConEntry->Connection.SymbolicLinkName, ConEntry->Connection.Size); + IoStatus->Information = ConEntry->Connection.Size; + + if (!DataLength) + { + IoStatus->Information = ConEntry->Connection.Size; + return STATUS_MORE_ENTRIES; + } + + if (DataLength < ConEntry->Connection.Size) + { + return STATUS_BUFFER_TOO_SMALL; + } + + RtlMoveMemory(Data, &ConEntry->Connection, ConEntry->Connection.Size); + return STATUS_SUCCESS; + } + + // move to next item + Entry = Entry->Flink; + }while(Entry != &Descriptor->PhysicalConnectionList); + + IoStatus->Information = 0; + return STATUS_NOT_FOUND; +} NTSTATUS NTAPI @@ -188,6 +253,8 @@ Status = HandleDataIntersection(&Irp->IoStatus, Request, Data, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Descriptor, SubDevice); break; case KSPROPERTY_PIN_PHYSICALCONNECTION: + Status = HandlePhysicalConnection(&Irp->IoStatus, Request, IoStack->Parameters.DeviceIoControl.InputBufferLength, Data, IoStack->Parameters.DeviceIoControl.OutputBufferLength, Descriptor); + break; case KSPROPERTY_PIN_CONSTRAINEDDATARANGES: UNIMPLEMENTED Status = STATUS_NOT_IMPLEMENTED; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -165,6 +165,10 @@ if (!Descriptor) return STATUS_INSUFFICIENT_RESOURCES; + // initialize physical / symbolic link connection list + InitializeListHead(&Descriptor->SymbolicLinkList); + InitializeListHead(&Descriptor->PhysicalConnectionList); + Descriptor->Interfaces = (GUID*)AllocateItem(NonPagedPool, sizeof(GUID) * InterfaceCount, TAG_PORTCLASS); if (!Descriptor->Interfaces) goto cleanup; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Sun Sep 27 02:50:06 2009 @@ -66,10 +66,9 @@ { PPCLASS_DEVICE_EXTENSION DeviceExtension; PLIST_ENTRY Entry; - PSUBDEVICE_ENTRY SubDeviceEntry; PSYMBOLICLINK_ENTRY SymLinkEntry; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor; ISubdevice *SubDevice; - ULONG Found; ULONG Index; NTSTATUS Status; @@ -93,32 +92,18 @@ return STATUS_INVALID_PARAMETER; } - Entry = DeviceExtension->SubDeviceList.Flink; - Found = FALSE; - // loop subdevice entry list and search for the subdevice - while(Entry != &DeviceExtension->SubDeviceList) + Status = SubDevice->GetDescriptor(&SubDeviceDescriptor); + if (!NT_SUCCESS(Status)) { - SubDeviceEntry = (PSUBDEVICE_ENTRY)CONTAINING_RECORD(Entry, SUBDEVICE_ENTRY, Entry); - if (SubDeviceEntry->SubDevice == SubDevice) - { - Found = TRUE; - break; - } - Entry = Entry->Flink; + DPRINT1("Failed to retrieve subdevice descriptor %x\n", Status); + // the provided port driver doesnt support ISubdevice + return STATUS_INVALID_PARAMETER; } - // release the subdevice - SubDevice->Release(); - - if (!Found) - return STATUS_NOT_FOUND; - - // remove subdevice entry - RemoveEntryList(&SubDeviceEntry->Entry); // loop our create items and disable the create handler for(Index = 0; Index < DeviceExtension->MaxSubDevices; Index++) { - if (!RtlCompareUnicodeString(&SubDeviceEntry->Name, &DeviceExtension->CreateItems[Index].ObjectClass, TRUE)) + if (!RtlCompareUnicodeString(&SubDeviceDescriptor->RefString, &DeviceExtension->CreateItems[Index].ObjectClass, TRUE)) { DeviceExtension->CreateItems[Index].Create = NULL; RtlInitUnicodeString(&DeviceExtension->CreateItems[Index].ObjectClass, NULL); @@ -127,10 +112,10 @@ } // now unregister device interfaces - while(!IsListEmpty(&SubDeviceEntry->SymbolicLinkList)) + while(!IsListEmpty(&SubDeviceDescriptor->SymbolicLinkList)) { // remove entry - Entry = RemoveHeadList(&SubDeviceEntry->SymbolicLinkList); + Entry = RemoveHeadList(&SubDeviceDescriptor->SymbolicLinkList); // get symlink entry SymLinkEntry = (PSYMBOLICLINK_ENTRY)CONTAINING_RECORD(Entry, SYMBOLICLINK_ENTRY, Entry); @@ -141,9 +126,6 @@ // free sym entry FreeItem(SymLinkEntry, TAG_PORTCLASS); } - - // free subdevice entry - ExFreePool(SubDeviceEntry); return STATUS_SUCCESS; }

1 0

[tkreuzer] 43174: Add rbuild files for x64 build. Dedicated to encoded.
by tkreuzer＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: tkreuzer Date: Sat Sep 26 23:52:00 2009 New Revision: 43174 URL: http://svn.reactos.org/svn/reactos?rev=43174&view=rev Log: Add rbuild files for x64 build. Dedicated to encoded. Added: trunk/reactos/ReactOS-amd64.rbuild (with props) trunk/reactos/config-amd64.template.rbuild (with props) Added: trunk/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4… ============================================================================== --- trunk/reactos/ReactOS-amd64.rbuild (added) +++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Sat Sep 26 23:52:00 2009 @@ -1,0 +1,320 @@ +<?xml version="1.0"?> +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="config-amd64.rbuild"> + <xi:fallback> + <xi:include href="config-amd64.template.rbuild" /> + </xi:fallback> + </xi:include> + + <define name="_M_AMD64" /> + <define name="_AMD64_" /> + <define name="_M_AXP64" /> + <define name="__x86_64__" /> +  + <define name="_WIN64" /> + <define name="TARGET_amd64" host="true" /> + + <define name="USE_COMPILER_EXCEPTIONS" /> + + <property name="PLATFORM" value="PC"/> + <property name="usewrc" value="false"/> + <property name="WINEBUILD_FLAGS" value="--kill-at"/> + <property name="NTOSKRNL_SHARED" value="-shared"/> + + <if property="OPTIMIZE" value="1"> + <compilerflag>-Os</compilerflag> + <compilerflag>-ftracer</compilerflag> + <compilerflag>-momit-leaf-frame-pointer</compilerflag> + </if> + <if property="OPTIMIZE" value="2"> + <compilerflag>-Os</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> + <compilerflag>-O1</compilerflag> + </if> + <if property="OPTIMIZE" value="4"> + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="5"> + <compilerflag>-O3</compilerflag> + </if> + + <compilerflag>-U_X86_</compilerflag> + <compilerflag>-mpreferred-stack-boundary=4</compilerflag> + <compilerflag>-fno-strict-aliasing</compilerflag> + <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag>-Wpointer-arith</compilerflag> + <compilerflag>-Wno-multichar</compilerflag> + <compilerflag>-Wno-format</compilerflag> +  + <linkerflag>-disable-stdcall-fixup</linkerflag> + <linkerflag>-static</linkerflag> + <linkerflag>--unique=.eh_frame</linkerflag> + + + + <xi:include href="baseaddress.rbuild" /> + + <define name="__REACTOS__" /> + <define name="__REACTOS__" host="true" /> + + <if property="DBG" value="1"> + <define name="DBG">1</define> + <define name="_SEH_ENABLE_TRACE" /> + <property name="DBG_OR_KDBG" value="true" /> + </if> + <if property="DBG" value="0"> + <define name="DBG">0</define> + </if> + + <if property="KDBG" value="1"> + <define name="KDBG">1</define> + <property name="DBG_OR_KDBG" value="true" /> + </if> + +  + <property name="VERSION_TARGET" value="NT52" /> + + <if property="VERSION_TARGET" value="NT4"> + <define name="WINVER">0x400</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x400</define> + <define name="_WIN32_WINDOWS">0x400</define> + <define name="_SETUPAPI_VER">0x400</define> + </if> + + <if property="VERSION_TARGET" value="NT5"> + <define name="WINVER">0x500</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x500</define> + <define name="_WIN32_WINDOWS">0x500</define> + <define name="_SETUPAPI_VER">0x500</define> + </if> + + <if property="VERSION_TARGET" value="NT51"> + <define name="WINVER">0x501</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="_WIN32_WINDOWS">0x501</define> + <define name="_SETUPAPI_VER">0x501</define> + </if> + + <if property="VERSION_TARGET" value="NT52"> + <define name="WINVER">0x502</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x502</define> + <define name="_WIN32_WINDOWS">0x502</define> + <define name="_SETUPAPI_VER">0x502</define> + </if> + + <if property="VERSION_TARGET" value="NT6"> + <define name="WINVER">0x600</define> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="_WIN32_WINDOWS">0x600</define> + <define name="_SETUPAPI_VER">0x600</define> + </if> + + <include>.</include> + <include>include</include> + <include root="intermediate">include</include> + <include>include/psdk</include> + <include root="intermediate">include/psdk</include> + <include>include/dxsdk</include> + <include root="intermediate">include/dxsdk</include> + <include>include/crt</include> + <include>include/crt/mingw32</include> + <include>include/ddk</include> + <include>include/GL</include> + <include>include/ndk</include> + <include>include/reactos</include> + <include root="intermediate">include/reactos</include> + <include root="intermediate">include/reactos/mc</include> + <include>include/reactos/libs</include> + + <include host="true">include</include> + <include host="true" root="intermediate">include</include> + <include host="true">include/reactos</include> + <include host="true">include/reactos/wine</include> + + <if property="USERMODE" value="1"> + <directory name="base"> + <xi:include href="base/base.rbuild" /> + </directory> + + <directory name="dll"> + <xi:include href="dll/dll.rbuild" /> + </directory> + </if> + + <directory name="boot"> + <xi:include href="boot/boot.rbuild" /> + </directory> + + <directory name="drivers"> + <directory name="base"> + <xi:include href="drivers/base/directory.rbuild" /> + </directory> + <directory name="bus"> + <xi:include href="drivers/bus/directory.rbuild" /> + </directory> + <directory name="directx"> + <xi:include href="drivers/directx/directory.rbuild" /> + </directory> + <directory name="filesystems"> + <xi:include href="drivers/filesystems/directory.rbuild" /> + </directory> + <directory name="input"> + <xi:include href="drivers/input/directory.rbuild" /> + </directory> + <directory name="ksfilter"> + <xi:include href="drivers/ksfilter/directory.rbuild" /> + </directory> + +  + + <directory name="network"> + <xi:include href="drivers/network/directory.rbuild" /> + </directory> + <directory name="parallel"> + <xi:include href="drivers/parallel/directory.rbuild" /> + </directory> + <directory name="serial"> + <xi:include href="drivers/serial/directory.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="drivers/setup/directory.rbuild" /> + </directory> + <directory name="storage"> + <xi:include href="drivers/storage/directory.rbuild" /> + </directory> + <directory name="usb"> + <xi:include href="drivers/usb/directory.rbuild" /> + </directory> + <directory name="video"> + <xi:include href="drivers/video/directory.rbuild" /> + </directory> + <directory name="wdm"> + <xi:include href="drivers/wdm/wdm.rbuild" /> + </directory> + <directory name="wmi"> + <xi:include href="drivers/wmi/wmilib.rbuild" /> + </directory> + </directory> + + <directory name="hal"> + <xi:include href="hal/hal.rbuild" /> + </directory> + + <directory name="include"> + <xi:include href="include/directory.rbuild" /> + </directory> + + <directory name="lib"> + <directory name="3rdparty"> + <directory name="adns"> + <xi:include href="lib/3rdparty/adns/adns.rbuild" /> + </directory> + <directory name="bzip2"> + <xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" /> + </directory> + <directory name="expat"> + <xi:include href="lib/3rdparty/expat/expat.rbuild" /> + </directory> + <directory name="freetype"> + <xi:include href="lib/3rdparty/freetype/freetype.rbuild" /> + </directory> + <directory name="icu4ros"> + <xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" /> + </directory> + <directory name="libsamplerate"> + <xi:include href="lib/3rdparty/libsamplerate/libsamplerate.rbuild" /> + </directory> + <directory name="libwine"> + <xi:include href="lib/3rdparty/libwine/libwine.rbuild" /> + </directory> + <directory name="libxml2"> + <xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" /> + </directory> + + <if property="USERMODE" value="1"> + <directory name="mingw"> + <xi:include href="lib/3rdparty/mingw/mingw.rbuild" /> + </directory> + </if> + <directory name="zlib"> + <xi:include href="lib/3rdparty/zlib/zlib.rbuild" /> + </directory> + </directory> + <directory name="sdk"> + <xi:include href="lib/sdk/sdk.rbuild" /> + </directory> + <directory name="cmlib"> + <xi:include href="lib/cmlib/cmlib.rbuild" /> + </directory> + <directory name="debugsup"> + <xi:include href="lib/debugsup/debugsup.rbuild" /> + </directory> + <directory name="drivers"> + <xi:include href="lib/drivers/directory.rbuild" /> + </directory> + <directory name="epsapi"> + <xi:include href="lib/epsapi/epsapi.rbuild" /> + </directory> + <directory name="fslib"> + <xi:include href="lib/fslib/directory.rbuild" /> + </directory> + <directory name="host"> + <xi:include href="lib/host/directory.rbuild" /> + </directory> + <directory name="inflib"> + <xi:include href="lib/inflib/inflib.rbuild" /> + </directory> + <directory name="nls"> + <xi:include href="lib/nls/nls.rbuild" /> + </directory> + <directory name="ntdllsys"> + <xi:include href="lib/ntdllsys/ntdllsys.rbuild" /> + </directory> + <directory name="pseh"> + <xi:include href="lib/pseh/pseh.rbuild" /> + </directory> + <directory name="recyclebin"> + <xi:include href="lib/recyclebin/recyclebin.rbuild" /> + </directory> + <directory name="rossym"> + <xi:include href="lib/rossym/rossym.rbuild" /> + </directory> + <directory name="rtl"> + <xi:include href="lib/rtl/rtl.rbuild" /> + </directory> + <directory name="smlib"> + <xi:include href="lib/smlib/smlib.rbuild" /> + </directory> + <directory name="win32ksys"> + <xi:include href="lib/win32ksys/win32ksys.rbuild" /> + </directory> + </directory> + + <directory name="media"> + <xi:include href="media/media.rbuild" /> + </directory> + + <directory name="ntoskrnl"> + <xi:include href="ntoskrnl/ntoskrnl.rbuild" /> + </directory> + + <directory name="subsystems"> + <xi:include href="subsystems/subsystems.rbuild" /> + </directory> + + <directory name="tools"> + <xi:include href="tools/tools.rbuild" /> + </directory> + + + +</project> Propchange: trunk/reactos/ReactOS-amd64.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-amd64.template.rbui… ============================================================================== --- trunk/reactos/config-amd64.template.rbuild (added) +++ trunk/reactos/config-amd64.template.rbuild [iso-8859-1] Sat Sep 26 23:52:00 2009 @@ -1,0 +1,92 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd"> +<group> + + + + + +<property name="SARCH" value="" /> + + + +<property name="OARCH" value="athlon64" /> + + + +<property name="OPTIMIZE" value="1" /> + + + +<property name="KDBG" value="0" /> + + + +<property name="DBG" value="1" /> + + + +<property name="GDB" value="0" /> + + + +<property name="NSWPAT" value="1" /> + + +<property name="_WINKD_" value="1" /> + + +<property name="_ELF_" value="0" /> + + +<property name="USERMODE" value="1" /> + + +</group> Propchange: trunk/reactos/config-amd64.template.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 43173: Merge HAL changes 34743, 34812, 34839, 34917, 35515, 35771, 35902, 35904, 35905, 35906, 35942, 35947, 35948, 35949, 35953, 36013, 36388, 36389, 36570, 37873, 37991, 39151 from amd64 branch
by tkreuzer＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: tkreuzer Date: Sat Sep 26 23:32:53 2009 New Revision: 43173 URL: http://svn.reactos.org/svn/reactos?rev=43173&view=rev Log: Merge HAL changes 34743, 34812, 34839, 34917, 35515, 35771, 35902, 35904, 35905, 35906, 35942, 35947, 35948, 35949, 35953, 36013, 36388, 36389, 36570, 37873, 37991, 39151 from amd64 branch Added: trunk/reactos/hal/hal/hal_amd64.def (with props) trunk/reactos/hal/halamd64/ - copied from r34743, branches/ros-amd64-bringup/reactos/hal/halamd64/ trunk/reactos/hal/halamd64/directory.rbuild - copied unchanged from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/directory.rbuild trunk/reactos/hal/halamd64/generic/ - copied from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/ trunk/reactos/hal/halamd64/generic/halinit.c - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/halinit.c trunk/reactos/hal/halamd64/generic/irq.S - copied, changed from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S trunk/reactos/hal/halamd64/generic/misc.c - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/misc.c trunk/reactos/hal/halamd64/generic/mps.S - copied unchanged from r35947, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/mps.S trunk/reactos/hal/halamd64/generic/systimer.S - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/systimer.S trunk/reactos/hal/halamd64/include/ - copied from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/include/ trunk/reactos/hal/halamd64/include/bus.h - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/include/bus.h trunk/reactos/hal/halamd64/up/ - copied from r34812, branches/ros-amd64-bringup/reactos/hal/halamd64/up/ trunk/reactos/hal/halamd64/up/processor.c - copied unchanged from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c trunk/reactos/hal/halx86/hal_generic_amd64.rbuild - copied, changed from r35905, branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild Modified: trunk/reactos/ (props changed) trunk/reactos/hal/hal.rbuild trunk/reactos/hal/hal/hal.c trunk/reactos/hal/hal/hal.rbuild trunk/reactos/hal/halamd64/generic/generic.rbuild trunk/reactos/hal/halamd64/include/hal.h trunk/reactos/hal/halamd64/include/halp.h trunk/reactos/hal/halamd64/up/halup.rbuild trunk/reactos/hal/halx86/generic/timer.c trunk/reactos/hal/halx86/include/apic.h trunk/reactos/hal/halx86/include/bus.h trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halp.h trunk/reactos/hal/halx86/mp/apic.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Sep 26 23:32:53 2009 @@ -1,1 +1,1 @@ -/branches/ros-amd64-bringup/reactos:35746,35789,36614,36930,38148,38151,38265,38268,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 +/branches/ros-amd64-bringup/reactos:34743,34812,34839,34917,35515,35746,35771,35789,35902,35904-35906,35942,35947-35949,35953,36013,36388-36389,36570,36614,36930,37873,37991,38148,38151,38265,38268,39151,39333,39345,40991,41000,41027-41028,41050,41052,41082-41086,41549,43080 Modified: trunk/reactos/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal.rbuild?rev=43173&r… ============================================================================== --- trunk/reactos/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -26,4 +26,12 @@ <xi:include href="halarm/directory.rbuild" /> </directory> </if> + <if property="ARCH" value="amd64"> + <directory name="halx86"> + <xi:include href="halx86/hal_generic_amd64.rbuild" /> + </directory> + <directory name="halamd64"> + <xi:include href="halamd64/directory.rbuild" /> + </directory> + </if> </group> Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=43173&r1… ============================================================================== --- trunk/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.c [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -75,6 +75,7 @@ return Interval; } +#ifndef _M_AMD64 VOID FASTCALL ExAcquireFastMutex( @@ -101,7 +102,7 @@ return TRUE; } - +#endif VOID NTAPI @@ -466,7 +467,7 @@ VOID NTAPI HalRequestIpi( - ULONG Unknown) + KAFFINITY TargetSet) { UNIMPLEMENTED; } @@ -747,7 +748,7 @@ return 0; } - +#ifndef _M_AMD64 VOID FASTCALL KeAcquireInStackQueuedSpinLock( @@ -776,6 +777,7 @@ { UNIMPLEMENTED; } +#endif VOID NTAPI @@ -784,6 +786,7 @@ UNIMPLEMENTED; } +#ifndef _M_AMD64 #undef KeGetCurrentIrql KIRQL NTAPI @@ -802,6 +805,7 @@ { UNIMPLEMENTED; } +#endif LARGE_INTEGER @@ -818,6 +822,7 @@ return Value; } +#ifndef _M_AMD64 #undef KeRaiseIrql VOID NTAPI @@ -847,7 +852,9 @@ return (KIRQL)0; } - +#endif + +#ifndef _M_AMD64 #undef KeReleaseSpinLock VOID NTAPI @@ -857,7 +864,7 @@ { UNIMPLEMENTED; } - +#endif VOID NTAPI @@ -891,7 +898,7 @@ return FALSE; } - +#if !defined(_M_AMD64) KIRQL FASTCALL KfAcquireSpinLock( @@ -931,8 +938,9 @@ { UNIMPLEMENTED; } - - +#endif + +#if !defined(_M_AMD64) VOID NTAPI READ_PORT_BUFFER_UCHAR( @@ -1058,6 +1066,7 @@ { UNIMPLEMENTED; } +#endif KIRQL FASTCALL Modified: trunk/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.rbuild?rev=431… ============================================================================== --- trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/hal/hal.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -10,8 +10,8 @@ <file>hal.c</file> <file>hal.rc</file> </module> - </if> - <if property="ARCH" value="i386"> + </if> + <if property="ARCH" value="i386"> <module name="hal" type="kernelmodedll"> <importlibrary definition="hal.pspec" /> <include base="ntoskrnl">include</include> @@ -20,7 +20,7 @@ <file>hal.c</file> <file>hal.rc</file> </module> - </if> + </if> <if property="ARCH" value="i386"> <module ifnot="false" name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halup"> </module> @@ -30,4 +30,14 @@ <if property="ARCH" value="powerpc"> <module name="halupalias" type="alias" installbase="system32" installname="hal.dll" aliasof="halppc_up"/> </if> + <if property="ARCH" value="amd64"> + <module name="hal" type="kernelmodedll"> + <importlibrary definition="hal_amd64.def" /> + <include base="ntoskrnl">include</include> + <library>ntoskrnl</library> + <define name="_NTHAL_" /> + <file>hal.c</file> + <file>hal.rc</file> + </module> + </if> </group> Added: trunk/reactos/hal/hal/hal_amd64.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal_amd64.def?rev=… ============================================================================== --- trunk/reactos/hal/hal/hal_amd64.def (added) +++ trunk/reactos/hal/hal/hal_amd64.def [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,0 +1,86 @@ +; Hardware Abstraction Layer - ReactOS Operating System + +LIBRARY hal.dll + +EXPORTS +HalAcquireDisplayOwnership +HalAdjustResourceList +HalAllProcessorsStarted +HalAllocateAdapterChannel +HalAllocateCommonBuffer +HalAllocateCrashDumpRegisters +HalAssignSlotResources +;HalBugCheckSystem +HalCalibratePerformanceCounter +HalClearSoftwareInterrupt +;HalConvertDeviceIdtToIrql +;HalDisableInterrupt +HalDisplayString +;HalEnableInterrupt +;HalEnumerateEnvironmentVariablesEx +;HalEnumerateProcessors +HalFlushCommonBuffer +HalFreeCommonBuffer +HalGetAdapter +HalGetBusData +HalGetBusDataByOffset +HalGetEnvironmentVariable +;HalGetEnvironmentVariableEx +;HalGetInterruptTargetInformation +HalGetInterruptVector +;HalGetMessageRoutingInfo +;HalGetProcessorIdByNtNumber +;HalGetVectorInput +;HalHandleMcheck +HalHandleNMI +HalInitSystem +;HalInitializeBios +;HalInitializeOnResume +HalInitializeProcessor +;HalIsHyperThreadingEnabled +HalMakeBeep +HalProcessorIdle +HalQueryDisplayParameters +;HalQueryEnvironmentVariableInfoEx +;HalQueryMaximumProcessorCount +HalQueryRealTimeClock +HalReadDmaCounter +;HalRegisterDynamicProcessor +;HalRegisterErrataCallbacks +HalReportResourceUsage +HalRequestIpi +HalRequestSoftwareInterrupt +HalReturnToFirmware +;HalSendNMI +;HalSendSoftwareInterrupt +HalSetBusData +HalSetBusDataByOffset +HalSetDisplayParameters +HalSetEnvironmentVariable +;HalSetEnvironmentVariableEx +HalSetProfileInterval +HalSetRealTimeClock +HalSetTimeIncrement +;HalStartDynamicProcessor +HalStartNextProcessor +HalStartProfileInterrupt +HalStopProfileInterrupt +HalSystemVectorDispatchEntry +HalTranslateBusAddress +IoAssignDriveLetters +IoFlushAdapterBuffers +IoFreeAdapterChannel +IoFreeMapRegisters +IoMapTransfer +IoReadPartitionTable +IoSetPartitionInformation +IoWritePartitionTable +KdComPortInUse=_KdComPortInUse DATA +KeFlushWriteBuffer +KeQueryPerformanceCounter +KeStallExecutionProcessor +;x86BiosAllocateBuffer +;x86BiosCall +;x86BiosFreeBuffer +;x86BiosReadMemory +;x86BiosWriteMemory Propchange: trunk/reactos/hal/hal/hal_amd64.def ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halamd64/generic/generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/gener… ============================================================================== --- trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/generic.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,10 +1,16 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halamd64_generic" type="objectlibrary"> - <include base="halamd64_generic">../include</include> - <include base="ntoskrnl">include</include> - <define name="_DISABLE_TIDENTS" /> - <define name="_NTHAL_" /> - <file>hal.c</file> - <pch>../include/hal.h</pch> -</module> +<group> + <module name="hal_generic" type="objectlibrary"> + <include base="hal_generic">../include</include> + <include base="ntoskrnl">include</include> + <define name="_DISABLE_TIDENTS" /> + <define name="_NTHAL_" /> + <file>halinit.c</file> + <file>irq.S</file> + <file>misc.c</file> + <file>mps.S</file> + <file>systimer.S</file> + <pch>../include/hal.h</pch> + </module> +</group> Copied: trunk/reactos/hal/halamd64/generic/irq.S (from r35905, branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/irq.S… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/irq.S [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/irq.S [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -14,7 +14,7 @@ .macro UNIMPLEMENTED func jmp 2f 1: - .ascii "Sory, asm function " + .ascii "Sorry, asm function " .ascii func .ascii " is unimplemented!\n\0" 2: @@ -34,13 +34,44 @@ .globl _HalpInitPICs .func _HalpInitPICs _HalpInitPICs: -UNIMPLEMENTED "HalpInitPICs" + UNIMPLEMENTED "HalpInitPICs" +.endfunc +.global _HalEnableInterrupt +.func _HalEnableInterrupt +_HalEnableInterrupt: + UNIMPLEMENTED "HalEnableInterrupt" .endfunc + +.global _HalDisableInterrupt +.func _HalDisableInterrupt +_HalDisableInterrupt: + UNIMPLEMENTED "HalDisableInterrupt" +.endfunc + +.global _HalRequestSoftwareInterrupt +.func _HalRequestSoftwareInterrupt +_HalRequestSoftwareInterrupt: + UNIMPLEMENTED "HalRequestSoftwareInterrupt" +.endfunc + +.global _HalSendSoftwareInterrupt +.func _HalSendSoftwareInterrupt +_HalSendSoftwareInterrupt: + UNIMPLEMENTED "HalSendSoftwareInterrupt" +.endfunc + +.global _HalEndSystemInterrupt +.func _HalEndSystemInterrupt +_HalEndSystemInterrupt: + UNIMPLEMENTED "HalEndSystemInterrupt" +.endfunc + .globl _HalClearSoftwareInterrupt .func _HalClearSoftwareInterrupt _HalClearSoftwareInterrupt: + UNIMPLEMENTED "HalClearSoftwareInterrupt" /* Get IRR mask */ mov eax, 1 @@ -52,42 +83,9 @@ ret .endfunc -.globl _HalRequestSoftwareInterrupt -.func _HalRequestSoftwareInterrupt -_HalRequestSoftwareInterrupt: -UNIMPLEMENTED "HalRequestSoftwareInterrupt" -.endfunc - .globl _HalBeginSystemInterrupt .func _HalBeginSystemInterrupt _HalBeginSystemInterrupt: -UNIMPLEMENTED "HalBeginSystemInterrupt" + UNIMPLEMENTED "HalBeginSystemInterrupt" .endfunc -.globl _HalpApcInterrupt -.func _HalpApcInterrupt -//TRAP_FIXUPS hapc_a, hapc_t, DoFixupV86, DoFixupAbios -_HalpApcInterrupt: -UNIMPLEMENTED "HalpApcInterrupt" -.endfunc - -.globl _HalpApcInterrupt2ndEntry -.func _HalpApcInterrupt2ndEntry -_HalpApcInterrupt2ndEntry: -UNIMPLEMENTED "HalpApcInterrupt2ndEntry" -.endfunc - -.globl _HalpDispatchInterrupt -.func _HalpDispatchInterrupt -//TRAP_FIXUPS hdpc_a, hdpc_t, DoFixupV86, DoFixupAbios -_HalpDispatchInterrupt: -UNIMPLEMENTED "HalpDispatchInterrupt" -.endfunc - - -.globl _HalpDispatchInterrupt2ndEntry -.func _HalpDispatchInterrupt2ndEntry -_HalpDispatchInterrupt2ndEntry: -UNIMPLEMENTED "HalpDispatchInterrupt2ndEntry" -.endfunc - Modified: trunk/reactos/hal/halamd64/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/include/hal.h… ============================================================================== --- trunk/reactos/hal/halamd64/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/include/hal.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,9 +1,9 @@ /* - * PROJECT: ReactOS HAL - * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: hal/halarm/include/hal.h - * PURPOSE: Hardware Abstraction Layer Header - * PROGRAMMERS: ReactOS Portable Systems Group + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Hardware Abstraction Layer + * FILE: hal/halx86/include/hal.h + * PURPOSE: HAL Header + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES ******************************************************************/ @@ -28,14 +28,23 @@ #include <arc/arc.h> #include <iotypes.h> #include <kefuncs.h> -#include <intrin.h> #include <halfuncs.h> #include <iofuncs.h> #include <ldrtypes.h> #include <obfuncs.h> +/* Internal kernel headers */ +#include "internal/pci.h" +#include "internal/i386/intrin_i.h" + /* Internal HAL Headers */ +//#include "apic.h" +#include "bus.h" +//#include "halirq.h" +//#include "haldma.h" #include "halp.h" +//#include "mps.h" +//#include "ioapic.h" /* Helper Header */ #include <reactos/helper.h> Modified: trunk/reactos/hal/halamd64/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/include/halp.… ============================================================================== --- trunk/reactos/hal/halamd64/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/include/halp.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,22 +1,172 @@ +/* + * + */ + #ifndef __INTERNAL_HAL_HAL_H #define __INTERNAL_HAL_HAL_H -// -// ARM Headers -// -#include <internal/arm/ke.h> -#include <internal/arm/intrin_i.h> +#define HAL_APC_REQUEST 0 +#define HAL_DPC_REQUEST 1 + +/* CMOS Registers and Ports */ +#define CMOS_CONTROL_PORT (PUCHAR)0x70 +#define CMOS_DATA_PORT (PUCHAR)0x71 +#define RTC_REGISTER_A 0x0A +#define RTC_REGISTER_B 0x0B +#define RTC_REG_A_UIP 0x80 +#define RTC_REGISTER_CENTURY 0x32 + +/* Timer Registers and Ports */ +#define TIMER_CONTROL_PORT 0x43 +#define TIMER_DATA_PORT0 0x40 +#define TIMER_SC0 0 +#define TIMER_BOTH 0x30 +#define TIMER_MD2 0x4 + +/* Conversion functions */ +#define BCD_INT(bcd) \ + (((bcd & 0xF0) >> 4) * 10 + (bcd & 0x0F)) +#define INT_BCD(int) \ + (UCHAR)(((int / 10) << 4) + (int % 10)) + +/* adapter.c */ +PADAPTER_OBJECT NTAPI HalpAllocateAdapterEx(ULONG NumberOfMapRegisters,BOOLEAN IsMaster, BOOLEAN Dma32BitAddresses); + +/* bus.c */ +VOID NTAPI HalpInitNonBusHandler (VOID); + +/* irql.c */ +VOID NTAPI HalpInitPICs(VOID); + +/* udelay.c */ +VOID NTAPI HalpInitializeClock(VOID); + +/* pci.c */ +VOID HalpInitPciBus (VOID); + +/* dma.c */ +VOID HalpInitDma (VOID); + +/* Non-generic initialization */ +VOID HalpInitPhase0 (PLOADER_PARAMETER_BLOCK LoaderBlock); +VOID HalpInitPhase1(VOID); +VOID NTAPI HalpClockInterrupt(VOID); // -// Versatile Peripherals +// KD Support // -#include <peripherals/pl011.h> -#include <peripherals/pl190.h> -#include <peripherals/sp804.h> +VOID +NTAPI +HalpCheckPowerButton( + VOID +); + +VOID +NTAPI +HalpRegisterKdSupportFunctions( + VOID +); + +NTSTATUS +NTAPI +HalpSetupPciDeviceForDebugging( + IN PVOID LoaderBlock, + IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice +); + +NTSTATUS +NTAPI +HalpReleasePciDeviceForDebugging( + IN OUT PDEBUG_DEVICE_DESCRIPTOR PciDevice +); // -// WDK Hack +// Memory routines // -#define KdComPortInUse _KdComPortInUse +PVOID +NTAPI +HalpMapPhysicalMemory64( + IN PHYSICAL_ADDRESS PhysicalAddress, + IN ULONG NumberPage +); + +VOID +NTAPI +HalpUnmapVirtualAddress( + IN PVOID VirtualAddress, + IN ULONG NumberPages +); + +/* sysinfo.c */ +NTSTATUS +NTAPI +HaliQuerySystemInformation( + IN HAL_QUERY_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer, + OUT PULONG ReturnedLength +); + +NTSTATUS +NTAPI +HaliSetSystemInformation( + IN HAL_SET_INFORMATION_CLASS InformationClass, + IN ULONG BufferSize, + IN OUT PVOID Buffer +); + +// +// BIOS Routines +// +BOOLEAN +NTAPI +HalpBiosDisplayReset( + VOID +); + +ULONG +NTAPI +HalpBorrowTss( + VOID +); + +ULONG +NTAPI +HalpReturnTss( + ULONG SavedTss +); + +VOID +NTAPI +HalpBiosCall( + VOID +); + +VOID +NTAPI +HalpTrap0D( + VOID +); + +VOID +NTAPI +HalpTrap06( + VOID +); + +PDMA_ADAPTER +NTAPI +HalpGetDmaAdapter( + IN PVOID Context, + IN PDEVICE_DESCRIPTION DeviceDescription, + OUT PULONG NumberOfMapRegisters); + +VOID HaliInitBSP(VOID); +VOID HaliStartApplicationProcessor(ULONG Cpu, ULONG Stack); + +extern PVOID HalpRealModeStart; +extern PVOID HalpRealModeEnd; + +extern KSPIN_LOCK HalpSystemHardwareLock; #endif /* __INTERNAL_HAL_HAL_H */ Modified: trunk/reactos/hal/halamd64/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/up/halup.rbui… ============================================================================== --- trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/up/halup.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -1,14 +1,16 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="halarm_up" type="kernelmodedll" installbase="system32" installname="hal.dll"> - <importlibrary definition="../../hal/hal_amd64.def" /> +<module name="halup" type="kernelmodedll" installbase="system32" installname="hal.dll"> + <importlibrary base="hal" definition="hal_amd64.def" /> <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> - <include base="halamd64_generic">../include</include> + <include base="halup">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> - <library>halamd64_generic</library> + <library>hal_generic_amd64</library> + <library>hal_generic</library> <library>ntoskrnl</library> <file>halinit_up.c</file> <file>halup.rc</file> + <file>processor.c</file> </module> Modified: trunk/reactos/hal/halx86/generic/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/timer.c… ============================================================================== --- trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/timer.c [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -48,7 +48,7 @@ PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Increment; USHORT RollOver; - ULONG Flags; + ULONG_PTR Flags; /* Check the CPU Type */ if (Prcb->CpuType <= 4) @@ -92,7 +92,7 @@ HalCalibratePerformanceCounter(IN volatile PLONG Count, IN ULONGLONG NewCount) { - ULONG Flags; + ULONG_PTR Flags; /* Disable interrupts */ Flags = __readeflags(); Copied: trunk/reactos/hal/halx86/hal_generic_amd64.rbuild (from r35905, branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic_amd… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic_amd64.rbuild [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -13,13 +13,14 @@ <file>dma.c</file> <file>drive.c</file> <file>display.c</file> + <file>pci.c</file> <file>profil.c</file> <file>reboot.c</file> <file>sysinfo.c</file> <file>timer.c</file> </directory> <directory name="mp"> -  + <file>apic.c</file> </directory> <directory name="include"> <pch>hal.h</pch> Modified: trunk/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/apic.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/apic.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -5,7 +5,11 @@ #ifndef __INTERNAL_HAL_APIC_H #define __INTERNAL_HAL_APIC_H +#ifdef _M_AMD64 +#define APIC_DEFAULT_BASE 0xfffffffffee00000ULL; +#else #define APIC_DEFAULT_BASE 0xFEE00000 /* Default Local APIC Base Register Address */ +#endif /* APIC Register Address Map */ #define APIC_ID 0x0020 /* Local APIC ID Register (R/W) */ @@ -115,30 +119,6 @@ #define APIC_TDCR_128 0x0A #define APIC_TDCR_1 0x0B -#define APIC_LVT_VECTOR (0xFF << 0) /* Vector */ -#define APIC_LVT_DS (0x1 << 12) /* Delivery Status */ -#define APIC_LVT_REMOTE_IRR (0x1 << 14) /* Remote IRR */ -#define APIC_LVT_LEVEL_TRIGGER (0x1 << 15) /* Lvel Triggered */ -#define APIC_LVT_MASKED (0x1 << 16) /* Mask */ -#define APIC_LVT_PERIODIC (0x1 << 17) /* Timer Mode */ - -#define APIC_LVT3_DM (0x7 << 8) -#define APIC_LVT3_IIPP (0x1 << 13) -#define APIC_LVT3_TM (0x1 << 15) -#define APIC_LVT3_MASKED (0x1 << 16) -#define APIC_LVT3_OS (0x1 << 17) - -#define APIC_TDCR_TMBASE (0x1 << 2) -#define APIC_TDCR_MASK 0x0F -#define APIC_TDCR_2 0x00 -#define APIC_TDCR_4 0x01 -#define APIC_TDCR_8 0x02 -#define APIC_TDCR_16 0x03 -#define APIC_TDCR_32 0x08 -#define APIC_TDCR_64 0x09 -#define APIC_TDCR_128 0x0A -#define APIC_TDCR_1 0x0B - #define APIC_TARGET_SELF 0x100 #define APIC_TARGET_ALL 0x200 #define APIC_TARGET_ALL_BUT_SELF 0x300 @@ -206,7 +186,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); return *p; } @@ -216,7 +196,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); *p = Value; } @@ -230,7 +210,7 @@ lastregw[CPU] = Offset; lastvalw[CPU] = Value; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); *p = Value; } @@ -241,7 +221,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); return *p; } #else @@ -253,7 +233,7 @@ lastregr[CPU] = Offset; lastvalr[CPU] = 0; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); lastvalr[CPU] = *p; return lastvalr[CPU]; Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -43,7 +43,7 @@ #define TYPE1_READ(x, y) \ TYPE1_START(x, y) \ *((POINTER_TO_(y))Buffer) = \ - READ_FROM(y)((POINTER_TO_(y))(BusData->Config.Type1.Data + i)); \ + READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i)); \ TYPE1_END(y) // @@ -51,7 +51,7 @@ // #define TYPE1_WRITE(x, y) \ TYPE1_START(x, y) \ - WRITE_TO(y)((POINTER_TO_(y))(BusData->Config.Type1.Data + i), \ + WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)(BusData->Config.Type1.Data + i), \ *((POINTER_TO_(y))Buffer)); \ TYPE1_END(y) @@ -69,7 +69,7 @@ #define TYPE2_READ(x, y) \ TYPE2_START(x, y) \ *((POINTER_TO_(y))Buffer) = \ - READ_FROM(y)((POINTER_TO_(y))(ULONG)PciCfg->u.AsUSHORT); \ + READ_FROM(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT); \ TYPE2_END(y) // @@ -77,7 +77,7 @@ // #define TYPE2_WRITE(x, y) \ TYPE2_START(x, y) \ - WRITE_TO(y)((POINTER_TO_(y))(ULONG)PciCfg->u.AsUSHORT, \ + WRITE_TO(y)((POINTER_TO_(y))(ULONG_PTR)PciCfg->u.AsUSHORT, \ *((POINTER_TO_(y))Buffer)); \ TYPE2_END(y) Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -34,7 +34,11 @@ /* Internal kernel headers */ #include "internal/pci.h" +#ifdef _M_AMD64 +#include "internal/amd64/intrin_i.h" +#else #include "internal/i386/intrin_i.h" +#endif /* Internal HAL Headers */ #include "apic.h" Modified: trunk/reactos/hal/halx86/include/halp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?… ============================================================================== --- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -154,6 +154,17 @@ VOID ); +#ifdef _M_AMD64 +#define KfLowerIrql KeLowerIrql +#ifndef CONFIG_SMP +/* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ +#define KiAcquireSpinLock(SpinLock) +#define KiReleaseSpinLock(SpinLock) +#define KfAcquireSpinLock(SpinLock) KfRaiseIrql(DISPATCH_LEVEL); +#define KfReleaseSpinLock(SpinLock, OldIrql) KeLowerIrql(OldIrql); +#endif // !CONFIG_SMP +#endif // _M_AMD64 + extern PVOID HalpRealModeStart; extern PVOID HalpRealModeEnd; Modified: trunk/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/apic.c?rev=4… ============================================================================== --- trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/mp/apic.c [iso-8859-1] Sat Sep 26 23:32:53 2009 @@ -709,6 +709,9 @@ MpsIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, PKTRAP_FRAME TrapFrame) { +#ifdef _M_AMD64 + UNIMPLEMENTED; +#else TrapFrame->SegGs = (USHORT)IrqTrapFrame->Gs; TrapFrame->SegFs = (USHORT)IrqTrapFrame->Fs; TrapFrame->SegEs = (USHORT)IrqTrapFrame->Es; @@ -724,6 +727,7 @@ TrapFrame->Eip = IrqTrapFrame->Eip; TrapFrame->SegCs = IrqTrapFrame->Cs; TrapFrame->EFlags = IrqTrapFrame->Eflags; +#endif } VOID @@ -798,7 +802,7 @@ APICSetupLVTT(1000000000); - TSCPresent = ((PKIPCR)KeGetPcr())->PrcbData.FeatureBits & KF_RDTSC ? TRUE : FALSE; + TSCPresent = KeGetCurrentPrcb()->FeatureBits & KF_RDTSC ? TRUE : FALSE; /* * The timer chip counts down to zero. Let's wait @@ -827,7 +831,7 @@ DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); - ((PKIPCR)KeGetPcr())->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; + KeGetCurrentPrcb()->MHz = CPUMap[CPU].CoreSpeed/1000000; } CPUMap[CPU].BusSpeed = (HZ * (long)(tt1 - tt2) * APIC_DIVISOR); @@ -843,8 +847,25 @@ } VOID -SetInterruptGate(ULONG index, ULONG address) -{ +SetInterruptGate(ULONG index, ULONG_PTR address) +{ +#ifdef _M_AMD64 + KIDTENTRY64 *idt; + + idt = &KeGetPcr()->IdtBase[index]; + + idt->OffsetLow = address & 0xffff; + idt->Selector = KGDT_64_R0_CODE; + idt->IstIndex = 0; + idt->Reserved0 = 0; + idt->Type = 0x0e; + idt->Dpl = 0; + idt->Present = 1; + idt->OffsetMiddle = (address >> 16) & 0xffff; + idt->OffsetHigh = address >> 32; + idt->Reserved1 = 0; + idt->Alignment = 0; +#else KIDTENTRY *idt; KIDT_ACCESS Access; @@ -860,6 +881,7 @@ idt->Selector = KGDT_R0_CODE; idt->Access = Access.Value; idt->ExtendedOffset = (USHORT)(address >> 16); +#endif } VOID HaliInitBSP(VOID) @@ -880,11 +902,11 @@ BSPInitialized = TRUE; /* Setup interrupt handlers */ - SetInterruptGate(LOCAL_TIMER_VECTOR, (ULONG)MpsTimerInterrupt); - SetInterruptGate(ERROR_VECTOR, (ULONG)MpsErrorInterrupt); - SetInterruptGate(SPURIOUS_VECTOR, (ULONG)MpsSpuriousInterrupt); + SetInterruptGate(LOCAL_TIMER_VECTOR, (ULONG_PTR)MpsTimerInterrupt); + SetInterruptGate(ERROR_VECTOR, (ULONG_PTR)MpsErrorInterrupt); + SetInterruptGate(SPURIOUS_VECTOR, (ULONG_PTR)MpsSpuriousInterrupt); #ifdef CONFIG_SMP - SetInterruptGate(IPI_VECTOR, (ULONG)MpsIpiInterrupt); + SetInterruptGate(IPI_VECTOR, (ULONG_PTR)MpsIpiInterrupt); #endif DPRINT("APIC is mapped at 0x%X\n", APICBase); @@ -913,18 +935,18 @@ CommonBase = (PULONG)COMMON_AREA; /* Copy bootstrap code to common area */ - memcpy((PVOID)((ULONG)CommonBase + PAGE_SIZE), + memcpy((PVOID)((ULONG_PTR)CommonBase + PAGE_SIZE), &APstart, - (ULONG)&APend - (ULONG)&APstart + 1); + (ULONG_PTR)&APend - (ULONG_PTR)&APstart + 1); /* Set shutdown code */ CMOS_WRITE(0xF, 0xA); /* Set warm reset vector */ - ps = (PUSHORT)((ULONG)BIOSBase + 0x467); + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x467); *ps = (COMMON_AREA + PAGE_SIZE) & 0xF; - ps = (PUSHORT)((ULONG)BIOSBase + 0x469); + ps = (PUSHORT)((ULONG_PTR)BIOSBase + 0x469); *ps = (COMMON_AREA + PAGE_SIZE) >> 4; #endif

1 0

[janderwald] 43172: - Add macros
by janderwald＠svn.reactos.org 26 Sep '09

26 Sep '09

Author: janderwald Date: Sat Sep 26 22:19:28 2009 New Revision: 43172 URL: http://svn.reactos.org/svn/reactos?rev=43172&view=rev Log: - Add macros Modified: trunk/reactos/include/psdk/mmreg.h Modified: trunk/reactos/include/psdk/mmreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mmreg.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/mmreg.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/mmreg.h [iso-8859-1] Sat Sep 26 22:19:28 2009 @@ -133,6 +133,9 @@ #define WAVE_FORMAT_OLISBC 0x1003 /* Ing C. Olivetti & C., S.p.A. */ #define WAVE_FORMAT_OLIOPR 0x1004 /* Ing C. Olivetti & C., S.p.A. */ +#define MM_UNMAPPED 0xffff +#define MM_PID_UNMAPPED MM_UNMAPPED + #if !defined(WAVE_FORMAT_EXTENSIBLE) #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ #endif

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