[HAL]

[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 4b8757b..0c3654f 100644 (file)
--- a/reactos/hal/halx86/include/hal.h
+++ b/reactos/hal/halx86/include/hal.h
@@ -8,34 +8,48 @@
 
 /* INCLUDES ******************************************************************/
 
-/* IFS/DDK/NDK Headers */
-#include <ddk/ntddk.h>
-#include <ddk/ntifs.h>
-#include <ndk/ntndk.h>
+/* C Headers */
+#include <stdio.h>
+
+/* WDK HAL Compilation hack */
+#include <excpt.h>
+#include <ntdef.h>
+#ifndef _MINIHAL_
+#undef NTSYSAPI
+#define NTSYSAPI __declspec(dllimport)
+#else
+#undef NTSYSAPI
+#define NTSYSAPI
+#endif
 
-/* Internal Kernel Headers */
-//#include <internal/mm.h>
-#include <internal/ke.h>
+/* IFS/DDK/NDK Headers */
+#include <ntifs.h>
+#include <bugcodes.h>
+#include <ntdddisk.h>
+#include <arc/arc.h>
+#include <ntndk.h>
 
-#define KPCR_BASE 0xFF000000 // HACK!
+/* Internal kernel headers */
+#include "internal/pci.h"
+#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
 
-//Temporary hack below until ntoskrnl is on NDK
-PVOID STDCALL
-MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes,
-                                 IN PHYSICAL_ADDRESS LowestAcceptableAddress,
-                                 IN PHYSICAL_ADDRESS HighestAcceptableAddress,
-                                 IN PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL,
-                                 IN MEMORY_CACHING_TYPE CacheType OPTIONAL,
-                                 IN ULONG Alignment);
 /* 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>
+#include "halacpi.h"
 
 /* EOF */