Author: sginsberg Date: Wed Jul 15 12:22:05 2009 New Revision: 41965
URL: http://svn.reactos.org/svn/reactos?rev=41965&view=rev Log: - Don't use Kf* and Kef* in portable code.
Modified: trunk/reactos/drivers/network/ndis/ndis/control.c trunk/reactos/drivers/video/videoprt/spinlock.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/spinlock.c
Modified: trunk/reactos/drivers/network/ndis/ndis/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/c... ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/control.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -83,9 +83,9 @@ if (Lock->Context != PsGetCurrentThread()) { /* Wait for the exclusive lock to be released. */ Lock->RefCount[KeGetCurrentProcessorNumber()].RefCount--; - KefAcquireSpinLockAtDpcLevel(&Lock->SpinLock); + KeAcquireSpinLockAtDpcLevel(&Lock->SpinLock); Lock->RefCount[KeGetCurrentProcessorNumber()].RefCount++; - KefReleaseSpinLockFromDpcLevel(&Lock->SpinLock); + KeReleaseSpinLockFromDpcLevel(&Lock->SpinLock); } } } @@ -124,7 +124,7 @@ case 4: /* Exclusive write lock */ Lock->Context = NULL; LockState->LockState = -1; - KfReleaseSpinLock(&Lock->SpinLock, LockState->OldIrql); + KeReleaseSpinLock(&Lock->SpinLock, LockState->OldIrql); return; } }
Modified: trunk/reactos/drivers/video/videoprt/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/spin... ============================================================================== --- trunk/reactos/drivers/video/videoprt/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/spinlock.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -77,7 +77,7 @@ IN PSPIN_LOCK SpinLock) { TRACE_(VIDEOPRT, "VideoPortAcquireSpinLockAtDpcLevel\n"); - KefAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)SpinLock); + KeAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)SpinLock); }
/* @@ -104,5 +104,5 @@ IN PSPIN_LOCK SpinLock) { TRACE_(VIDEOPRT, "VideoPortReleaseSpinLockFromDpcLevel\n"); - KefReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)SpinLock); + KeReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)SpinLock); }
Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vide... ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -1045,12 +1045,12 @@ case VpHighPriority: OldIrql = KeGetCurrentIrql(); if (OldIrql < SYNCH_LEVEL) - OldIrql = KfRaiseIrql(SYNCH_LEVEL); + KeRaiseIrql(SYNCH_LEVEL, &OldIrql);
Ret = (*SynchronizeRoutine)(Context);
if (OldIrql < SYNCH_LEVEL) - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); break;
default:
Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=41965... ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -578,7 +578,7 @@ while (DpcData->DpcQueueDepth != 0) { /* Lock the DPC data and get the DPC entry*/ - KefAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); + KeAcquireSpinLockAtDpcLevel(&DpcData->DpcLock); DpcEntry = ListHead->Flink;
/* Make sure we have an entry */ @@ -602,7 +602,7 @@ Prcb->DebugDpcTime = 0;
/* Release the lock */ - KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); + KeReleaseSpinLockFromDpcLevel(&DpcData->DpcLock);
/* Re-enable interrupts */ _enable(); @@ -623,7 +623,7 @@ ASSERT(DpcData->DpcQueueDepth == 0);
/* Release DPC Lock */ - KefReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); + KeReleaseSpinLockFromDpcLevel(&DpcData->DpcLock); } }
Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev=... ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Wed Jul 15 12:22:05 2009 @@ -85,6 +85,38 @@ }
/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +KIRQL +NTAPI +KeAcquireInterruptSpinLock(IN PKINTERRUPT Interrupt) +{ + KIRQL OldIrql; + + /* Raise IRQL */ + KeRaiseIrql(Interrupt->SynchronizeIrql, &OldIrql); + + /* Acquire spinlock on MP */ + KeAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); + return OldIrql; +} + +/* + * @implemented + */ +VOID +NTAPI +KeReleaseInterruptSpinLock(IN PKINTERRUPT Interrupt, + IN KIRQL OldIrql) +{ + /* Release lock on MP */ + KeReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); + + /* Lower IRQL */ + KeLowerIrql(OldIrql); +}
/* * @implemented @@ -229,38 +261,6 @@ }
/* - * @implemented - */ -KIRQL -NTAPI -KeAcquireInterruptSpinLock(IN PKINTERRUPT Interrupt) -{ - KIRQL OldIrql; - - /* Raise IRQL */ - KeRaiseIrql(Interrupt->SynchronizeIrql, &OldIrql); - - /* Acquire spinlock on MP */ - KefAcquireSpinLockAtDpcLevel(Interrupt->ActualLock); - return OldIrql; -} - -/* - * @implemented - */ -VOID -NTAPI -KeReleaseInterruptSpinLock(IN PKINTERRUPT Interrupt, - IN KIRQL OldIrql) -{ - /* Release lock on MP */ - KefReleaseSpinLockFromDpcLevel(Interrupt->ActualLock); - - /* Lower IRQL */ - KeLowerIrql(OldIrql); -} - -/* * @unimplemented */ KIRQL