From f8d053290e9e8a88c47fb3ff6b3e22fa8e0375a5 Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Sat, 18 Jun 2005 14:29:31 +0000
Subject: [PATCH] Build Generic HAL with w32api

svn path=/trunk/; revision=16039
---
 reactos/hal/halx86/generic/adapter.c   |  6 +-----
 reactos/hal/halx86/generic/beep.c      |  5 +----
 reactos/hal/halx86/generic/bus.c       |  6 +-----
 reactos/hal/halx86/generic/display.c   |  3 ++-
 reactos/hal/halx86/generic/dma.c       |  2 --
 reactos/hal/halx86/generic/drive.c     |  9 +++++----
 reactos/hal/halx86/generic/enum.c      |  4 +---
 reactos/hal/halx86/generic/fmutex.c    |  5 ++---
 reactos/hal/halx86/generic/generic.xml |  9 ++++++---
 reactos/hal/halx86/generic/halinit.c   |  5 +----
 reactos/hal/halx86/generic/ipi.c       |  5 +----
 reactos/hal/halx86/generic/irql.c      | 20 +++++++-------------
 reactos/hal/halx86/generic/isa.c       |  6 +-----
 reactos/hal/halx86/generic/kdbg.c      |  4 +---
 reactos/hal/halx86/generic/mca.c       |  6 +-----
 reactos/hal/halx86/generic/misc.c      |  4 +---
 reactos/hal/halx86/generic/pci.c       | 11 ++---------
 reactos/hal/halx86/generic/portio.c    |  4 ++--
 reactos/hal/halx86/generic/processor.c |  6 +-----
 reactos/hal/halx86/generic/reboot.c    |  3 +--
 reactos/hal/halx86/generic/resource.c  |  4 +---
 reactos/hal/halx86/generic/spinlock.c  |  9 ++++-----
 reactos/hal/halx86/generic/sysbus.c    |  6 +-----
 reactos/hal/halx86/generic/sysinfo.c   |  7 ++-----
 reactos/hal/halx86/generic/time.c      |  8 ++------
 reactos/hal/halx86/generic/timer.c     | 17 ++++++-----------
 26 files changed, 54 insertions(+), 120 deletions(-)

diff --git a/reactos/hal/halx86/generic/adapter.c b/reactos/hal/halx86/generic/adapter.c
index a40d1e86ac5..1832b726f70 100644
--- a/reactos/hal/halx86/generic/adapter.c
+++ b/reactos/hal/halx86/generic/adapter.c
@@ -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 *****************************************************************/
diff --git a/reactos/hal/halx86/generic/beep.c b/reactos/hal/halx86/generic/beep.c
index 08b3adf2cd2..ea1bec54dda 100644
--- a/reactos/hal/halx86/generic/beep.c
+++ b/reactos/hal/halx86/generic/beep.c
@@ -10,11 +10,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 
 /* CONSTANTS *****************************************************************/
diff --git a/reactos/hal/halx86/generic/bus.c b/reactos/hal/halx86/generic/bus.c
index 2adce8c07c2..19e7939d0e9 100644
--- a/reactos/hal/halx86/generic/bus.c
+++ b/reactos/hal/halx86/generic/bus.c
@@ -15,12 +15,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-#include <bus.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* GLOBALS *******************************************************************/
 
diff --git a/reactos/hal/halx86/generic/display.c b/reactos/hal/halx86/generic/display.c
index b9ade8247e2..46d2fd06a67 100644
--- a/reactos/hal/halx86/generic/display.c
+++ b/reactos/hal/halx86/generic/display.c
@@ -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
diff --git a/reactos/hal/halx86/generic/dma.c b/reactos/hal/halx86/generic/dma.c
index 63eb75897a1..8b0f63fb262 100644
--- a/reactos/hal/halx86/generic/dma.c
+++ b/reactos/hal/halx86/generic/dma.c
@@ -11,9 +11,7 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
 #define NDEBUG
-#include <internal/debug.h>
 #include <hal.h>
 
 /* Adapters for each channel */
diff --git a/reactos/hal/halx86/generic/drive.c b/reactos/hal/halx86/generic/drive.c
index 8b24779dfb1..bc1f1613e48 100644
--- a/reactos/hal/halx86/generic/drive.c
+++ b/reactos/hal/halx86/generic/drive.c
@@ -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);
diff --git a/reactos/hal/halx86/generic/enum.c b/reactos/hal/halx86/generic/enum.c
index 0b0313fb9a4..185110d4a1c 100644
--- a/reactos/hal/halx86/generic/enum.c
+++ b/reactos/hal/halx86/generic/enum.c
@@ -11,10 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 VOID
 HalpStartEnumerator (VOID)
