Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change some printf to DPRINTF for consistency. From Nick Hibma, FreeBSD.

This commit is contained in:
augustss 1999-09-05 21:22:38 +00:00
parent 24251055bc
commit 2425433ff6
5 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
sys/dev/usb/ohci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ohci.c,v 1.40 1999/09/04 22:26:11 augustss Exp $ */
/* $NetBSD: ohci.c,v 1.41 1999/09/05 21:22:38 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -539,7 +539,7 @@ ohci_power(why, v)
#ifdef USB_DEBUG
ohci_softc_t *sc = v;
printf("ohci_power: sc=%p, why=%d\n", sc, why);
DPRINTF(("ohci_power: sc=%p, why=%d\n", sc, why));
/* XXX should suspend/resume */
ohci_dumpregs(sc);
#endif
@ -554,40 +554,40 @@ void
ohci_dumpregs(sc)
ohci_softc_t *sc;
{
printf("ohci_dumpregs: rev=0x%08x control=0x%08x command=0x%08x\n",
OREAD4(sc, OHCI_REVISION),
OREAD4(sc, OHCI_CONTROL),
OREAD4(sc, OHCI_COMMAND_STATUS));
printf(" intrstat=0x%08x intre=0x%08x intrd=0x%08x\n",
OREAD4(sc, OHCI_INTERRUPT_STATUS),
OREAD4(sc, OHCI_INTERRUPT_ENABLE),
OREAD4(sc, OHCI_INTERRUPT_DISABLE));
printf(" hcca=0x%08x percur=0x%08x ctrlhd=0x%08x\n",
OREAD4(sc, OHCI_HCCA),
OREAD4(sc, OHCI_PERIOD_CURRENT_ED),
OREAD4(sc, OHCI_CONTROL_HEAD_ED));
printf(" ctrlcur=0x%08x bulkhd=0x%08x bulkcur=0x%08x\n",
OREAD4(sc, OHCI_CONTROL_CURRENT_ED),
OREAD4(sc, OHCI_BULK_HEAD_ED),
OREAD4(sc, OHCI_BULK_CURRENT_ED));
printf(" done=0x%08x fmival=0x%08x fmrem=0x%08x\n",
OREAD4(sc, OHCI_DONE_HEAD),
OREAD4(sc, OHCI_FM_INTERVAL),
OREAD4(sc, OHCI_FM_REMAINING));
printf(" fmnum=0x%08x perst=0x%08x lsthrs=0x%08x\n",
OREAD4(sc, OHCI_FM_NUMBER),
OREAD4(sc, OHCI_PERIODIC_START),
OREAD4(sc, OHCI_LS_THRESHOLD));
printf(" desca=0x%08x descb=0x%08x stat=0x%08x\n",
OREAD4(sc, OHCI_RH_DESCRIPTOR_A),
OREAD4(sc, OHCI_RH_DESCRIPTOR_B),
OREAD4(sc, OHCI_RH_STATUS));
printf(" port1=0x%08x port2=0x%08x\n",
OREAD4(sc, OHCI_RH_PORT_STATUS(1)),
OREAD4(sc, OHCI_RH_PORT_STATUS(2)));
printf(" HCCA: frame_number=0x%04x done_head=0x%08x\n",
LE(sc->sc_hcca->hcca_frame_number),
LE(sc->sc_hcca->hcca_done_head));
DPRINTF(("ohci_dumpregs: rev=0x%08x control=0x%08x command=0x%08x\n",
OREAD4(sc, OHCI_REVISION),
OREAD4(sc, OHCI_CONTROL),
OREAD4(sc, OHCI_COMMAND_STATUS)));
DPRINTF((" intrstat=0x%08x intre=0x%08x intrd=0x%08x\n",
OREAD4(sc, OHCI_INTERRUPT_STATUS),
OREAD4(sc, OHCI_INTERRUPT_ENABLE),
OREAD4(sc, OHCI_INTERRUPT_DISABLE)));
DPRINTF((" hcca=0x%08x percur=0x%08x ctrlhd=0x%08x\n",
OREAD4(sc, OHCI_HCCA),
OREAD4(sc, OHCI_PERIOD_CURRENT_ED),
OREAD4(sc, OHCI_CONTROL_HEAD_ED)));
DPRINTF((" ctrlcur=0x%08x bulkhd=0x%08x bulkcur=0x%08x\n",
OREAD4(sc, OHCI_CONTROL_CURRENT_ED),
OREAD4(sc, OHCI_BULK_HEAD_ED),
OREAD4(sc, OHCI_BULK_CURRENT_ED)));
DPRINTF((" done=0x%08x fmival=0x%08x fmrem=0x%08x\n",
OREAD4(sc, OHCI_DONE_HEAD),
OREAD4(sc, OHCI_FM_INTERVAL),
OREAD4(sc, OHCI_FM_REMAINING)));
DPRINTF((" fmnum=0x%08x perst=0x%08x lsthrs=0x%08x\n",
OREAD4(sc, OHCI_FM_NUMBER),
OREAD4(sc, OHCI_PERIODIC_START),
OREAD4(sc, OHCI_LS_THRESHOLD)));
DPRINTF((" desca=0x%08x descb=0x%08x stat=0x%08x\n",
OREAD4(sc, OHCI_RH_DESCRIPTOR_A),
OREAD4(sc, OHCI_RH_DESCRIPTOR_B),
OREAD4(sc, OHCI_RH_STATUS)));
DPRINTF((" port1=0x%08x port2=0x%08x\n",
OREAD4(sc, OHCI_RH_PORT_STATUS(1)),
OREAD4(sc, OHCI_RH_PORT_STATUS(2))));
DPRINTF((" HCCA: frame_number=0x%04x done_head=0x%08x\n",
LE(sc->sc_hcca->hcca_frame_number),
LE(sc->sc_hcca->hcca_done_head)));
}
#endif
@ -720,7 +720,7 @@ ohci_process_done(sc, done)
#ifdef USB_DEBUG
if (ohcidebug > 10) {
printf("ohci_process_done: TD done:\n");
DPRINTF(("ohci_process_done: TD done:\n"));
ohci_dump_tds(sdone);
}
#endif
@ -1079,7 +1079,7 @@ ohci_device_request(reqh)
#if USB_DEBUG
if (ohcidebug > 5) {
printf("ohci_device_request:\n");
DPRINTF(("ohci_device_request:\n"));
ohci_dump_ed(sed);
ohci_dump_tds(setup);
}
@ -1103,8 +1103,8 @@ ohci_device_request(reqh)
#if USB_DEBUG
if (ohcidebug > 5) {
delay(5000);
printf("ohci_device_request: status=%x\n",
OREAD4(sc, OHCI_COMMAND_STATUS));
DPRINTF(("ohci_device_request: status=%x\n",
OREAD4(sc, OHCI_COMMAND_STATUS)));
ohci_dump_ed(sed);
ohci_dump_tds(setup);
}
@ -1225,33 +1225,33 @@ void
ohci_dump_td(std)
ohci_soft_td_t *std;
{
printf("TD(%p) at %08lx: %b delay=%d ec=%d cc=%d\ncbp=0x%08lx "
"nexttd=0x%08lx be=0x%08lx\n",
std, (u_long)std->physaddr,
(int)LE(std->td.td_flags),
"\20\23R\24OUT\25IN\31TOG1\32SETTOGGLE",
OHCI_TD_GET_DI(LE(std->td.td_flags)),
OHCI_TD_GET_EC(LE(std->td.td_flags)),
OHCI_TD_GET_CC(LE(std->td.td_flags)),
(u_long)LE(std->td.td_cbp),
(u_long)LE(std->td.td_nexttd), (u_long)LE(std->td.td_be));
DPRINTF(("TD(%p) at %08lx: %b delay=%d ec=%d cc=%d\ncbp=0x%08lx "
"nexttd=0x%08lx be=0x%08lx\n",
std, (u_long)std->physaddr,
(int)LE(std->td.td_flags),
"\20\23R\24OUT\25IN\31TOG1\32SETTOGGLE",
OHCI_TD_GET_DI(LE(std->td.td_flags)),
OHCI_TD_GET_EC(LE(std->td.td_flags)),
OHCI_TD_GET_CC(LE(std->td.td_flags)),
(u_long)LE(std->td.td_cbp),
(u_long)LE(std->td.td_nexttd), (u_long)LE(std->td.td_be)));
}
void
ohci_dump_ed(sed)
ohci_soft_ed_t *sed;
{
printf("ED(%p) at %08lx: addr=%d endpt=%d maxp=%d %b\ntailp=0x%08lx "
"headp=%b nexted=0x%08lx\n",
sed, (u_long)sed->physaddr,
OHCI_ED_GET_FA(LE(sed->ed.ed_flags)),
OHCI_ED_GET_EN(LE(sed->ed.ed_flags)),
OHCI_ED_GET_MAXP(LE(sed->ed.ed_flags)),
(int)LE(sed->ed.ed_flags),
"\20\14OUT\15IN\16LOWSPEED\17SKIP\20ISO",
(u_long)LE(sed->ed.ed_tailp),
(u_long)LE(sed->ed.ed_headp), "\20\1HALT\2CARRY",
(u_long)LE(sed->ed.ed_nexted));
DPRINTF(("ED(%p) at %08lx: addr=%d endpt=%d maxp=%d %b\ntailp=0x%08lx "
"headp=%b nexted=0x%08lx\n",
sed, (u_long)sed->physaddr,
OHCI_ED_GET_FA(LE(sed->ed.ed_flags)),
OHCI_ED_GET_EN(LE(sed->ed.ed_flags)),
OHCI_ED_GET_MAXP(LE(sed->ed.ed_flags)),
(int)LE(sed->ed.ed_flags),
"\20\14OUT\15IN\16LOWSPEED\17SKIP\20ISO",
(u_long)LE(sed->ed.ed_tailp),
(u_long)LE(sed->ed.ed_headp), "\20\1HALT\2CARRY",
(u_long)LE(sed->ed.ed_nexted)));
}
#endif
@ -2110,8 +2110,8 @@ ohci_device_bulk_start(reqh)
#ifdef USB_DEBUG
if (ohcidebug > 5) {
delay(5000);
printf("ohci_device_intr_transfer: status=%x\n",
OREAD4(sc, OHCI_COMMAND_STATUS));
DPRINTF(("ohci_device_intr_transfer: status=%x\n",
OREAD4(sc, OHCI_COMMAND_STATUS)));
ohci_dump_ed(sed);
ohci_dump_tds(xfer);
}
@ -2220,7 +2220,7 @@ ohci_device_intr_start(reqh)
#if USB_DEBUG
if (ohcidebug > 5) {
printf("ohci_device_intr_transfer:\n");
DPRINTF(("ohci_device_intr_transfer:\n"));
ohci_dump_ed(sed);
ohci_dump_tds(xfer);
}
@ -2236,8 +2236,8 @@ ohci_device_intr_start(reqh)
#ifdef USB_DEBUG
if (ohcidebug > 5) {
delay(5000);
printf("ohci_device_intr_transfer: status=%x\n",
OREAD4(sc, OHCI_COMMAND_STATUS));
DPRINTF(("ohci_device_intr_transfer: status=%x\n",
OREAD4(sc, OHCI_COMMAND_STATUS)));
ohci_dump_ed(sed);
ohci_dump_tds(xfer);
}

