Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/usb Revert previous due to active usbmp branch(es).



details:   https://anonhg.NetBSD.org/src/rev/8922bf8dc3ca
branches:  trunk
changeset: 772191:8922bf8dc3ca
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Fri Dec 23 00:51:43 2011 +0000

description:
Revert previous due to active usbmp branch(es).

diffstat:

 sys/dev/usb/aubtfwl.c         |    6 +-
 sys/dev/usb/ehci.c            |   30 ++++++------
 sys/dev/usb/emdtv.c           |    6 +-
 sys/dev/usb/emdtv_dtv.c       |    6 +-
 sys/dev/usb/hid.c             |    6 +-
 sys/dev/usb/if_atu.c          |    8 +-
 sys/dev/usb/if_aue.c          |   12 ++--
 sys/dev/usb/if_udav.c         |   10 ++--
 sys/dev/usb/if_upgt.c         |    6 +-
 sys/dev/usb/if_upl.c          |   10 ++--
 sys/dev/usb/if_ural.c         |   10 ++--
 sys/dev/usb/if_url.c          |   10 ++--
 sys/dev/usb/if_urndis.c       |   16 +++---
 sys/dev/usb/moscom.c          |   34 +++++++-------
 sys/dev/usb/stuirda.c         |   17 +++---
 sys/dev/usb/u3g.c             |   16 +++---
 sys/dev/usb/uark.c            |   10 ++--
 sys/dev/usb/uaudio.c          |    8 +-
 sys/dev/usb/uberry.c          |   16 +++---
 sys/dev/usb/ubsa.c            |   10 ++--
 sys/dev/usb/ubsa_common.c     |    6 +-
 sys/dev/usb/ubsavar.h         |    4 +-
 sys/dev/usb/ubt.c             |   14 ++--
 sys/dev/usb/uchcom.c          |   10 ++--
 sys/dev/usb/ucom.c            |    6 +-
 sys/dev/usb/udsbr.c           |   10 ++--
 sys/dev/usb/uep.c             |    6 +-
 sys/dev/usb/uftdi.c           |   10 ++--
 sys/dev/usb/ugen.c            |   22 ++++----
 sys/dev/usb/ugensa.c          |   10 ++--
 sys/dev/usb/ugraphire_rdesc.h |    4 +-
 sys/dev/usb/uhci.c            |   12 ++--
 sys/dev/usb/uhidev.c          |   20 ++++----
 sys/dev/usb/uhmodem.c         |   42 ++++++++--------
 sys/dev/usb/uhso.c            |    6 +-
 sys/dev/usb/uipaq.c           |   10 ++--
 sys/dev/usb/uirda.c           |   10 ++--
 sys/dev/usb/ukbd.c            |    6 +-
 sys/dev/usb/ukyopon.c         |   10 ++--
 sys/dev/usb/ulpt.c            |   16 +++---
 sys/dev/usb/umass_quirks.c    |   22 ++++----
 sys/dev/usb/umct.c            |   10 ++--
 sys/dev/usb/umidi.c           |   60 ++++++++++++------------
 sys/dev/usb/umodem.c          |   10 ++--
 sys/dev/usb/ums.c             |   28 +++++-----
 sys/dev/usb/uplcom.c          |   12 ++--
 sys/dev/usb/urio.c            |   10 ++--
 sys/dev/usb/usb.c             |   10 ++--
 sys/dev/usb/usb_quirks.c      |    6 +-
 sys/dev/usb/usb_verbose.c     |    8 +-
 sys/dev/usb/uscanner.c        |   10 ++--
 sys/dev/usb/uslsa.c           |   10 ++--
 sys/dev/usb/usscanner.c       |   10 ++--
 sys/dev/usb/ustir.c           |   10 ++--
 sys/dev/usb/uthum.c           |    8 +-
 sys/dev/usb/utoppy.c          |   12 ++--
 sys/dev/usb/uvideo.c          |  102 +++++++++++++++++++++---------------------
 sys/dev/usb/uvideoreg.h       |    4 +-
 sys/dev/usb/uvisor.c          |    8 +-
 sys/dev/usb/uvscom.c          |   10 ++--
 sys/dev/usb/uyap.c            |   10 ++--
 sys/dev/usb/uyurex.c          |    8 +-
 62 files changed, 430 insertions(+), 429 deletions(-)

