Ros-diffs June 2005

ros-diffs@reactos.org

22 participants
649 discussions

[ion] 16039: Build Generic HAL with w32api

by ion＠svn.reactos.com

Build Generic HAL with w32api Modified: trunk/reactos/hal/halx86/generic/adapter.c Modified: trunk/reactos/hal/halx86/generic/beep.c Modified: trunk/reactos/hal/halx86/generic/bus.c Modified: trunk/reactos/hal/halx86/generic/display.c Modified: trunk/reactos/hal/halx86/generic/dma.c Modified: trunk/reactos/hal/halx86/generic/drive.c Modified: trunk/reactos/hal/halx86/generic/enum.c Modified: trunk/reactos/hal/halx86/generic/fmutex.c Modified: trunk/reactos/hal/halx86/generic/generic.xml Modified: trunk/reactos/hal/halx86/generic/halinit.c Modified: trunk/reactos/hal/halx86/generic/ipi.c Modified: trunk/reactos/hal/halx86/generic/irql.c Modified: trunk/reactos/hal/halx86/generic/isa.c Modified: trunk/reactos/hal/halx86/generic/kdbg.c Modified: trunk/reactos/hal/halx86/generic/mca.c Modified: trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/hal/halx86/generic/pci.c Modified: trunk/reactos/hal/halx86/generic/portio.c Modified: trunk/reactos/hal/halx86/generic/processor.c Modified: trunk/reactos/hal/halx86/generic/reboot.c Modified: trunk/reactos/hal/halx86/generic/resource.c Modified: trunk/reactos/hal/halx86/generic/spinlock.c Modified: trunk/reactos/hal/halx86/generic/sysbus.c Modified: trunk/reactos/hal/halx86/generic/sysinfo.c Modified: trunk/reactos/hal/halx86/generic/time.c Modified: trunk/reactos/hal/halx86/generic/timer.c _____ Modified: trunk/reactos/hal/halx86/generic/adapter.c --- trunk/reactos/hal/halx86/generic/adapter.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/adapter.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -13,15 +13,11 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ddk/iotypes.h> -#include <internal/ob.h> -#include <internal/ps.h> #define NDEBUG -#include <internal/debug.h> #include <hal.h> /* Hmm, needed for KDBG := 1. Why? */ +extern POBJECT_TYPE IMPORTED IoAdapterObjectType; #undef KeGetCurrentIrql /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/beep.c --- trunk/reactos/hal/halx86/generic/beep.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/beep.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -10,13 +10,10 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - /* CONSTANTS *****************************************************************/ #define TIMER2 0x42 _____ Modified: trunk/reactos/hal/halx86/generic/bus.c --- trunk/reactos/hal/halx86/generic/bus.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/bus.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -15,13 +15,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#include <bus.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS *******************************************************************/ #define TAG_BUS TAG('B', 'U', 'S', 'H') _____ Modified: trunk/reactos/hal/halx86/generic/display.c --- trunk/reactos/hal/halx86/generic/display.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/display.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -121,9 +121,10 @@ * since there is already support for them via the VideoPortInt10 routine. */ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> + #define SCREEN_SYNCHRONIZATION #define VGA_GRAPH_MEM 0xa0000 _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -11,9 +11,7 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> #define NDEBUG -#include <internal/debug.h> #include <hal.h> /* Adapters for each channel */ _____ Modified: trunk/reactos/hal/halx86/generic/drive.c --- trunk/reactos/hal/halx86/generic/drive.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/drive.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -11,18 +11,19 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <internal/debug.h> +#define NDEBUG +#include <hal.h> /* FUNCTIONS *****************************************************************/ VOID STDCALL -IoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, +IoAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, IN PSTRING NtDeviceName, OUT PUCHAR NtSystemPath, OUT PSTRING NtSystemPathString) { - HalIoAssignDriveLetters(LoaderBlock, + /* FIXME FIXME FIXME FUCK SOMEONE FIXME*/ + HalIoAssignDriveLetters(NULL, NtDeviceName, NtSystemPath, NtSystemPathString); _____ Modified: trunk/reactos/hal/halx86/generic/enum.c --- trunk/reactos/hal/halx86/generic/enum.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/enum.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -11,10 +11,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <internal/debug.h> +#include <hal.h> VOID HalpStartEnumerator (VOID) _____ Modified: trunk/reactos/hal/halx86/generic/fmutex.c --- trunk/reactos/hal/halx86/generic/fmutex.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/fmutex.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -12,10 +12,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG +#include <hal.h> -#include <internal/debug.h> - /* FUNCTIONS *****************************************************************/ #undef KeEnterCriticalRegion _____ Modified: trunk/reactos/hal/halx86/generic/generic.xml --- trunk/reactos/hal/halx86/generic/generic.xml 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/generic.xml 2005-06-18 14:29:31 UTC (rev 16039) @@ -2,7 +2,8 @@ <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__NTHAL__" /> + <define name="__USE_W32API" /> + <define name="_NTHAL_" /> <file>adapter.c</file> <file>beep.c</file> <file>bus.c</file> @@ -28,7 +29,8 @@ <include base="hal_generic_up">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__NTHAL__" /> + <define name="_NTHAL_" /> + <define name="__USE_W32API" /> <file>ipi.c</file> <file>irql.c</file> <file>processor.c</file> @@ -38,6 +40,7 @@ <include base="hal_generic_pc">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> - <define name="__NTHAL__" /> + <define name="_NTHAL_" /> + <define name="__USE_W32API" /> <file>display.c</file> </module> _____ Modified: trunk/reactos/hal/halx86/generic/halinit.c --- trunk/reactos/hal/halx86/generic/halinit.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/halinit.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -11,12 +11,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS *****************************************************************/ PVOID HalpZeroPageMapping = NULL; _____ Modified: trunk/reactos/hal/halx86/generic/ipi.c --- trunk/reactos/hal/halx86/generic/ipi.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/ipi.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -9,12 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - /* FUNCTIONS ****************************************************************/ VOID STDCALL _____ Modified: trunk/reactos/hal/halx86/generic/irql.c --- trunk/reactos/hal/halx86/generic/irql.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/irql.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -9,16 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <internal/ob.h> -#include <internal/ps.h> -#include <ntos/minmax.h> +#define NDEBUG #include <hal.h> -#include <halirq.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS ******************************************************************/ /* @@ -174,9 +167,9 @@ return; } KeGetCurrentKPCR()->Irql = DISPATCH_LEVEL; - if (KeGetCurrentKPCR()->HalReserved[HAL_DPC_REQUEST]) + if (((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_DPC_REQUEST]) { - KeGetCurrentKPCR()->HalReserved[HAL_DPC_REQUEST] = FALSE; + ((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_DPC_REQUEST] = FALSE; KiDispatchInterrupt(); } KeGetCurrentKPCR()->Irql = APC_LEVEL; @@ -240,7 +233,7 @@ * * NOTES */ - +#undef KeLowerIrql VOID STDCALL KeLowerIrql (KIRQL NewIrql) { @@ -303,6 +296,7 @@ * NOTES * Calls KfRaiseIrql */ +#undef KeRaiseIrql VOID STDCALL KeRaiseIrql (KIRQL NewIrql, PKIRQL OldIrql) @@ -466,11 +460,11 @@ switch (Request) { case APC_LEVEL: - KeGetCurrentKPCR()->HalReserved[HAL_APC_REQUEST] = TRUE; + ((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_APC_REQUEST] = TRUE; break; case DISPATCH_LEVEL: - KeGetCurrentKPCR()->HalReserved[HAL_DPC_REQUEST] = TRUE; + ((PKIPCR)KeGetCurrentKPCR())->HalReserved[HAL_DPC_REQUEST] = TRUE; break; default: _____ Modified: trunk/reactos/hal/halx86/generic/isa.c --- trunk/reactos/hal/halx86/generic/isa.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/isa.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -11,12 +11,8 @@ /* INCLUDES ***************************************************************/ -#include <ddk/ntddk.h> -#include <bus.h> -#include <halirq.h> - #define NDEBUG -#include <internal/debug.h> +#include <hal.h> /* FUNCTIONS *****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/kdbg.c --- trunk/reactos/hal/halx86/generic/kdbg.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/kdbg.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -12,10 +12,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG -#include <internal/debug.h> +#include <hal.h> #define DEFAULT_BAUD_RATE 19200 _____ Modified: trunk/reactos/hal/halx86/generic/mca.c --- trunk/reactos/hal/halx86/generic/mca.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/mca.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -32,13 +32,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <bus.h> - #define NDEBUG -#include <internal/debug.h> +#include <hal.h> - /* FUNCTIONS ****************************************************************/ ULONG STDCALL _____ Modified: trunk/reactos/hal/halx86/generic/misc.c --- trunk/reactos/hal/halx86/generic/misc.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/misc.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -9,11 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/pci.c --- trunk/reactos/hal/halx86/generic/pci.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/pci.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -18,17 +18,10 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <bus.h> -#include <halirq.h> +#define NDEBUG #include <hal.h> -#include <internal/ob.h> -#include <internal/ps.h> -#define NDEBUG -#include <internal/debug.h> - /* MACROS ******************************************************************/ /* FIXME These are also defined in drivers/bus/pci/pcidef.h. @@ -639,7 +632,7 @@ if (0 != PciConfig.u.type0.BaseAddresses[Address]) { ResourceCount++; - Offset = offsetof(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); + Offset = FIELD_OFFSET(PCI_COMMON_CONFIG, u.type0.BaseAddresses[Address]); Status = WritePciConfigUlong((UCHAR)BusNumber, (UCHAR)SlotNumber, Offset, 0xffffffff); if (! NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/hal/halx86/generic/portio.c --- trunk/reactos/hal/halx86/generic/portio.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/portio.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -9,9 +9,9 @@ * Created 18/10/99 */ -#include <ddk/ntddk.h> +#define NDEBUG +#include <hal.h> - /* FUNCTIONS ****************************************************************/ /* _____ Modified: trunk/reactos/hal/halx86/generic/processor.c --- trunk/reactos/hal/halx86/generic/processor.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/processor.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -14,13 +14,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - - /* FUNCTIONS *****************************************************************/ VOID STDCALL _____ Modified: trunk/reactos/hal/halx86/generic/reboot.c --- trunk/reactos/hal/halx86/generic/reboot.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/reboot.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -9,8 +9,7 @@ * Created 11/10/99 */ - -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> _____ Modified: trunk/reactos/hal/halx86/generic/resource.c --- trunk/reactos/hal/halx86/generic/resource.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/resource.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -9,11 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/spinlock.c --- trunk/reactos/hal/halx86/generic/spinlock.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/spinlock.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -17,17 +17,15 @@ /* INCLUDES ****************************************************************/ -#include <ddk/ntddk.h> -#include <internal/ob.h> -#include <internal/ps.h> +#define NDEBUG +#include <hal.h> -#include <internal/debug.h> - /* Hmm, needed for KDBG := 1. Why? */ #undef KeGetCurrentIrql /* FUNCTIONS ***************************************************************/ +#undef KeAcquireSpinLock VOID STDCALL KeAcquireSpinLock ( PKSPIN_LOCK SpinLock, @@ -56,6 +54,7 @@ return OldIrql; } +#undef KeReleaseSpinLock VOID STDCALL KeReleaseSpinLock ( PKSPIN_LOCK SpinLock, _____ Modified: trunk/reactos/hal/halx86/generic/sysbus.c --- trunk/reactos/hal/halx86/generic/sysbus.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/sysbus.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -11,12 +11,8 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <bus.h> -#include <halirq.h> - #define NDEBUG -#include <internal/debug.h> +#include <hal.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/sysinfo.c --- trunk/reactos/hal/halx86/generic/sysinfo.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/sysinfo.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -10,12 +10,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#include <bus.h> -#define NDEBUG -#include <internal/debug.h> /* FUNCTIONS ****************************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/time.c --- trunk/reactos/hal/halx86/generic/time.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/time.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -8,13 +8,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <string.h> +#define NDEBUG #include <hal.h> -#include <bus.h> -#define NDEBUG -#include <internal/debug.h> /* MACROS and CONSTANTS ******************************************************/ _____ Modified: trunk/reactos/hal/halx86/generic/timer.c --- trunk/reactos/hal/halx86/generic/timer.c 2005-06-18 14:29:17 UTC (rev 16038) +++ trunk/reactos/hal/halx86/generic/timer.c 2005-06-18 14:29:31 UTC (rev 16039) @@ -32,14 +32,9 @@ /* INCLUDES ***************************************************************/ -#include <ddk/ntddk.h> -#include <internal/ob.h> -#include <internal/ps.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS ******************************************************************/ #define TMR_CTRL 0x43 /* I/O for control */ @@ -127,7 +122,7 @@ VOID STDCALL KeStallExecutionProcessor(ULONG Microseconds) { - PKPCR Pcr = KeGetCurrentKPCR(); + PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR(); if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) { @@ -194,7 +189,7 @@ ULONG i; ULONG calib_bit; ULONG CurCount; - PKPCR Pcr; + PKIPCR Pcr; LARGE_INTEGER StartCount, EndCount; if (UdelayCalibrated) @@ -203,7 +198,7 @@ } UdelayCalibrated = TRUE; - Pcr = KeGetCurrentKPCR(); + Pcr = (PKIPCR)KeGetCurrentKPCR(); /* Initialise timer interrupt with MILLISEC ms interval */ WRITE_PORT_UCHAR((PUCHAR) TMR_CTRL, TMR_SC0 | TMR_BOTH | TMR_MD2); /* binary, mode 2, LSB/MSB, ch 0 */ @@ -319,14 +314,14 @@ * RETURNS: The number of performance counter ticks since boot */ { - PKPCR Pcr; + PKIPCR Pcr; LARGE_INTEGER Value; ULONG Flags; Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - Pcr = KeGetCurrentKPCR(); + Pcr = (PKIPCR)KeGetCurrentKPCR(); if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC) {

