From 841caa96b484484c5adaec08d1436315be26923b Mon Sep 17 00:00:00 2001 From: Nate Lawson Date: Tue, 25 May 2004 16:17:39 +0000 Subject: Enable GPE at runtime rather than suspend time. This is to match the new behavior in ACPI-CA that defers GPE configuration. This is a temporary measure while reworking the GPE interface. --- sys/dev/acpica/acpi_button.c | 4 +++- sys/dev/acpica/acpi_lid.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/acpica/acpi_button.c b/sys/dev/acpica/acpi_button.c index 121ebec354d7..004a54ed35d7 100644 --- a/sys/dev/acpica/acpi_button.c +++ b/sys/dev/acpica/acpi_button.c @@ -155,6 +155,7 @@ acpi_button_attach(device_t dev) return_VALUE (ENXIO); } acpi_device_enable_wake_capability(sc->button_handle, 1); + acpi_device_enable_wake_event(sc->button_handle); return_VALUE (0); } @@ -162,10 +163,11 @@ acpi_button_attach(device_t dev) static int acpi_button_suspend(device_t dev) { +#if 0 struct acpi_button_softc *sc; sc = device_get_softc(dev); - acpi_device_enable_wake_event(sc->button_handle); +#endif return (0); } diff --git a/sys/dev/acpica/acpi_lid.c b/sys/dev/acpica/acpi_lid.c index 5f64a62da5e9..82c49598f046 100644 --- a/sys/dev/acpica/acpi_lid.c +++ b/sys/dev/acpica/acpi_lid.c @@ -108,6 +108,7 @@ acpi_lid_attach(device_t dev) AcpiInstallNotifyHandler(sc->lid_handle, ACPI_DEVICE_NOTIFY, acpi_lid_notify_handler, sc); acpi_device_enable_wake_capability(sc->lid_handle, 1); + acpi_device_enable_wake_event(sc->lid_handle); return_VALUE (0); } @@ -115,10 +116,11 @@ acpi_lid_attach(device_t dev) static int acpi_lid_suspend(device_t dev) { +#if 0 struct acpi_lid_softc *sc; sc = device_get_softc(dev); - acpi_device_enable_wake_event(sc->lid_handle); +#endif return (0); } -- cgit v1.3