Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/usb pull down from usbmp branch:



details:   https://anonhg.NetBSD.org/src/rev/98479825659b
branches:  trunk
changeset: 777843:98479825659b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Mar 06 03:35:29 2012 +0000

description:
pull down from usbmp branch:

- rename usb_detach_{wake,waitup}() to usb_detach_{wake,waitup}old()
- use some c99 struct .initialisers

diffstat:

 sys/dev/usb/ehci.c         |  90 +++++++++++++++++++++++-----------------------
 sys/dev/usb/if_aue.c       |   8 ++--
 sys/dev/usb/if_axe.c       |   8 ++--
 sys/dev/usb/if_udav.c      |  30 +++++++-------
 sys/dev/usb/if_url.c       |  20 +++++-----
 sys/dev/usb/ohci.c         |  90 +++++++++++++++++++++++-----------------------
 sys/dev/usb/stuirda.c      |   6 +-
 sys/dev/usb/ubt.c          |  16 ++++----
 sys/dev/usb/ucom.c         |  16 ++++----
 sys/dev/usb/ucycom.c       |   6 +-
 sys/dev/usb/ugen.c         |  12 +++---
 sys/dev/usb/uhci.c         |  90 +++++++++++++++++++++++-----------------------
 sys/dev/usb/uhid.c         |  12 +++---
 sys/dev/usb/uhso.c         |  28 +++++++-------
 sys/dev/usb/uirda.c        |  10 ++--
 sys/dev/usb/ulpt.c         |  12 +++---
 sys/dev/usb/umass.c        |   6 +-
 sys/dev/usb/umass_scsipi.c |   8 ++--
 sys/dev/usb/urio.c         |  12 +++---
 sys/dev/usb/usbdi_util.c   |  16 ++++----
 sys/dev/usb/usbdi_util.h   |   6 +-
 sys/dev/usb/uscanner.c     |  10 ++--
 sys/dev/usb/usscanner.c    |   6 +-
 sys/dev/usb/ustir.c        |  16 ++++----
 sys/dev/usb/utoppy.c       |  14 +++---
 25 files changed, 274 insertions(+), 274 deletions(-)

diffs (truncated from 1601 to 300 lines):

