[ros-diffs] [tkreuzer] 46401: [NTIFS] - KeReleaseQueuedSpinLock [XDK] - reorder some #if's - fix Mm64BitPhysicalAddress

Author: tkreuzer
Date: Wed Mar 24 21:19:04 2010
New Revision: 46401

URL: http://svn.reactos.org/svn/reactos?rev=46401&view=rev
Log:
[NTIFS]
- KeReleaseQueuedSpinLock
[XDK]
- reorder some #if's
- fix Mm64BitPhysicalAddress

Modified:
    branches/header-work/include/ddk/ntifs.h
    branches/header-work/include/xdk/halfuncs.h
    branches/header-work/include/xdk/mmtypes.h

Modified: branches/header-work/include/ddk/ntifs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h…
==============================================================================
--- branches/header-work/include/ddk/ntifs.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/ntifs.h [iso-8859-1] Wed Mar 24 21:19:04 2010
@@ -4689,7 +4689,7 @@
 KeAcquireQueuedSpinLock(
   IN OUT KSPIN_LOCK_QUEUE_NUMBER Number);
 
-NTHALAPI
+_DECL_HAL_KE_IMPORT
 VOID
 FASTCALL
 KeReleaseQueuedSpinLock(

Modified: branches/header-work/include/xdk/halfuncs.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/halfunc…
==============================================================================
--- branches/header-work/include/xdk/halfuncs.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/halfuncs.h [iso-8859-1] Wed Mar 24 21:19:04 2010
@@ -1,7 +1,8 @@
 /* Hardware Abstraction Layer Functions */
 
+#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 @@
 }
 
 $endif
-
 $if (_NTDDK_)
 
-#else
-
-#if (NTDDI_VERSION >= NTDDI_WIN2K)
+/* Nothing here */
+
+#else /* USE_DMA_MACROS ... */
+
 //DECLSPEC_DEPRECATED_DDK
 NTHALAPI
 VOID
@@ -140,18 +141,11 @@
   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,12 +195,7 @@
 NTAPI
 HalMakeBeep(
   IN ULONG Frequency);
-
-#endif
-
 #endif /* !defined(NO_LEGACY_DRIVERS) */
-
-#if (NTDDI_VERSION >= NTDDI_WIN2K)
 
 NTHALAPI
 PADAPTER_OBJECT
@@ -284,7 +273,9 @@
   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 @@
   IN ULONG SectorSize,
   IN ULONG MBRTypeIdentifier,
   OUT PVOID *Buffer);
-#endif
+#endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
 
 #if (NTDDI_VERSION >= NTDDI_WIN7)
 
@@ -312,7 +303,7 @@
 HalFreeHardwareCounters(
   IN HANDLE CounterSetHandle);
 
-#endif
+#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
 
 #if defined(_IA64_)
 #if (NTDDI_VERSION >= NTDDI_WIN2K)
@@ -351,5 +342,5 @@
 
 #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
 
-
-$endif
+$endif /* _NTDDK_ */
+

Modified: branches/header-work/include/xdk/mmtypes.h
URL:
http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmtypes…
==============================================================================
--- branches/header-work/include/xdk/mmtypes.h [iso-8859-1] (original)
+++ branches/header-work/include/xdk/mmtypes.h [iso-8859-1] Wed Mar 24 21:19:04 2010
@@ -142,7 +142,7 @@
   MmLargeSystem
 } MM_SYSTEMSIZE;
 
-extern PBOOLEAN Mm64BitPhysicalAddress;
+extern NTKERNELAPI BOOLEAN Mm64BitPhysicalAddress;
 extern PVOID MmBadPointer;
 
 $endif /* _WDMDDK_ */