summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2000-12-01 12:09:18 +0000
committermsmith <msmith@FreeBSD.org>2000-12-01 12:09:18 +0000
commit9ec0ffdb782ce2a9011433c25a9c6fc40353a5e1 (patch)
tree5d2ba180baf0e62581a9749fbae3658a35ac2cd2 /sys/contrib
parent24771a5a3c2ba89e3afb649345fb8b30af12f94a (diff)
downloadFreeBSD-src-9ec0ffdb782ce2a9011433c25a9c6fc40353a5e1.zip
FreeBSD-src-9ec0ffdb782ce2a9011433c25a9c6fc40353a5e1.tar.gz
Update local changes for new hardware register interface.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c b/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
index eeb40ba..5524936 100644
--- a/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
+++ b/sys/contrib/dev/acpica/Subsystem/Hardware/hwxface.c
@@ -859,14 +859,14 @@ AcpiSetSystemSleepState (
/*
* Clear wake status
*/
- AcpiHwRegisterAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, WAK_STS, 1);
+ AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, WAK_STS, 1);
/*
* Set ACPI_SLP_TYPA/b and ACPI_SLP_EN
*/
- AcpiHwRegisterAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_TYPE_A, Slp_TypA);
- AcpiHwRegisterAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_TYPE_B, Slp_TypB);
- AcpiHwRegisterAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_EN, 1);
+ AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_TYPE_A, Slp_TypA);
+ AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_TYPE_B, Slp_TypB);
+ AcpiHwRegisterBitAccess (ACPI_WRITE, ACPI_MTX_DO_NOT_LOCK, SLP_EN, 1);
/*
* For S0 we don't wait for the WAK_STS bit.
@@ -878,7 +878,7 @@ AcpiSetSystemSleepState (
*/
Count = 0;
- while (!(AcpiHwRegisterAccess (ACPI_READ, ACPI_MTX_DO_NOT_LOCK, WAK_STS)))
+ while (!(AcpiHwRegisterBitAccess (ACPI_READ, ACPI_MTX_DO_NOT_LOCK, WAK_STS)))
{
#if 1
AcpiOsSleepUsec(1000); /* should we have OsdFunc for sleep or halt? */
OpenPOWER on IntegriCloud