MFNetBSD:
date: 2003/05/13 04:41:59; author: gson; Function names printed in debug messages did not always match the actual name of the function.
This commit is contained in:
parent
d0eba3629e
commit
771b291ad0
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=117576
@ -4,6 +4,7 @@
|
||||
/* Also, already ported:
|
||||
* $NetBSD: ohci.c,v 1.127 2002/08/07 20:03:19 augustss Exp $
|
||||
* $NetBSD: ohci.c,v 1.138 2003/02/08 03:32:50 ichiro Exp $
|
||||
* $NetBSD: ohci.c,v 1.140 2003/05/13 04:42:00 gson Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1484,11 +1485,11 @@ ohci_softintr(void *v)
|
||||
void
|
||||
ohci_device_ctrl_done(usbd_xfer_handle xfer)
|
||||
{
|
||||
DPRINTFN(10,("ohci_ctrl_done: xfer=%p\n", xfer));
|
||||
DPRINTFN(10,("ohci_device_ctrl_done: xfer=%p\n", xfer));
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
if (!(xfer->rqflags & URQ_REQUEST)) {
|
||||
panic("ohci_ctrl_done: not a request");
|
||||
panic("ohci_device_ctrl_done: not a request");
|
||||
}
|
||||
#endif
|
||||
xfer->hcpriv = NULL;
|
||||
@ -1503,7 +1504,7 @@ ohci_device_intr_done(usbd_xfer_handle xfer)
|
||||
ohci_soft_td_t *data, *tail;
|
||||
|
||||
|
||||
DPRINTFN(10,("ohci_intr_done: xfer=%p, actlen=%d\n",
|
||||
DPRINTFN(10,("ohci_device_intr_done: xfer=%p, actlen=%d\n",
|
||||
xfer, xfer->actlen));
|
||||
|
||||
xfer->hcpriv = NULL;
|
||||
@ -1541,7 +1542,7 @@ ohci_device_intr_done(usbd_xfer_handle xfer)
|
||||
void
|
||||
ohci_device_bulk_done(usbd_xfer_handle xfer)
|
||||
{
|
||||
DPRINTFN(10,("ohci_bulk_done: xfer=%p, actlen=%d\n",
|
||||
DPRINTFN(10,("ohci_device_bulk_done: xfer=%p, actlen=%d\n",
|
||||
xfer, xfer->actlen));
|
||||
|
||||
xfer->hcpriv = NULL;
|
||||
|
@ -12,6 +12,7 @@
|
||||
* $NetBSD: uhci.c,v 1.169 2003/02/16 23:15:28 augustss Exp $
|
||||
* $NetBSD: uhci.c,v 1.170 2003/02/19 01:35:04 augustss Exp $
|
||||
* $NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $
|
||||
* $NetBSD: uhci.c,v 1.173 2003/05/13 04:41:59 gson Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -2652,7 +2653,7 @@ uhci_device_intr_done(usbd_xfer_handle xfer)
|
||||
uhci_soft_qh_t *sqh;
|
||||
int i, npoll;
|
||||
|
||||
DPRINTFN(5, ("uhci_intr_done: length=%d\n", xfer->actlen));
|
||||
DPRINTFN(5, ("uhci_device_intr_done: length=%d\n", xfer->actlen));
|
||||
|
||||
npoll = upipe->u.intr.npoll;
|
||||
for(i = 0; i < npoll; i++) {
|
||||
@ -2714,7 +2715,7 @@ uhci_device_ctrl_done(usbd_xfer_handle xfer)
|
||||
|
||||
#ifdef DIAGNOSTIC
|
||||
if (!(xfer->rqflags & URQ_REQUEST))
|
||||
panic("uhci_ctrl_done: not a request");
|
||||
panic("uhci_device_ctrl_done: not a request");
|
||||
#endif
|
||||
|
||||
if (!uhci_active_intr_info(ii))
|
||||
@ -2730,7 +2731,7 @@ uhci_device_ctrl_done(usbd_xfer_handle xfer)
|
||||
if (upipe->u.ctl.length != 0)
|
||||
uhci_free_std_chain(sc, ii->stdstart->link.std, ii->stdend);
|
||||
|
||||
DPRINTFN(5, ("uhci_ctrl_done: length=%d\n", xfer->actlen));
|
||||
DPRINTFN(5, ("uhci_device_ctrl_done: length=%d\n", xfer->actlen));
|
||||
}
|
||||
|
||||
/* Deallocate request data structures */
|
||||
@ -2741,7 +2742,7 @@ uhci_device_bulk_done(usbd_xfer_handle xfer)
|
||||
uhci_softc_t *sc = ii->sc;
|
||||
struct uhci_pipe *upipe = (struct uhci_pipe *)xfer->pipe;
|
||||
|
||||
DPRINTFN(5,("uhci_device_ctrl_done: xfer=%p ii=%p sc=%p upipe=%p\n",
|
||||
DPRINTFN(5,("uhci_device_bulk_done: xfer=%p ii=%p sc=%p upipe=%p\n",
|
||||
xfer, ii, sc, upipe));
|
||||
|
||||
if (!uhci_active_intr_info(ii))
|
||||
@ -2753,7 +2754,7 @@ uhci_device_bulk_done(usbd_xfer_handle xfer)
|
||||
|
||||
uhci_free_std_chain(sc, ii->stdstart, NULL);
|
||||
|
||||
DPRINTFN(5, ("uhci_bulk_done: length=%d\n", xfer->actlen));
|
||||
DPRINTFN(5, ("uhci_device_bulk_done: length=%d\n", xfer->actlen));
|
||||
}
|
||||
|
||||
/* Add interrupt QH, called with vflock. */
|
||||
@ -2805,7 +2806,7 @@ uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
|
||||
int i, npoll, s;
|
||||
u_int bestbw, bw, bestoffs, offs;
|
||||
|
||||
DPRINTFN(2, ("uhci_setintr: pipe=%p\n", upipe));
|
||||
DPRINTFN(2, ("uhci_device_setintr: pipe=%p\n", upipe));
|
||||
if (ival == 0) {
|
||||
printf("uhci_setintr: 0 interval\n");
|
||||
return (USBD_INVAL);
|
||||
@ -2814,7 +2815,7 @@ uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
|
||||
if (ival > UHCI_VFRAMELIST_COUNT)
|
||||
ival = UHCI_VFRAMELIST_COUNT;
|
||||
npoll = (UHCI_VFRAMELIST_COUNT + ival - 1) / ival;
|
||||
DPRINTFN(2, ("uhci_setintr: ival=%d npoll=%d\n", ival, npoll));
|
||||
DPRINTFN(2, ("uhci_device_setintr: ival=%d npoll=%d\n", ival, npoll));
|
||||
|
||||
upipe->u.intr.npoll = npoll;
|
||||
upipe->u.intr.qhs =
|
||||
@ -2833,7 +2834,7 @@ uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
|
||||
bestoffs = offs;
|
||||
}
|
||||
}
|
||||
DPRINTFN(1, ("uhci_setintr: bw=%d offs=%d\n", bestbw, bestoffs));
|
||||
DPRINTFN(1, ("uhci_device_setintr: bw=%d offs=%d\n", bestbw, bestoffs));
|
||||
|
||||
for(i = 0; i < npoll; i++) {
|
||||
upipe->u.intr.qhs[i] = sqh = uhci_alloc_sqh(sc);
|
||||
@ -2849,7 +2850,7 @@ uhci_device_setintr(uhci_softc_t *sc, struct uhci_pipe *upipe, int ival)
|
||||
uhci_add_intr(sc, upipe->u.intr.qhs[i]);
|
||||
splx(s);
|
||||
|
||||
DPRINTFN(5, ("uhci_setintr: returns %p\n", upipe));
|
||||
DPRINTFN(5, ("uhci_device_setintr: returns %p\n", upipe));
|
||||
return (USBD_NORMAL_COMPLETION);
|
||||
}
|
||||
|
||||
@ -3505,7 +3506,7 @@ uhci_root_intr_start(usbd_xfer_handle xfer)
|
||||
usbd_pipe_handle pipe = xfer->pipe;
|
||||
uhci_softc_t *sc = (uhci_softc_t *)pipe->device->bus;
|
||||
|
||||
DPRINTFN(3, ("uhci_root_intr_transfer: xfer=%p len=%d flags=%d\n",
|
||||
DPRINTFN(3, ("uhci_root_intr_start: xfer=%p len=%d flags=%d\n",
|
||||
xfer, xfer->length, xfer->flags));
|
||||
|
||||
if (sc->sc_dying)
|
||||
|
Loading…
Reference in New Issue
Block a user