summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/usb/dwc2/dwc2.c4
-rw-r--r--sys/dev/usb/ehci.c6
-rw-r--r--sys/dev/usb/ohci.c12
-rw-r--r--sys/dev/usb/uhci.c14
-rw-r--r--sys/dev/usb/usbdi.c6
-rw-r--r--sys/dev/usb/usbdi.h8
6 files changed, 22 insertions, 28 deletions
diff --git a/sys/dev/usb/dwc2/dwc2.c b/sys/dev/usb/dwc2/dwc2.c
index 80832f45a5b..adfa69c9f85 100644
--- a/sys/dev/usb/dwc2/dwc2.c
+++ b/sys/dev/usb/dwc2/dwc2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dwc2.c,v 1.44 2017/04/30 16:45:46 mpi Exp $ */
+/* $OpenBSD: dwc2.c,v 1.45 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: dwc2.c,v 1.32 2014/09/02 23:26:20 macallan Exp $ */
/*-
@@ -532,7 +532,7 @@ dwc2_abort_xfer(struct usbd_xfer *xfer, usbd_status status)
bool wake;
int err;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTF("xfer=%p\n", xfer);
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 058aff19af1..9d2174bd6ff 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.199 2017/04/08 02:57:25 deraadt Exp $ */
+/* $OpenBSD: ehci.c,v 1.200 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */
/*
@@ -1512,7 +1512,7 @@ ehci_open(struct usbd_pipe *pipe)
void
ehci_add_qh(struct ehci_soft_qh *sqh, struct ehci_soft_qh *head)
{
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
usb_syncmem(&head->dma, head->offs + offsetof(struct ehci_qh, qh_link),
sizeof(head->qh.qh_link), BUS_DMASYNC_POSTWRITE);
@@ -1536,7 +1536,7 @@ ehci_add_qh(struct ehci_soft_qh *sqh, struct ehci_soft_qh *head)
void
ehci_rem_qh(struct ehci_softc *sc, struct ehci_soft_qh *sqh)
{
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
/* XXX */
usb_syncmem(&sqh->dma, sqh->offs + offsetof(struct ehci_qh, qh_link),
sizeof(sqh->qh.qh_link), BUS_DMASYNC_POSTWRITE);
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index 72e5abef11d..8baeabfa41a 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ohci.c,v 1.149 2017/03/10 11:18:48 mpi Exp $ */
+/* $OpenBSD: ohci.c,v 1.150 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $ */
/* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */
@@ -1649,7 +1649,7 @@ ohci_add_ed(struct ohci_soft_ed *sed, struct ohci_soft_ed *head)
{
DPRINTFN(8,("ohci_add_ed: sed=%p head=%p\n", sed, head));
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
sed->next = head->next;
sed->ed.ed_nexted = head->ed.ed_nexted;
head->next = sed;
@@ -1664,7 +1664,7 @@ ohci_rem_ed(struct ohci_soft_ed *sed, struct ohci_soft_ed *head)
{
struct ohci_soft_ed *p;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
/* XXX */
for (p = head; p != NULL && p->next != sed; p = p->next)
@@ -1692,7 +1692,7 @@ ohci_hash_add_td(struct ohci_softc *sc, struct ohci_soft_td *std)
{
int h = HASH(std->physaddr);
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
LIST_INSERT_HEAD(&sc->sc_hash_tds[h], std, hnext);
}
@@ -1717,7 +1717,7 @@ ohci_hash_add_itd(struct ohci_softc *sc, struct ohci_soft_itd *sitd)
{
int h = HASH(sitd->physaddr);
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10,("ohci_hash_add_itd: sitd=%p physaddr=0x%08lx\n",
sitd, (u_long)sitd->physaddr));
@@ -1729,7 +1729,7 @@ ohci_hash_add_itd(struct ohci_softc *sc, struct ohci_soft_itd *sitd)
void
ohci_hash_rem_itd(struct ohci_softc *sc, struct ohci_soft_itd *sitd)
{
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10,("ohci_hash_rem_itd: sitd=%p physaddr=0x%08lx\n",
sitd, (u_long)sitd->physaddr));
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 7cc3127a7e3..412d06d9b05 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uhci.c,v 1.142 2017/03/10 11:18:48 mpi Exp $ */
+/* $OpenBSD: uhci.c,v 1.143 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $ */
/* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */
@@ -870,7 +870,7 @@ uhci_add_hs_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *eqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_add_hs_ctrl: sqh=%p\n", sqh));
eqh = sc->sc_hctl_end;
@@ -890,7 +890,7 @@ uhci_remove_hs_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *pqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_remove_hs_ctrl: sqh=%p\n", sqh));
#ifdef UHCI_CTL_LOOP
@@ -923,7 +923,7 @@ uhci_add_ls_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *eqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_add_ls_ctrl: sqh=%p\n", sqh));
eqh = sc->sc_lctl_end;
@@ -940,7 +940,7 @@ uhci_remove_ls_ctrl(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *pqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_remove_ls_ctrl: sqh=%p\n", sqh));
/* See comment in uhci_remove_hs_ctrl() */
@@ -962,7 +962,7 @@ uhci_add_bulk(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *eqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_add_bulk: sqh=%p\n", sqh));
eqh = sc->sc_bulk_end;
@@ -980,7 +980,7 @@ uhci_remove_bulk(struct uhci_softc *sc, struct uhci_soft_qh *sqh)
{
struct uhci_soft_qh *pqh;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(10, ("uhci_remove_bulk: sqh=%p\n", sqh));
uhci_rem_loop(sc);
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index bcebf593cb1..8ef65ceece7 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi.c,v 1.94 2017/05/10 17:35:40 mpi Exp $ */
+/* $OpenBSD: usbdi.c,v 1.95 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */
@@ -718,7 +718,7 @@ usb_transfer_complete(struct usbd_xfer *xfer)
int polling = pipe->device->bus->use_polling;
int status, flags;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
DPRINTFN(5, ("usb_transfer_complete: pipe=%p xfer=%p status=%d "
"actlen=%d\n", pipe, xfer, xfer->status, xfer->actlen));
@@ -852,7 +852,7 @@ usbd_start_next(struct usbd_pipe *pipe)
struct usbd_xfer *xfer;
usbd_status err;
- SPLUSBCHECK;
+ splsoftassert(IPL_SOFTUSB);
#ifdef DIAGNOSTIC
if (pipe == NULL) {
diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h
index 2e85c9afe15..24de323c204 100644
--- a/sys/dev/usb/usbdi.h
+++ b/sys/dev/usb/usbdi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: usbdi.h,v 1.67 2016/03/03 18:13:24 stefan Exp $ */
+/* $OpenBSD: usbdi.h,v 1.68 2017/05/15 10:52:08 mpi Exp $ */
/* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
@@ -250,13 +250,7 @@ struct usb_attach_arg {
/* No match */
#define UMATCH_NONE 0
-/* XXX Perhaps USB should have its own levels? */
#define splusb splsoftnet
-#if 0
-#define SPLUSBCHECK splsoftassert(IPL_SOFTUSB)
-#else
-#define SPLUSBCHECK do { /* nothing */ } while (0)
-#endif
#define splhardusb splbio
#define IPL_USB IPL_BIO
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 10:21:47 +0000