--- trunk/reactos/hal/halx86/generic/adapter.c 2005-06-24 01:31:23 UTC (rev 16252)
+++ trunk/reactos/hal/halx86/generic/adapter.c 2005-06-24 01:37:08 UTC (rev 16253)
@@ -17,10 +17,6 @@
#define NDEBUG
#include <debug.h>
-/* Hmm, needed for KDBG := 1. Why? */
-extern POBJECT_TYPE IMPORTED IoAdapterObjectType;
-#undef KeGetCurrentIrql
-
/* FUNCTIONS *****************************************************************/
/* NOTE: IoAllocateAdapterChannel in NTOSKRNL.EXE */
--- trunk/reactos/hal/halx86/generic/generic.xml 2005-06-24 01:31:23 UTC (rev 16252)
+++ trunk/reactos/hal/halx86/generic/generic.xml 2005-06-24 01:37:08 UTC (rev 16253)
@@ -24,6 +24,7 @@
<file>sysinfo.c</file>
<file>time.c</file>
<file>timer.c</file>
+ <pch>../include/hal.h</pch>
</module>
<module name="hal_generic_up" type="objectlibrary">
<include base="hal_generic_up">../include</include>
--- trunk/reactos/hal/halx86/generic/reboot.c 2005-06-24 01:31:23 UTC (rev 16252)
+++ trunk/reactos/hal/halx86/generic/reboot.c 2005-06-24 01:37:08 UTC (rev 16253)
@@ -54,7 +54,7 @@
VOID STDCALL
HalReturnToFirmware (
- ULONG Action
+ FIRMWARE_REENTRY Action
)
{
if (Action == HalHaltRoutine)
--- trunk/reactos/hal/halx86/include/hal.h 2005-06-24 01:31:23 UTC (rev 16252)
+++ trunk/reactos/hal/halx86/include/hal.h 2005-06-24 01:37:08 UTC (rev 16253)
@@ -8,21 +8,17 @@
/* INCLUDES ******************************************************************/
-/* SDK/DDK/NDK Headers. */
+/* IFS/DDK/NDK Headers */
#include <ddk/ntddk.h>
-#include <stdio.h>
+#include <ddk/ntifs.h>
+#include <ndk/ntndk.h>
-/* FIXME: NDK Headers */
-#include <roskrnl.h>
-
/* Internal Kernel Headers */
//#include <internal/mm.h>
#include <internal/ke.h>
#include <internal/i386/ps.h>
-#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24))
-
-//Temporary hack below.
+//Temporary hack below until ntoskrnl is on NDK
PVOID STDCALL
MmAllocateContiguousAlignedMemory(IN ULONG NumberOfBytes,
IN PHYSICAL_ADDRESS LowestAcceptableAddress,
@@ -31,25 +27,6 @@
IN MEMORY_CACHING_TYPE CacheType OPTIONAL,
IN ULONG Alignment);
-/* FIXME: NDK */
-VOID STDCALL KeEnterKernelDebugger (VOID);
-VOID FASTCALL KiAcquireSpinLock(PKSPIN_LOCK SpinLock);
-VOID FASTCALL KiReleaseSpinLock(PKSPIN_LOCK SpinLock);
-VOID STDCALL KiDispatchInterrupt(VOID);
-NTSTATUS
-STDCALL
-ObCreateObject (
- IN KPROCESSOR_MODE ObjectAttributesAccessMode OPTIONAL,
- IN POBJECT_TYPE ObjectType,
- IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL,
- IN KPROCESSOR_MODE AccessMode,
- IN OUT PVOID ParseContext OPTIONAL,
- IN ULONG ObjectSize,
- IN ULONG PagedPoolCharge OPTIONAL,
- IN ULONG NonPagedPoolCharge OPTIONAL,
- OUT PVOID *Object
-);
-
/* Internal HAL Headers */
#include "apic.h"
#include "bus.h"
@@ -58,14 +35,7 @@
#include "mps.h"
#include "ioapic.h"
-/* Helper Macros FIXME: NDK */
-#define ROUNDUP(a,b) ((((a)+(b)-1)/(b))*(b))
-#define ROUND_DOWN(N, S) ((N) - ((N) % (S)))
-#ifndef HIWORD
-#define HIWORD(l) ((WORD)(((DWORD)(l) >> 16) & 0xFFFF))
-#endif
-#ifndef LOWORD
-#define LOWORD(l) ((WORD)(l))
-#endif
+/* Helper Header */
+#include <reactos/helper.h>
/* EOF */
--- trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-24 01:31:23 UTC (rev 16252)
+++ trunk/reactos/hal/halx86/xbox/halxbox.xml 2005-06-24 01:37:08 UTC (rev 16253)
@@ -15,4 +15,5 @@
<file>part_xbox.c</file>
<file>pci_xbox.c</file>
<file>halxbox.rc</file>
+ <pch>../include/hal.h</pch>
</module>