[src/trunk]: src/sys/dev/usb localify

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

details:   https://anonhg.NetBSD.org/src/rev/29d5d429f48b
branches:  trunk
changeset: 1005163:29d5d429f48b
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Dec 01 08:23:09 2019 +0000

description:
localify

diffstat:

 sys/arch/x86/include/i82489var.h |   3 +-
 sys/arch/x86/x86/lapic.c         |  12 +-----
 sys/dev/usb/if_ural.c            |  20 +++++-----
 sys/dev/usb/uaudio.c             |  24 ++++++------
 sys/dev/usb/uberry.c             |  17 ++++-----
 sys/dev/usb/ubt.c                |  22 ++++++------
 sys/dev/usb/ucycom.c             |  52 ++++++++++++++--------------
 sys/dev/usb/udsbr.c              |  26 +++++++-------
 sys/dev/usb/uep.c                |  26 +++++++-------
 sys/dev/usb/ugen.c               |  56 ++++++++++++++++----------------
 sys/dev/usb/uhid.c               |  48 +++++++++++++-------------
 sys/dev/usb/uhso.c               |  48 +++++++++++++-------------
 sys/dev/usb/ulpt.c               |  70 +++++++++++++++++++--------------------
 sys/dev/usb/umidi.c              |  24 ++++++------
 sys/dev/usb/ums.c                |  28 ++++++++--------
 sys/dev/usb/urio.c               |  40 +++++++++++-----------
 sys/dev/usb/usscanner.c          |  24 ++++++------
 sys/dev/usb/ustir.c              |  22 ++++++------
 sys/dev/usb/uthum.c              |  51 ++++++++++++++--------------
 sys/dev/usb/utoppy.c             |  40 +++++++++++-----------
 sys/dev/usb/uvideo.c             |  24 ++++++------
 sys/dev/usb/uvscom.c             |  22 ++++++------
 sys/dev/usb/uyap.c               |  24 ++++++------
 23 files changed, 356 insertions(+), 367 deletions(-)

diffs (truncated from 2317 to 300 lines):

diff -r 4e343115170c -r 29d5d429f48b sys/arch/x86/include/i82489var.h
--- a/sys/arch/x86/include/i82489var.h  Sun Dec 01 08:19:09 2019 +0000
+++ b/sys/arch/x86/include/i82489var.h  Sun Dec 01 08:23:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82489var.h,v 1.19 2017/05/23 08:54:39 nonaka Exp $    */
+/*     $NetBSD: i82489var.h,v 1.20 2019/12/01 08:23:09 maxv Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -94,7 +94,6 @@
 extern uint32_t lapic_readreg(u_int);
 extern void lapic_writereg(u_int, uint32_t);
 extern void lapic_write_tpri(uint32_t);
-extern void lapic_eoi(void);
 extern uint32_t lapic_cpu_number(void);
 extern bool lapic_is_x2apic(void);
 
diff -r 4e343115170c -r 29d5d429f48b sys/arch/x86/x86/lapic.c
--- a/sys/arch/x86/x86/lapic.c  Sun Dec 01 08:19:09 2019 +0000
+++ b/sys/arch/x86/x86/lapic.c  Sun Dec 01 08:23:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lapic.c,v 1.75 2019/06/14 09:23:42 msaitoh Exp $       */
+/*     $NetBSD: lapic.c,v 1.76 2019/12/01 08:23:09 maxv Exp $  */
 
 /*-
  * Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.75 2019/06/14 09:23:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.76 2019/12/01 08:23:09 maxv Exp $");
 
 #include "acpica.h"
 #include "ioapic.h"
@@ -206,12 +206,6 @@
 #endif
 }
 
-void
-lapic_eoi(void)
-{
-       lapic_writereg(LAPIC_EOI, 0);
-}
-
 uint32_t
 lapic_cpu_number(void)
 {
@@ -594,7 +588,7 @@
        lapic_writereg(LAPIC_ICR_TIMER, lapic_tval);
        lapic_writereg(LAPIC_LVT_TIMER,
            LAPIC_LVT_TMM_PERIODIC | LAPIC_TIMER_VECTOR);
-       lapic_eoi();
+       lapic_writereg(LAPIC_EOI, 0);
 }
 
 extern u_long rtclock_tval; /* XXX put in header file */