diff --git a/reactos/hal/halx86/generic/fmutex.c b/reactos/hal/halx86/generic/fmutex.c
index fc6f61f9eab..5c469103add 100644
--- a/reactos/hal/halx86/generic/fmutex.c
+++ b/reactos/hal/halx86/generic/fmutex.c
@@ -12,9 +12,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-
-#include <internal/debug.h>
+#define NDEBUG
+#include <hal.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/generic.xml b/reactos/hal/halx86/generic/generic.xml
index e71223aa871..ac2fcd30f89 100644
--- a/reactos/hal/halx86/generic/generic.xml
+++ b/reactos/hal/halx86/generic/generic.xml
@@ -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>
diff --git a/reactos/hal/halx86/generic/halinit.c b/reactos/hal/halx86/generic/halinit.c
index 29e997ace76..335f0401db8 100644
--- a/reactos/hal/halx86/generic/halinit.c
+++ b/reactos/hal/halx86/generic/halinit.c
@@ -11,11 +11,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* GLOBALS *****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/ipi.c b/reactos/hal/halx86/generic/ipi.c
index 614ba3d7bba..4b34f518106 100644
--- a/reactos/hal/halx86/generic/ipi.c
+++ b/reactos/hal/halx86/generic/ipi.c
@@ -9,11 +9,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/irql.c b/reactos/hal/halx86/generic/irql.c
index 3d93bd5205a..2b07a91a2e5 100644
--- a/reactos/hal/halx86/generic/irql.c
+++ b/reactos/hal/halx86/generic/irql.c
@@ -9,15 +9,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/ob.h>
-#include <internal/ps.h>
-#include <ntos/minmax.h>
-#include <hal.h>
-#include <halirq.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* GLOBALS ******************************************************************/
 
@@ -174,9 +167,9 @@ HalpLowerIrql(KIRQL NewIrql)
       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 @@ KfLowerIrql (KIRQL	NewIrql)
  *
  * NOTES
  */
