summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/uhci.c
diff options
context:
space:
mode:
authorjoe <joe@FreeBSD.org>2002-04-01 22:03:37 +0000
committerjoe <joe@FreeBSD.org>2002-04-01 22:03:37 +0000
commit68a39ea77e6300590e09337bc648d93b5c6d047d (patch)
treea592c9fcea645d707ac8e87795399050d77e2010 /sys/dev/usb/uhci.c
parenteef2a1f1c70e06245e9496dc71631b01233c10b7 (diff)
downloadFreeBSD-src-68a39ea77e6300590e09337bc648d93b5c6d047d.zip
FreeBSD-src-68a39ea77e6300590e09337bc648d93b5c6d047d.tar.gz
MFNetBSD:
revision 1.140 date: 2001/10/24 20:20:03; author: augustss; state: Exp; lines: +9 -5 More debug.
Diffstat (limited to 'sys/dev/usb/uhci.c')
-rw-r--r--sys/dev/usb/uhci.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 929e8f5..39bb04b 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.138 2001/10/02 17:59:38 pooka Exp $ */
+/* $NetBSD: uhci.c,v 1.140 2001/10/24 20:20:03 augustss Exp $ */
/* $FreeBSD$ */
/*
@@ -1238,7 +1238,8 @@ uhci_softintr(void *v)
uhci_softc_t *sc = v;
uhci_intr_info_t *ii;
- DPRINTFN(10,("%s: uhci_softintr\n", USBDEVNAME(sc->sc_bus.bdev)));
+ DPRINTFN(10,("%s: uhci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev),
+ sc->sc_bus.intr_context));
sc->sc_bus.intr_context++;
@@ -1376,8 +1377,7 @@ uhci_idone(uhci_intr_info_t *ii)
upipe->u.iso.inuse -= nframes;
xfer->actlen = actlen;
xfer->status = USBD_NORMAL_COMPLETION;
- usb_transfer_complete(xfer);
- return;
+ goto end;
}
#ifdef UHCI_DEBUG
@@ -1404,7 +1404,7 @@ uhci_idone(uhci_intr_info_t *ii)
upipe->nexttoggle = UHCI_TD_GET_DT(le32toh(std->td.td_token));
status &= UHCI_TD_ERROR;
- DPRINTFN(10, ("uhci_check_intr: actlen=%d, status=0x%x\n",
+ DPRINTFN(10, ("uhci_idone: actlen=%d, status=0x%x\n",
actlen, status));
xfer->actlen = actlen;
if (status != 0) {
@@ -1431,6 +1431,8 @@ uhci_idone(uhci_intr_info_t *ii)
} else {
xfer->status = USBD_NORMAL_COMPLETION;
}
+
+end:
usb_transfer_complete(xfer);
DPRINTFN(12, ("uhci_idone: ii=%p done\n", ii));
}
OpenPOWER on IntegriCloud