update for HEAD-2003091401

[reactos.git] / include / ntos / haltypes.h

diff --git a/include/ddk/haltypes.h b/include/ntos/haltypes.h
old mode 100644 (file)
new mode 100755 (executable)
similarity index 97%
rename from include/ddk/haltypes.h
rename to include/ntos/haltypes.h
index ff34edf..1cf303d
--- a/include/ddk/haltypes.h
+++ b/include/ntos/haltypes.h
@@ -10,14 +10,24 @@
  */
 
 
-#ifndef __INCLUDE_DDK_HALTYPES_H
-#define __INCLUDE_DDK_HALTYPES_H
+#ifndef __INCLUDE_NTOS_HALTYPES_H
+#define __INCLUDE_NTOS_HALTYPES_H
+
+#ifdef __GNUC__
+#define STDCALL_FUNC STDCALL
+#else
+#define STDCALL_FUNC(a) (__stdcall a )
+#endif /*__GNUC__*/
+
+#include "types.h"
 
 
 /* HalReturnToFirmware */
 #define FIRMWARE_HALT   1
 #define FIRMWARE_REBOOT 3
 
+#ifndef __USE_W32API
+
 enum
 {
    DEVICE_DESCRIPTION_VERSION,
@@ -54,7 +64,7 @@ typedef struct _DEVICE_DESCRIPTION
   BOOLEAN ScatterGather;
   BOOLEAN DemandMode;
   BOOLEAN AutoInitialize;
-  BOOLEAN Dma32BitAddress;
+  BOOLEAN Dma32BitAddresses;
   BOOLEAN IgnoreCount;
   BOOLEAN Reserved1;
   BOOLEAN Reserved2;
@@ -163,7 +173,6 @@ typedef struct _PCI_COMMON_CONFIG
 
 #define PCI_INVALID_VENDORID                0xFFFF
 
-
 /* Bit encodings for PCI_COMMON_CONFIG.HeaderType */
 
 #define PCI_MULTIFUNCTION                   0x80
@@ -259,6 +268,7 @@ typedef struct _PCI_SLOT_NUMBER
     } u;
 } PCI_SLOT_NUMBER, *PPCI_SLOT_NUMBER;
 
+#endif /* __USE_W32API */
 
 /* Hal dispatch table */
 
@@ -418,14 +428,23 @@ typedef struct _HAL_DISPATCH
   pHalReferenceBusHandler      HalDereferenceBusHandler;
 } HAL_DISPATCH, *PHAL_DISPATCH;
 
+#ifndef __USE_W32API
+
 #ifdef __NTOSKRNL__
 extern HAL_DISPATCH EXPORTED HalDispatchTable;
-#define HALDISPATCH (&HalDispatchTable)
 #else
 extern PHAL_DISPATCH IMPORTED HalDispatchTable;
+#endif
+
+#endif /* !__USE_W32API */
+
+#ifdef __NTOSKRNL__
+#define HALDISPATCH (&HalDispatchTable)
+#else
 #define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable)
 #endif
 
+
 #define HAL_DISPATCH_VERSION           1
 #define HalDispatchTableVersion                HALDISPATCH->Version
 #define HalQuerySystemInformation      HALDISPATCH->HalQuerySystemInformation
@@ -449,6 +468,7 @@ typedef struct _HAL_PRIVATE_DISPATCH
   ULONG Version;
 } HAL_PRIVATE_DISPATCH, *PHAL_PRIVATE_DISPATCH;
 
+#ifndef __USE_W32API
 
 #ifdef __NTOSKRNL__
 extern HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable;
@@ -456,6 +476,8 @@ extern HAL_PRIVATE_DISPATCH EXPORTED HalPrivateDispatchTable;
 extern PHAL_PRIVATE_DISPATCH IMPORTED HalPrivateDispatchTable;
 #endif
 
+#endif /* !__USE_W32API */
+
 #define HAL_PRIVATE_DISPATCH_VERSION   1