[src/trunk]: src/sys/dev/usb remove any remnants of freebsd/openbsd code.

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

details:   https://anonhg.NetBSD.org/src/rev/9eea6635cd3c
branches:  trunk
changeset: 777584:9eea6635cd3c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Feb 24 06:48:23 2012 +0000

description:
remove any remnants of freebsd/openbsd code.

diffstat:

 sys/dev/usb/hid.c         |    6 +-
 sys/dev/usb/if_axe.c      |    9 +--
 sys/dev/usb/if_cdce.c     |    7 +-
 sys/dev/usb/if_cue.c      |   47 +-----------------
 sys/dev/usb/uaudio.c      |    8 +--
 sys/dev/usb/ubsa.c        |   16 +-----
 sys/dev/usb/ubsa_common.c |   11 +---
 sys/dev/usb/ucom.c        |   14 +-----
 sys/dev/usb/ugen.c        |   72 +-----------------------------
 sys/dev/usb/uhcivar.h     |    9 +---
 sys/dev/usb/uhid.c        |   10 +---
 sys/dev/usb/ukbd.c        |   18 +-----
 sys/dev/usb/ukyopon.c     |    7 +--
 sys/dev/usb/ulpt.c        |   89 +------------------------------------
 sys/dev/usb/umass.c       |  110 ++++++++++++++++++++++-----------------------
 sys/dev/usb/umodem.c      |    7 +--
 sys/dev/usb/urio.c        |   67 +---------------------------
 sys/dev/usb/usb_mem.c     |    9 +--
 sys/dev/usb/usb_mem.h     |   38 +---------------
 sys/dev/usb/usbdi.h       |    6 +--
 sys/dev/usb/uscanner.c    |   82 +---------------------------------
 sys/dev/usb/uvscom.c      |   27 +----------
 22 files changed, 99 insertions(+), 570 deletions(-)

diffs (truncated from 1643 to 300 lines):

diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/hid.c
--- a/sys/dev/usb/hid.c Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/hid.c Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hid.c,v 1.34 2011/12/23 00:51:43 jakllsch Exp $        */
+/*     $NetBSD: hid.c,v 1.35 2012/02/24 06:48:23 mrg Exp $     */
 /*     $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
 /*
@@ -32,13 +32,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.34 2011/12/23 00:51:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.35 2012/02/24 06:48:23 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#if defined(__NetBSD__)
 #include <sys/kernel.h>
-#endif
 #include <sys/malloc.h>
 
 #include <dev/usb/usb.h>
diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/if_axe.c
--- a/sys/dev/usb/if_axe.c      Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/if_axe.c      Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_axe.c,v 1.51 2012/02/02 19:43:07 tls Exp $  */
+/*     $NetBSD: if_axe.c,v 1.52 2012/02/24 06:48:23 mrg Exp $  */
 /*     $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
 
 /*
@@ -89,14 +89,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.51 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.52 2012/02/24 06:48:23 mrg Exp $");
 
-#if defined(__NetBSD__)
-#ifndef _MODULE
+#if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #endif
-#endif
-
 
 #include <sys/param.h>
 #include <sys/bus.h>
diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/if_cdce.c
--- a/sys/dev/usb/if_cdce.c     Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/if_cdce.c     Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cdce.c,v 1.35 2012/02/02 19:43:07 tls Exp $ */
+/*     $NetBSD: if_cdce.c,v 1.36 2012/02/24 06:48:24 mrg Exp $ */
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul%windriver.com@localhost>
@@ -41,8 +41,9 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.35 2012/02/02 19:43:07 tls Exp $");
-#ifdef __NetBSD__
+__KERNEL_RCSID(0, "$NetBSD: if_cdce.c,v 1.36 2012/02/24 06:48:24 mrg Exp $");
+
+#if defined(_KERNEL_OPT)
 #include "opt_inet.h"
 #endif
 
diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/if_cue.c
--- a/sys/dev/usb/if_cue.c      Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/if_cue.c      Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_cue.c,v 1.61 2012/02/02 19:43:07 tls Exp $  */
+/*     $NetBSD: if_cue.c,v 1.62 2012/02/24 06:48:24 mrg Exp $  */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -56,19 +56,13 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.61 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_cue.c,v 1.62 2012/02/24 06:48:24 mrg Exp $");
 
-#if defined(__NetBSD__)
 #include "opt_inet.h"
-#elif defined(__OpenBSD__)
-#include "bpfilter.h"
-#endif /* defined(__OpenBSD__) */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#if !defined(__OpenBSD__)
 #include <sys/callout.h>
-#endif
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
@@ -79,31 +73,15 @@
 #include <sys/rnd.h>
 
 #include <net/if.h>
-#if defined(__NetBSD__)
 #include <net/if_arp.h>
-#endif
 #include <net/if_dl.h>
+#include <net/bpf.h>
+#include <net/if_ether.h>
 
-#include <net/bpf.h>
-
-#if defined(__NetBSD__)
-#include <net/if_ether.h>
 #ifdef INET
 #include <netinet/in.h>
 #include <netinet/if_inarp.h>
 #endif
-#endif /* defined(__NetBSD__) */
-
-#if defined(__OpenBSD__)
-#ifdef INET
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/in_var.h>
-#include <netinet/ip.h>
-#include <netinet/if_ether.h>
-#endif
-#endif /* defined(__OpenBSD__) */
-
 
 #include <dev/usb/usb.h>
 #include <dev/usb/usbdi.h>
