[src/jmcneill-usbmp]: src/sys/dev/usb rename old usb_detach_wakeup/wait to us...

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

details:   https://anonhg.NetBSD.org/src/rev/fac6237c6cde
branches:  jmcneill-usbmp
changeset: 771826:fac6237c6cde
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Feb 26 07:12:49 2012 +0000

description:
rename old usb_detach_wakeup/wait to usb_detach_{wake,wakeup}old().

diffstat:

 sys/dev/usb/TODO.usbmp     |  13 ++++++++-----
 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/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/uhso.c         |  28 ++++++++++++++--------------
 sys/dev/usb/uirda.c        |  10 +++++-----
 sys/dev/usb/ulpt.c         |  12 ++++++------
 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   |   7 +++----
 sys/dev/usb/uscanner.c     |  10 +++++-----
 sys/dev/usb/usscanner.c    |   6 +++---
 sys/dev/usb/ustir.c        |  16 ++++++++--------
 sys/dev/usb/utoppy.c       |  14 +++++++-------
 21 files changed, 138 insertions(+), 136 deletions(-)

diffs (truncated from 1182 to 300 lines):

diff -r 56b08655ec16 -r fac6237c6cde sys/dev/usb/TODO.usbmp
--- a/sys/dev/usb/TODO.usbmp    Sun Feb 26 06:59:38 2012 +0000
+++ b/sys/dev/usb/TODO.usbmp    Sun Feb 26 07:12:49 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: TODO.usbmp,v 1.1.2.5 2012/02/26 05:05:44 mrg Exp $
+$NetBSD: TODO.usbmp,v 1.1.2.6 2012/02/26 07:12:49 mrg Exp $
 
 
 the majority of the USB MP device interface is documented in usbdivar.h.
@@ -20,8 +20,9 @@
 usb_event_thread() startup should use something to sync companions
 
 
-usb_transfer_complete() is sometimes called with host intr lock held,
-sometimes with usb lock.  may need to re-consider soft_intr() API.
+ehci issues:
+  - ehci_idone() has gone from splhigh() to splusb().  OK?
+  - ehci_suspend() no longer has splhardusb() across the whole function
 
 
 wake/wakeup conversion:
@@ -49,7 +50,10 @@
       ustir.c
       utoppy.c
   - maybe rename usb_detach_wait() to usb_detach_waitold(), so that the
-    new one can be usb_detach_waitcv()
+    new one can be usb_detach_wait()  [old names done]
+
+
+use usb_delay_ms_locked() in places
 
 
 convert uhidev users to MPSAFE:
@@ -79,7 +83,6 @@
   - uirda.c
   - ulpt.c
   - umass_isdata.c
-  - usb_subr.c: usb_delay_ms() should use kpause
   - ustir.c
   - uthum.c
   - utoppy.c
diff -r 56b08655ec16 -r fac6237c6cde sys/dev/usb/if_aue.c
--- a/sys/dev/usb/if_aue.c      Sun Feb 26 06:59:38 2012 +0000
+++ b/sys/dev/usb/if_aue.c      Sun Feb 26 07:12:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_aue.c,v 1.121.12.1 2012/02/18 07:35:04 mrg Exp $    */
+/*     $NetBSD: if_aue.c,v 1.121.12.2 2012/02/26 07:12:49 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.121.12.1 2012/02/18 07:35:04 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.121.12.2 2012/02/26 07:12:49 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 56b08655ec16 -r fac6237c6cde sys/dev/usb/if_axe.c
--- a/sys/dev/usb/if_axe.c      Sun Feb 26 06:59:38 2012 +0000
+++ b/sys/dev/usb/if_axe.c      Sun Feb 26 07:12:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_axe.c,v 1.50.6.2 2012/02/24 09:11:42 mrg Exp $      */
+/*     $NetBSD: if_axe.c,v 1.50.6.3 2012/02/26 07:12:49 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.50.6.2 2012/02/24 09:11:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axe.c,v 1.50.6.3 2012/02/26 07:12:49 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 56b08655ec16 -r fac6237c6cde sys/dev/usb/if_udav.c
--- a/sys/dev/usb/if_udav.c     Sun Feb 26 06:59:38 2012 +0000
+++ b/sys/dev/usb/if_udav.c     Sun Feb 26 07:12:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_udav.c,v 1.31.12.2 2012/02/24 09:11:42 mrg Exp $    */
+/*     $NetBSD: if_udav.c,v 1.31.12.3 2012/02/26 07:12:49 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.31.12.2 2012/02/24 09:11:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_udav.c,v 1.31.12.3 2012/02/26 07:12:49 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));
@@ -1089,7 +1089,7 @@
                        sc->sc_refcnt++;
                        usbd_clear_endpoint_stall_async(sc->sc_pipe_tx);
                        if (--sc->sc_refcnt < 0)
-                               usb_detach_wakeup(sc->sc_dev);
+                               usb_detach_wakeupold(sc->sc_dev);
                }
                splx(s);
                return;
@@ -1136,7 +1136,7 @@
                        sc->sc_refcnt++;
                        usbd_clear_endpoint_stall_async(sc->sc_pipe_rx);
                        if (--sc->sc_refcnt < 0)
-                               usb_detach_wakeup(sc->sc_dev);
+                               usb_detach_wakeupold(sc->sc_dev);
                }
                goto done;
        }
@@ -1197,7 +1197,7 @@
        sc->sc_refcnt++;
        usbd_transfer(xfer);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
 
        DPRINTF(("%s: %s: start rx\n", device_xname(sc->sc_dev), __func__));
 }
@@ -1463,7 +1463,7 @@
 
        mutex_exit(&sc->sc_mii_lock);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
 }
 
 Static int
diff -r 56b08655ec16 -r fac6237c6cde sys/dev/usb/if_url.c
--- a/sys/dev/usb/if_url.c      Sun Feb 26 06:59:38 2012 +0000
+++ b/sys/dev/usb/if_url.c      Sun Feb 26 07:12:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_url.c,v 1.38.12.2 2012/02/26 05:05:44 mrg Exp $     */
+/*     $NetBSD: if_url.c,v 1.38.12.3 2012/02/26 07:12:49 mrg Exp $     */
 
 /*
  * Copyright (c) 2001, 2002
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.38.12.2 2012/02/26 05:05:44 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.38.12.3 2012/02/26 07:12:49 mrg Exp $");
 
 #include "opt_inet.h"
 
@@ -351,7 +351,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)
@@ -411,7 +411,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: url_mem(): %s failed. off=%04x, err=%d\n",
                         device_xname(sc->sc_dev),
@@ -752,7 +752,7 @@
 
  done:
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
 
        return (error);
 }
@@ -919,7 +919,7 @@
        sc->sc_refcnt++;
        err = usbd_transfer(c->url_xfer);
        if (--sc->sc_refcnt < 0)
-               usb_detach_wakeup(sc->sc_dev);
+               usb_detach_wakeupold(sc->sc_dev);
        if (err != USBD_IN_PROGRESS) {