19 years, 6 months

[ion] 16038: Build XBOX HAL with w32api

by ion＠svn.reactos.com

Build XBOX HAL with w32api Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c _____ Modified: trunk/reactos/hal/halx86/xbox/halxbox.xml --- trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-18 14:28:55 UTC (rev 16037) +++ trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-18 14:29:17 UTC (rev 16038) @@ -4,7 +4,8 @@ <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="UP" /> - <define name="__NTHAL__" /> + <define name="_NTHAL_" /> + <define name="__USE_W32API" /> <library>hal_generic</library> <library>hal_generic_up</library> <library>ntoskrnl</library> _____ Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c --- trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-18 14:28:55 UTC (rev 16037) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c 2005-06-18 14:29:17 UTC (rev 16038) @@ -308,6 +308,8 @@ return STATUS_ACCESS_DENIED; } +#define HalExamineMBR HALDISPATCH->HalExamineMBR + void HalpXboxInitPartIo(void) {

19 years, 6 months

[ion] 16037: Build UP HAL with w32api

by ion＠svn.reactos.com

Build UP HAL with w32api Modified: trunk/reactos/hal/halx86/up/halinit_up.c Modified: trunk/reactos/hal/halx86/up/halup.xml _____ Modified: trunk/reactos/hal/halx86/up/halinit_up.c --- trunk/reactos/hal/halx86/up/halinit_up.c 2005-06-18 14:28:28 UTC (rev 16036) +++ trunk/reactos/hal/halx86/up/halinit_up.c 2005-06-18 14:28:55 UTC (rev 16037) @@ -11,12 +11,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - /* FUNCTIONS ***************************************************************/ VOID _____ Modified: trunk/reactos/hal/halx86/up/halup.xml --- trunk/reactos/hal/halx86/up/halup.xml 2005-06-18 14:28:28 UTC (rev 16036) +++ trunk/reactos/hal/halx86/up/halup.xml 2005-06-18 14:28:55 UTC (rev 16037) @@ -4,7 +4,9 @@ <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> + <define name="__USE_W32API" /> <define name="__NTHAL__" /> + <define name="_NTOSKRNL_" /> <library>hal_generic</library> <library>hal_generic_up</library> <library>hal_generic_pc</library>