@@ -401,11 +379,7 @@
                sc->cue_mctab[i] = 0;
 
        /* now program new ones */
-#if defined(__NetBSD__)
        ETHER_FIRST_MULTI(step, &sc->cue_ec, enm);
-#else
-       ETHER_FIRST_MULTI(step, &sc->arpcom, enm);
-#endif
        while (enm != NULL) {
                if (memcmp(enm->enm_addrlo,
                    enm->enm_addrhi, ETHER_ADDR_LEN) != 0)
@@ -565,9 +539,6 @@
        ifp->if_ioctl = cue_ioctl;
        ifp->if_start = cue_start;
        ifp->if_watchdog = cue_watchdog;
-#if defined(__OpenBSD__)
-       ifp->if_snd.ifq_maxlen = IFQ_MAXLEN;
-#endif
        strncpy(ifp->if_xname, device_xname(sc->cue_dev), IFNAMSIZ);
 
        IFQ_SET_READY(&ifp->if_snd);
@@ -615,10 +586,8 @@
        if (ifp->if_flags & IFF_RUNNING)
                cue_stop(sc);
 
-#if defined(__NetBSD__)
        rnd_detach_source(&sc->rnd_source);
        ether_ifdetach(ifp);
-#endif /* __NetBSD__ */
 
        if_detach(ifp);
 
@@ -1041,11 +1010,7 @@
        cue_csr_write_1(sc, CUE_ADVANCED_OPMODES,
            CUE_AOP_EMBED_RXLEN | 0x03); /* 1 wait state */
 
-#if defined(__OpenBSD__)
-       eaddr = sc->arpcom.ac_enaddr;
-#elif defined(__NetBSD__)
        eaddr = CLLADDR(ifp->if_sadl);
-#endif
        /* Set MAC address */
        for (i = 0; i < ETHER_ADDR_LEN; i++)
                cue_csr_write_1(sc, CUE_PAR0 - i, eaddr[i]);
@@ -1159,11 +1124,7 @@
                switch (ifa->ifa_addr->sa_family) {
 #ifdef INET
                case AF_INET:
-#if defined(__NetBSD__)
                        arp_ifinit(ifp, ifa);
-#else
-                       arp_ifinit(&sc->arpcom, ifa);
-#endif
                        break;
 #endif /* INET */
                }
diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/uaudio.c
--- a/sys/dev/usb/uaudio.c      Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/uaudio.c      Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uaudio.c,v 1.128 2011/12/23 00:51:44 jakllsch Exp $    */
+/*     $NetBSD: uaudio.c,v 1.129 2012/02/24 06:48:24 mrg Exp $ */
 
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.128 2011/12/23 00:51:44 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.129 2012/02/24 06:48:24 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -497,11 +497,7 @@
                           sc->sc_dev);
 
        DPRINTF("%s", "doing audio_attach_mi\n");
-#if defined(__OpenBSD__)
-       audio_attach_mi(&uaudio_hw_if, sc, &sc->sc_dev);
-#else
        sc->sc_audiodev = audio_attach_mi(&uaudio_hw_if, sc, sc->sc_dev);
-#endif
 
        return;
 }
diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/ubsa.c
--- a/sys/dev/usb/ubsa.c        Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/ubsa.c        Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubsa.c,v 1.29 2011/12/23 00:51:45 jakllsch Exp $       */
+/*     $NetBSD: ubsa.c,v 1.30 2012/02/24 06:48:24 mrg Exp $    */
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
  * All rights reserved.
@@ -54,25 +54,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.29 2011/12/23 00:51:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa.c,v 1.30 2012/02/24 06:48:24 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#ifdef __FreeBSD__
-#include <sys/bus.h>
-#endif
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
-#include <sys/selinfo.h>
-#else
 #include <sys/select.h>
-#endif
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/poll.h>
@@ -91,11 +84,6 @@
 
 #ifdef UBSA_DEBUG
 int            ubsadebug = 0;
-#ifdef __FreeBSD__
-SYSCTL_NODE(_hw_usb, OID_AUTO, ubsa, CTLFLAG_RW, 0, "USB ubsa");
-SYSCTL_INT(_hw_usb_ubsa, OID_AUTO, debug, CTLFLAG_RW,
-          &ubsadebug, 0, "ubsa debug level");
-#endif
 
 #define        DPRINTFN(n, x)  do { \
                                if (ubsadebug > (n)) \
diff -r 6f00895c67bc -r 9eea6635cd3c sys/dev/usb/ubsa_common.c
--- a/sys/dev/usb/ubsa_common.c Thu Feb 23 23:39:19 2012 +0000
+++ b/sys/dev/usb/ubsa_common.c Fri Feb 24 06:48:23 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ubsa_common.c,v 1.7 2011/12/23 00:51:45 jakllsch Exp $ */
+/*     $NetBSD: ubsa_common.c,v 1.8 2012/02/24 06:48:25 mrg Exp $      */
 /*-
  * Copyright (c) 2002, Alexander Kabaev <kan.FreeBSD.org>.
  * All rights reserved.
@@ -54,25 +54,18 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubsa_common.c,v 1.7 2011/12/23 00:51:45 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubsa_common.c,v 1.8 2012/02/24 06:48:25 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
-#ifdef __FreeBSD__
-#include <sys/bus.h>
-#endif
 #include <sys/ioccom.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 #include <sys/tty.h>
 #include <sys/file.h>
-#if __FreeBSD_version >= 500014
-#include <sys/selinfo.h>