summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/if_atu.c6
-rw-r--r--sys/dev/usb/if_aue.c8
-rw-r--r--sys/dev/usb/if_axe.c6
-rw-r--r--sys/dev/usb/if_cdce.c6
-rw-r--r--sys/dev/usb/if_cue.c6
-rw-r--r--sys/dev/usb/if_kue.c6
-rw-r--r--sys/dev/usb/if_ral.c6
-rw-r--r--sys/dev/usb/if_udav.c6
-rw-r--r--sys/dev/usb/if_upl.c8
-rw-r--r--sys/dev/usb/if_url.c6
-rw-r--r--sys/dev/usb/if_wi_usb.c10
-rw-r--r--sys/dev/usb/ueagle.c4
12 files changed, 39 insertions, 39 deletions
diff --git a/sys/dev/usb/if_atu.c b/sys/dev/usb/if_atu.c
index b79368dcf34..c6c5c29f014 100644
--- a/sys/dev/usb/if_atu.c
+++ b/sys/dev/usb/if_atu.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_atu.c,v 1.66 2006/01/29 01:13:47 dlg Exp $ */
+/* $OpenBSD: if_atu.c,v 1.67 2006/01/29 03:22:52 brad Exp $ */
/*
* Copyright (c) 2003, 2004
* Daan Vreeken <Danovitsch@Vitsch.net>. All rights reserved.
@@ -1698,7 +1698,7 @@ atu_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
USBDEVNAME(sc->atu_dev), usbd_errstr(status)));
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(
+ usbd_clear_endpoint_stall_async(
sc->atu_ep[ATU_ENDPT_RX]);
goto done;
}
@@ -1801,7 +1801,7 @@ atu_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
DPRINTF(("%s: usb error on tx: %s\n", USBDEVNAME(sc->atu_dev),
usbd_errstr(status)));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->atu_ep[ATU_ENDPT_TX]);
+ usbd_clear_endpoint_stall_async(sc->atu_ep[ATU_ENDPT_TX]);
return;
}
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 32a24dcd98d..d2a066bf384 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aue.c,v 1.42 2005/08/01 05:36:47 brad Exp $ */
+/* $OpenBSD: if_aue.c,v 1.43 2006/01/29 03:22:52 brad Exp $ */
/* $NetBSD: if_aue.c,v 1.82 2003/03/05 17:37:36 shiba Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1063,7 +1063,7 @@ aue_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->aue_intr_errs = 0;
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->aue_ep[AUE_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->aue_ep[AUE_ENDPT_RX]);
return;
}
@@ -1108,7 +1108,7 @@ aue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->aue_rx_errs = 0;
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->aue_ep[AUE_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->aue_ep[AUE_ENDPT_RX]);
goto done;
}
@@ -1209,7 +1209,7 @@ aue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->aue_dev),
usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->aue_ep[AUE_ENDPT_TX]);
+ usbd_clear_endpoint_stall_async(sc->aue_ep[AUE_ENDPT_TX]);
splx(s);
return;
}
diff --git a/sys/dev/usb/if_axe.c b/sys/dev/usb/if_axe.c
index 443da9ac5c2..519fa52463d 100644
--- a/sys/dev/usb/if_axe.c
+++ b/sys/dev/usb/if_axe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_axe.c,v 1.44 2006/01/10 10:15:22 dlg Exp $ */
+/* $OpenBSD: if_axe.c,v 1.45 2006/01/29 03:22:52 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003
@@ -948,7 +948,7 @@ axe_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
USBDEVNAME(sc->axe_dev), usbd_errstr(status));
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->axe_ep[AXE_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->axe_ep[AXE_ENDPT_RX]);
goto done;
}
@@ -1057,7 +1057,7 @@ axe_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("axe%d: usb error on tx: %s\n", sc->axe_unit,
usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->axe_ep[AXE_ENDPT_TX]);
+ usbd_clear_endpoint_stall_async(sc->axe_ep[AXE_ENDPT_TX]);
splx(s);
return;
}
diff --git a/sys/dev/usb/if_cdce.c b/sys/dev/usb/if_cdce.c
index f40c3b583ad..e5f1b640461 100644
--- a/sys/dev/usb/if_cdce.c
+++ b/sys/dev/usb/if_cdce.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cdce.c,v 1.12 2005/12/13 17:41:59 drahn Exp $ */
+/* $OpenBSD: if_cdce.c,v 1.13 2006/01/29 03:22:52 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000-2003 Bill Paul <wpaul@windriver.com>
@@ -626,7 +626,7 @@ cdce_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("%s: usb error on rx: %s\n",
USBDEVNAME(sc->cdce_dev), usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->cdce_bulkin_pipe);
+ usbd_clear_endpoint_stall_async(sc->cdce_bulkin_pipe);
DELAY(sc->cdce_rxeof_errors * 10000);
sc->cdce_rxeof_errors++;
goto done;
@@ -704,7 +704,7 @@ cdce_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->cdce_dev),
usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->cdce_bulkout_pipe);
+ usbd_clear_endpoint_stall_async(sc->cdce_bulkout_pipe);
splx(s);
return;
}
diff --git a/sys/dev/usb/if_cue.c b/sys/dev/usb/if_cue.c
index 0da05862cb0..81610ef68fd 100644
--- a/sys/dev/usb/if_cue.c
+++ b/sys/dev/usb/if_cue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_cue.c,v 1.27 2005/08/01 05:36:48 brad Exp $ */
+/* $OpenBSD: if_cue.c,v 1.28 2006/01/29 03:22:52 brad Exp $ */
/* $NetBSD: if_cue.c,v 1.40 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -776,7 +776,7 @@ cue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->cue_rx_errs = 0;
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->cue_ep[CUE_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->cue_ep[CUE_ENDPT_RX]);
goto done;
}
@@ -869,7 +869,7 @@ cue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->cue_dev),
usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->cue_ep[CUE_ENDPT_TX]);
+ usbd_clear_endpoint_stall_async(sc->cue_ep[CUE_ENDPT_TX]);
splx(s);
return;
}
diff --git a/sys/dev/usb/if_kue.c b/sys/dev/usb/if_kue.c
index fe28ccc43e7..21fdf08367d 100644
--- a/sys/dev/usb/if_kue.c
+++ b/sys/dev/usb/if_kue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_kue.c,v 1.38 2005/08/01 05:36:48 brad Exp $ */
+/* $OpenBSD: if_kue.c,v 1.39 2006/01/29 03:22:52 brad Exp $ */
/* $NetBSD: if_kue.c,v 1.50 2002/07/16 22:00:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -769,7 +769,7 @@ kue_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->kue_rx_errs = 0;
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->kue_ep[KUE_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->kue_ep[KUE_ENDPT_RX]);
goto done;
}
@@ -870,7 +870,7 @@ kue_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->kue_dev),
usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->kue_ep[KUE_ENDPT_TX]);
+ usbd_clear_endpoint_stall_async(sc->kue_ep[KUE_ENDPT_TX]);
splx(s);
return;
}
diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index b90945db3b6..769be5e7655 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ral.c,v 1.61 2006/01/22 21:41:03 damien Exp $ */
+/* $OpenBSD: if_ral.c,v 1.62 2006/01/29 03:22:52 brad Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -848,7 +848,7 @@ ural_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->sc_tx_pipeh);
+ usbd_clear_endpoint_stall_async(sc->sc_tx_pipeh);
ifp->if_oerrors++;
return;
@@ -891,7 +891,7 @@ ural_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->sc_rx_pipeh);
+ usbd_clear_endpoint_stall_async(sc->sc_rx_pipeh);
goto skip;
}
diff --git a/sys/dev/usb/if_udav.c b/sys/dev/usb/if_udav.c
index 73f851a0ac0..9709b602cf3 100644
--- a/sys/dev/usb/if_udav.c
+++ b/sys/dev/usb/if_udav.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_udav.c,v 1.13 2005/08/01 05:36:48 brad Exp $ */
+/* $OpenBSD: if_udav.c,v 1.14 2006/01/29 03:22:52 brad Exp $ */
/* $NetBSD: if_udav.c,v 1.3 2004/04/23 17:25:25 itojun Exp $ */
/* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */
/*
@@ -1081,7 +1081,7 @@ udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_errstr(status));
if (status == USBD_STALLED) {
sc->sc_refcnt++;
- usbd_clear_endpoint_stall(sc->sc_pipe_tx);
+ usbd_clear_endpoint_stall_async(sc->sc_pipe_tx);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
}
@@ -1128,7 +1128,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
if (status == USBD_STALLED) {
sc->sc_refcnt++;
- usbd_clear_endpoint_stall(sc->sc_pipe_rx);
+ usbd_clear_endpoint_stall_async(sc->sc_pipe_rx);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
}
diff --git a/sys/dev/usb/if_upl.c b/sys/dev/usb/if_upl.c
index 57370973563..09b187217f4 100644
--- a/sys/dev/usb/if_upl.c
+++ b/sys/dev/usb/if_upl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_upl.c,v 1.21 2006/01/04 06:04:41 canacar Exp $ */
+/* $OpenBSD: if_upl.c,v 1.22 2006/01/29 03:22:52 brad Exp $ */
/* $NetBSD: if_upl.c,v 1.19 2002/07/11 21:14:26 augustss Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -541,7 +541,7 @@ upl_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_rx_errs = 0;
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->sc_ep[UPL_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->sc_ep[UPL_ENDPT_RX]);
goto done;
}
@@ -635,7 +635,7 @@ upl_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->sc_dev),
usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->sc_ep[UPL_ENDPT_TX]);
+ usbd_clear_endpoint_stall_async(sc->sc_ep[UPL_ENDPT_TX]);
splx(s);
return;
}
@@ -851,7 +851,7 @@ upl_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_intr_errs = 0;
}
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->sc_ep[UPL_ENDPT_RX]);
+ usbd_clear_endpoint_stall_async(sc->sc_ep[UPL_ENDPT_RX]);
return;
}
diff --git a/sys/dev/usb/if_url.c b/sys/dev/usb/if_url.c
index f19c5645eaf..9935a59eb5a 100644
--- a/sys/dev/usb/if_url.c
+++ b/sys/dev/usb/if_url.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_url.c,v 1.27 2005/09/23 10:24:51 grunk Exp $ */
+/* $OpenBSD: if_url.c,v 1.28 2006/01/29 03:22:52 brad Exp $ */
/* $NetBSD: if_url.c,v 1.6 2002/09/29 10:19:21 martin Exp $ */
/*
* Copyright (c) 2001, 2002
@@ -996,7 +996,7 @@ url_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_errstr(status));
if (status == USBD_STALLED) {
sc->sc_refcnt++;
- usbd_clear_endpoint_stall(sc->sc_pipe_tx);
+ usbd_clear_endpoint_stall_async(sc->sc_pipe_tx);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
}
@@ -1043,7 +1043,7 @@ url_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
if (status == USBD_STALLED) {
sc->sc_refcnt++;
- usbd_clear_endpoint_stall(sc->sc_pipe_rx);
+ usbd_clear_endpoint_stall_async(sc->sc_pipe_rx);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
}
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 60083f5bcdc..636855f9844 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.27 2006/01/25 20:58:12 grange Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.28 2006/01/29 03:22:52 brad Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -1114,7 +1114,7 @@ wi_usb_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_errstr(status));
if (status == USBD_STALLED) {
sc->wi_usb_refcnt++;
- usbd_clear_endpoint_stall(
+ usbd_clear_endpoint_stall_async(
sc->wi_usb_ep[WI_USB_ENDPT_TX]);
if (--sc->wi_usb_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->wi_usb_dev));
@@ -1160,7 +1160,7 @@ wi_usb_txeof_frm(usbd_xfer_handle xfer, usbd_private_handle priv,
usbd_errstr(status));
if (status == USBD_STALLED) {
sc->wi_usb_refcnt++;
- usbd_clear_endpoint_stall(
+ usbd_clear_endpoint_stall_async(
sc->wi_usb_ep[WI_USB_ENDPT_TX]);
if (--sc->wi_usb_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->wi_usb_dev));
@@ -1407,7 +1407,7 @@ wi_usb_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status
#endif
if (status == USBD_STALLED) {
sc->wi_usb_refcnt++;
- usbd_clear_endpoint_stall(
+ usbd_clear_endpoint_stall_async(
sc->wi_usb_ep[WI_USB_ENDPT_RX]);
if (--sc->wi_usb_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->wi_usb_dev));
@@ -1510,7 +1510,7 @@ wi_usb_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
if (status == USBD_STALLED) {
sc->wi_usb_refcnt++;
- usbd_clear_endpoint_stall(
+ usbd_clear_endpoint_stall_async(
sc->wi_usb_ep[WI_USB_ENDPT_RX]);
if (--sc->wi_usb_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->wi_usb_dev));
diff --git a/sys/dev/usb/ueagle.c b/sys/dev/usb/ueagle.c
index b136811c761..75d4e1fa10c 100644
--- a/sys/dev/usb/ueagle.c
+++ b/sys/dev/usb/ueagle.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ueagle.c,v 1.8 2006/01/04 06:04:41 canacar Exp $ */
+/* $OpenBSD: ueagle.c,v 1.9 2006/01/29 03:22:52 brad Exp $ */
/*-
* Copyright (c) 2003-2005
@@ -944,7 +944,7 @@ ueagle_txeof(usbd_xfer_handle xfer, usbd_private_handle priv,
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
if (status == USBD_STALLED)
- usbd_clear_endpoint_stall(sc->pipeh_tx);
+ usbd_clear_endpoint_stall_async(sc->pipeh_tx);
ifp->if_oerrors++;
return;