diffs (truncated from 3678 to 300 lines):

diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/aubtfwl.c
--- a/sys/dev/usb/aubtfwl.c     Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/aubtfwl.c     Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: aubtfwl.c,v 1.2 2011/12/22 20:06:59 jakllsch Exp $ */
+/* $NetBSD: aubtfwl.c,v 1.3 2011/12/23 00:51:43 jakllsch Exp $ */
 
 /*
  * Copyright (c) 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.2 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aubtfwl.c,v 1.3 2011/12/23 00:51:43 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <dev/usb/usb.h>
@@ -98,7 +98,7 @@
        size_t fws;
        size_t fwo = 0;
        uint32_t n;
-
+       
        memset(&req, 0, sizeof(req));
 
        error = firmware_open("ubt", "ath3k-1.fw", &fwh); /* XXX revisit name */
diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/ehci.c        Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.182 2011/12/22 20:06:59 jakllsch Exp $ */
+/*     $NetBSD: ehci.c,v 1.183 2011/12/23 00:51:43 jakllsch Exp $ */
 
 /*
  * Copyright (c) 2004-2008 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.182 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.183 2011/12/23 00:51:43 jakllsch Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -923,7 +923,7 @@
 
                        if (nframes >= xfer->nframes)
                                break;
-               }
+               }
 
                xfer->actlen = actlen;
                xfer->status = USBD_NORMAL_COMPLETION;
@@ -1405,12 +1405,12 @@
        for (i = 0; sqtd && i < 20 && !stop; sqtd = sqtd->nextqtd, i++) {
                ehci_dump_sqtd(sqtd);
                usb_syncmem(&sqtd->dma,
-                   sqtd->offs + offsetof(ehci_qtd_t, qtd_next),
+                   sqtd->offs + offsetof(ehci_qtd_t, qtd_next), 
                    sizeof(sqtd->qtd),
                    BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
                stop = sqtd->qtd.qtd_next & htole32(EHCI_LINK_TERMINATE);
                usb_syncmem(&sqtd->dma,
-                   sqtd->offs + offsetof(ehci_qtd_t, qtd_next),
+                   sqtd->offs + offsetof(ehci_qtd_t, qtd_next), 
                    sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD);
        }
        if (sqtd)
@@ -1420,11 +1420,11 @@
 Static void
 ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
 {
-       usb_syncmem(&sqtd->dma, sqtd->offs,
+       usb_syncmem(&sqtd->dma, sqtd->offs, 
            sizeof(sqtd->qtd), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
        printf("QTD(%p) at 0x%08x:\n", sqtd, sqtd->physaddr);
        ehci_dump_qtd(&sqtd->qtd);
-       usb_syncmem(&sqtd->dma, sqtd->offs,
+       usb_syncmem(&sqtd->dma, sqtd->offs, 
            sizeof(sqtd->qtd), BUS_DMASYNC_PREREAD);
 }
 
@@ -1456,7 +1456,7 @@
        ehci_qh_t *qh = &sqh->qh;
        u_int32_t endp, endphub;
 
-       usb_syncmem(&sqh->dma, sqh->offs,
+       usb_syncmem(&sqh->dma, sqh->offs, 
            sizeof(sqh->qh), BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
        printf("QH(%p) at 0x%08x:\n", sqh, sqh->physaddr);
        printf("  link="); ehci_dump_link(qh->qh_link, 1); printf("\n");
@@ -1478,7 +1478,7 @@
        printf("  curqtd="); ehci_dump_link(qh->qh_curqtd, 0); printf("\n");
        printf("Overlay qTD:\n");
        ehci_dump_qtd(&qh->qh_qtd);
-       usb_syncmem(&sqh->dma, sqh->offs,
+       usb_syncmem(&sqh->dma, sqh->offs, 
            sizeof(sqh->qh), BUS_DMASYNC_PREREAD);
 }
 
@@ -2280,7 +2280,7 @@
                         * If we are doing embedded transaction translation,
                         * then directly attached LS/FS devices are reset by
                         * the EHCI controller itself.  PSPD is encoded
-                        * the same way as in USBSTATUS.
+                        * the same way as in USBSTATUS. 
                         */
                        i = __SHIFTOUT(v, EHCI_PS_PSPD) * UPS_LOW_SPEED;
                }
