[src/trunk]: src/sys/dev/usb use quirk bit for devices that need sc_alwayson ...

[macallan <macallan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6314ce640bed
branches:  trunk
changeset: 1023911:6314ce640bed
user:      macallan <macallan%NetBSD.org@localhost>
date:      Fri Oct 01 21:14:06 2021 +0000

description:
use quirk bit for devices that need sc_alwayson instead of adding yet another
if (uha->uiaa->uiaa_vendor == USB_VENDOR_..., remove entries now covered
by UQ_ALWAYS_ON

diffstat:

 sys/dev/usb/ums.c |  25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)

diffs (53 lines):

diff -r b83aef352670 -r 6314ce640bed sys/dev/usb/ums.c
--- a/sys/dev/usb/ums.c Fri Oct 01 21:09:50 2021 +0000
+++ b/sys/dev/usb/ums.c Fri Oct 01 21:14:06 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ums.c,v 1.100 2021/02/03 23:26:08 thorpej Exp $        */
+/*     $NetBSD: ums.c,v 1.101 2021/10/01 21:14:06 macallan Exp $       */
 
 /*
  * Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.100 2021/02/03 23:26:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.101 2021/10/01 21:14:06 macallan Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -155,6 +155,8 @@
                sc->sc_ms.flags |= HIDMS_REVZ;
        if (quirks & UQ_SPUR_BUT_UP)
                sc->sc_ms.flags |= HIDMS_SPUR_BUT_UP;
+       if (quirks & UQ_ALWAYS_ON)
+               sc->sc_alwayson = true;
 
        if (!pmf_device_register(self, NULL, NULL))
                aprint_error_dev(self, "couldn't establish power handler\n");
@@ -201,25 +203,6 @@
                }
        }
 
-       if (uha->uiaa->uiaa_vendor == USB_VENDOR_HAILUCK &&
-           uha->uiaa->uiaa_product == USB_PRODUCT_HAILUCK_KEYBOARD) {
-               /*
-                * The HAILUCK USB Keyboard has a built-in touchpad, which
-                * needs to be active for the keyboard to function properly.
-                */
-               sc->sc_alwayson = true;
-       }
-
-       if (uha->uiaa->uiaa_vendor == USB_VENDOR_CHICONY &&
-           uha->uiaa->uiaa_product == USB_PRODUCT_CHICONY_OPTMOUSE0939) {
-               /*
-                * This cheap mouse will disconnect after 60 seconds,
-                * reconnect, and then disconnect again (ad nauseum)
-                * unless it's kept open.
-                */
-               sc->sc_alwayson = true;
-       }
-
        tpcalib_init(&sc->sc_ms.sc_tpcalib);
 
        /* calibrate the pointer if it reports absolute events */