19 years, 6 months

[ion] 16036: Build MP HAL with w32api

by ion＠svn.reactos.com

Build MP HAL with w32api Modified: trunk/reactos/hal/halx86/mp/apic.c Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c Modified: trunk/reactos/hal/halx86/mp/halmp.xml Modified: trunk/reactos/hal/halx86/mp/ioapic.c Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c Modified: trunk/reactos/hal/halx86/mp/mpconfig.c Modified: trunk/reactos/hal/halx86/mp/mpsirql.c Modified: trunk/reactos/hal/halx86/mp/processor_mp.c Modified: trunk/reactos/hal/halx86/mp/resource_mp.c _____ Modified: trunk/reactos/hal/halx86/mp/apic.c --- trunk/reactos/hal/halx86/mp/apic.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/apic.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -27,17 +27,10 @@ /* INCLUDE ***********************************************************************/ -#include <ddk/ntddk.h> -#include <internal/i386/ps.h> - +#define NDEBUG #include <hal.h> -#include <halirq.h> -#include <mps.h> -#include <apic.h> +#include <internal/ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS ***********************************************************************/ ULONG CPUCount; /* Total number of CPUs */ @@ -89,8 +82,6 @@ WRITE_PORT_UCHAR((PUCHAR)0x71, value); \ }) -extern PVOID IMPORTED MmSystemRangeStart; - /* FUNCTIONS *********************************************************************/ extern ULONG Read8254Timer(VOID); @@ -866,7 +857,7 @@ APICSetupLVTT(1000000000); - TSCPresent = KeGetCurrentKPCR()->PrcbData.FeatureBits & X86_FEATURE_TSC ? TRUE : FALSE; + TSCPresent = ((PKIPCR)KeGetCurrentKPCR())->PrcbData.FeatureBits & X86_FEATURE_TSC ? TRUE : FALSE; /* * The timer chip counts down to zero. Let's wait @@ -895,7 +886,7 @@ DPRINT("CPU clock speed is %ld.%04ld MHz.\n", CPUMap[CPU].CoreSpeed/1000000, CPUMap[CPU].CoreSpeed%1000000); - KeGetCurrentKPCR()->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; + ((PKIPCR)KeGetCurrentKPCR())->PrcbData.MHz = CPUMap[CPU].CoreSpeed/1000000; } CPUMap[CPU].BusSpeed = (HZ * (long)(tt1 - tt2) * APIC_DIVISOR); _____ Modified: trunk/reactos/hal/halx86/mp/halinit_mp.c --- trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/halinit_mp.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -11,13 +11,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#include <mps.h> -#define NDEBUG -#include <internal/debug.h> - /* FUNCTIONS ***************************************************************/ extern BOOLEAN HaliFindSmpConfig(VOID); _____ Modified: trunk/reactos/hal/halx86/mp/halmp.xml --- trunk/reactos/hal/halx86/mp/halmp.xml 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/halmp.xml 2005-06-18 14:28:28 UTC (rev 16036) @@ -4,7 +4,8 @@ <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> <define name="CONFIG_SMP" /> - <define name="__NTHAL__" /> + <define name="_NTHAL_" /> + <define name="__USE_W32API" /> <library>hal_generic</library> <library>hal_generic_pc</library> <library>ntoskrnl</library> _____ Modified: trunk/reactos/hal/halx86/mp/ioapic.c --- trunk/reactos/hal/halx86/mp/ioapic.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/ioapic.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -9,22 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#include <mps.h> -#include <halirq.h> -#include <apic.h> -#include <ioapic.h> - -#include <internal/ntoskrnl.h> -#include <internal/i386/segment.h> -#include <internal/ke.h> -#include <internal/ps.h> - -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS *****************************************************************/ MP_CONFIGURATION_INTSRC IRQMap[MAX_IRQ_SOURCE]; /* Map of all IRQs */ _____ Modified: trunk/reactos/hal/halx86/mp/ipi_mp.c --- trunk/reactos/hal/halx86/mp/ipi_mp.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/ipi_mp.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -9,13 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#include <apic.h> -#define NDEBUG -#include <internal/debug.h> - /* FUNCTIONS ****************************************************************/ VOID STDCALL _____ Modified: trunk/reactos/hal/halx86/mp/mpconfig.c --- trunk/reactos/hal/halx86/mp/mpconfig.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/mpconfig.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -9,16 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <ntos/types.h> +#define NDEBUG #include <hal.h> -#include <mps.h> -#include <apic.h> -#include <ioapic.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS ******************************************************************/ MP_FLOATING_POINTER* Mpf = NULL; _____ Modified: trunk/reactos/hal/halx86/mp/mpsirql.c --- trunk/reactos/hal/halx86/mp/mpsirql.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/mpsirql.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -11,19 +11,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> -#include <internal/ke.h> -#include <internal/ps.h> -#include <ntos/minmax.h> -#include <halirq.h> +#define NDEBUG #include <hal.h> -#include <mps.h> -#include <apic.h> -#include <ioapic.h> -#define NDEBUG -#include <internal/debug.h> - /* GLOBALS ******************************************************************/; @@ -42,7 +32,7 @@ Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - irql = Ki386ReadFsByte(offsetof(KPCR, Irql)); + irql = Ki386ReadFsByte(FIELD_OFFSET(KPCR, Irql)); if (irql > HIGH_LEVEL) { DPRINT1 ("CurrentIrql %x\n", irql); @@ -70,7 +60,7 @@ } Ki386SaveFlags(Flags); Ki386DisableInterrupts(); - Ki386WriteFsByte(offsetof(KPCR, Irql), NewIrql); + Ki386WriteFsByte(FIELD_OFFSET(KPCR, Irql), NewIrql); if (Flags & X86_EFLAGS_IF) { Ki386EnableInterrupts(); @@ -92,9 +82,9 @@ { KeSetCurrentIrql (DISPATCH_LEVEL); APICWrite(APIC_TPR, IRQL2TPR (DISPATCH_LEVEL) & APIC_TPR_PRI); - if (FromHalEndSystemInterrupt || Ki386ReadFsByte(offsetof(KPCR, HalReserved[HAL_DPC_REQUEST]))) + if (FromHalEndSystemInterrupt || Ki386ReadFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]))) { - Ki386WriteFsByte(offsetof(KPCR, HalReserved[HAL_DPC_REQUEST]), 0); + Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 0); Ki386EnableInterrupts(); KiDispatchInterrupt(); if (!(Flags & X86_EFLAGS_IF)) @@ -166,7 +156,7 @@ * * NOTES */ - +#undef KeLowerIrql VOID STDCALL KeLowerIrql (KIRQL NewIrql) { @@ -240,6 +230,7 @@ * NOTES * Calls KfRaiseIrql */ +#undef KeRaiseIrql VOID STDCALL KeRaiseIrql (KIRQL NewIrql, PKIRQL OldIrql) @@ -392,11 +383,11 @@ switch (Request) { case APC_LEVEL: - Ki386WriteFsByte(offsetof(KPCR, HalReserved[HAL_APC_REQUEST]), 1); + Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_APC_REQUEST]), 1); break; case DISPATCH_LEVEL: - Ki386WriteFsByte(offsetof(KPCR, HalReserved[HAL_DPC_REQUEST]), 1); + Ki386WriteFsByte(FIELD_OFFSET(KIPCR, HalReserved[HAL_DPC_REQUEST]), 1); break; default: _____ Modified: trunk/reactos/hal/halx86/mp/processor_mp.c --- trunk/reactos/hal/halx86/mp/processor_mp.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/processor_mp.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -14,24 +14,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#include <halirq.h> -#include <mps.h> -#include <ioapic.h> -#include <apic.h> - -#include <internal/ntoskrnl.h> -#include <internal/i386/segment.h> -#include <internal/ke.h> -#include <internal/ps.h> - -#define NDEBUG -#include <internal/debug.h> - - - /* FUNCTIONS *****************************************************************/ VOID STDCALL _____ Modified: trunk/reactos/hal/halx86/mp/resource_mp.c --- trunk/reactos/hal/halx86/mp/resource_mp.c 2005-06-18 14:27:44 UTC (rev 16035) +++ trunk/reactos/hal/halx86/mp/resource_mp.c 2005-06-18 14:28:28 UTC (rev 16036) @@ -9,12 +9,9 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> +#define NDEBUG #include <hal.h> -#define NDEBUG -#include <internal/debug.h> - /* FUNCTIONS ****************************************************************/ VOID

