diff options
| author | christos <christos@NetBSD.org> | 2012-05-02 14:54:26 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2012-05-02 14:54:26 +0000 |
| commit | 738430c0aa11368c8024ec0285739838530b678c (patch) | |
| tree | b98d3b96c28267097a247f889c0a484b864ebbe1 /sys/dev | |
| parent | b0384e441043e3811a5ad9bdbadacb31de193d2e (diff) | |
make this compile again.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/sun/kbd.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/sys/dev/sun/kbd.c b/sys/dev/sun/kbd.c index 0a2965c25d8..8afa9f8c47d 100644 --- a/sys/dev/sun/kbd.c +++ b/sys/dev/sun/kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbd.c,v 1.65 2012/04/27 09:30:13 martin Exp $ */ +/* $NetBSD: kbd.c,v 1.66 2012/05/02 14:54:26 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.65 2012/04/27 09:30:13 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.66 2012/05/02 14:54:26 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,10 +154,6 @@ static void kbd_input_wskbd(struct kbd_softc *, int); /* firm events input */ static void kbd_input_event(struct kbd_softc *, int); -#if NSYSMON_ENVSYS -static void kbd_powerbutton(void *); -#endif - /**************************************************************** * Entry points for /dev/kbd * (open,close,read,write,...) @@ -901,6 +897,17 @@ kbd_bell(int on) } #if NWSKBD > 0 + +#if NSYSMON_ENVSYS +static void +kbd_powerbutton(void *cookie) +{ + struct kbd_softc *k = cookie; + + sysmon_pswitch_event(&k->k_sm_pbutton, k->k_ev); +} +#endif + static void kbd_input_wskbd(struct kbd_softc *k, int code) { @@ -935,7 +942,8 @@ kbd_input_wskbd(struct kbd_softc *k, int code) k->k_ev = KEY_UP(code) ? PSWITCH_EVENT_RELEASED : PSWITCH_EVENT_PRESSED; - sysmon_task_queue_sched(0, kbd_powerbutton, k); + sysmon_task_queue_sched(0, + kbd_powerbutton, k); #endif return; } @@ -1091,15 +1099,4 @@ kbd_wskbd_attach(struct kbd_softc *k, int isconsole) } config_interrupts(k->k_dev, kbd_enable); } - -#if NSYSMON_ENVSYS -static void -kbd_powerbutton(void *cookie) -{ - struct kbd_softc *k = cookie; - - sysmon_pswitch_event(&k->k_sm_pbutton, k->k_ev); -} -#endif - #endif |