diff -r 4e343115170c -r 29d5d429f48b sys/dev/usb/if_ural.c
--- a/sys/dev/usb/if_ural.c     Sun Dec 01 08:19:09 2019 +0000
+++ b/sys/dev/usb/if_ural.c     Sun Dec 01 08:23:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ural.c,v 1.60 2019/09/14 12:42:36 maxv Exp $ */
+/*     $NetBSD: if_ural.c,v 1.61 2019/12/01 08:27:54 maxv Exp $ */
 /*     $FreeBSD: /repoman/r/ncvs/src/sys/dev/usb/if_ural.c,v 1.40 2006/06/02 23:14:40 sam Exp $        */
 
 /*-
@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.60 2019/09/14 12:42:36 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ural.c,v 1.61 2019/12/01 08:27:54 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -335,15 +335,15 @@
        { 161, 0x08808, 0x0242f, 0x00281 }
 };
 
-int    ural_match(device_t, cfdata_t, void *);
-void   ural_attach(device_t, device_t, void *);
-int    ural_detach(device_t, int);
-int    ural_activate(device_t, enum devact);
+static int     ural_match(device_t, cfdata_t, void *);
+static void    ural_attach(device_t, device_t, void *);
+static int     ural_detach(device_t, int);
+static int     ural_activate(device_t, enum devact);
 
 CFATTACH_DECL_NEW(ural, sizeof(struct ural_softc), ural_match, ural_attach,
     ural_detach, ural_activate);
 
-int
+static int
 ural_match(device_t parent, cfdata_t match, void *aux)
 {
        struct usb_attach_arg *uaa = aux;
@@ -352,7 +352,7 @@
            UMATCH_VENDOR_PRODUCT : UMATCH_NONE;
 }
 
-void
+static void
 ural_attach(device_t parent, device_t self, void *aux)
 {
        struct ural_softc *sc = device_private(self);
@@ -524,7 +524,7 @@
        return;
 }
 
-int
+static int
 ural_detach(device_t self, int flags)
 {
        struct ural_softc *sc = device_private(self);
@@ -2267,7 +2267,7 @@
        }
 }
 
-int
+static int
 ural_activate(device_t self, enum devact act)
 {
        struct ural_softc *sc = device_private(self);
diff -r 4e343115170c -r 29d5d429f48b sys/dev/usb/uaudio.c
--- a/sys/dev/usb/uaudio.c      Sun Dec 01 08:19:09 2019 +0000
+++ b/sys/dev/usb/uaudio.c      Sun Dec 01 08:23:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uaudio.c,v 1.162 2019/11/04 05:46:39 isaki Exp $       */
+/*     $NetBSD: uaudio.c,v 1.163 2019/12/01 08:27:54 maxv Exp $        */
 
 /*
  * Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.162 2019/11/04 05:46:39 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.163 2019/12/01 08:27:54 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -367,11 +367,11 @@
        .get_locks              = uaudio_get_locks,
 };
 
-int uaudio_match(device_t, cfdata_t, void *);
-void uaudio_attach(device_t, device_t, void *);
-int uaudio_detach(device_t, int);
-void uaudio_childdet(device_t, device_t);
-int uaudio_activate(device_t, enum devact);
+static int uaudio_match(device_t, cfdata_t, void *);
+static void uaudio_attach(device_t, device_t, void *);
+static int uaudio_detach(device_t, int);
+static void uaudio_childdet(device_t, device_t);
+static int uaudio_activate(device_t, enum devact);
 
 
 
@@ -379,7 +379,7 @@
     uaudio_match, uaudio_attach, uaudio_detach, uaudio_activate, NULL,
     uaudio_childdet);
 
-int
+static int
 uaudio_match(device_t parent, cfdata_t match, void *aux)
 {
        struct usbif_attach_arg *uiaa = aux;
@@ -393,7 +393,7 @@
        return UMATCH_IFACECLASS_IFACESUBCLASS;
 }
 
-void
+static void
 uaudio_attach(device_t parent, device_t self, void *aux)
 {
        struct uaudio_softc *sc = device_private(self);
@@ -490,7 +490,7 @@
        return;
 }
 
-int
+static int
 uaudio_activate(device_t self, enum devact act)
 {
        struct uaudio_softc *sc = device_private(self);
@@ -504,7 +504,7 @@
        }
 }
 
-void
+static void
 uaudio_childdet(device_t self, device_t child)
 {
        struct uaudio_softc *sc = device_private(self);
@@ -513,7 +513,7 @@
        sc->sc_audiodev = NULL;
 }
 
-int
+static int
 uaudio_detach(device_t self, int flags)
 {
        struct uaudio_softc *sc = device_private(self);
diff -r 4e343115170c -r 29d5d429f48b sys/dev/usb/uberry.c
--- a/sys/dev/usb/uberry.c      Sun Dec 01 08:19:09 2019 +0000
+++ b/sys/dev/usb/uberry.c      Sun Dec 01 08:23:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uberry.c,v 1.14 2019/05/05 03:17:54 mrg Exp $  */
+/*     $NetBSD: uberry.c,v 1.15 2019/12/01 08:27:54 maxv Exp $ */
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.14 2019/05/05 03:17:54 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uberry.c,v 1.15 2019/12/01 08:27:54 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -89,10 +89,9 @@
 #define uberry_lookup(v, p) usb_lookup(uberry_devs, v, p)
 #define UBERRY_CONFIG_NO 1
 