19 years, 6 months

[ion] 16035: Build stub HAL with w32api

by ion＠svn.reactos.com

Build stub HAL with w32api Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.xml _____ Modified: trunk/reactos/hal/hal/hal.c --- trunk/reactos/hal/hal/hal.c 2005-06-18 14:26:22 UTC (rev 16034) +++ trunk/reactos/hal/hal/hal.c 2005-06-18 14:27:44 UTC (rev 16035) @@ -737,7 +737,7 @@ return FALSE; } - +#undef KeAcquireSpinLock VOID STDCALL KeAcquireSpinLock( @@ -797,7 +797,7 @@ return (KIRQL)0; } - +#undef KeLowerIrql VOID STDCALL KeLowerIrql( @@ -821,7 +821,7 @@ return Value; } - +#undef KeRaiseIrql VOID STDCALL KeRaiseIrql( @@ -851,7 +851,7 @@ return (KIRQL)0; } - +#undef KeReleaseSpinLock VOID STDCALL KeReleaseSpinLock( _____ Modified: trunk/reactos/hal/hal/hal.xml --- trunk/reactos/hal/hal/hal.xml 2005-06-18 14:26:22 UTC (rev 16034) +++ trunk/reactos/hal/hal/hal.xml 2005-06-18 14:27:44 UTC (rev 16035) @@ -2,6 +2,8 @@ <importlibrary basename="hal" definition="hal.def" /> <include base="ntoskrnl">include</include> <library>ntoskrnl</library> + <define name="_NTOSKRNL_" /> + <define name="__USE_W32API" /> <file>hal.c</file> <file>hal.rc</file> </module>

