Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

report power button events to sysmon

Browse Source
This commit is contained in:
macallan 2007-02-20 01:27:25 +00:00
parent b8abdd4f69
commit f6a33e5a19
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/dev/adb/adb_kbd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: adb_kbd.c,v 1.2 2007/01/18 00:49:17 macallan Exp $ */
/* $NetBSD: adb_kbd.c,v 1.3 2007/02/20 01:27:25 macallan Exp $ */
/*
* Copyright (C) 1998 Colin Wood
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.2 2007/01/18 00:49:17 macallan Exp $");
__KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.3 2007/02/20 01:27:25 macallan Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -49,6 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: adb_kbd.c,v 1.2 2007/01/18 00:49:17 macallan Exp $")
#include <dev/wscons/wsksymvar.h>
#include <dev/wscons/wsmousevar.h>
#include <dev/sysmon/sysmonvar.h>
#include <dev/sysmon/sysmon_taskq.h>
#include <machine/autoconf.h>
#include <machine/keyboard.h>
#include <machine/adbsys.h>
@ -64,6 +67,7 @@ struct adbkbd_softc {
struct adb_bus_accessops *sc_ops;
struct device *sc_wskbddev;
struct device *sc_wsmousedev;
struct sysmon_pswitch sc_sm_pbutton;
int sc_leds;
int sc_have_led_control;
int sc_msg_len;
@ -294,6 +298,15 @@ adbkbd_attach(struct device *parent, struct device *self, void *aux)
if (sc->sc_wsmousedev != NULL)
adbkbd_setup_sysctl(sc);
/* finally register the power button */
sysmon_task_queue_init();
memset(&sc->sc_sm_pbutton, 0, sizeof(struct sysmon_pswitch));
sc->sc_sm_pbutton.smpsw_name = sc->sc_dev.dv_xname;
sc->sc_sm_pbutton.smpsw_type = PSWITCH_TYPE_POWER;
if (sysmon_pswitch_register(&sc->sc_sm_pbutton) != 0)
printf("%s: unable to register power button with sysmon\n",
sc->sc_dev.dv_xname);
}
static void
@ -344,14 +357,19 @@ adbkbd_wait(struct adbkbd_softc *sc, int timeout)
static void
adbkbd_keys(struct adbkbd_softc *sc, uint8_t k1, uint8_t k2)
{
/* keyboard event processing */
DPRINTF("[%02x %02x]", k1, k2);
if (((k1 == k2) && (k1 == 0x7f)) || (k1 == 0x7e)) {
/* power button, handle separately */
#ifdef ADBKBD_POWER_PANIC
panic("power button pressed");
#endif
/* power button, report to sysmon */
sysmon_pswitch_event(&sc->sc_sm_pbutton,
ADBK_PRESS(k1) ? PSWITCH_EVENT_PRESSED :
PSWITCH_EVENT_RELEASED);
} else {
adbkbd_key(sc, k1);
if (k2 != 0xff)
adbkbd_key(sc, k2);

4
sys/dev/adb/files.adb
View File

@ -1,5 +1,5 @@
#
# $NetBSD: files.adb,v 1.3 2007/02/10 03:38:47 tsutsui Exp $
# $NetBSD: files.adb,v 1.4 2007/02/20 01:27:25 macallan Exp $
#
# Apple Desktop Bus protocol and drivers
@ -14,7 +14,7 @@ device nadb {}
attach nadb at adb_bus
file dev/adb/adb_bus.c nadb needs-flag
device adbkbd : wskbddev, wsmousedev
device adbkbd : wskbddev, wsmousedev, sysmon_power, sysmon_taskq
attach adbkbd at nadb
file dev/adb/adb_kbd.c adbkbd needs-flag