Module Name: src
Committed By: tsutsui
Date: Sat Sep 18 15:14:41 UTC 2021
Modified Files:
src/sys/arch/dreamcast/dev/maple: mkbd.c
src/sys/arch/ews4800mips/dev: ewskbd.c
src/sys/arch/ews4800mips/sbd: kbms_sbdio.c
src/sys/arch/mac68k/dev: akbd.c
src/sys/arch/sgimips/dev: zs_kbd.c
src/sys/dev/hpc: hpcfb.c
Log Message:
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).
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/dreamcast/dev/maple/mkbd.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ews4800mips/dev/ewskbd.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mac68k/dev/akbd.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sgimips/dev/zs_kbd.c
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/hpc/hpcfb.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/arch/dreamcast/dev/maple/mkbd.c
diff -u src/sys/arch/dreamcast/dev/maple/mkbd.c:1.31 src/sys/arch/dreamcast/dev/maple/mkbd.c:1.32
--- src/sys/arch/dreamcast/dev/maple/mkbd.c:1.31 Sat Aug 7 16:18:48 2021
+++ src/sys/arch/dreamcast/dev/maple/mkbd.c Sat Sep 18 15:14:40 2021
@@ -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 *da
case WSKBDIO_GETLEDS:
*(int *) data = 0;
return 0;
- case WSKBDIO_BELL:
case WSKBDIO_COMPLEXBELL:
return 0;
}
Index: src/sys/arch/ews4800mips/dev/ewskbd.c
diff -u src/sys/arch/ews4800mips/dev/ewskbd.c:1.13 src/sys/arch/ews4800mips/dev/ewskbd.c:1.14
--- src/sys/arch/ews4800mips/dev/ewskbd.c:1.13 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/ews4800mips/dev/ewskbd.c Sat Sep 18 15:14:40 2021
@@ -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
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:
Index: src/sys/arch/ews4800mips/sbd/kbms_sbdio.c
diff -u src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.13 src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.14
--- src/sys/arch/ews4800mips/sbd/kbms_sbdio.c:1.13 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/ews4800mips/sbd/kbms_sbdio.c Sat Sep 18 15:14:40 2021
@@ -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 *d
case WSKBDIO_GETLEDS:
*(int *)data = sc->sc_leds;
return 0;
- case WSKBDIO_BELL:
case WSKBDIO_COMPLEXBELL:
return 0;
}
Index: src/sys/arch/mac68k/dev/akbd.c
diff -u src/sys/arch/mac68k/dev/akbd.c:1.26 src/sys/arch/mac68k/dev/akbd.c:1.27
--- src/sys/arch/mac68k/dev/akbd.c:1.26 Sat Aug 7 16:18:57 2021
+++ src/sys/arch/mac68k/dev/akbd.c Sat Sep 18 15:14:40 2021
@@ -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 *da
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);
Index: src/sys/arch/sgimips/dev/zs_kbd.c
diff -u src/sys/arch/sgimips/dev/zs_kbd.c:1.13 src/sys/arch/sgimips/dev/zs_kbd.c:1.14
--- src/sys/arch/sgimips/dev/zs_kbd.c:1.13 Sat Aug 7 16:19:04 2021
+++ src/sys/arch/sgimips/dev/zs_kbd.c Sat Sep 18 15:14:41 2021
@@ -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 c
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:
Index: src/sys/dev/hpc/hpcfb.c
diff -u src/sys/dev/hpc/hpcfb.c:1.63 src/sys/dev/hpc/hpcfb.c:1.64
--- src/sys/dev/hpc/hpcfb.c:1.63 Sat Aug 7 16:19:11 2021
+++ src/sys/dev/hpc/hpcfb.c Sat Sep 18 15:14:41 2021
@@ -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 cm
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);
