From f71e0e99fd7845abcbcaea2a7f7bc3253fb7c5ab Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 24 Mar 2010 20:19:04 +0000
Subject: [PATCH] [NTIFS] - KeReleaseQueuedSpinLock [XDK] - reorder some #if's
 - fix Mm64BitPhysicalAddress

svn path=/branches/header-work/; revision=46401
---
 include/ddk/ntifs.h    |  2 +-
 include/xdk/halfuncs.h | 33 ++++++++++++---------------------
 include/xdk/mmtypes.h  |  2 +-
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h
index 1122e7fcc48..7e14da769e7 100644
--- a/include/ddk/ntifs.h
+++ b/include/ddk/ntifs.h
@@ -4689,7 +4689,7 @@ FASTCALL
 KeAcquireQueuedSpinLock(
   IN OUT KSPIN_LOCK_QUEUE_NUMBER Number);
 
-NTHALAPI
+_DECL_HAL_KE_IMPORT
 VOID
 FASTCALL
 KeReleaseQueuedSpinLock(
diff --git a/include/xdk/halfuncs.h b/include/xdk/halfuncs.h
index 962473b5b9f..547f4e4b7ce 100644
--- a/include/xdk/halfuncs.h
+++ b/include/xdk/halfuncs.h
@@ -1,7 +1,8 @@
 /* Hardware Abstraction Layer Functions */
 
-#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)
+#if (NTDDI_VERSION >= NTDDI_WIN2K)
 
+#if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)
 $if (_WDMDDK_)
 
 FORCEINLINE
@@ -69,12 +70,12 @@ HalGetDmaAlignment(
 }
 
 $endif
-
 $if (_NTDDK_)
 
-#else
+/* Nothing here */
+
+#else /* USE_DMA_MACROS ... */
 
-#if (NTDDI_VERSION >= NTDDI_WIN2K)
 //DECLSPEC_DEPRECATED_DDK
 NTHALAPI
 VOID
@@ -140,18 +141,11 @@ HalAllocateAdapterChannel(
   IN ULONG  NumberOfMapRegisters,
   IN PDRIVER_CONTROL  ExecutionRoutine);
 
-#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
-
-$endif
-
-#endif
-
+$endif /* _NTDDK_ */
+#endif /* USE_DMA_MACROS ... */
 $if (_NTDDK_)
 
 #if !defined(NO_LEGACY_DRIVERS)
-
-#if (NTDDI_VERSION >= NTDDI_WIN2K)
-
 NTHALAPI
 NTSTATUS
 NTAPI
@@ -201,13 +195,8 @@ BOOLEAN
 NTAPI
 HalMakeBeep(
   IN ULONG Frequency);
-
-#endif
-
 #endif /* !defined(NO_LEGACY_DRIVERS) */
 
-#if (NTDDI_VERSION >= NTDDI_WIN2K)
-
 NTHALAPI
 PADAPTER_OBJECT
 NTAPI
@@ -284,7 +273,9 @@ HalPutScatterGatherList(
   IN PSCATTER_GATHER_LIST ScatterGather,
   IN BOOLEAN WriteToDevice);
 
+$endif /* _NTDDK_ */
 #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
+$if (_NTDDK_)
 
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 NTKERNELAPI
@@ -295,7 +286,7 @@ HalExamineMBR(
   IN ULONG SectorSize,
   IN ULONG MBRTypeIdentifier,
   OUT PVOID *Buffer);
-#endif
+#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
 
 #if (NTDDI_VERSION >= NTDDI_WIN7)
 
@@ -312,7 +303,7 @@ NTAPI
 HalFreeHardwareCounters(
   IN HANDLE CounterSetHandle);
 
-#endif
+#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
 
 #if defined(_IA64_)
 #if (NTDDI_VERSION >= NTDDI_WIN2K)
@@ -351,5 +342,5 @@ HalBugCheckSystem(
 
 #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
 
+$endif /* _NTDDK_ */
 
-$endif
diff --git a/include/xdk/mmtypes.h b/include/xdk/mmtypes.h
index 4cd2f5b9c6f..e4a23f48215 100644
--- a/include/xdk/mmtypes.h
+++ b/include/xdk/mmtypes.h
@@ -142,7 +142,7 @@ typedef enum _MM_SYSTEM_SIZE {
   MmLargeSystem
 } MM_SYSTEMSIZE;
 
-extern PBOOLEAN Mm64BitPhysicalAddress;
+extern NTKERNELAPI BOOLEAN Mm64BitPhysicalAddress;
 extern PVOID MmBadPointer;
 
 $endif /* _WDMDDK_ */