-int    uberry_match(device_t, cfdata_t, void *);
-void   uberry_attach(device_t, device_t, void *);
-int    uberry_detach(device_t, int);
-int    uberry_activate(device_t, enum devact);
+static int     uberry_match(device_t, cfdata_t, void *);
+static void    uberry_attach(device_t, device_t, void *);
+static int     uberry_detach(device_t, int);
 
 CFATTACH_DECL_NEW(uberry, sizeof(struct uberry_softc), uberry_match,
     uberry_attach, uberry_detach, NULL);
@@ -156,7 +155,7 @@
 }
 
 
-int
+static int
 uberry_match(device_t parent, cfdata_t match, void *aux)
 {
        struct usb_attach_arg *uaa = aux;
@@ -166,7 +165,7 @@
                UMATCH_VENDOR_PRODUCT : UMATCH_NONE);
 }
 
-void
+static void
 uberry_attach(device_t parent, device_t self, void *aux)
 {
        struct uberry_softc *sc = device_private(self);
@@ -199,7 +198,7 @@
        return;
 }
 
-int
+static int
 uberry_detach(device_t self, int flags)
 {
        struct uberry_softc *sc = device_private(self);
diff -r 4e343115170c -r 29d5d429f48b sys/dev/usb/ubt.c
--- a/sys/dev/usb/ubt.c Sun Dec 01 08:19:09 2019 +0000
+++ b/sys/dev/usb/ubt.c Sun Dec 01 08:23:09 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubt.c,v 1.63 2019/09/22 07:29:16 dsainty Exp $ */
+/*     $NetBSD: ubt.c,v 1.64 2019/12/01 08:27:54 maxv Exp $    */
 
 /*-
  * Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.63 2019/09/22 07:29:16 dsainty Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.64 2019/12/01 08:27:54 maxv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -289,10 +289,10 @@
  *
  */
 
-int    ubt_match(device_t, cfdata_t, void *);
-void   ubt_attach(device_t, device_t, void *);
-int    ubt_detach(device_t, int);
-int    ubt_activate(device_t, enum devact);
+static int     ubt_match(device_t, cfdata_t, void *);
+static void    ubt_attach(device_t, device_t, void *);
+static int     ubt_detach(device_t, int);
+static int     ubt_activate(device_t, enum devact);
 
 CFATTACH_DECL_NEW(ubt, sizeof(struct ubt_softc), ubt_match, ubt_attach,
     ubt_detach, ubt_activate);
@@ -306,7 +306,7 @@
  * Use value of -1 to indicate a wildcard
  * To override another entry, add details earlier
  */
-const struct ubt_devno {