28c28
< * $FreeBSD: head/sys/dev/acpica/acpi_button.c 121493 2003-10-25 05:03:25Z njl $
---
> * $FreeBSD: head/sys/dev/acpica/acpi_button.c 125679 2004-02-11 02:57:33Z njl $
63,64c63,64
< static void acpi_button_notify_pressed_for_sleep(void *arg);
< static void acpi_button_notify_pressed_for_wakeup(void *arg);
---
> static void acpi_button_notify_sleep(void *arg);
> static void acpi_button_notify_wakeup(void *arg);
129a130,131
> event = (sc->button_type == ACPI_SLEEP_BUTTON) ?
> ACPI_EVENT_SLEEP_BUTTON : ACPI_EVENT_POWER_BUTTON;
130a133
> /* Install the appropriate new handler. */
132,133c135,136
< event = (sc->button_type == ACPI_SLEEP_BUTTON) ?
< ACPI_EVENT_SLEEP_BUTTON : ACPI_EVENT_POWER_BUTTON;
---
> AcpiEnableEvent(event, 0);
> AcpiClearEvent(event);
145a149,165
>
> /*
> * If we have fixed buttons defined in the FADT, remove them now that
> * we have found one in the AML. Some systems define buttons both ways
> * but only deliver events to the AML object.
> */
> if (event == ACPI_EVENT_POWER_BUTTON && AcpiGbl_FADT->PwrButton == 0) {
> AcpiDisableEvent(event, 0);
> AcpiClearEvent(event);
> AcpiRemoveFixedEventHandler(event, acpi_event_power_button_sleep);
> }
> if (event == ACPI_EVENT_SLEEP_BUTTON && AcpiGbl_FADT->SleepButton == 0) {
> AcpiDisableEvent(event, 0);
> AcpiClearEvent(event);
> AcpiRemoveFixedEventHandler(event, acpi_event_sleep_button_sleep);
> }
>
166c186
< acpi_button_notify_pressed_for_sleep(void *arg)
---
> acpi_button_notify_sleep(void *arg)
183c203
< acpi_eventhandler_power_button_for_sleep((void *)acpi_sc);
---
> acpi_event_power_button_sleep(acpi_sc);
187c207
< acpi_eventhandler_sleep_button_for_sleep((void *)acpi_sc);
---
> acpi_event_sleep_button_sleep(acpi_sc);
195c215
< acpi_button_notify_pressed_for_wakeup(void *arg)
---
> acpi_button_notify_wakeup(void *arg)
212c232
< acpi_eventhandler_power_button_for_wakeup((void *)acpi_sc);
---
> acpi_event_power_button_wake(acpi_sc);
216c236
< acpi_eventhandler_sleep_button_for_wakeup((void *)acpi_sc);
---
> acpi_event_sleep_button_wake(acpi_sc);
233c253
< acpi_button_notify_pressed_for_sleep, sc);
---
> acpi_button_notify_sleep, sc);
237c257
< acpi_button_notify_pressed_for_wakeup, sc);
---
> acpi_button_notify_wakeup, sc);