- KeReleaseQueuedSpinLock
[XDK]
- reorder some #if's
- fix Mm64BitPhysicalAddress

svn path=/branches/header-work/; revision=46401
This commit is contained in:
Timo Kreuzer 2010-03-24 20:19:04 +00:00
parent f743212592
commit f71e0e99fd
3 changed files with 14 additions and 23 deletions

View file

@ -4689,7 +4689,7 @@ FASTCALL
KeAcquireQueuedSpinLock( KeAcquireQueuedSpinLock(
IN OUT KSPIN_LOCK_QUEUE_NUMBER Number); IN OUT KSPIN_LOCK_QUEUE_NUMBER Number);
NTHALAPI _DECL_HAL_KE_IMPORT
VOID VOID
FASTCALL FASTCALL
KeReleaseQueuedSpinLock( KeReleaseQueuedSpinLock(

View file

@ -1,7 +1,8 @@
/* Hardware Abstraction Layer Functions */ /* 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_) $if (_WDMDDK_)
FORCEINLINE FORCEINLINE
@ -69,12 +70,12 @@ HalGetDmaAlignment(
} }
$endif $endif
$if (_NTDDK_) $if (_NTDDK_)
#else /* Nothing here */
#else /* USE_DMA_MACROS ... */
#if (NTDDI_VERSION >= NTDDI_WIN2K)
//DECLSPEC_DEPRECATED_DDK //DECLSPEC_DEPRECATED_DDK
NTHALAPI NTHALAPI
VOID VOID
@ -140,18 +141,11 @@ HalAllocateAdapterChannel(
IN ULONG NumberOfMapRegisters, IN ULONG NumberOfMapRegisters,
IN PDRIVER_CONTROL ExecutionRoutine); IN PDRIVER_CONTROL ExecutionRoutine);
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ $endif /* _NTDDK_ */
#endif /* USE_DMA_MACROS ... */
$endif
#endif
$if (_NTDDK_) $if (_NTDDK_)
#if !defined(NO_LEGACY_DRIVERS) #if !defined(NO_LEGACY_DRIVERS)
#if (NTDDI_VERSION >= NTDDI_WIN2K)
NTHALAPI NTHALAPI
NTSTATUS NTSTATUS
NTAPI NTAPI
@ -201,13 +195,8 @@ BOOLEAN
NTAPI NTAPI
HalMakeBeep( HalMakeBeep(
IN ULONG Frequency); IN ULONG Frequency);
#endif
#endif /* !defined(NO_LEGACY_DRIVERS) */ #endif /* !defined(NO_LEGACY_DRIVERS) */
#if (NTDDI_VERSION >= NTDDI_WIN2K)
NTHALAPI NTHALAPI
PADAPTER_OBJECT PADAPTER_OBJECT
NTAPI NTAPI
@ -284,7 +273,9 @@ HalPutScatterGatherList(
IN PSCATTER_GATHER_LIST ScatterGather, IN PSCATTER_GATHER_LIST ScatterGather,
IN BOOLEAN WriteToDevice); IN BOOLEAN WriteToDevice);
$endif /* _NTDDK_ */
#endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
$if (_NTDDK_)
#if (NTDDI_VERSION >= NTDDI_WINXP) #if (NTDDI_VERSION >= NTDDI_WINXP)
NTKERNELAPI NTKERNELAPI
@ -295,7 +286,7 @@ HalExamineMBR(
IN ULONG SectorSize, IN ULONG SectorSize,
IN ULONG MBRTypeIdentifier, IN ULONG MBRTypeIdentifier,
OUT PVOID *Buffer); OUT PVOID *Buffer);
#endif #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
#if (NTDDI_VERSION >= NTDDI_WIN7) #if (NTDDI_VERSION >= NTDDI_WIN7)
@ -312,7 +303,7 @@ NTAPI
HalFreeHardwareCounters( HalFreeHardwareCounters(
IN HANDLE CounterSetHandle); IN HANDLE CounterSetHandle);
#endif #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
#if defined(_IA64_) #if defined(_IA64_)
#if (NTDDI_VERSION >= NTDDI_WIN2K) #if (NTDDI_VERSION >= NTDDI_WIN2K)
@ -351,5 +342,5 @@ HalBugCheckSystem(
#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
$endif /* _NTDDK_ */
$endif

View file

@ -142,7 +142,7 @@ typedef enum _MM_SYSTEM_SIZE {
MmLargeSystem MmLargeSystem
} MM_SYSTEMSIZE; } MM_SYSTEMSIZE;
extern PBOOLEAN Mm64BitPhysicalAddress; extern NTKERNELAPI BOOLEAN Mm64BitPhysicalAddress;
extern PVOID MmBadPointer; extern PVOID MmBadPointer;
$endif /* _WDMDDK_ */ $endif /* _WDMDDK_ */