diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2005-12-16 19:09:32 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2005-12-16 19:09:32 +0000 |
| commit | 9483adf18e845f0605b04971c3a9ca3ed140d244 (patch) | |
| tree | ded91c2eff9f8928c92ddc4b7771109e2cdfe6fd /sys/dev/acpi | |
| parent | 29b5133eaa04fbb70c852c7917617913d9f5fa6f (diff) | |
Remove test for kbd_reset. Prompted deraadt@, ok jordan@
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpi.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sys/dev/acpi/acpi.c b/sys/dev/acpi/acpi.c index b431c9b3bd1..76c22fded96 100644 --- a/sys/dev/acpi/acpi.c +++ b/sys/dev/acpi/acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpi.c,v 1.10 2005/12/16 18:59:41 jordan Exp $ */ +/* $OpenBSD: acpi.c,v 1.11 2005/12/16 19:09:31 marco Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -22,6 +22,8 @@ #include <sys/fcntl.h> #include <sys/ioccom.h> #include <sys/event.h> +#include <sys/signalvar.h> +#include <sys/proc.h> #include <machine/conf.h> #include <machine/bus.h> @@ -31,9 +33,6 @@ #include <dev/acpi/amltypes.h> #include <dev/acpi/dsdt.h> -#include <sys/signalvar.h> -#include <sys/proc.h> - #ifdef ACPI_DEBUG int acpi_debug = 20; #endif @@ -725,7 +724,6 @@ void acpi_softintr(void *arg) { struct acpi_softc *sc = arg; - extern int kbd_reset; if (sc->sc_powerbtn) { sc->sc_powerbtn = 0; @@ -733,11 +731,10 @@ acpi_softintr(void *arg) dnprintf(1,"power button pressed\n"); KNOTE(sc->sc_note, ACPI_EVENT_COMPOSE(ACPI_EV_PWRBTN, acpi_evindex)); + + /* power down */ acpi_s5 = 1; - if (kbd_reset == 1) { - kbd_reset = 0; - psignal(initproc, SIGUSR1); - } + psignal(initproc, SIGUSR1); } if (sc->sc_sleepbtn) { sc->sc_sleepbtn = 0; |