Module Name: src
Committed By: mrg
Date: Sun Feb 26 07:12:50 UTC 2012
Modified Files:
src/sys/dev/usb [jmcneill-usbmp]: TODO.usbmp if_aue.c if_axe.c
if_udav.c if_url.c stuirda.c ubt.c ucom.c ucycom.c ugen.c uhso.c
uirda.c ulpt.c umass_scsipi.c urio.c usbdi_util.c usbdi_util.h
uscanner.c usscanner.c ustir.c utoppy.c
Log Message:
rename old usb_detach_wakeup/wait to usb_detach_{wake,wakeup}old().
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/usb/TODO.usbmp
cvs rdiff -u -r1.121.12.1 -r1.121.12.2 src/sys/dev/usb/if_aue.c
cvs rdiff -u -r1.50.6.2 -r1.50.6.3 src/sys/dev/usb/if_axe.c
cvs rdiff -u -r1.31.12.2 -r1.31.12.3 src/sys/dev/usb/if_udav.c
cvs rdiff -u -r1.38.12.2 -r1.38.12.3 src/sys/dev/usb/if_url.c
cvs rdiff -u -r1.11.12.1 -r1.11.12.2 src/sys/dev/usb/stuirda.c
cvs rdiff -u -r1.40.8.1 -r1.40.8.2 src/sys/dev/usb/ubt.c
cvs rdiff -u -r1.88.2.2 -r1.88.2.3 src/sys/dev/usb/ucom.c
cvs rdiff -u -r1.33 -r1.33.8.1 src/sys/dev/usb/ucycom.c
cvs rdiff -u -r1.114.2.2 -r1.114.2.3 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.5.8.1 -r1.5.8.2 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.34.12.1 -r1.34.12.2 src/sys/dev/usb/uirda.c
cvs rdiff -u -r1.86.8.2 -r1.86.8.3 src/sys/dev/usb/ulpt.c
cvs rdiff -u -r1.38.6.3 -r1.38.6.4 src/sys/dev/usb/umass_scsipi.c
cvs rdiff -u -r1.35.12.2 -r1.35.12.3 src/sys/dev/usb/urio.c
cvs rdiff -u -r1.55.12.4 -r1.55.12.5 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.41.16.1 -r1.41.16.2 src/sys/dev/usb/usbdi_util.h
cvs rdiff -u -r1.68.12.2 -r1.68.12.3 src/sys/dev/usb/uscanner.c
cvs rdiff -u -r1.30.12.3 -r1.30.12.4 src/sys/dev/usb/usscanner.c
cvs rdiff -u -r1.29.12.1 -r1.29.12.2 src/sys/dev/usb/ustir.c
cvs rdiff -u -r1.15.12.1 -r1.15.12.2 src/sys/dev/usb/utoppy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/TODO.usbmp
diff -u src/sys/dev/usb/TODO.usbmp:1.1.2.5 src/sys/dev/usb/TODO.usbmp:1.1.2.6
--- src/sys/dev/usb/TODO.usbmp:1.1.2.5 Sun Feb 26 05:05:44 2012
+++ src/sys/dev/usb/TODO.usbmp Sun Feb 26 07:12:49 2012
@@ -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 @@ add lots more asserts
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 @@ wake/wakeup conversion:
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 @@ wakeup/tsleep drivers:
- uirda.c
- ulpt.c
- umass_isdata.c
- - usb_subr.c: usb_delay_ms() should use kpause
- ustir.c
- uthum.c
- utoppy.c
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.121.12.1 src/sys/dev/usb/if_aue.c:1.121.12.2
--- src/sys/dev/usb/if_aue.c:1.121.12.1 Sat Feb 18 07:35:04 2012
+++ src/sys/dev/usb/if_aue.c Sun Feb 26 07:12:49 2012
@@ -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 <[email protected]>. 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 @@ aue_unlock_mii(struct aue_softc *sc)
{
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 @@ aue_detach(device_t self, int flags)
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);
Index: src/sys/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.50.6.2 src/sys/dev/usb/if_axe.c:1.50.6.3
--- src/sys/dev/usb/if_axe.c:1.50.6.2 Fri Feb 24 09:11:42 2012
+++ src/sys/dev/usb/if_axe.c Sun Feb 26 07:12:49 2012
@@ -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 @@ axe_unlock_mii(struct axe_softc *sc)
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 @@ axe_detach(device_t self, int flags)
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);
Index: src/sys/dev/usb/if_udav.c
diff -u src/sys/dev/usb/if_udav.c:1.31.12.2 src/sys/dev/usb/if_udav.c:1.31.12.3
--- src/sys/dev/usb/if_udav.c:1.31.12.2 Fri Feb 24 09:11:42 2012
+++ src/sys/dev/usb/if_udav.c Sun Feb 26 07:12:49 2012
@@ -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 @@ udav_detach(device_t self, int flags)
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 @@ udav_mem_read(struct udav_softc *sc, int
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 @@ udav_mem_write(struct udav_softc *sc, in
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 @@ udav_mem_write1(struct udav_softc *sc, i
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 @@ udav_csr_read(struct udav_softc *sc, int
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 @@ udav_csr_write(struct udav_softc *sc, in
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 @@ udav_csr_write1(struct udav_softc *sc, i
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 @@ udav_openpipes(struct udav_softc *sc)
done:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -1040,7 +1040,7 @@ udav_send(struct udav_softc *sc, struct
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 @@ udav_txeof(usbd_xfer_handle xfer, usbd_p
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 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_p
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 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_p
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 @@ udav_unlock_mii(struct udav_softc *sc)
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
Index: src/sys/dev/usb/if_url.c
diff -u src/sys/dev/usb/if_url.c:1.38.12.2 src/sys/dev/usb/if_url.c:1.38.12.3
--- src/sys/dev/usb/if_url.c:1.38.12.2 Sun Feb 26 05:05:44 2012
+++ src/sys/dev/usb/if_url.c Sun Feb 26 07:12:49 2012
@@ -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 @@ url_detach(device_t self, int flags)
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 @@ url_mem(struct url_softc *sc, int cmd, i
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 @@ url_openpipes(struct url_softc *sc)
done:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -919,7 +919,7 @@ url_send(struct url_softc *sc, struct mb
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) {
printf("%s: url_send error=%s\n", device_xname(sc->sc_dev),
usbd_errstr(err));
@@ -968,7 +968,7 @@ url_txeof(usbd_xfer_handle xfer, usbd_pr
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;
@@ -1015,7 +1015,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_pr
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;
}
@@ -1075,7 +1075,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_pr
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__));
}
@@ -1340,7 +1340,7 @@ url_unlock_mii(struct url_softc *sc)
rw_exit(&sc->sc_mii_rwlock);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
}
Static int
Index: src/sys/dev/usb/stuirda.c
diff -u src/sys/dev/usb/stuirda.c:1.11.12.1 src/sys/dev/usb/stuirda.c:1.11.12.2
--- src/sys/dev/usb/stuirda.c:1.11.12.1 Sat Feb 18 07:35:07 2012
+++ src/sys/dev/usb/stuirda.c Sun Feb 26 07:12:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: stuirda.c,v 1.11.12.1 2012/02/18 07:35:07 mrg Exp $ */
+/* $NetBSD: stuirda.c,v 1.11.12.2 2012/02/26 07:12:49 mrg Exp $ */
/*
* Copyright (c) 2001,2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.11.12.1 2012/02/18 07:35:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: stuirda.c,v 1.11.12.2 2012/02/26 07:12:49 mrg Exp $");
#include <sys/param.h>
@@ -329,7 +329,7 @@ stuirda_write(void *h, struct uio *uio,
mutex_exit(&sc->sc_wr_buf_lk);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
DPRINTFN(1,("%s: sc=%p done\n", __func__, sc));
return (error);
Index: src/sys/dev/usb/ubt.c
diff -u src/sys/dev/usb/ubt.c:1.40.8.1 src/sys/dev/usb/ubt.c:1.40.8.2
--- src/sys/dev/usb/ubt.c:1.40.8.1 Sat Feb 18 07:35:07 2012
+++ src/sys/dev/usb/ubt.c Sun Feb 26 07:12:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ubt.c,v 1.40.8.1 2012/02/18 07:35:07 mrg Exp $ */
+/* $NetBSD: ubt.c,v 1.40.8.2 2012/02/26 07:12:49 mrg Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.40.8.1 2012/02/18 07:35:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ubt.c,v 1.40.8.2 2012/02/26 07:12:49 mrg Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -575,7 +575,7 @@ ubt_detach(device_t self, int flags)
/* wait for all processes to finish */
s = splusb();
if (sc->sc_refcnt-- > 0)
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
splx(s);
@@ -1089,7 +1089,7 @@ ubt_xmit_cmd_complete(usbd_xfer_handle x
if (--sc->sc_refcnt < 0) {
DPRINTF("sc_refcnt=%d\n", sc->sc_refcnt);
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return;
}
@@ -1200,7 +1200,7 @@ ubt_xmit_acl_complete(usbd_xfer_handle x
sc->sc_aclwr_busy = 0;
if (--sc->sc_refcnt < 0) {
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return;
}
@@ -1365,7 +1365,7 @@ ubt_xmit_sco_complete(usbd_xfer_handle x
}
if (--sc->sc_refcnt < 0) {
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return;
}
@@ -1500,7 +1500,7 @@ ubt_recv_acl_complete(usbd_xfer_handle x
if (--sc->sc_refcnt < 0) {
DPRINTF("refcnt = %d\n", sc->sc_refcnt);
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return;
}
@@ -1591,7 +1591,7 @@ ubt_recv_sco_complete(usbd_xfer_handle x
if (--sc->sc_refcnt < 0) {
DPRINTF("refcnt=%d\n", sc->sc_refcnt);
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return;
}
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.88.2.2 src/sys/dev/usb/ucom.c:1.88.2.3
--- src/sys/dev/usb/ucom.c:1.88.2.2 Fri Feb 24 09:11:42 2012
+++ src/sys/dev/usb/ucom.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.88.2.2 2012/02/24 09:11:42 mrg Exp $ */
+/* $NetBSD: ucom.c,v 1.88.2.3 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.88.2.2 2012/02/24 09:11:42 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.88.2.3 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -277,7 +277,7 @@ ucom_detach(device_t self, int flags)
mutex_spin_exit(&tty_lock);
}
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
softint_disestablish(sc->sc_si);
@@ -606,7 +606,7 @@ ucomclose(dev_t dev, int flag, int mode,
sc->sc_methods->ucom_close(sc->sc_parent, sc->sc_portno);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
splx(s);
return (0);
@@ -625,7 +625,7 @@ ucomread(dev_t dev, struct uio *uio, int
sc->sc_refcnt++;
error = ((*tp->t_linesw->l_read)(tp, uio, flag));
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -642,7 +642,7 @@ ucomwrite(dev_t dev, struct uio *uio, in
sc->sc_refcnt++;
error = ((*tp->t_linesw->l_write)(tp, uio, flag));
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -662,7 +662,7 @@ ucompoll(dev_t dev, int events, struct l
sc->sc_refcnt++;
revents = ((*tp->t_linesw->l_poll)(tp, events, l));
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (revents);
}
@@ -684,7 +684,7 @@ ucomioctl(dev_t dev, u_long cmd, void *d
sc->sc_refcnt++;
error = ucom_do_ioctl(sc, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
Index: src/sys/dev/usb/ucycom.c
diff -u src/sys/dev/usb/ucycom.c:1.33 src/sys/dev/usb/ucycom.c:1.33.8.1
--- src/sys/dev/usb/ucycom.c:1.33 Sun Apr 24 16:27:01 2011
+++ src/sys/dev/usb/ucycom.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ucycom.c,v 1.33 2011/04/24 16:27:01 rmind Exp $ */
+/* $NetBSD: ucycom.c,v 1.33.8.1 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.33 2011/04/24 16:27:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucycom.c,v 1.33.8.1 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -245,7 +245,7 @@ ucycom_detach(device_t self, int flags)
mutex_spin_exit(&tty_lock);
}
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_hdev.sc_dev);
+ usb_detach_waitold(sc->sc_hdev.sc_dev);
splx(s);
/* locate the major number */
Index: src/sys/dev/usb/ugen.c
diff -u src/sys/dev/usb/ugen.c:1.114.2.2 src/sys/dev/usb/ugen.c:1.114.2.3
--- src/sys/dev/usb/ugen.c:1.114.2.2 Fri Feb 24 09:11:43 2012
+++ src/sys/dev/usb/ugen.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.114.2.2 2012/02/24 09:11:43 mrg Exp $ */
+/* $NetBSD: ugen.c,v 1.114.2.3 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.114.2.2 2012/02/24 09:11:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.114.2.3 2012/02/26 07:12:50 mrg Exp $");
#include "opt_compat_netbsd.h"
@@ -756,7 +756,7 @@ ugenread(dev_t dev, struct uio *uio, int
sc->sc_refcnt++;
error = ugen_do_read(sc, endpt, uio, flag);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -941,7 +941,7 @@ ugenwrite(dev_t dev, struct uio *uio, in
sc->sc_refcnt++;
error = ugen_do_write(sc, endpt, uio, flag);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -987,7 +987,7 @@ ugen_detach(device_t self, int flags)
for (i = 0; i < USB_MAX_ENDPOINTS; i++)
wakeup(&sc->sc_endpoints[i][IN]);
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
@@ -1782,7 +1782,7 @@ ugenioctl(dev_t dev, u_long cmd, void *a
sc->sc_refcnt++;
error = ugen_do_ioctl(sc, endpt, cmd, addr, flag, l);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
Index: src/sys/dev/usb/uhso.c
diff -u src/sys/dev/usb/uhso.c:1.5.8.1 src/sys/dev/usb/uhso.c:1.5.8.2
--- src/sys/dev/usb/uhso.c:1.5.8.1 Sat Feb 18 07:35:09 2012
+++ src/sys/dev/usb/uhso.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uhso.c,v 1.5.8.1 2012/02/18 07:35:09 mrg Exp $ */
+/* $NetBSD: uhso.c,v 1.5.8.2 2012/02/26 07:12:50 mrg Exp $ */
/*-
* Copyright (c) 2009 Iain Hibbert
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.5.8.1 2012/02/18 07:35:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhso.c,v 1.5.8.2 2012/02/26 07:12:50 mrg Exp $");
#include "opt_inet.h"
@@ -549,13 +549,13 @@ uhso_detach(device_t self, int flags)
s = splusb();
if (sc->sc_refcnt-- > 0) {
DPRINTF(1, "waiting for refcnt (%d)..\n", sc->sc_refcnt);
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
/*
* XXX the tty close routine increases/decreases refcnt causing
- * XXX another usb_detach_wakeup() does it matter, should these
+ * XXX another usb_detach_wakeupold() does it matter, should these
* XXX be before the detach_wait? or before the abort?
*/
@@ -1253,7 +1253,7 @@ uhso_bulk_control(struct uhso_port *hp)
status = 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 (status != USBD_NORMAL_COMPLETION) {
DPRINTF(0, "non-normal status %s\n", usbd_errstr(status));
@@ -1356,7 +1356,7 @@ uhso_tty_write_cb(usbd_xfer_handle xfer,
int s;
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(0, "non-normal status %s\n", usbd_errstr(status));
@@ -1390,7 +1390,7 @@ uhso_tty_read_cb(usbd_xfer_handle xfer,
int s;
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(0, "non-normal status: %s\n", usbd_errstr(status));
@@ -1569,7 +1569,7 @@ uhso_tty_close(dev_t dev, int flag, int
uhso_tty_clean(hp);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return 0;
}
@@ -1617,7 +1617,7 @@ uhso_tty_read(dev_t dev, struct uio *uio
error = tp->t_linesw->l_read(tp, uio, flag);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return error;
}
@@ -1640,7 +1640,7 @@ uhso_tty_write(dev_t dev, struct uio *ui
error = tp->t_linesw->l_write(tp, uio, flag);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return error;
}
@@ -1662,7 +1662,7 @@ uhso_tty_ioctl(dev_t dev, u_long cmd, vo
error = uhso_tty_do_ioctl(hp, cmd, data, flag, l);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return error;
}
@@ -1764,7 +1764,7 @@ uhso_tty_poll(dev_t dev, int events, str
revents = tp->t_linesw->l_poll(tp, events, l);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return revents;
}
@@ -1976,7 +1976,7 @@ uhso_ifnet_write_cb(usbd_xfer_handle xfe
int s;
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
if (!ISSET(ifp->if_flags, IFF_RUNNING))
return;
@@ -2017,7 +2017,7 @@ uhso_ifnet_read_cb(usbd_xfer_handle xfer
uint32_t cc;
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
if (!ISSET(ifp->if_flags, IFF_RUNNING))
return;
Index: src/sys/dev/usb/uirda.c
diff -u src/sys/dev/usb/uirda.c:1.34.12.1 src/sys/dev/usb/uirda.c:1.34.12.2
--- src/sys/dev/usb/uirda.c:1.34.12.1 Sat Feb 18 07:35:10 2012
+++ src/sys/dev/usb/uirda.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uirda.c,v 1.34.12.1 2012/02/18 07:35:10 mrg Exp $ */
+/* $NetBSD: uirda.c,v 1.34.12.2 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.34.12.1 2012/02/18 07:35:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uirda.c,v 1.34.12.2 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -317,7 +317,7 @@ uirda_detach(device_t self, int flags)
s = splusb();
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
@@ -518,7 +518,7 @@ uirda_read(void *h, struct uio *uio, int
ret:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -570,7 +570,7 @@ uirda_write(void *h, struct uio *uio, in
mutex_exit(&sc->sc_wr_buf_lk);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
DPRINTFN(1,("%s: sc=%p done\n", __func__, sc));
return (error);
Index: src/sys/dev/usb/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.86.8.2 src/sys/dev/usb/ulpt.c:1.86.8.3
--- src/sys/dev/usb/ulpt.c:1.86.8.2 Fri Feb 24 09:11:43 2012
+++ src/sys/dev/usb/ulpt.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ulpt.c,v 1.86.8.2 2012/02/24 09:11:43 mrg Exp $ */
+/* $NetBSD: ulpt.c,v 1.86.8.3 2012/02/26 07:12:50 mrg Exp $ */
/* $FreeBSD: src/sys/dev/usb/ulpt.c,v 1.24 1999/11/17 22:33:44 n_hibma Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.86.8.2 2012/02/24 09:11:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.86.8.3 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -351,7 +351,7 @@ ulpt_detach(device_t self, int flags)
if (--sc->sc_refcnt >= 0) {
/* There is noone to wake, aborting the pipe is enough */
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
@@ -531,7 +531,7 @@ ulptopen(dev_t dev, int flag, int mode,
done:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
DPRINTFN(2, ("ulptopen: done, error=%d\n", error));
return (error);
@@ -647,7 +647,7 @@ ulptwrite(dev_t dev, struct uio *uio, in
sc->sc_refcnt++;
error = ulpt_do_write(sc, uio, flags);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -830,7 +830,7 @@ ulptread(dev_t dev, struct uio *uio, int
sc->sc_refcnt++;
error = ulpt_do_read(sc, uio, flags);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.38.6.3 src/sys/dev/usb/umass_scsipi.c:1.38.6.4
--- src/sys/dev/usb/umass_scsipi.c:1.38.6.3 Sat Feb 25 10:26:24 2012
+++ src/sys/dev/usb/umass_scsipi.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_scsipi.c,v 1.38.6.3 2012/02/25 10:26:24 mrg Exp $ */
+/* $NetBSD: umass_scsipi.c,v 1.38.6.4 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.38.6.3 2012/02/25 10:26:24 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.38.6.4 2012/02/26 07:12:50 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_umass.h"
@@ -139,7 +139,7 @@ umass_scsi_attach(struct umass_softc *sc
config_found_ia(sc->sc_dev, "scsi", &scbus->sc_channel,
scsiprint);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (0);
}
@@ -167,7 +167,7 @@ umass_atapi_attach(struct umass_softc *s
config_found_ia(sc->sc_dev, "atapi", &scbus->sc_channel,
atapiprint);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (0);
}
Index: src/sys/dev/usb/urio.c
diff -u src/sys/dev/usb/urio.c:1.35.12.2 src/sys/dev/usb/urio.c:1.35.12.3
--- src/sys/dev/usb/urio.c:1.35.12.2 Fri Feb 24 09:11:43 2012
+++ src/sys/dev/usb/urio.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: urio.c,v 1.35.12.2 2012/02/24 09:11:43 mrg Exp $ */
+/* $NetBSD: urio.c,v 1.35.12.3 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.35.12.2 2012/02/24 09:11:43 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: urio.c,v 1.35.12.3 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -226,7 +226,7 @@ urio_detach(device_t self, int flags)
s = splusb();
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
@@ -368,7 +368,7 @@ urioread(dev_t dev, struct uio *uio, int
usbd_free_xfer(xfer);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -426,7 +426,7 @@ uriowrite(dev_t dev, struct uio *uio, in
usbd_free_xfer(xfer);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
DPRINTFN(5, ("uriowrite: done unit=%d, error=%d\n", URIOUNIT(dev),
error));
@@ -514,7 +514,7 @@ urioioctl(dev_t dev, u_long cmd, void *a
&req_actlen, USBD_DEFAULT_TIMEOUT);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
if (err) {
error = EIO;
Index: src/sys/dev/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.55.12.4 src/sys/dev/usb/usbdi_util.c:1.55.12.5
--- src/sys/dev/usb/usbdi_util.c:1.55.12.4 Sun Feb 26 05:05:45 2012
+++ src/sys/dev/usb/usbdi_util.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.55.12.4 2012/02/26 05:05:45 mrg Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.55.12.5 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.55.12.4 2012/02/26 05:05:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.55.12.5 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -531,19 +531,19 @@ usb_detach_broadcast(device_t dv, kcondv
}
void
-usb_detach_wait(device_t dv)
+usb_detach_waitold(device_t dv)
{
- DPRINTF(("usb_detach_wait: waiting for %s\n", device_xname(dv)));
+ DPRINTF(("usb_detach_waitold: waiting for %s\n", device_xname(dv)));
if (tsleep(dv, PZERO, "usbdet", hz * 60)) /* XXXSMP ok */
- printf("usb_detach_wait: %s didn't detach\n",
+ printf("usb_detach_waitold: %s didn't detach\n",
device_xname(dv));
- DPRINTF(("usb_detach_wait: %s done\n", device_xname(dv)));
+ DPRINTF(("usb_detach_waitold: %s done\n", device_xname(dv)));
}
void
-usb_detach_wakeup(device_t dv)
+usb_detach_wakeupold(device_t dv)
{
- DPRINTF(("usb_detach_wakeup: for %s\n", device_xname(dv)));
+ DPRINTF(("usb_detach_wakeupold: for %s\n", device_xname(dv)));
wakeup(dv); /* XXXSMP ok */
}
Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.41.16.1 src/sys/dev/usb/usbdi_util.h:1.41.16.2
--- src/sys/dev/usb/usbdi_util.h:1.41.16.1 Sat Feb 25 20:47:32 2012
+++ src/sys/dev/usb/usbdi_util.h Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.41.16.1 2012/02/25 20:47:32 mrg Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.41.16.2 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -69,7 +69,6 @@ usbd_status usbd_get_config(usbd_device_
usbd_status usbd_get_string_desc(usbd_device_handle dev, int sindex,
int langid,usb_string_descriptor_t *sdesc,
int *sizep);
-void usbd_delay_ms(usbd_device_handle, u_int);
usbd_status usbd_set_config_no(usbd_device_handle, int, int);
@@ -83,8 +82,8 @@ usbd_status usbd_intr_transfer(usbd_xfer
u_int16_t, u_int32_t, void *,
u_int32_t *, const char *);
-void usb_detach_wait(device_t);
-void usb_detach_wakeup(device_t);
+void usb_detach_waitold(device_t);
+void usb_detach_wakeupold(device_t);
/*
* MPSAFE versions - mutex must be at IPL_USB.
Index: src/sys/dev/usb/uscanner.c
diff -u src/sys/dev/usb/uscanner.c:1.68.12.2 src/sys/dev/usb/uscanner.c:1.68.12.3
--- src/sys/dev/usb/uscanner.c:1.68.12.2 Fri Feb 24 09:11:44 2012
+++ src/sys/dev/usb/uscanner.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uscanner.c,v 1.68.12.2 2012/02/24 09:11:44 mrg Exp $ */
+/* $NetBSD: uscanner.c,v 1.68.12.3 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.68.12.2 2012/02/24 09:11:44 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uscanner.c,v 1.68.12.3 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -527,7 +527,7 @@ uscannerread(dev_t dev, struct uio *uio,
sc->sc_refcnt++;
error = uscanner_do_read(sc, uio, flag);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -577,7 +577,7 @@ uscannerwrite(dev_t dev, struct uio *uio
sc->sc_refcnt++;
error = uscanner_do_write(sc, uio, flag);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -616,7 +616,7 @@ uscanner_detach(device_t self, int flags
s = splusb();
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
Index: src/sys/dev/usb/usscanner.c
diff -u src/sys/dev/usb/usscanner.c:1.30.12.3 src/sys/dev/usb/usscanner.c:1.30.12.4
--- src/sys/dev/usb/usscanner.c:1.30.12.3 Fri Feb 24 09:11:44 2012
+++ src/sys/dev/usb/usscanner.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: usscanner.c,v 1.30.12.3 2012/02/24 09:11:44 mrg Exp $ */
+/* $NetBSD: usscanner.c,v 1.30.12.4 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.30.12.3 2012/02/24 09:11:44 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usscanner.c,v 1.30.12.4 2012/02/26 07:12:50 mrg Exp $");
#include "scsibus.h"
#include <sys/param.h>
@@ -372,7 +372,7 @@ usscanner_detach(device_t self, int flag
s = splusb();
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
Index: src/sys/dev/usb/ustir.c
diff -u src/sys/dev/usb/ustir.c:1.29.12.1 src/sys/dev/usb/ustir.c:1.29.12.2
--- src/sys/dev/usb/ustir.c:1.29.12.1 Sat Feb 18 07:35:13 2012
+++ src/sys/dev/usb/ustir.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ustir.c,v 1.29.12.1 2012/02/18 07:35:13 mrg Exp $ */
+/* $NetBSD: ustir.c,v 1.29.12.2 2012/02/26 07:12:50 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.29.12.1 2012/02/18 07:35:13 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ustir.c,v 1.29.12.2 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -419,7 +419,7 @@ ustir_detach(device_t self, int flags)
s = splusb();
if (--sc->sc_refcnt >= 0) {
/* Wait for processes to go away. */
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
}
splx(s);
@@ -729,7 +729,7 @@ ustir_thread(void *arg)
wakeup(&sc->sc_closing);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
kthread_exit(0);
}
@@ -1010,7 +1010,7 @@ ustir_close(void *h, int flag, int mode,
}
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return 0;
}
@@ -1081,7 +1081,7 @@ ustir_read(void *h, struct uio *uio, int
ret:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return error;
}
@@ -1201,7 +1201,7 @@ ustir_write(void *h, struct uio *uio, in
ret:
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
DPRINTFN(1,("%s: sc=%p done\n", __func__, sc));
return error;
@@ -1390,7 +1390,7 @@ Static int ustir_ioctl(void *h, u_long c
}
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return error;
}
Index: src/sys/dev/usb/utoppy.c
diff -u src/sys/dev/usb/utoppy.c:1.15.12.1 src/sys/dev/usb/utoppy.c:1.15.12.2
--- src/sys/dev/usb/utoppy.c:1.15.12.1 Thu Dec 8 03:10:09 2011
+++ src/sys/dev/usb/utoppy.c Sun Feb 26 07:12:50 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: utoppy.c,v 1.15.12.1 2011/12/08 03:10:09 mrg Exp $ */
+/* $NetBSD: utoppy.c,v 1.15.12.2 2012/02/26 07:12:50 mrg Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.15.12.1 2011/12/08 03:10:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: utoppy.c,v 1.15.12.2 2012/02/26 07:12:50 mrg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -345,7 +345,7 @@ utoppy_detach(device_t self, int flags)
s = splusb();
if (--sc->sc_refcnt >= 0)
- usb_detach_wait(sc->sc_dev);
+ usb_detach_waitold(sc->sc_dev);
splx(s);
/* locate the major number */
@@ -1424,7 +1424,7 @@ utoppyopen(dev_t dev, int flag, int mode
utoppy_state_string(sc->sc_state)));
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (error);
}
@@ -1562,7 +1562,7 @@ utoppyread(dev_t dev, struct uio *uio, i
device_xname(sc->sc_dev), err, utoppy_state_string(sc->sc_state)));
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (err);
}
@@ -1665,7 +1665,7 @@ utoppywrite(dev_t dev, struct uio *uio,
}
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (err);
}
@@ -1930,7 +1930,7 @@ utoppyioctl(dev_t dev, u_long cmd, void
utoppy_cancel(sc);
if (--sc->sc_refcnt < 0)
- usb_detach_wakeup(sc->sc_dev);
+ usb_detach_wakeupold(sc->sc_dev);
return (err);
}
