Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 18:15:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make the shutdown with ACPI enabled actually work.

Browse source 
Patch by Samuel Serapion.

svn path=/trunk/; revision=45967
This commit is contained in:
Sylvain Petreolle 2010-03-06 22:22:28 +00:00
parent 77013ae0dd
commit 8eca3e0dcd
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/drivers/bus/acpi/busmgr/system.c
View file

@ -373,15 +373,14 @@ acpi_suspend (
// /* We don't support S4 under 2.4. Give up */
// return AE_ERROR;
//}
AcpiEnterSleepStatePrep(state);
status = AcpiEnterSleepState(state);
if (!ACPI_SUCCESS(status) && state != ACPI_STATE_S5)
return status;
AcpiEnterSleepStatePrep(state);
/* disable interrupts and flush caches */
//ACPI_DISABLE_IRQS();
_disable();
ACPI_FLUSH_CPU_CACHE();
/* perform OS-specific sleep actions */
@ -395,7 +394,7 @@ acpi_suspend (
acpi_system_restore_state(state);
/* make sure interrupts are enabled */
//ACPI_ENABLE_IRQS();
_enable();
/* reset firmware waking vector */
AcpiSetFirmwareWakingVector((ACPI_PHYSICAL_ADDRESS) 0);

2
reactos/drivers/bus/acpi/power.c
View file

@ -103,7 +103,7 @@ Bus_FDO_Power (
}
oldPowerState = Data->Common.SystemPowerState;
Data->Common.SystemPowerState = powerState.SystemState;
AcpiStatus = AcpiEnterSleepState(AcpiState);
AcpiStatus = acpi_suspend(AcpiState);
if (!ACPI_SUCCESS(AcpiStatus)) {
DPRINT1("Failed to enter sleep state %d (Status 0x%X)\n",
AcpiState, AcpiStatus);