-
+#undef KeLowerIrql
 VOID STDCALL
 KeLowerIrql (KIRQL NewIrql)
 {
@@ -303,6 +296,7 @@ KfRaiseIrql (KIRQL	NewIrql)
  * NOTES
  *	Calls KfRaiseIrql
  */
+#undef KeRaiseIrql
 VOID STDCALL
 KeRaiseIrql (KIRQL	NewIrql,
 	     PKIRQL	OldIrql)
@@ -466,11 +460,11 @@ HalRequestSoftwareInterrupt(
   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:
diff --git a/reactos/hal/halx86/generic/isa.c b/reactos/hal/halx86/generic/isa.c
index 6e19112437f..441cd769ab2 100644
--- a/reactos/hal/halx86/generic/isa.c
+++ b/reactos/hal/halx86/generic/isa.c
@@ -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 *****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/kdbg.c b/reactos/hal/halx86/generic/kdbg.c
index f62ae1ebbcd..ca75dc24b6c 100644
--- a/reactos/hal/halx86/generic/kdbg.c
+++ b/reactos/hal/halx86/generic/kdbg.c
@@ -12,10 +12,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 
 #define DEFAULT_BAUD_RATE    19200
diff --git a/reactos/hal/halx86/generic/mca.c b/reactos/hal/halx86/generic/mca.c
index a0d0af9cacc..2999a6316bc 100644
--- a/reactos/hal/halx86/generic/mca.c
+++ b/reactos/hal/halx86/generic/mca.c
@@ -32,12 +32,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <bus.h>
-
 #define NDEBUG
-#include <internal/debug.h>
-
+#include <hal.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/misc.c b/reactos/hal/halx86/generic/misc.c
index f5d80987d52..bddc05c6ea7 100644
--- a/reactos/hal/halx86/generic/misc.c
+++ b/reactos/hal/halx86/generic/misc.c
@@ -9,11 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#define NDEBUG
 #include <hal.h>
 
-#define NDEBUG
-#include <internal/debug.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/pci.c b/reactos/hal/halx86/generic/pci.c
index bd5013791e3..93307dfe6e6 100644
--- a/reactos/hal/halx86/generic/pci.c
+++ b/reactos/hal/halx86/generic/pci.c
@@ -18,15 +18,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <bus.h>
-#include <halirq.h>
-#include <hal.h>
-#include <internal/ob.h>
-#include <internal/ps.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 
 /* MACROS ******************************************************************/
@@ -639,7 +632,7 @@ HalpAssignPciSlotResources(IN PBUS_HANDLER BusHandler,
       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))
 	    {
diff --git a/reactos/hal/halx86/generic/portio.c b/reactos/hal/halx86/generic/portio.c
index 3c8e0a5b914..20f647353ee 100644
--- a/reactos/hal/halx86/generic/portio.c
+++ b/reactos/hal/halx86/generic/portio.c
@@ -9,8 +9,8 @@
  *                  Created 18/10/99
  */
 
-#include <ddk/ntddk.h>
-
+#define NDEBUG
+#include <hal.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/processor.c b/reactos/hal/halx86/generic/processor.c
index 9aff906aee8..168a2fb5ff6 100644
--- a/reactos/hal/halx86/generic/processor.c
+++ b/reactos/hal/halx86/generic/processor.c
@@ -14,12 +14,8 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-
 #define NDEBUG
-#include <internal/debug.h>
-
+#include <hal.h>
 
 /* FUNCTIONS *****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/reboot.c b/reactos/hal/halx86/generic/reboot.c
index 8c15cf04631..f2d64e7c028 100644
--- a/reactos/hal/halx86/generic/reboot.c
+++ b/reactos/hal/halx86/generic/reboot.c
@@ -9,8 +9,7 @@
  *                  Created 11/10/99
  */
 
-
-#include <ddk/ntddk.h>
+#define NDEBUG
 #include <hal.h>
 
 
diff --git a/reactos/hal/halx86/generic/resource.c b/reactos/hal/halx86/generic/resource.c
index 6cfb1d8661e..f473911e05b 100644
--- a/reactos/hal/halx86/generic/resource.c
+++ b/reactos/hal/halx86/generic/resource.c
@@ -9,11 +9,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
+#define NDEBUG
 #include <hal.h>
 
-#define NDEBUG
-#include <internal/debug.h>
 
 /* FUNCTIONS ****************************************************************/
 
diff --git a/reactos/hal/halx86/generic/spinlock.c b/reactos/hal/halx86/generic/spinlock.c
index e40f7e1cb17..9a5a9f7961c 100644
--- a/reactos/hal/halx86/generic/spinlock.c
+++ b/reactos/hal/halx86/generic/spinlock.c
@@ -17,17 +17,15 @@
 
 /* INCLUDES ****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/ob.h>
-#include <internal/ps.h>
-
-#include <internal/debug.h>
+#define NDEBUG
+#include <hal.h>
 
 /* Hmm, needed for KDBG := 1. Why? */
 #undef KeGetCurrentIrql
 
 /* FUNCTIONS ***************************************************************/
 
+#undef KeAcquireSpinLock
 VOID STDCALL
 KeAcquireSpinLock (
 	PKSPIN_LOCK	SpinLock,
@@ -56,6 +54,7 @@ KeAcquireSpinLockRaiseToSynch (
   return OldIrql;
 }
 
+#undef KeReleaseSpinLock
 VOID STDCALL
 KeReleaseSpinLock (
 	PKSPIN_LOCK	SpinLock,
diff --git a/reactos/hal/halx86/generic/sysbus.c b/reactos/hal/halx86/generic/sysbus.c
index a40cdc05ed7..1e14ce0f9ab 100644
--- a/reactos/hal/halx86/generic/sysbus.c
+++ b/reactos/hal/halx86/generic/sysbus.c
@@ -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 ****************************************************************/
diff --git a/reactos/hal/halx86/generic/sysinfo.c b/reactos/hal/halx86/generic/sysinfo.c
index fb17cbceeee..15c36145b65 100644
--- a/reactos/hal/halx86/generic/sysinfo.c
+++ b/reactos/hal/halx86/generic/sysinfo.c
@@ -10,12 +10,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <hal.h>
-#include <bus.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
+
 
 
 /* FUNCTIONS ****************************************************************/
diff --git a/reactos/hal/halx86/generic/time.c b/reactos/hal/halx86/generic/time.c
index 8641bfffc6f..9b6e22946bf 100644
--- a/reactos/hal/halx86/generic/time.c
+++ b/reactos/hal/halx86/generic/time.c
@@ -8,13 +8,9 @@
 
 /* INCLUDES *****************************************************************/
 
-#include <ddk/ntddk.h>
-#include <string.h>
-#include <hal.h>
-#include <bus.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
+
 
 /* MACROS and CONSTANTS ******************************************************/
 
diff --git a/reactos/hal/halx86/generic/timer.c b/reactos/hal/halx86/generic/timer.c
index 8c86fe786ee..7973bd5a36a 100644
--- a/reactos/hal/halx86/generic/timer.c
+++ b/reactos/hal/halx86/generic/timer.c
@@ -32,13 +32,8 @@
 
 /* INCLUDES ***************************************************************/
 
-#include <ddk/ntddk.h>
-#include <internal/ob.h>
-#include <internal/ps.h>
-#include <hal.h>
-
 #define NDEBUG
-#include <internal/debug.h>
+#include <hal.h>
 
 /* GLOBALS ******************************************************************/
 
@@ -127,7 +122,7 @@ ROSL1:
 
 VOID STDCALL KeStallExecutionProcessor(ULONG Microseconds)
 {
-   PKPCR Pcr = KeGetCurrentKPCR();
+   PKIPCR Pcr = (PKIPCR)KeGetCurrentKPCR();
 
    if (Pcr->PrcbData.FeatureBits & X86_FEATURE_TSC)
    {
@@ -194,7 +189,7 @@ VOID HalpCalibrateStallExecution(VOID)
   ULONG i;
   ULONG calib_bit;
   ULONG CurCount;
-  PKPCR Pcr;
+  PKIPCR Pcr;
   LARGE_INTEGER StartCount, EndCount;
 
   if (UdelayCalibrated)
@@ -203,7 +198,7 @@ VOID HalpCalibrateStallExecution(VOID)
     }
 
   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 @@ KeQueryPerformanceCounter(PLARGE_INTEGER PerformanceFreq)
  * 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)
   {