Module Name: src Committed By: christos Date: Wed May 2 14:54:26 UTC 2012
Modified Files: src/sys/dev/sun: kbd.c Log Message: make this compile again. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/dev/sun/kbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/sun/kbd.c diff -u src/sys/dev/sun/kbd.c:1.65 src/sys/dev/sun/kbd.c:1.66 --- src/sys/dev/sun/kbd.c:1.65 Fri Apr 27 05:30:13 2012 +++ src/sys/dev/sun/kbd.c Wed May 2 10:54:26 2012 @@ -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_s /* 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 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, in } 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