From 4e669a268295cccf9f3cc358d93df91b34f9e961 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 24 Mar 2010 02:20:51 +0000 Subject: [PATCH] [XDK] - Add amd64 KeAcquireSpinLock - move KeGetCurrentIrql prototype to x86 specific file svn path=/branches/header-work/; revision=46386 --- include/ddk/wdm.h | 13 ++++++++----- include/xdk/amd64/ke.h | 3 +++ include/xdk/kefuncs.h | 5 ----- include/xdk/x86/ke.h | 5 +++++ 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index c80004a7f99..6c396e46345 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -7724,6 +7724,11 @@ KeMemoryBarrier(VOID) #endif } +NTHALAPI +KIRQL +NTAPI +KeGetCurrentIrql(VOID); + NTHALAPI VOID FASTCALL @@ -7918,6 +7923,9 @@ KeRaiseIrqlToSynchLevel(VOID) return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 } +#define KeAcquireSpinLock(SpinLock, OldIrql) \ + *(OldIrql) = KeAcquireSpinLockRaiseToDpc(SpinLock) + FORCEINLINE PKTHREAD KeGetCurrentThread(VOID) @@ -9652,11 +9660,6 @@ RTLVERLIB_DDI(RtlIsServicePackVersionInstalled)( * Kernel Functions * ******************************************************************************/ -NTHALAPI -KIRQL -NTAPI -KeGetCurrentIrql(VOID); - NTKERNELAPI VOID NTAPI diff --git a/include/xdk/amd64/ke.h b/include/xdk/amd64/ke.h index 57f16fe420b..2ef3c8c8d4d 100644 --- a/include/xdk/amd64/ke.h +++ b/include/xdk/amd64/ke.h @@ -93,6 +93,9 @@ KeRaiseIrqlToSynchLevel(VOID) return KfRaiseIrql(12); // SYNCH_LEVEL = IPI_LEVEL - 2 } +#define KeAcquireSpinLock(SpinLock, OldIrql) \ + *(OldIrql) = KeAcquireSpinLockRaiseToDpc(SpinLock) + FORCEINLINE PKTHREAD KeGetCurrentThread(VOID) diff --git a/include/xdk/kefuncs.h b/include/xdk/kefuncs.h index 8c26b626f21..040daf78c55 100644 --- a/include/xdk/kefuncs.h +++ b/include/xdk/kefuncs.h @@ -11,11 +11,6 @@ KeInvalidateRangeAllCaches( $endif $if (_WDMDDK_) -NTHALAPI -KIRQL -NTAPI -KeGetCurrentIrql(VOID); - NTKERNELAPI VOID NTAPI diff --git a/include/xdk/x86/ke.h b/include/xdk/x86/ke.h index b210804ee1a..19d42740ee4 100644 --- a/include/xdk/x86/ke.h +++ b/include/xdk/x86/ke.h @@ -59,6 +59,11 @@ KeMemoryBarrier(VOID) #endif } +NTHALAPI +KIRQL +NTAPI +KeGetCurrentIrql(VOID); + NTHALAPI VOID FASTCALL