diff -r 94ba67b19e25 -r 98479825659b sys/dev/usb/ehci.c
--- a/sys/dev/usb/ehci.c        Tue Mar 06 02:49:02 2012 +0000
+++ b/sys/dev/usb/ehci.c        Tue Mar 06 03:35:29 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ehci.c,v 1.185 2012/03/06 02:49:02 mrg Exp $ */
+/*     $NetBSD: ehci.c,v 1.186 2012/03/06 03:35:29 mrg 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.185 2012/03/06 02:49:02 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.186 2012/03/06 03:35:29 mrg Exp $");
 
 #include "ohci.h"
 #include "uhci.h"
@@ -246,67 +246,67 @@
 #define ehci_active_intr_list(ex) ((ex)->inext.tqe_prev != NULL)
 
 Static const struct usbd_bus_methods ehci_bus_methods = {
-       ehci_open,
-       ehci_softintr,
-       ehci_poll,
-       ehci_allocm,
-       ehci_freem,
-       ehci_allocx,
-       ehci_freex,
+       .open_pipe =    ehci_open,
+       .soft_intr =    ehci_softintr,
+       .do_poll =      ehci_poll,
+       .allocm =       ehci_allocm,
+       .freem =        ehci_freem,
+       .allocx =       ehci_allocx,
+       .freex =        ehci_freex,
 };
 
 Static const struct usbd_pipe_methods ehci_root_ctrl_methods = {
-       ehci_root_ctrl_transfer,
-       ehci_root_ctrl_start,
-       ehci_root_ctrl_abort,
-       ehci_root_ctrl_close,
-       ehci_noop,
-       ehci_root_ctrl_done,
+       .transfer =     ehci_root_ctrl_transfer,
+       .start =        ehci_root_ctrl_start,
+       .abort =        ehci_root_ctrl_abort,
+       .close =        ehci_root_ctrl_close,
+       .cleartoggle =  ehci_noop,
+       .done =         ehci_root_ctrl_done,
 };
 
 Static const struct usbd_pipe_methods ehci_root_intr_methods = {
-       ehci_root_intr_transfer,
-       ehci_root_intr_start,
-       ehci_root_intr_abort,
-       ehci_root_intr_close,
-       ehci_noop,
-       ehci_root_intr_done,
+       .transfer =     ehci_root_intr_transfer,
+       .start =        ehci_root_intr_start,
+       .abort =        ehci_root_intr_abort,
+       .close =        ehci_root_intr_close,
+       .cleartoggle =  ehci_noop,
+       .done =         ehci_root_intr_done,
 };
 
 Static const struct usbd_pipe_methods ehci_device_ctrl_methods = {
-       ehci_device_ctrl_transfer,
-       ehci_device_ctrl_start,
-       ehci_device_ctrl_abort,
-       ehci_device_ctrl_close,
-       ehci_noop,
-       ehci_device_ctrl_done,
+       .transfer =     ehci_device_ctrl_transfer,
+       .start =        ehci_device_ctrl_start,
+       .abort =        ehci_device_ctrl_abort,
+       .close =        ehci_device_ctrl_close,
+       .cleartoggle =  ehci_noop,
+       .done =         ehci_device_ctrl_done,
 };
 
 Static const struct usbd_pipe_methods ehci_device_intr_methods = {
-       ehci_device_intr_transfer,
-       ehci_device_intr_start,
-       ehci_device_intr_abort,
-       ehci_device_intr_close,
-       ehci_device_clear_toggle,
-       ehci_device_intr_done,
+       .transfer =     ehci_device_intr_transfer,
+       .start =        ehci_device_intr_start,
+       .abort =        ehci_device_intr_abort,
+       .close =        ehci_device_intr_close,
+       .cleartoggle =  ehci_device_clear_toggle,
+       .done =         ehci_device_intr_done,
 };
 
 Static const struct usbd_pipe_methods ehci_device_bulk_methods = {
-       ehci_device_bulk_transfer,
-       ehci_device_bulk_start,
-       ehci_device_bulk_abort,
-       ehci_device_bulk_close,
-       ehci_device_clear_toggle,
-       ehci_device_bulk_done,
+       .transfer =     ehci_device_bulk_transfer,
+       .start =        ehci_device_bulk_start,
+       .abort =        ehci_device_bulk_abort,
+       .close =        ehci_device_bulk_close,
+       .cleartoggle =  ehci_device_clear_toggle,
+       .done =         ehci_device_bulk_done,
 };
 
 Static const struct usbd_pipe_methods ehci_device_isoc_methods = {
-       ehci_device_isoc_transfer,
-       ehci_device_isoc_start,
-       ehci_device_isoc_abort,
-       ehci_device_isoc_close,
-       ehci_noop,
-       ehci_device_isoc_done,
+       .transfer =     ehci_device_isoc_transfer,
+       .start =        ehci_device_isoc_start,
+       .abort =        ehci_device_isoc_abort,
+       .close =        ehci_device_isoc_close,
+       .cleartoggle =  ehci_noop,
+       .done =         ehci_device_isoc_done,
 };
 
 static const uint8_t revbits[EHCI_MAX_POLLRATE] = {
diff -r 94ba67b19e25 -r 98479825659b sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Tue Mar 06 02:49:02 2012 +0000
+++ b/sys/dev/usb/if_aue.c      Tue Mar 06 03:35:29 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aue.c,v 1.124 2012/02/02 19:43:07 tls Exp $ */
+/*     $NetBSD: if_aue.c,v 1.125 2012/03/06 03:35:29 mrg 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.124 2012/02/02 19:43:07 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.125 2012/03/06 03:35:29 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -424,7 +424,7 @@
 {
        mutex_exit(&sc->aue_mii_lock);
        if (--sc->aue_refcnt < 0)
-               usb_detach_wakeup((sc->aue_dev));
+               usb_detach_wakeupold((sc->aue_dev));
 }
 
 Static int
@@ -923,7 +923,7 @@
 
        if (--sc->aue_refcnt >= 0) {
                /* Wait for processes to go away. */