84
sys/dev/usb/uhci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uhci.c,v 1.46 1999/09/05 19:32:18 augustss Exp $ */
/* $NetBSD: uhci.c,v 1.47 1999/09/05 21:22:39 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -488,17 +488,17 @@ static void
uhci_dumpregs(sc)
uhci_softc_t *sc;
{
printf("%s regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, "
"flbase=%08x, sof=%04x, portsc1=%04x, portsc2=%04x\n",
USBDEVNAME(sc->sc_bus.bdev),
UREAD2(sc, UHCI_CMD),
UREAD2(sc, UHCI_STS),
UREAD2(sc, UHCI_INTR),
UREAD2(sc, UHCI_FRNUM),
UREAD4(sc, UHCI_FLBASEADDR),
UREAD1(sc, UHCI_SOF),
UREAD2(sc, UHCI_PORTSC1),
UREAD2(sc, UHCI_PORTSC2));
DPRINTF(("%s regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, "
"flbase=%08x, sof=%04x, portsc1=%04x, portsc2=%04x\n",
USBDEVNAME(sc->sc_bus.bdev),
UREAD2(sc, UHCI_CMD),
UREAD2(sc, UHCI_STS),
UREAD2(sc, UHCI_INTR),
UREAD2(sc, UHCI_FRNUM),
UREAD4(sc, UHCI_FLBASEADDR),
UREAD1(sc, UHCI_SOF),
UREAD2(sc, UHCI_PORTSC1),
UREAD2(sc, UHCI_PORTSC2)));
}
int uhci_longtd = 1;
@ -507,28 +507,28 @@ void
uhci_dump_td(p)
uhci_soft_td_t *p;
{
printf("TD(%p) at %08lx = link=0x%08lx status=0x%08lx "
"token=0x%08lx buffer=0x%08lx\n",
p, (long)p->physaddr,
(long)LE(p->td.td_link),
(long)LE(p->td.td_status),
(long)LE(p->td.td_token),
(long)LE(p->td.td_buffer));
DPRINTF(("TD(%p) at %08lx = link=0x%08lx status=0x%08lx "
"token=0x%08lx buffer=0x%08lx\n",
p, (long)p->physaddr,
(long)LE(p->td.td_link),
(long)LE(p->td.td_status),
(long)LE(p->td.td_token),
(long)LE(p->td.td_buffer)));
if (uhci_longtd)
printf(" %b %b,errcnt=%d,actlen=%d pid=%02x,addr=%d,endpt=%d,"
"D=%d,maxlen=%d\n",
(int)LE(p->td.td_link),
"\20\1T\2Q\3VF",
(int)LE(p->td.td_status),
"\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27"
"STALLED\30ACTIVE\31IOC\32ISO\33LS\36SPD",
UHCI_TD_GET_ERRCNT(LE(p->td.td_status)),
UHCI_TD_GET_ACTLEN(LE(p->td.td_status)),
UHCI_TD_GET_PID(LE(p->td.td_token)),
UHCI_TD_GET_DEVADDR(LE(p->td.td_token)),
UHCI_TD_GET_ENDPT(LE(p->td.td_token)),
UHCI_TD_GET_DT(LE(p->td.td_token)),
UHCI_TD_GET_MAXLEN(LE(p->td.td_token)));
DPRINTF((" %b %b,errcnt=%d,actlen=%d pid=%02x,addr=%d,endpt=%d,"
"D=%d,maxlen=%d\n",
(int)LE(p->td.td_link),
"\20\1T\2Q\3VF",
(int)LE(p->td.td_status),
"\20\22BITSTUFF\23CRCTO\24NAK\25BABBLE\26DBUFFER\27"
"STALLED\30ACTIVE\31IOC\32ISO\33LS\36SPD",
UHCI_TD_GET_ERRCNT(LE(p->td.td_status)),
UHCI_TD_GET_ACTLEN(LE(p->td.td_status)),
UHCI_TD_GET_PID(LE(p->td.td_token)),
UHCI_TD_GET_DEVADDR(LE(p->td.td_token)),
UHCI_TD_GET_ENDPT(LE(p->td.td_token)),
UHCI_TD_GET_DT(LE(p->td.td_token)),
UHCI_TD_GET_MAXLEN(LE(p->td.td_token))));
}
void
@ -1323,7 +1323,7 @@ uhci_device_bulk_start(reqh)
#ifdef USB_DEBUG
if (uhcidebug > 8) {
printf("uhci_device_bulk_transfer: xfer(1)\n");
DPRINTF(("uhci_device_bulk_transfer: xfer(1)\n"));
uhci_dump_tds(xfer);
}
#endif
@ -1352,7 +1352,7 @@ uhci_device_bulk_start(reqh)
#ifdef USB_DEBUG
if (uhcidebug > 10) {
printf("uhci_device_bulk_transfer: xfer(2)\n");
DPRINTF(("uhci_device_bulk_transfer: xfer(2)\n"));
uhci_dump_tds(xfer);
}
#endif
@ -1526,7 +1526,7 @@ uhci_device_intr_start(reqh)
#ifdef USB_DEBUG
if (uhcidebug > 10) {
printf("uhci_device_intr_transfer: xfer(1)\n");
DPRINTF(("uhci_device_intr_transfer: xfer(1)\n"));
uhci_dump_tds(xfer);
uhci_dump_qh(upipe->u.intr.qhs[0]);
}
@ -1552,7 +1552,7 @@ uhci_device_intr_start(reqh)
#ifdef USB_DEBUG
if (uhcidebug > 10) {
printf("uhci_device_intr_transfer: xfer(2)\n");
DPRINTF(("uhci_device_intr_transfer: xfer(2)\n"));
uhci_dump_tds(xfer);
uhci_dump_qh(upipe->u.intr.qhs[0]);
}
@ -1712,7 +1712,7 @@ uhci_device_request(reqh)
#ifdef USB_DEBUG
if (uhcidebug > 20) {
printf("uhci_device_request: before transfer\n");
DPRINTF(("uhci_device_request: before transfer\n"));
uhci_dump_tds(setup);
}
#endif
@ -1739,7 +1739,7 @@ uhci_device_request(reqh)
uhci_soft_qh_t *sxqh;
int maxqh = 0;
uhci_physaddr_t link;
printf("uhci_enter_ctl_q: follow from [0]\n");
DPRINTF(("uhci_enter_ctl_q: follow from [0]\n"));
for (std = sc->sc_vframes[0].htd, link = 0;
(link & UHCI_PTR_Q) == 0;
std = std->link.std) {
@ -1753,7 +1753,7 @@ uhci_device_request(reqh)
uhci_dump_qh(xqh);
uhci_dump_qh(sxqh);
}
printf("Enqueued QH:\n");
DPRINTF(("Enqueued QH:\n"));
uhci_dump_qh(sqh);
uhci_dump_tds(sqh->elink);
}
@ -1982,7 +1982,7 @@ uhci_device_intr_done(reqh)
#ifdef USB_DEBUG
if (uhcidebug > 10) {
printf("uhci_device_intr_done: xfer(1)\n");
DPRINTF(("uhci_device_intr_done: xfer(1)\n"));
uhci_dump_tds(xfer);
uhci_dump_qh(upipe->u.intr.qhs[0]);
}
@ -2094,7 +2094,7 @@ uhci_remove_intr(sc, n, sqh)
for (pqh = vf->hqh; pqh->hlink != sqh; pqh = pqh->hlink)
#if defined(DIAGNOSTIC) || defined(USB_DEBUG)
if (LE(pqh->qh.qh_hlink) & UHCI_PTR_T) {
printf("uhci_remove_intr: QH not found\n");
DPRINTF(("uhci_remove_intr: QH not found\n"));
return;
}
#else

8
sys/dev/usb/usb_quirks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_quirks.c,v 1.11 1999/06/26 00:09:15 augustss Exp $ */
/* $NetBSD: usb_quirks.c,v 1.12 1999/09/05 21:22:39 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -85,9 +85,9 @@ usbd_find_quirk(d)
}
#ifdef USB_DEBUG
if (usbdebug && t->quirks.uq_flags)
printf("usbd_find_quirk 0x%04x/0x%04x/%x: %d\n",
UGETW(d->idVendor), UGETW(d->idProduct),
UGETW(d->bcdDevice), t->quirks.uq_flags);
logprintf("usbd_find_quirk 0x%04x/0x%04x/%x: %d\n",
UGETW(d->idVendor), UGETW(d->idProduct),
UGETW(d->bcdDevice), t->quirks.uq_flags);
#endif
return (&t->quirks);
}

4
sys/dev/usb/usb_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usb_subr.c,v 1.43 1999/09/05 19:32:19 augustss Exp $ */
/* $NetBSD: usb_subr.c,v 1.44 1999/09/05 21:22:39 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -596,7 +596,7 @@ usbd_set_config_index(dev, index, msg)
selfpowered, cdp->bMaxPower * 2));
#ifdef USB_DEBUG
if (!dev->powersrc) {
printf("usbd_set_config_index: No power source?\n");
DPRINTF(("usbd_set_config_index: No power source?\n"));
return (USBD_IOERROR);
}
#endif

32
sys/dev/usb/usbdi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: usbdi.c,v 1.34 1999/09/05 19:32:19 augustss Exp $ */
/* $NetBSD: usbdi.c,v 1.35 1999/09/05 21:22:39 augustss Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -765,13 +765,13 @@ usbd_do_request_flags(dev, req, data, flags, actlen)
r = usbd_sync_transfer(reqh);
#if defined(USB_DEBUG) || defined(DIAGNOSTIC)
if (reqh->actlen > reqh->length)
printf("usbd_do_request: overrun addr=%d type=0x%02x req=0x"
"%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
dev->address, reqh->request.bmRequestType,
reqh->request.bRequest, UGETW(reqh->request.wValue),
UGETW(reqh->request.wIndex),
UGETW(reqh->request.wLength),
reqh->length, reqh->actlen);
DPRINTF(("usbd_do_request: overrun addr=%d type=0x%02x req=0x"
"%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
dev->address, reqh->request.bmRequestType,
reqh->request.bRequest, UGETW(reqh->request.wValue),
UGETW(reqh->request.wIndex),
UGETW(reqh->request.wLength),
reqh->length, reqh->actlen));
#endif
if (actlen)
*actlen = reqh->actlen;
@ -831,14 +831,14 @@ usbd_do_request_async_cb(reqh, priv, status)
{
#if defined(USB_DEBUG) || defined(DIAGNOSTIC)
if (reqh->actlen > reqh->length)
printf("usbd_do_request: overrun addr=%d type=0x%02x req=0x"
"%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
reqh->pipe->device->address,
reqh->request.bmRequestType,
reqh->request.bRequest, UGETW(reqh->request.wValue),
UGETW(reqh->request.wIndex),
UGETW(reqh->request.wLength),
reqh->length, reqh->actlen);
DPRINTF(("usbd_do_request: overrun addr=%d type=0x%02x req=0x"
"%02x val=%d index=%d rlen=%d length=%d actlen=%d\n",
reqh->pipe->device->address,
reqh->request.bmRequestType,
reqh->request.bRequest, UGETW(reqh->request.wValue),
UGETW(reqh->request.wIndex),
UGETW(reqh->request.wLength),
reqh->length, reqh->actlen));
#endif
usbd_free_request(reqh);
}