diff options
author | njl <njl@FreeBSD.org> | 2003-07-13 22:44:13 +0000 |
---|---|---|
committer | njl <njl@FreeBSD.org> | 2003-07-13 22:44:13 +0000 |
commit | 148a8cc4ac210f6d3692eb478d20cc64818d274a (patch) | |
tree | dd1a453ab93efa28848b21047ec45d003c6f262e /sys/contrib/dev/acpica/hwsleep.c | |
parent | 857b9ae7f340e84e806f355c2a19d9cac1ab3faf (diff) | |
download | FreeBSD-src-148a8cc4ac210f6d3692eb478d20cc64818d274a.zip FreeBSD-src-148a8cc4ac210f6d3692eb478d20cc64818d274a.tar.gz |
ACPICA import from the 0619 dist.
Diffstat (limited to 'sys/contrib/dev/acpica/hwsleep.c')
-rw-r--r-- | sys/contrib/dev/acpica/hwsleep.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/sys/contrib/dev/acpica/hwsleep.c b/sys/contrib/dev/acpica/hwsleep.c index 50b0fa9..73c89ab 100644 --- a/sys/contrib/dev/acpica/hwsleep.c +++ b/sys/contrib/dev/acpica/hwsleep.c @@ -2,7 +2,7 @@ /****************************************************************************** * * Name: hwsleep.c - ACPI Hardware Sleep/Wake Interface - * $Revision: 52 $ + * $Revision: 56 $ * *****************************************************************************/ @@ -308,13 +308,13 @@ AcpiEnterSleepState ( /* Clear wake status */ - Status = AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_LOCK); + Status = AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); } - Status = AcpiHwClearAcpiStatus(); + Status = AcpiHwClearAcpiStatus(ACPI_MTX_DO_NOT_LOCK); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -322,7 +322,7 @@ AcpiEnterSleepState ( /* Disable BM arbitration */ - Status = AcpiSetRegister (ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_LOCK); + Status = AcpiSetRegister (ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -422,12 +422,6 @@ AcpiEnterSleepState ( } while (!InValue); - Status = AcpiSetRegister (ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_DO_NOT_LOCK); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } - return_ACPI_STATUS (AE_OK); } @@ -456,13 +450,13 @@ AcpiEnterSleepStateS4bios ( ACPI_FUNCTION_TRACE ("AcpiEnterSleepStateS4bios"); AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); - AcpiHwClearAcpiStatus(); + AcpiHwClearAcpiStatus(ACPI_MTX_DO_NOT_LOCK); AcpiHwDisableNonWakeupGpes(); ACPI_FLUSH_CPU_CACHE(); - Status = AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, (ACPI_INTEGER) AcpiGbl_FADT->S4BiosReq, 8); + Status = AcpiOsWritePort (AcpiGbl_FADT->SmiCmd, (UINT32) AcpiGbl_FADT->S4BiosReq, 8); do { AcpiOsStall(1000); |