Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-21 11:48:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

KiAcquire/ReleaseSpinLock adaption

Browse source 
svn path=/trunk/; revision=7757
This commit is contained in:
Gunnar Dalsnes 2004-01-18 22:35:26 +00:00
parent 703eb5e8c9
commit 11a4e44d62
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/hal/halx86/display.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: display.c,v 1.12 2003/12/28 22:38:09 fireball Exp $ /* $Id: display.c,v 1.13 2004/01/18 22:35:26 gdalsnes Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -692,7 +692,7 @@ HalDisplayString(IN PCH String)
#error Unknown compiler for inline assembler #error Unknown compiler for inline assembler
#endif #endif
KeAcquireSpinLockAtDpcLevel(&Lock); KiAcquireSpinLock(&Lock);
#if 0 #if 0
if (HalOwnsDisplay == FALSE) if (HalOwnsDisplay == FALSE)
@ -754,7 +754,7 @@ HalDisplayString(IN PCH String)
WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_CURHI); WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_INDEX, CRTC_CURHI);
WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA, (UCHAR)((offset >> 8) & 0xff)); WRITE_PORT_UCHAR((PUCHAR)VGA_CRTC_DATA, (UCHAR)((offset >> 8) & 0xff));
#endif #endif
KeReleaseSpinLockFromDpcLevel(&Lock); KiReleaseSpinLock(&Lock);
popfl(Flags); popfl(Flags);
} }

24
reactos/hal/halx86/spinlock.c
View file

@ -1,4 +1,4 @@
/* $Id: spinlock.c,v 1.6 2003/11/06 21:13:21 gvg Exp $ /* $Id: spinlock.c,v 1.7 2004/01/18 22:35:05 gdalsnes Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -35,8 +35,7 @@ KeAcquireSpinLock (
* OldIrql (OUT) = Caller supplied storage for the previous irql * OldIrql (OUT) = Caller supplied storage for the previous irql
*/ */
{ {
KeRaiseIrql(DISPATCH_LEVEL,OldIrql); *OldIrql = KfAcquireSpinLock(SpinLock);
KeAcquireSpinLockAtDpcLevel(SpinLock);
} }
KIRQL FASTCALL KIRQL FASTCALL
@ -46,9 +45,8 @@ KeAcquireSpinLockRaiseToSynch (
{ {
KIRQL OldIrql; KIRQL OldIrql;
KeRaiseIrql(SYNCH_LEVEL, &OldIrql); OldIrql = KfRaiseIrql(SYNCH_LEVEL);
KiAcquireSpinLock(SpinLock);
KeAcquireSpinLockAtDpcLevel(SpinLock);
return OldIrql; return OldIrql;
} }
@ -65,8 +63,7 @@ KeReleaseSpinLock (
* NewIrql = Irql level before acquiring the spinlock * NewIrql = Irql level before acquiring the spinlock
*/ */
{ {
KeReleaseSpinLockFromDpcLevel(SpinLock); KfReleaseSpinLock(SpinLock, NewIrql);
KeLowerIrql(NewIrql);
} }
KIRQL FASTCALL KIRQL FASTCALL
@ -76,8 +73,10 @@ KfAcquireSpinLock (
{ {
KIRQL OldIrql; KIRQL OldIrql;
KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
KeAcquireSpinLockAtDpcLevel(SpinLock);
OldIrql = KfRaiseIrql(DISPATCH_LEVEL);
KiAcquireSpinLock(SpinLock);
return OldIrql; return OldIrql;
} }
@ -94,8 +93,9 @@ KfReleaseSpinLock (
* NewIrql = Irql level before acquiring the spinlock * NewIrql = Irql level before acquiring the spinlock
*/ */
{ {
KeReleaseSpinLockFromDpcLevel(SpinLock); assert(KeGetCurrentIrql() == DISPATCH_LEVEL);
KeLowerIrql(NewIrql); KiReleaseSpinLock(SpinLock);
KfLowerIrql(NewIrql);
} }
/* EOF */ /* EOF */