[PCI]: Add PCI IRQ Routing Table structure to Shared, Internal PCI Header (based...

[reactos.git] / reactos / hal / halx86 / include / hal.h

diff --git a/reactos/hal/halx86/include/hal.h b/reactos/hal/halx86/include/hal.h
index 200bd82..f18d872 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -11,29 +11,40 @@
 /* C Headers */
 #include <stdio.h>
 
-/* WDK HAL Complation hack */
-#ifdef _MSC_VER
+/* WDK HAL Compilation hack */
 #include <excpt.h>
 #include <ntdef.h>
-#undef _NTHAL_
-#undef DECLSPEC_IMPORT
-#define DECLSPEC_IMPORT
+#ifndef _MINIHAL_
+#undef NTSYSAPI
+#define NTSYSAPI __declspec(dllimport)
+#else
+#undef NTSYSAPI
+#define NTSYSAPI
 #endif
 
 /* IFS/DDK/NDK Headers */
 #include <ntifs.h>
+#include <bugcodes.h>
 #include <ntdddisk.h>
 #include <arc/arc.h>
-#include <iotypes.h>
-#include <kefuncs.h>
-#include <halfuncs.h>
-#include <iofuncs.h>
-#include <ldrtypes.h>
-
-#define KPCR_BASE 0xFF000000 // HACK!
+#include <ntndk.h>
+
+/* Internal shared PCI header */
+#include <drivers/pci/pci.h>
+
+/* Internal kernel headers */
+#define KeGetCurrentThread _KeGetCurrentThread
+#ifdef _M_AMD64
+#include <internal/amd64/ke.h>
+#include <internal/amd64/mm.h>
+#include "internal/amd64/intrin_i.h"
+#else
+#include <internal/i386/ke.h>
+#include <internal/i386/mm.h>
+#include "internal/i386/intrin_i.h"
+#endif
 
 /* Internal HAL Headers */
-#include "internal/pci.h"
 #include "apic.h"
 #include "bus.h"
 #include "halirq.h"
@@ -41,8 +52,6 @@
 #include "halp.h"
 #include "mps.h"
 #include "ioapic.h"
-
-/* Helper Header */
-#include <reactos/helper.h>
+#include "halacpi.h"
 
 /* EOF */