[src/trunk]: src/sys/dev/usb minor cleanups from usbmp:

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

details:   https://anonhg.NetBSD.org/src/rev/0988ce70371a
branches:  trunk
changeset: 777959:0988ce70371a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 11 01:06:06 2012 +0000

description:
minor cleanups from usbmp:
- move usbd_delay_ms() into usbdivar.h in the usb_subr.c section
- minor rcsid fixes
- copyright maintenence

diffstat:

 sys/dev/usb/emdtv.c        |   5 +++--
 sys/dev/usb/emdtv_dtv.c    |   5 +++--
 sys/dev/usb/ezload.c       |   5 +++--
 sys/dev/usb/if_aue.c       |   9 +++++----
 sys/dev/usb/if_axe.c       |   6 +++---
 sys/dev/usb/if_cue.c       |   7 ++++---
 sys/dev/usb/if_kue.c       |  13 ++++++-------
 sys/dev/usb/if_otus.c      |   4 ++--
 sys/dev/usb/if_udav.c      |   5 +++--
 sys/dev/usb/if_upgt.c      |   6 +++---
 sys/dev/usb/if_url.c       |   5 +++--
 sys/dev/usb/udsbr.c        |   5 +++--
 sys/dev/usb/ukbd.c         |   5 +++--
 sys/dev/usb/ulpt.c         |   5 ++---
 sys/dev/usb/umass_scsipi.c |   8 ++++----
 sys/dev/usb/umidi.c        |  11 ++++++-----
 sys/dev/usb/umidivar.h     |   7 ++++---
 sys/dev/usb/usb.c          |   8 ++++----
 sys/dev/usb/usbdi.c        |   9 ++++-----
 sys/dev/usb/usbdi_util.h   |   3 +--
 sys/dev/usb/usbdivar.h     |   4 +++-
 sys/dev/usb/utoppy.c       |   6 ++++--
 22 files changed, 76 insertions(+), 65 deletions(-)

diffs (truncated from 598 to 300 lines):

diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/emdtv.c
--- a/sys/dev/usb/emdtv.c       Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/emdtv.c       Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.7 2012/01/09 11:02:18 jmcneill Exp $ */
+/* $NetBSD: emdtv.c,v 1.8 2012/03/11 01:06:06 mrg Exp $ */
 
 /*-
  * Copyright (c) 2008, 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.7 2012/01/09 11:02:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.8 2012/03/11 01:06:06 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -38,6 +38,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/emdtvvar.h>
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/emdtv_dtv.c
--- a/sys/dev/usb/emdtv_dtv.c   Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/emdtv_dtv.c   Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.8 2012/01/09 11:02:18 jmcneill Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.9 2012/03/11 01:06:06 mrg Exp $ */
 
 /*-
  * Copyright (c) 2008, 2011 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.8 2012/01/09 11:02:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.9 2012/03/11 01:06:06 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -37,6 +37,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/i2c/i2cvar.h>
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/ezload.c
--- a/sys/dev/usb/ezload.c      Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/ezload.c      Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $       */
+/*     $NetBSD: ezload.c,v 1.13 2012/03/11 01:06:06 mrg Exp $  */
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.12 2008/04/28 20:23:59 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ezload.c,v 1.13 2012/03/11 01:06:06 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -41,6 +41,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
 
 #include <dev/usb/ezload.h>
 
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_aue.c      Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,5 @@
-/*     $NetBSD: if_aue.c,v 1.125 2012/03/06 03:35:29 mrg Exp $ */
+/*     $NetBSD: if_aue.c,v 1.126 2012/03/11 01:06:06 mrg Exp $ */
+
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -77,7 +78,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.125 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.126 2012/03/11 01:06:06 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -424,7 +425,7 @@
 {
        mutex_exit(&sc->aue_mii_lock);
        if (--sc->aue_refcnt < 0)
-               usb_detach_wakeupold((sc->aue_dev));
+               usb_detach_wakeupold(sc->aue_dev);
 }
 
 Static int