@@ -2830,7 +2830,7 @@
                        offs = i * EHCI_ITD_SIZE;
                        itd = KERNADDR(&dma, offs);
                        itd->physaddr = DMAADDR(&dma, offs);
-                       itd->dma = dma;
+                       itd->dma = dma;
                        itd->offs = offs;
                        LIST_INSERT_HEAD(&sc->sc_freeitds, itd, u.free_list);
                }
@@ -3938,7 +3938,7 @@
                            sizeof(itd->itd.itd_next), BUS_DMASYNC_POSTWRITE);
 
                        prev->xfer_next = itd;
-               } else {
+               } else {
                        start = itd;
                }
 
@@ -3959,7 +3959,7 @@
                         */
 
                        itd->itd.itd_ctl[j] = htole32 ( EHCI_ITD_ACTIVE |
-                           EHCI_ITD_SET_LEN(xfer->frlengths[trans_count]) |
+                           EHCI_ITD_SET_LEN(xfer->frlengths[trans_count]) | 
                            EHCI_ITD_SET_PG(addr) |
                            EHCI_ITD_SET_OFFS(EHCI_PAGE_OFFSET(DMAADDR(dma_buf,offs))));
 
@@ -3971,7 +3971,7 @@
                                itd->itd.itd_ctl[j] |= htole32(EHCI_ITD_IOC);
                                break;
                        }
-               }
+               }       
 
                /* Step 1.75, set buffer pointers. To simplify matters, all
                 * pointers are filled out for the next 7 hardware pages in
@@ -4011,7 +4011,7 @@
                    EHCI_ITD_SET_MAXPKT(UE_GET_SIZE(j)));
 
                /* FIXME: handle invalid trans */
