From 8eca3e0dcd30d7569799ef177e303b187ee186dc Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sat, 6 Mar 2010 22:22:28 +0000 Subject: [PATCH] Make the shutdown with ACPI enabled actually work. Patch by Samuel Serapion. svn path=/trunk/; revision=45967 --- reactos/drivers/bus/acpi/busmgr/system.c | 7 +++---- reactos/drivers/bus/acpi/power.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/reactos/drivers/bus/acpi/busmgr/system.c b/reactos/drivers/bus/acpi/busmgr/system.c index 1ffee4c95c7..d0f0503f366 100644 --- a/reactos/drivers/bus/acpi/busmgr/system.c +++ b/reactos/drivers/bus/acpi/busmgr/system.c @@ -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); diff --git a/reactos/drivers/bus/acpi/power.c b/reactos/drivers/bus/acpi/power.c index ac9c9f0f393..3af99c96402 100644 --- a/reactos/drivers/bus/acpi/power.c +++ b/reactos/drivers/bus/acpi/power.c @@ -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); -- 2.17.1