-               usb_detach_wait((sc->aue_dev));
+               usb_detach_waitold((sc->aue_dev));
        }
        splx(s);
 
diff -r 94ba67b19e25 -r 98479825659b sys/dev/usb/if_axe.c
--- a/sys/dev/usb/if_axe.c      Tue Mar 06 02:49:02 2012 +0000
+++ b/sys/dev/usb/if_axe.c      Tue Mar 06 03:35:29 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_axe.c,v 1.52 2012/02/24 06:48:23 mrg Exp $  */
+/*     $NetBSD: if_axe.c,v 1.53 2012/03/06 03:35:29 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.52 2012/02/24 06:48:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.53 2012/03/06 03:35:29 mrg Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -221,7 +221,7 @@
 
        mutex_exit(&sc->axe_mii_lock);
        if (--sc->axe_refcnt < 0)
-               usb_detach_wakeup((sc->axe_dev));
+               usb_detach_wakeupold((sc->axe_dev));
 }
 
 static int
@@ -778,7 +778,7 @@
 
        if (--sc->axe_refcnt >= 0) {
                /* Wait for processes to go away. */
-               usb_detach_wait((sc->axe_dev));
+               usb_detach_waitold((sc->axe_dev));
        }
        splx(s);
 
diff -r 94ba67b19e25 -r 98479825659b sys/dev/usb/if_udav.c
--- a/sys/dev/usb/if_udav.c     Tue Mar 06 02:49:02 2012 +0000
+++ b/sys/dev/usb/if_udav.c     Tue Mar 06 03:35:29 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_udav.c,v 1.35 2012/02/19 14:56:16 mbalmer Exp $     */
+/*     $NetBSD: if_udav.c,v 1.36 2012/03/06 03:35:29 mrg Exp $ */
 /*     $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $   */
 /*
  * Copyright (c) 2003
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.35 2012/02/19 14:56:16 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.36 2012/03/06 03:35:29 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -345,7 +345,7 @@
 
        if (--sc->sc_refcnt >= 0) {
                /* Wait for processes to go away */
-               usb_detach_wait(sc->sc_dev);
+               usb_detach_waitold(sc->sc_dev);
        }
        if (ifp->if_flags & IFF_RUNNING)
                udav_stop(GET_IFP(sc), 1);
@@ -405,7 +405,7 @@
        sc->sc_refcnt++;
        err = usbd_do_request(sc->sc_udev, &req, buf);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err) {
                DPRINTF(("%s: %s: read failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev), __func__, offset, err));
@@ -442,7 +442,7 @@
        sc->sc_refcnt++;
        err = usbd_do_request(sc->sc_udev, &req, buf);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err) {
                DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev), __func__, offset, err));
@@ -478,7 +478,7 @@
        sc->sc_refcnt++;
        err = usbd_do_request(sc->sc_udev, &req, NULL);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err) {
                DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev), __func__, offset, err));
@@ -516,7 +516,7 @@
        sc->sc_refcnt++;
        err = usbd_do_request(sc->sc_udev, &req, buf);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err) {
                DPRINTF(("%s: %s: read failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev), __func__, offset, err));
@@ -553,7 +553,7 @@
        sc->sc_refcnt++;
        err = usbd_do_request(sc->sc_udev, &req, buf);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err) {
                DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev), __func__, offset, err));
@@ -606,7 +606,7 @@
        sc->sc_refcnt++;
        err = usbd_do_request(sc->sc_udev, &req, NULL);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err) {
                DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev), __func__, offset, err));
@@ -867,7 +867,7 @@
 
  done:
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
 
        return (error);
 }
@@ -1040,7 +1040,7 @@
        sc->sc_refcnt++;
        err = usbd_transfer(c->udav_xfer);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err != USBD_IN_PROGRESS) {
                printf("%s: udav_send error=%s\n", device_xname(sc->sc_dev),
                       usbd_errstr(err));



Home | Main Index | Thread Index | Old Index