19 years, 6 months

[ion] 16034: Remove weird header and add a missing prototype in halfuncs.h

by ion＠svn.reactos.com

Remove weird header and add a missing prototype in halfuncs.h Deleted: trunk/reactos/include/msvcrt/ Modified: trunk/reactos/include/ntos/halfuncs.h Modified: trunk/reactos/include/ntos/types.h _____ Modified: trunk/reactos/include/ntos/halfuncs.h --- trunk/reactos/include/ntos/halfuncs.h 2005-06-18 14:10:28 UTC (rev 16033) +++ trunk/reactos/include/ntos/halfuncs.h 2005-06-18 14:26:22 UTC (rev 16034) @@ -6,6 +6,12 @@ BOOLEAN STDCALL HalAllProcessorsStarted(VOID); +VOID +STDCALL +HalDisplayString ( + IN PCHAR String +); + BOOLEAN STDCALL HalBeginSystemInterrupt(ULONG Vector, KIRQL Irql, @@ -37,7 +43,7 @@ VOID STDCALL -IoAssignDriveLetters(IN PLOADER_PARAMETER_BLOCK LoaderBlock, +IoAssignDriveLetters(IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock, IN PSTRING NtDeviceName, OUT PUCHAR NtSystemPath, OUT PSTRING NtSystemPathString); _____ Modified: trunk/reactos/include/ntos/types.h --- trunk/reactos/include/ntos/types.h 2005-06-18 14:10:28 UTC (rev 16033) +++ trunk/reactos/include/ntos/types.h 2005-06-18 14:26:22 UTC (rev 16034) @@ -116,8 +116,6 @@ typedef wchar_t *PWCH; typedef unsigned short *PWORD; -#include <msvcrt/crttypes.h> /* for definition of LONGLONG, PLONGLONG etc */ - typedef const void *LPCVOID; typedef BYTE *LPBYTE, *PBYTE; typedef BOOL *PBOOL; @@ -137,6 +135,10 @@ typedef USHORT CSHORT; typedef const wchar_t *PCWSTR; typedef char* PCSZ; +typedef long long LONGLONG; +typedef LONGLONG *PLONGLONG; +typedef unsigned long long ULONGLONG; +typedef ULONGLONG *PULONGLONG; typedef DWORD STDCALL_FUNC (*PTHREAD_START_ROUTINE) (LPVOID);

19 years, 6 months

[ion] 16033: Remove IoAdapterObjectType defintion, it doesn't belong in public headers

by ion＠svn.reactos.com

Remove IoAdapterObjectType defintion, it doesn't belong in public headers Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-06-18 14:05:56 UTC (rev 16032) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-06-18 14:10:28 UTC (rev 16033) @@ -339,7 +339,6 @@ extern NTOSAPI POBJECT_TYPE ExEventObjectType; extern NTOSAPI POBJECT_TYPE ExSemaphoreObjectType; extern NTOSAPI POBJECT_TYPE ExWindowStationObjectType; -extern NTOSAPI POBJECT_TYPE IoAdapterObjectType; extern NTOSAPI ULONG IoDeviceHandlerObjectSize; extern NTOSAPI POBJECT_TYPE IoDeviceHandlerObjectType; extern NTOSAPI POBJECT_TYPE IoDeviceObjectType;

19 years, 6 months

[navaraf] 16032: Fix SMP version of ASSERT and assert.

by navaraf＠svn.reactos.com

Fix SMP version of ASSERT and assert. Modified: trunk/reactos/ntoskrnl/include/internal/debug.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/debug.h --- trunk/reactos/ntoskrnl/include/internal/debug.h 2005-06-18 13:15:07 UTC (rev 16031) +++ trunk/reactos/ntoskrnl/include/internal/debug.h 2005-06-18 14:05:56 UTC (rev 16032) @@ -37,8 +37,8 @@ /* Assert only on "checked" version */ #ifndef NASSERT #ifdef CONFIG_SMP -#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber), DbgBreakPoint(); } -#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->ProcessorNumber), DbgBreakPoint(); } +#define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->Number), DbgBreakPoint(); } +#define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d for CPU%d\n", __FILE__,__LINE__, KeGetCurrentKPCR()->Number), DbgBreakPoint(); } #else #define assert(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); } #define ASSERT(x) if (!(x)) {DbgPrint("Assertion "#x" failed at %s:%d\n", __FILE__,__LINE__); DbgBreakPoint(); }

19 years, 6 months

[navaraf] 16031: Remove duplicate definition of EVENT_QUERY_STATE.

by navaraf＠svn.reactos.com

Remove duplicate definition of EVENT_QUERY_STATE. Modified: trunk/reactos/lib/kernel32/mem/resnotify.c _____ Modified: trunk/reactos/lib/kernel32/mem/resnotify.c --- trunk/reactos/lib/kernel32/mem/resnotify.c 2005-06-18 12:56:11 UTC (rev 16030) +++ trunk/reactos/lib/kernel32/mem/resnotify.c 2005-06-18 13:15:07 UTC (rev 16031) @@ -14,9 +14,6 @@ #define NDEBUG #include "../include/debug.h" -/* stolen from include/ntos/synch.h */ -#define EVENT_QUERY_STATE (1) - /* FUNCTIONS *****************************************************************/ /*

19 years, 6 months

[navaraf] 16030: Correctly pack the KIPCR structure.

by navaraf＠svn.reactos.com

Correctly pack the KIPCR structure. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h _____ Modified: trunk/reactos/ntoskrnl/include/internal/i386/ps.h --- trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-06-18 12:55:02 UTC (rev 16029) +++ trunk/reactos/ntoskrnl/include/internal/i386/ps.h 2005-06-18 12:56:11 UTC (rev 16030) @@ -257,6 +257,8 @@ #pragma pack(pop) #endif /* __USE_W32API */ +#pragma pack(push,4) + /* * This is the complete, internal KPCR structure */ @@ -289,6 +291,8 @@ KPRCB PrcbData; /* 120 */ } KIPCR, *PKIPCR; +#pragma pack(pop) + #ifndef __USE_W32API #ifdef CONFIG_SMP

19 years, 6 months

← Newer
1
...
30
31
32
33
34
35
36
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2005