diff options
author | jkim <jkim@FreeBSD.org> | 2012-04-23 23:05:14 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2012-04-23 23:05:14 +0000 |
commit | 6ad6e5ad458430028d7210712b32b42a6a5bd27f (patch) | |
tree | 56922987e2cfefbddd9a8298beb2dce0ea965339 /sys/contrib/dev/acpica/components/hardware | |
parent | 22fae261d4ee03ee88b67242e0842711fe24b0f3 (diff) | |
parent | eb364ef2c90291c41e896d265d93fe21e48d02a7 (diff) | |
download | FreeBSD-src-6ad6e5ad458430028d7210712b32b42a6a5bd27f.zip FreeBSD-src-6ad6e5ad458430028d7210712b32b42a6a5bd27f.tar.gz |
Merge ACPICA 20120420.
Diffstat (limited to 'sys/contrib/dev/acpica/components/hardware')
-rw-r--r-- | sys/contrib/dev/acpica/components/hardware/hwesleep.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/components/hardware/hwesleep.c b/sys/contrib/dev/acpica/components/hardware/hwesleep.c index 1bf50a0..ede5278 100644 --- a/sys/contrib/dev/acpica/components/hardware/hwesleep.c +++ b/sys/contrib/dev/acpica/components/hardware/hwesleep.c @@ -132,7 +132,7 @@ AcpiHwExtendedSleep ( /* Clear wake status (WAK_STS) */ - Status = AcpiWrite (ACPI_X_WAKE_STATUS, &AcpiGbl_FADT.SleepStatus); + Status = AcpiWrite ((UINT64) ACPI_X_WAKE_STATUS, &AcpiGbl_FADT.SleepStatus); if (ACPI_FAILURE (Status)) { return_ACPI_STATUS (Status); @@ -163,7 +163,7 @@ AcpiHwExtendedSleep ( SleepTypeValue = ((AcpiGbl_SleepTypeA << ACPI_X_SLEEP_TYPE_POSITION) & ACPI_X_SLEEP_TYPE_MASK); - Status = AcpiWrite ((SleepTypeValue | ACPI_X_SLEEP_ENABLE), + Status = AcpiWrite ((UINT64) (SleepTypeValue | ACPI_X_SLEEP_ENABLE), &AcpiGbl_FADT.SleepControl); if (ACPI_FAILURE (Status)) { @@ -219,7 +219,7 @@ AcpiHwExtendedWakePrep ( SleepTypeValue = ((AcpiGbl_SleepTypeA << ACPI_X_SLEEP_TYPE_POSITION) & ACPI_X_SLEEP_TYPE_MASK); - (void) AcpiWrite ((SleepTypeValue | ACPI_X_SLEEP_ENABLE), + (void) AcpiWrite ((UINT64) (SleepTypeValue | ACPI_X_SLEEP_ENABLE), &AcpiGbl_FADT.SleepControl); } @@ -269,7 +269,7 @@ AcpiHwExtendedWake ( * and use it to determine whether the system is rebooting or * resuming. Clear WAK_STS for compatibility. */ - (void) AcpiWrite (ACPI_X_WAKE_STATUS, &AcpiGbl_FADT.SleepStatus); + (void) AcpiWrite ((UINT64) ACPI_X_WAKE_STATUS, &AcpiGbl_FADT.SleepStatus); AcpiGbl_SystemAwakeAndRunning = TRUE; AcpiHwExecuteSleepMethod (METHOD_PATHNAME__SST, ACPI_SST_WORKING); |