[src/trunk]: src/sys/dev/hpc Remove unnecessary (and unimplemented) WSKBD_*BE...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/dev/hpc Remove unnecessary (and unimplemented) WSKBD_*BE...
From: tsutsui <tsutsui%NetBSD.org@localhost>
Date: Mon, 08 Nov 2021 15:37:03 +0000

details:   https://anonhg.NetBSD.org/src/rev/2b74b8859360
branches:  trunk
changeset: 1023619:2b74b8859360
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Sep 18 15:14:40 2021 +0000

description:
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:

 sys/arch/dreamcast/dev/maple/mkbd.c   |  5 ++---
 sys/arch/ews4800mips/dev/ewskbd.c     |  9 ++-------
 sys/arch/ews4800mips/sbd/kbms_sbdio.c |  5 ++---
 sys/arch/mac68k/dev/akbd.c            |  5 ++---
 sys/arch/sgimips/dev/zs_kbd.c         |  9 ++-------
 sys/dev/hpc/hpcfb.c                   |  8 ++------
 6 files changed, 12 insertions(+), 29 deletions(-)

diffs (169 lines):

diff -r de4f1a78032b -r 2b74b8859360 sys/arch/dreamcast/dev/maple/mkbd.c
--- a/sys/arch/dreamcast/dev/maple/mkbd.c       Sat Sep 18 15:09:05 2021 +0000
+++ b/sys/arch/dreamcast/dev/maple/mkbd.c       Sat Sep 18 15:14:40 2021 +0000
@@ -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 @@
        case WSKBDIO_GETLEDS:
                *(int *) data = 0;
                return 0;
-       case WSKBDIO_BELL:
        case WSKBDIO_COMPLEXBELL:
                return 0;
        }
diff -r de4f1a78032b -r 2b74b8859360 sys/arch/ews4800mips/dev/ewskbd.c
--- a/sys/arch/ews4800mips/dev/ewskbd.c Sat Sep 18 15:09:05 2021 +0000
+++ b/sys/arch/ews4800mips/dev/ewskbd.c Sat Sep 18 15:14:40 2021 +0000
@@ -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 @@
                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 -r de4f1a78032b -r 2b74b8859360 sys/arch/ews4800mips/sbd/kbms_sbdio.c
--- a/sys/arch/ews4800mips/sbd/kbms_sbdio.c     Sat Sep 18 15:09:05 2021 +0000
+++ b/sys/arch/ews4800mips/sbd/kbms_sbdio.c     Sat Sep 18 15:14:40 2021 +0000
@@ -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 @@
        case WSKBDIO_GETLEDS:
                *(int *)data = sc->sc_leds;
                return 0;
-       case WSKBDIO_BELL:
        case WSKBDIO_COMPLEXBELL:
                return 0;
        }
diff -r de4f1a78032b -r 2b74b8859360 sys/arch/mac68k/dev/akbd.c
--- a/sys/arch/mac68k/dev/akbd.c        Sat Sep 18 15:09:05 2021 +0000
+++ b/sys/arch/mac68k/dev/akbd.c        Sat Sep 18 15:14:40 2021 +0000
@@ -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 @@
        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 -r de4f1a78032b -r 2b74b8859360 sys/arch/sgimips/dev/zs_kbd.c
--- a/sys/arch/sgimips/dev/zs_kbd.c     Sat Sep 18 15:09:05 2021 +0000
+++ b/sys/arch/sgimips/dev/zs_kbd.c     Sat Sep 18 15:14:40 2021 +0000
@@ -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 @@
                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 -r de4f1a78032b -r 2b74b8859360 sys/dev/hpc/hpcfb.c
--- a/sys/dev/hpc/hpcfb.c       Sat Sep 18 15:09:05 2021 +0000
+++ b/sys/dev/hpc/hpcfb.c       Sat Sep 18 15:14:40 2021 +0000
@@ -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 @@
 
        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);

Prev by Date: [src/trunk]: src/sys/arch/sh3/sh3 Do not obfuscate r0 as "reg_tmp0".
Next by Date: [src/trunk]: src/share/man/man9 Update description of struct timecounter (u_i...
Previous by Thread: [src/trunk]: src/sys/arch/sh3/sh3 Do not obfuscate r0 as "reg_tmp0".
Next by Thread: [src/trunk]: src/share/man/man9 Update description of struct timecounter (u_i...
Indexes:

Home | Main Index | Thread Index | Old Index