diff options
| author | tsutsui <tsutsui@NetBSD.org> | 2021-09-18 15:14:40 +0000 |
|---|---|---|
| committer | tsutsui <tsutsui@NetBSD.org> | 2021-09-18 15:14:40 +0000 |
| commit | c6e39b64cfe56dfbee9cbd7b4397dec8e2eb9eec (patch) | |
| tree | cfa1e42f9252da420f6e52fb245b24bbb0c2717c /sys | |
| parent | 0d9fbcb53b6cd54948fa3f0cfef5dc1a372e50f8 (diff) | |
Remove unnecessary (and unimplemented) WSKBD_*BELL ioctls in kbd drivers.
It looks the only ioctl(4) to be implemented for WSKBDIO_*BELL in
the backend keyboard driver is WSKBDIO_COMPLEXBELL.
All other BELL ioctls (WSKBDIO_BELL, WSKBDIO_SETBELL, WSKBDIO_GETBELL,
WSKBDIO_SETDEFAULTBELL, and WSKBDIO_GETDEFAULTBELL) are handled in the
MI wskbd driver (in wskbd_displayioctl() in src/sys/dev/wscons/wskbd.c).
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/dreamcast/dev/maple/mkbd.c | 5 | ||||
| -rw-r--r-- | sys/arch/ews4800mips/dev/ewskbd.c | 9 | ||||
| -rw-r--r-- | sys/arch/ews4800mips/sbd/kbms_sbdio.c | 5 | ||||
| -rw-r--r-- | sys/arch/mac68k/dev/akbd.c | 5 | ||||
| -rw-r--r-- | sys/arch/sgimips/dev/zs_kbd.c | 9 | ||||
| -rw-r--r-- | sys/dev/hpc/hpcfb.c | 8 |
6 files changed, 12 insertions, 29 deletions
diff --git a/sys/arch/dreamcast/dev/maple/mkbd.c b/sys/arch/dreamcast/dev/maple/mkbd.c index c8519a2f3ba..6e70d5957fd 100644 --- a/sys/arch/dreamcast/dev/maple/mkbd.c +++ b/sys/arch/dreamcast/dev/maple/mkbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: mkbd.c,v 1.31 2021/08/07 16:18:48 thorpej Exp $ */ +/* $NetBSD: mkbd.c,v 1.32 2021/09/18 15:14:40 tsutsui Exp $ */ /*- * Copyright (c) 2001 Marcus Comstedt @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.31 2021/08/07 16:18:48 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mkbd.c,v 1.32 2021/09/18 15:14:40 tsutsui Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -216,7 +216,6 @@ mkbd_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l) case WSKBDIO_GETLEDS: *(int *) data = 0; return 0; - case WSKBDIO_BELL: case WSKBDIO_COMPLEXBELL: return 0; } diff --git a/sys/arch/ews4800mips/dev/ewskbd.c b/sys/arch/ews4800mips/dev/ewskbd.c index b60209c5229..26b73b316db 100644 --- a/sys/arch/ews4800mips/dev/ewskbd.c +++ b/sys/arch/ews4800mips/dev/ewskbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: ewskbd.c,v 1.13 2021/08/07 16:18:53 thorpej Exp $ */ +/* $NetBSD: ewskbd.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $ */ /*- * Copyright (c) 2005 Izumi Tsutsui. All rights reserved. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.13 2021/08/07 16:18:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ewskbd.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $"); #include <sys/param.h> #include <sys/kmem.h> @@ -494,12 +494,7 @@ ewskbd_wskbd_ioctl(void *cookie, u_long cmd, void *data, int flag, break; #ifdef notyet - case WSKBDIO_BELL: case WSKBDIO_COMPLEXBELL: - case WSKBDIO_SETBELL: - case WSKBDIO_GETBELL: - case WSKBDIO_SETDEFAULTBELL: - case WSKBDIO_GETDEFAULTBELL: case WSKBDIO_SETKEYREPEAT: case WSKBDIO_GETKEYREPEAT: case WSKBDIO_SETDEFAULTKEYREPEAT: diff --git a/sys/arch/ews4800mips/sbd/kbms_sbdio.c b/sys/arch/ews4800mips/sbd/kbms_sbdio.c index 01a27e48eca..a6f60e7f080 100644 --- a/sys/arch/ews4800mips/sbd/kbms_sbdio.c +++ b/sys/arch/ews4800mips/sbd/kbms_sbdio.c @@ -1,4 +1,4 @@ -/* $NetBSD: kbms_sbdio.c,v 1.13 2021/08/07 16:18:53 thorpej Exp $ */ +/* $NetBSD: kbms_sbdio.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $ */ /*- * Copyright (c) 2004, 2005 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.13 2021/08/07 16:18:53 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kbms_sbdio.c,v 1.14 2021/09/18 15:14:40 tsutsui Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -408,7 +408,6 @@ kbd_ioctl(void *arg, u_long cmd, void *data, int flag, struct lwp *l) case WSKBDIO_GETLEDS: *(int *)data = sc->sc_leds; return 0; - case WSKBDIO_BELL: case WSKBDIO_COMPLEXBELL: return 0; } diff --git a/sys/arch/mac68k/dev/akbd.c b/sys/arch/mac68k/dev/akbd.c index 3e8135fe530..440060e2953 100644 --- a/sys/arch/mac68k/dev/akbd.c +++ b/sys/arch/mac68k/dev/akbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: akbd.c,v 1.26 2021/08/07 16:18:57 thorpej Exp $ */ +/* $NetBSD: akbd.c,v 1.27 2021/09/18 15:14:40 tsutsui Exp $ */ /* * Copyright (C) 1998 Colin Wood @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.26 2021/08/07 16:18:57 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: akbd.c,v 1.27 2021/09/18 15:14:40 tsutsui Exp $"); #include "opt_adb.h" @@ -471,7 +471,6 @@ akbd_ioctl(void *v, u_long cmd, void *data, int flag, struct lwp *l) case WSKBDIO_GETLEDS: *(int *)data = 0; return 0; - case WSKBDIO_BELL: case WSKBDIO_COMPLEXBELL: #define d ((struct wskbd_bell_data *)data) mac68k_ring_bell(d->pitch, d->period * hz / 1000, 100); diff --git a/sys/arch/sgimips/dev/zs_kbd.c b/sys/arch/sgimips/dev/zs_kbd.c index aef9e061af1..0bdb49b803d 100644 --- a/sys/arch/sgimips/dev/zs_kbd.c +++ b/sys/arch/sgimips/dev/zs_kbd.c @@ -1,4 +1,4 @@ -/* $NetBSD: zs_kbd.c,v 1.13 2021/08/07 16:19:04 thorpej Exp $ */ +/* $NetBSD: zs_kbd.c,v 1.14 2021/09/18 15:14:41 tsutsui Exp $ */ /* * Copyright (c) 2004 Steve Rumble @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.13 2021/08/07 16:19:04 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: zs_kbd.c,v 1.14 2021/09/18 15:14:41 tsutsui Exp $"); #include <sys/param.h> #include <sys/kmem.h> @@ -536,12 +536,7 @@ zskbd_wskbd_ioctl(void *cookie, u_long cmd, break; #ifdef notyet - case WSKBDIO_BELL: case WSKBDIO_COMPLEXBELL: - case WSKBDIO_SETBELL: - case WSKBDIO_GETBELL: - case WSKBDIO_SETDEFAULTBELL: - case WSKBDIO_GETDEFAULTBELL: case WSKBDIO_SETKEYREPEAT: case WSKBDIO_GETKEYREPEAT: case WSKBDIO_SETDEFAULTKEYREPEAT: diff --git a/sys/dev/hpc/hpcfb.c b/sys/dev/hpc/hpcfb.c index 06f7d649b53..05969928f51 100644 --- a/sys/dev/hpc/hpcfb.c +++ b/sys/dev/hpc/hpcfb.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpcfb.c,v 1.63 2021/08/07 16:19:11 thorpej Exp $ */ +/* $NetBSD: hpcfb.c,v 1.64 2021/09/18 15:14:41 tsutsui Exp $ */ /*- * Copyright (c) 1999 @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.63 2021/08/07 16:19:11 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpcfb.c,v 1.64 2021/09/18 15:14:41 tsutsui Exp $"); #ifdef _KERNEL_OPT #include "opt_hpcfb.h" @@ -563,10 +563,6 @@ hpcfb_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, DPRINTF(("hpcfb_ioctl(cmd=0x%lx)\n", cmd)); switch (cmd) { - case WSKBDIO_BELL: - return (0); - break; - case WSDISPLAYIO_GTYPE: *(u_int *)data = WSDISPLAY_TYPE_HPCFB; return (0); |