@@ -923,7 +924,7 @@
 
        if (--sc->aue_refcnt >= 0) {
                /* Wait for processes to go away. */
-               usb_detach_waitold((sc->aue_dev));
+               usb_detach_waitold(sc->aue_dev);
        }
        splx(s);
 
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_axe.c
--- a/sys/dev/usb/if_axe.c      Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_axe.c      Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_axe.c,v 1.53 2012/03/06 03:35:29 mrg Exp $  */
+/*     $NetBSD: if_axe.c,v 1.54 2012/03/11 01:06:06 mrg Exp $  */
 /*     $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
 
 /*
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.53 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.54 2012/03/11 01:06:06 mrg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -778,7 +778,7 @@
 
        if (--sc->axe_refcnt >= 0) {
                /* Wait for processes to go away. */
-               usb_detach_waitold((sc->axe_dev));
+               usb_detach_waitold(sc->axe_dev);
        }
        splx(s);
 
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_cue.c
--- a/sys/dev/usb/if_cue.c      Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_cue.c      Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cue.c,v 1.62 2012/02/24 06:48:24 mrg Exp $  */
+/*     $NetBSD: if_cue.c,v 1.63 2012/03/11 01:06:06 mrg Exp $  */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.62 2012/02/24 06:48:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.63 2012/03/11 01:06:06 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -68,7 +68,7 @@
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-
+#include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/rnd.h>
 
@@ -86,6 +86,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_cuereg.h>
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_kue.c
--- a/sys/dev/usb/if_kue.c      Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_kue.c      Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,5 @@
-/*     $NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $  */
+/*     $NetBSD: if_kue.c,v 1.77 2012/03/11 01:06:06 mrg Exp $  */
+
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -70,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.76 2012/03/10 23:01:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_kue.c,v 1.77 2012/03/11 01:06:06 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -83,25 +84,23 @@
 #include <sys/socket.h>
 #include <sys/device.h>
 #include <sys/proc.h>
-
 #include <sys/rnd.h>
 
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <net/if_dl.h>
+#include <net/bpf.h>
+#include <net/if_ether.h>
 
-#include <net/bpf.h>
-
-#include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 #endif
 
-
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_kuereg.h>
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_otus.c
--- a/sys/dev/usb/if_otus.c     Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_otus.c     Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_otus.c,v 1.9 2010/12/02 17:38:05 christos Exp $     */
+/*     $NetBSD: if_otus.c,v 1.10 2012/03/11 01:06:06 mrg Exp $ */
 /*     $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $        */
 
 /*-
@@ -31,7 +31,6 @@
 #include <sys/callout.h>
 #include <sys/device.h>
 #include <sys/proc.h>
-
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/intr.h>
@@ -58,6 +57,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>
+#include <dev/usb/usbdivar.h>
 #include <dev/usb/usbdevs.h>
 
 #include <dev/usb/if_otusreg.h>
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_udav.c
--- a/sys/dev/usb/if_udav.c     Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_udav.c     Sun Mar 11 01:06:06 2012 +0000
@@ -1,5 +1,6 @@
-/*     $NetBSD: if_udav.c,v 1.36 2012/03/06 03:35:29 mrg Exp $ */
+/*     $NetBSD: if_udav.c,v 1.37 2012/03/11 01:06:06 mrg Exp $ */
 /*     $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $   */
+
 /*
  * Copyright (c) 2003
  *     Shingo WATANABE <nabe%nabechan.org@localhost>.  All rights reserved.
@@ -44,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.36 2012/03/06 03:35:29 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.37 2012/03/11 01:06:06 mrg Exp $");
 
 #include "opt_inet.h"
 
diff -r 66819c8e6550 -r 0988ce70371a sys/dev/usb/if_upgt.c
--- a/sys/dev/usb/if_upgt.c     Sun Mar 11 00:57:44 2012 +0000
+++ b/sys/dev/usb/if_upgt.c     Sun Mar 11 01:06:06 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_upgt.c,v 1.5 2011/12/23 00:51:43 jakllsch Exp $     */
+/*     $NetBSD: if_upgt.c,v 1.6 2012/03/11 01:06:06 mrg Exp $  */
 /*     $OpenBSD: if_upgt.c,v 1.49 2010/04/20 22:05:43 tedu Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.5 2011/12/23 00:51:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upgt.c,v 1.6 2012/03/11 01:06:06 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/callout.h>
@@ -31,7 +31,6 @@
 #include <sys/sockio.h>
 #include <sys/systm.h>
 #include <sys/vnode.h>
-
 #include <sys/bus.h>
 #include <sys/endian.h>
 #include <sys/intr.h>
@@ -52,6 +51,7 @@
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
 #include <dev/usb/usbdi_util.h>