From 29f16ed6c44006476770786ab8c48dddde4b0da9 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Wed, 7 Sep 2011 10:14:48 +0000 Subject: [PATCH] [HAL] Rename HalpAcquireSystemHardwareSpinLock to HalpAcquireCmosSpinLock svn path=/trunk/; revision=53615 --- reactos/hal/halx86/generic/beep.c | 10 +++++----- reactos/hal/halx86/generic/cmos.c | 14 +++++++------- reactos/hal/halx86/generic/profil.c | 2 +- reactos/hal/halx86/generic/reboot.c | 2 +- reactos/hal/halx86/generic/spinlock.c | 2 +- reactos/hal/halx86/generic/systimer.S | 8 ++++---- reactos/hal/halx86/include/halp.h | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/reactos/hal/halx86/generic/beep.c b/reactos/hal/halx86/generic/beep.c index 70612cd0be5..f1bc9634099 100644 --- a/reactos/hal/halx86/generic/beep.c +++ b/reactos/hal/halx86/generic/beep.c @@ -29,7 +29,7 @@ HalMakeBeep(IN ULONG Frequency) // // Acquire CMOS Lock // - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); // // Turn the timer off by disconnecting its output pin and speaker gate @@ -58,7 +58,7 @@ HalMakeBeep(IN ULONG Frequency) // Program the PIT for binary mode // TimerControl.BcdMode = FALSE; - + // // Program the PIT to generate a square wave (Mode 3) on channel 2. // Channel 0 is used for the IRQ0 clock interval timer, and channel @@ -76,17 +76,17 @@ HalMakeBeep(IN ULONG Frequency) // TimerControl.OperatingMode = PitOperatingMode3; TimerControl.Channel = PitChannel2; - + // // Set the access mode that we'll use to program the reload value. // TimerControl.AccessMode = PitAccessModeLowHigh; - + // // Now write the programming bits // __outbyte(TIMER_CONTROL_PORT, TimerControl.Bits); - + // // Next we write the reload value for channel 2 // diff --git a/reactos/hal/halx86/generic/cmos.c b/reactos/hal/halx86/generic/cmos.c index 6a3a9ec47a3..4eba603ff7f 100644 --- a/reactos/hal/halx86/generic/cmos.c +++ b/reactos/hal/halx86/generic/cmos.c @@ -57,7 +57,7 @@ HalpGetCmosData(IN ULONG BusNumber, if (!Length) return 0; /* Acquire CMOS Lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Check if this is simple CMOS */ if (BusNumber == 0) @@ -111,7 +111,7 @@ HalpSetCmosData(IN ULONG BusNumber, if (!Length) return 0; /* Acquire CMOS Lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Check if this is simple CMOS */ if (BusNumber == 0) @@ -179,7 +179,7 @@ HalGetEnvironmentVariable(IN PCH Name, if (_stricmp(Name, "LastKnownGood")) return ENOENT; /* Acquire CMOS Lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Query the current value */ Val = HalpReadCmos(RTC_REGISTER_B) & 0x01; @@ -220,7 +220,7 @@ HalSetEnvironmentVariable(IN PCH Name, if (!_stricmp(Value, "TRUE")) { /* It's true, acquire CMOS lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Read the current value and add the flag */ Val = HalpReadCmos(RTC_REGISTER_B) | 1; @@ -228,7 +228,7 @@ HalSetEnvironmentVariable(IN PCH Name, else if (!_stricmp(Value, "FALSE")) { /* It's false, acquire CMOS lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Read the current value and mask out the flag */ Val = HalpReadCmos(RTC_REGISTER_B) & ~1; @@ -255,7 +255,7 @@ NTAPI HalQueryRealTimeClock(OUT PTIME_FIELDS Time) { /* Acquire CMOS Lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Loop while update is in progress */ while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP); @@ -290,7 +290,7 @@ NTAPI HalSetRealTimeClock(IN PTIME_FIELDS Time) { /* Acquire CMOS Lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Loop while update is in progress */ while ((HalpReadCmos(RTC_REGISTER_A)) & RTC_REG_A_UIP); diff --git a/reactos/hal/halx86/generic/profil.c b/reactos/hal/halx86/generic/profil.c index b145942d9ab..186d009b869 100644 --- a/reactos/hal/halx86/generic/profil.c +++ b/reactos/hal/halx86/generic/profil.c @@ -25,7 +25,7 @@ HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) UCHAR StatusB; /* Acquire the CMOS lock */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Read Status Register B */ StatusB = HalpReadCmos(RTC_REGISTER_B); diff --git a/reactos/hal/halx86/generic/reboot.c b/reactos/hal/halx86/generic/reboot.c index c7eda5e96c1..068cc17a8af 100644 --- a/reactos/hal/halx86/generic/reboot.c +++ b/reactos/hal/halx86/generic/reboot.c @@ -50,7 +50,7 @@ HalpReboot(VOID) ((PUSHORT)ZeroPageMapping)[0x239] = 0x1234; /* Lock CMOS Access (and disable interrupts) */ - HalpAcquireSystemHardwareSpinLock(); + HalpAcquireCmosSpinLock(); /* Setup control register B */ WRITE_PORT_UCHAR((PUCHAR)0x70, 0x0B); diff --git a/reactos/hal/halx86/generic/spinlock.c b/reactos/hal/halx86/generic/spinlock.c index c397bf09598..554e85f59dc 100644 --- a/reactos/hal/halx86/generic/spinlock.c +++ b/reactos/hal/halx86/generic/spinlock.c @@ -224,7 +224,7 @@ KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, VOID NTAPI -HalpAcquireSystemHardwareSpinLock(VOID) +HalpAcquireCmosSpinLock(VOID) { ULONG Flags; diff --git a/reactos/hal/halx86/generic/systimer.S b/reactos/hal/halx86/generic/systimer.S index 5e76763e3ef..d3caa478fee 100644 --- a/reactos/hal/halx86/generic/systimer.S +++ b/reactos/hal/halx86/generic/systimer.S @@ -11,7 +11,7 @@ #include -EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC +EXTERN _HalpAcquireCmosSpinLock@0:PROC EXTERN _HalpReleaseCmosSpinLock@0:PROC EXTERN _DbgBreakPoint@0:PROC @@ -98,7 +98,7 @@ _HalpCalibrateStallExecution@0: mov dword ptr [ebp-12], 0 /* Acquire CMOS lock */ - call _HalpAcquireSystemHardwareSpinLock@0 + call _HalpAcquireCmosSpinLock@0 /* Now initialize register A on the CMOS */ mov ax, HEX(2D00) OR CMOS_REGISTER_A @@ -186,7 +186,7 @@ OnlyOnePersonCanWriteHalCode: push offset Looper /* Acquire CMOS lock */ - call _HalpAcquireSystemHardwareSpinLock@0 + call _HalpAcquireCmosSpinLock@0 /* Now initialize register A on the CMOS */ mov ax, HEX(2D00) OR CMOS_REGISTER_A @@ -271,7 +271,7 @@ FoundFactor: mov eax, HEX(13) /* Acquire CMOS lock */ - call _HalpAcquireSystemHardwareSpinLock@0 + call _HalpAcquireCmosSpinLock@0 /* Now initialize register A on the CMOS */ mov ax, HEX(2D00) OR CMOS_REGISTER_A diff --git a/reactos/hal/halx86/include/halp.h b/reactos/hal/halx86/include/halp.h index a4c58c09202..9e9e4c4f714 100644 --- a/reactos/hal/halx86/include/halp.h +++ b/reactos/hal/halx86/include/halp.h @@ -722,7 +722,7 @@ HalpWriteCmos( // VOID NTAPI -HalpAcquireSystemHardwareSpinLock( +HalpAcquireCmosSpinLock( VOID );