Author: tkreuzer
Date: Wed Sep 7 10:14:48 2011
New Revision: 53615
URL: http://svn.reactos.org/svn/reactos?rev=53615&view=rev
Log:
[HAL]
Rename HalpAcquireSystemHardwareSpinLock to HalpAcquireCmosSpinLock
Modified:
trunk/reactos/hal/halx86/generic/beep.c
trunk/reactos/hal/halx86/generic/cmos.c
trunk/reactos/hal/halx86/generic/profil.c
trunk/reactos/hal/halx86/generic/reboot.c
trunk/reactos/hal/halx86/generic/spinlock.c
trunk/reactos/hal/halx86/generic/systimer.S
trunk/reactos/hal/halx86/include/halp.h
Modified: trunk/reactos/hal/halx86/generic/beep.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/beep.c?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/beep.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/beep.c [iso-8859-1] Wed Sep 7 10:14:48
2011
@@ -29,7 +29,7 @@
//
// Acquire CMOS Lock
//
- HalpAcquireSystemHardwareSpinLock();
+ HalpAcquireCmosSpinLock();
//
// Turn the timer off by disconnecting its output pin and speaker gate
@@ -58,7 +58,7 @@
// 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 @@
//
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
//
Modified: trunk/reactos/hal/halx86/generic/cmos.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/cmos.c?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/cmos.c [iso-8859-1] Wed Sep 7 10:14:48
2011
@@ -57,7 +57,7 @@
if (!Length) return 0;
/* Acquire CMOS Lock */
- HalpAcquireSystemHardwareSpinLock();
+ HalpAcquireCmosSpinLock();
/* Check if this is simple CMOS */
if (BusNumber == 0)
@@ -111,7 +111,7 @@
if (!Length) return 0;
/* Acquire CMOS Lock */
- HalpAcquireSystemHardwareSpinLock();
+ HalpAcquireCmosSpinLock();
/* Check if this is simple CMOS */
if (BusNumber == 0)
@@ -179,7 +179,7 @@
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 @@
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 @@
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 @@
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 @@
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);
Modified: trunk/reactos/hal/halx86/generic/profil.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/profil.c?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/profil.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/profil.c [iso-8859-1] Wed Sep 7 10:14:48
2011
@@ -25,7 +25,7 @@
UCHAR StatusB;
/* Acquire the CMOS lock */
- HalpAcquireSystemHardwareSpinLock();
+ HalpAcquireCmosSpinLock();
/* Read Status Register B */
StatusB = HalpReadCmos(RTC_REGISTER_B);
Modified: trunk/reactos/hal/halx86/generic/reboot.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/reboot.c?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/reboot.c [iso-8859-1] Wed Sep 7 10:14:48
2011
@@ -50,7 +50,7 @@
((PUSHORT)ZeroPageMapping)[0x239] = 0x1234;
/* Lock CMOS Access (and disable interrupts) */
- HalpAcquireSystemHardwareSpinLock();
+ HalpAcquireCmosSpinLock();
/* Setup control register B */
WRITE_PORT_UCHAR((PUCHAR)0x70, 0x0B);
Modified: trunk/reactos/hal/halx86/generic/spinlock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinlock.c?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Wed Sep 7
10:14:48 2011
@@ -224,7 +224,7 @@
VOID
NTAPI
-HalpAcquireSystemHardwareSpinLock(VOID)
+HalpAcquireCmosSpinLock(VOID)
{
ULONG Flags;
Modified: trunk/reactos/hal/halx86/generic/systimer.S
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/systimer.S?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/generic/systimer.S [iso-8859-1] Wed Sep 7
10:14:48 2011
@@ -11,7 +11,7 @@
#include <ks386.inc>
-EXTERN _HalpAcquireSystemHardwareSpinLock@0:PROC
+EXTERN _HalpAcquireCmosSpinLock@0:PROC
EXTERN _HalpReleaseCmosSpinLock@0:PROC
EXTERN _DbgBreakPoint@0:PROC
@@ -98,7 +98,7 @@
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 @@
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 @@
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
Modified: trunk/reactos/hal/halx86/include/halp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halp.h?rev=53615&r1=53614&r2=53615&view=diff
==============================================================================
--- trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] (original)
+++ trunk/reactos/hal/halx86/include/halp.h [iso-8859-1] Wed Sep 7 10:14:48
2011
@@ -722,7 +722,7 @@
//
VOID
NTAPI
-HalpAcquireSystemHardwareSpinLock(
+HalpAcquireCmosSpinLock(
VOID
);