-               itd->itd.itd_bufr[2] |=
+               itd->itd.itd_bufr[2] |= 
                    htole32(EHCI_ITD_SET_MULTI(UE_GET_TRANS(j)+1));
 
                usb_syncmem(&itd->dma,
diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/emdtv.c
--- a/sys/dev/usb/emdtv.c       Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/emdtv.c       Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv.c,v 1.5 2011/12/22 20:06:59 jakllsch Exp $ */
+/* $NetBSD: emdtv.c,v 1.6 2011/12/23 00:51:43 jakllsch 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.5 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv.c,v 1.6 2011/12/23 00:51:43 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -374,7 +374,7 @@
 
        if (sc->sc_board->eb_manual_gpio == false) {
                val = eeprom_offset + gpioreg;
-               emdtv_write_1(sc, 0x03, 0xa0, val);
+               emdtv_write_1(sc, 0x03, 0xa0, val); 
                gpio_value = emdtv_read_1(sc, 0x02, 0xa0);
        } else {
                const struct emdtv_gpio_regs *r = &eb->eb_gpio_regs;
diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/emdtv_dtv.c
--- a/sys/dev/usb/emdtv_dtv.c   Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/emdtv_dtv.c   Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: emdtv_dtv.c,v 1.6 2011/12/22 20:06:59 jakllsch Exp $ */
+/* $NetBSD: emdtv_dtv.c,v 1.7 2011/12/23 00:51:43 jakllsch 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.6 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emdtv_dtv.c,v 1.7 2011/12/23 00:51:43 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -101,7 +101,7 @@
 
        aprint_debug_dev(sc->sc_dev, "calling usbd_open_pipe, ep 0x%02x\n",
            ed->bEndpointAddress);
-       status = usbd_open_pipe(sc->sc_iface,
+       status = usbd_open_pipe(sc->sc_iface, 
            ed->bEndpointAddress, USBD_EXCLUSIVE_USE,
            &sc->sc_isoc_pipe);
        if (status != USBD_NORMAL_COMPLETION) {
diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/hid.c
--- a/sys/dev/usb/hid.c Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/hid.c Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hid.c,v 1.33 2011/12/22 20:06:59 jakllsch Exp $        */
+/*     $NetBSD: hid.c,v 1.34 2011/12/23 00:51:43 jakllsch Exp $        */
 /*     $FreeBSD: src/sys/dev/usb/hid.c,v 1.11 1999/11/17 22:33:39 n_hibma Exp $ */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.33 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hid.c,v 1.34 2011/12/23 00:51:43 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -478,7 +478,7 @@
  * kind of report is considered. The current HID code that uses this for
  * matching is actually only looking for input reports, so this works
  * for now.
- *
+ * 
  * This function could try all report kinds (input, output and feature)
  * consecutively if necessary, but it may be better to integrate the
  * libusbhid code which can consider multiple report kinds simultaneously
diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/if_atu.c
--- a/sys/dev/usb/if_atu.c      Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/if_atu.c      Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_atu.c,v 1.42 2011/12/22 20:06:59 jakllsch Exp $ */
+/*     $NetBSD: if_atu.c,v 1.43 2011/12/23 00:51:43 jakllsch Exp $ */
 /*     $OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.42 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.43 2011/12/23 00:51:43 jakllsch Exp $");
 
 
 #include <sys/param.h>
@@ -630,8 +630,8 @@
 
                cmd.WEP_DefaultKeyID = ic->ic_def_txkey;
                for (i = 0; i < IEEE80211_WEP_NKID; i++) {
-                       memcpy(cmd.WEP_DefaultKey[i], ic->ic_nw_keys[i].wk_key,
-                           ic->ic_nw_keys[i].wk_keylen);
+                       memcpy(cmd.WEP_DefaultKey[i], ic->ic_nw_keys[i].wk_key, 
+                           ic->ic_nw_keys[i].wk_keylen); 
                }
        }
 
diff -r 56f86cbeb3f0 -r 8922bf8dc3ca sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Thu Dec 22 20:06:59 2011 +0000
+++ b/sys/dev/usb/if_aue.c      Fri Dec 23 00:51:43 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aue.c,v 1.122 2011/12/22 20:06:59 jakllsch Exp $    */
+/*     $NetBSD: if_aue.c,v 1.123 2011/12/23 00:51:43 jakllsch Exp $    */
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
  *     Bill Paul <wpaul%ee.columbia.edu@localhost>.  All rights reserved.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.122 2011/12/22 20:06:59 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.123 2011/12/23 00:51:43 jakllsch Exp $");
 
 #include "opt_inet.h"
 #include "rnd.h"
@@ -689,9 +689,9 @@
 {
        struct usb_attach_arg *uaa = aux;
 
-       /*
+       /* 
         * Some manufacturers use the same vendor and product id for
-        * different devices. We need to sanity check the DeviceClass
+        * different devices. We need to sanity check the DeviceClass 
         * in this case
         * Currently known guilty products:
         * 0x050d/0x0121 Belkin Bluetooth and USB2LAN
@@ -702,13 +702,13 @@
        if (uaa->vendor == USB_VENDOR_BELKIN &&
                uaa->product == USB_PRODUCT_BELKIN_USB2LAN) {
                usb_device_descriptor_t *dd;
-



Home | Main Index | Thread Index | Old Index