d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More removing compatibility macros.

Browse Source 
md5 still the same.

"Dave, stop.  I feel my mind slipping away." -- hal
This commit is contained in:
Warner Losh 2006-09-07 00:06:42 +00:00
parent 730503190d
commit 2deae8fa2f
46 changed files with 573 additions and 620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
sys/dev/usb/ehci.c
View File

@ -339,7 +339,7 @@ ehci_init(ehci_softc_t *sc)
sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
version = EREAD2(sc, EHCI_HCIVERSION);
printf("%s: EHCI version %x.%x\n", USBDEVNAME(sc->sc_bus.bdev),
printf("%s: EHCI version %x.%x\n", device_get_nameunit(sc->sc_bus.bdev),
version >> 8, version & 0xff);
sparams = EREAD4(sc, EHCI_HCSPARAMS);
@ -348,18 +348,18 @@ ehci_init(ehci_softc_t *sc)
ncomp = EHCI_HCS_N_CC(sparams);
if (ncomp != sc->sc_ncomp) {
printf("%s: wrong number of companions (%d != %d)\n",
USBDEVNAME(sc->sc_bus.bdev),
device_get_nameunit(sc->sc_bus.bdev),
ncomp, sc->sc_ncomp);
if (ncomp < sc->sc_ncomp)
sc->sc_ncomp = ncomp;
}
if (sc->sc_ncomp > 0) {
printf("%s: companion controller%s, %d port%s each:",
USBDEVNAME(sc->sc_bus.bdev), sc->sc_ncomp!=1 ? "s" : "",
device_get_nameunit(sc->sc_bus.bdev), sc->sc_ncomp!=1 ? "s" : "",
EHCI_HCS_N_PCC(sparams),
EHCI_HCS_N_PCC(sparams)!=1 ? "s" : "");
for (i = 0; i < sc->sc_ncomp; i++)
printf(" %s", USBDEVNAME(sc->sc_comps[i]->bdev));
printf(" %s", device_get_nameunit(sc->sc_comps[i]->bdev));
printf("\n");
}
sc->sc_noport = EHCI_HCS_N_PORTS(sparams);
@ -374,7 +374,7 @@ ehci_init(ehci_softc_t *sc)
sc->sc_bus.usbrev = USBREV_2_0;
/* Reset the controller */
DPRINTF(("%s: resetting\n", USBDEVNAME(sc->sc_bus.bdev)));
DPRINTF(("%s: resetting\n", device_get_nameunit(sc->sc_bus.bdev)));
EOWRITE4(sc, EHCI_USBCMD, 0); /* Halt controller */
usb_delay_ms(&sc->sc_bus, 1);
EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
@ -386,7 +386,7 @@ ehci_init(ehci_softc_t *sc)
}
if (hcr) {
printf("%s: reset timeout\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
return (USBD_IOERROR);
}
@ -401,7 +401,7 @@ ehci_init(ehci_softc_t *sc)
EHCI_FLALIGN_ALIGN, &sc->sc_fldma);
if (err)
return (err);
DPRINTF(("%s: flsize=%d\n", USBDEVNAME(sc->sc_bus.bdev),sc->sc_flsize));
DPRINTF(("%s: flsize=%d\n", device_get_nameunit(sc->sc_bus.bdev),sc->sc_flsize));
sc->sc_flist = KERNADDR(&sc->sc_fldma, 0);
EOWRITE4(sc, EHCI_PERIODICLISTBASE, DMAADDR(&sc->sc_fldma, 0));
@ -512,7 +512,7 @@ ehci_init(ehci_softc_t *sc)
break;
}
if (hcr) {
printf("%s: run timeout\n", USBDEVNAME(sc->sc_bus.bdev));
printf("%s: run timeout\n", device_get_nameunit(sc->sc_bus.bdev));
return (USBD_IOERROR);
}
@ -593,7 +593,7 @@ ehci_intr1(ehci_softc_t *sc)
}
if (eintrs & EHCI_STS_HSE) {
printf("%s: unrecoverable error, controller halted\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
/* XXX what else */
}
if (eintrs & EHCI_STS_PCD) {
@ -615,7 +615,7 @@ ehci_intr1(ehci_softc_t *sc)
sc->sc_eintrs &= ~eintrs;
EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
printf("%s: blocking intrs 0x%x\n",
USBDEVNAME(sc->sc_bus.bdev), eintrs);
device_get_nameunit(sc->sc_bus.bdev), eintrs);
}
return (1);
@ -675,7 +675,7 @@ ehci_softintr(void *v)
ehci_softc_t *sc = v;
struct ehci_xfer *ex, *nextex;
DPRINTFN(10,("%s: ehci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev),
DPRINTFN(10,("%s: ehci_softintr (%d)\n", device_get_nameunit(sc->sc_bus.bdev),
sc->sc_bus.intr_context));
sc->sc_bus.intr_context++;
@ -1037,7 +1037,7 @@ ehci_power(int why, void *v)
}
if (hcr != 0) {
printf("%s: reset timeout\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
}
cmd &= ~EHCI_CMD_RS;
@ -1052,7 +1052,7 @@ ehci_power(int why, void *v)
}
if (hcr != EHCI_STS_HCH) {
printf("%s: config timeout\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
}
sc->sc_bus.use_polling--;
@ -1102,7 +1102,7 @@ ehci_power(int why, void *v)
}
if (hcr == EHCI_STS_HCH) {
printf("%s: config timeout\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
}
usb_delay_ms(&sc->sc_bus, USB_RESUME_WAIT);
@ -1163,9 +1163,9 @@ ehci_allocx(struct usbd_bus *bus)
struct ehci_softc *sc = (struct ehci_softc *)bus;
usbd_xfer_handle xfer;
xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
xfer = STAILQ_FIRST(&sc->sc_free_xfers);
if (xfer != NULL) {
SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
#ifdef DIAGNOSTIC
if (xfer->busy_free != XFER_FREE) {
printf("ehci_allocx: xfer=%p not free, 0x%08x\n", xfer,
@ -1205,7 +1205,7 @@ ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
return;
}
#endif
SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
STAILQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
}
static void
@ -1415,7 +1415,7 @@ ehci_open(usbd_pipe_handle pipe)
if (speed != EHCI_QH_SPEED_HIGH && xfertype == UE_ISOCHRONOUS) {
printf("%s: *** WARNING: opening low/full speed device, this "
"does not work yet.\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
DPRINTFN(1,("ehci_open: hshubaddr=%d hshubport=%d\n",
hshubaddr, hshubport));
return USBD_INVAL;
@ -1708,7 +1708,7 @@ ehci_root_ctrl_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ehci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ehci_root_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -2050,7 +2050,7 @@ ehci_root_ctrl_start(usbd_xfer_handle xfer)
DPRINTF(("ehci after reset, status=0x%08x\n", v));
if (v & EHCI_PS_PR) {
printf("%s: port reset timeout\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
return (USBD_TIMEOUT);
}
if (!(v & EHCI_PS_PE)) {
@ -2112,15 +2112,15 @@ ehci_disown(ehci_softc_t *sc, int index, int lowspeed)
int i = (index-1) / sc->sc_npcomp;
if (i >= sc->sc_ncomp)
printf("%s: strange port\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
else
printf("%s: handing over %s speed device on "
"port %d to %s\n",
USBDEVNAME(sc->sc_bus.bdev),
device_get_nameunit(sc->sc_bus.bdev),
lowspeed ? "low" : "full",
index, USBDEVNAME(sc->sc_comps[i]->bdev));
index, device_get_nameunit(sc->sc_comps[i]->bdev));
} else {
printf("%s: npcomp == 0\n", USBDEVNAME(sc->sc_bus.bdev));
printf("%s: npcomp == 0\n", device_get_nameunit(sc->sc_bus.bdev));
}
#endif
port = EHCI_PORTSC(index);
@ -2159,7 +2159,7 @@ ehci_root_intr_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ehci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ehci_root_intr_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -2787,7 +2787,7 @@ ehci_device_ctrl_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ehci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ehci_device_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -3030,7 +3030,7 @@ ehci_device_bulk_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ehci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ehci_device_bulk_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
usbd_status
@ -3216,7 +3216,7 @@ ehci_device_intr_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise err would be USBD_INPROG),
* so start it first.
*/
return (ehci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ehci_device_intr_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status

6
sys/dev/usb/ehci_pci.c
View File

@ -414,7 +414,7 @@ ehci_pci_attach(device_t self)
continue;
bsc = device_get_softc(nbus[0]);
DPRINTF(("ehci_pci_attach: companion %s\n",
USBDEVNAME(bsc->bdev)));
device_get_nameunit(bsc->bdev)));
sc->sc_comps[ncomp++] = bsc;
if (ncomp >= EHCI_COMPANION_MAX)
break;
@ -526,7 +526,7 @@ ehci_pci_takecontroller(device_t self)
pci_write_config(self, eecp, legsup | EHCI_LEGSUP_OSOWNED, 4);
if (legsup & EHCI_LEGSUP_BIOSOWNED) {
printf("%s: waiting for BIOS to give up control\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
for (i = 0; i < 5000; i++) {
legsup = pci_read_config(self, eecp, 4);
if ((legsup & EHCI_LEGSUP_BIOSOWNED) == 0)
@ -535,7 +535,7 @@ ehci_pci_takecontroller(device_t self)
}
if (legsup & EHCI_LEGSUP_BIOSOWNED)
printf("%s: timed out waiting for BIOS\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
}
}
}

2
sys/dev/usb/ehcivar.h
View File

@ -150,7 +150,7 @@ typedef struct ehci_softc {
u_int32_t sc_eintrs;
ehci_soft_qh_t *sc_async_head;
SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
STAILQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
struct lock sc_doorbell_lock;

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

@ -677,7 +677,7 @@ USB_ATTACH(aue)
usbd_devinfo(uaa->device, 0, devinfo);
device_set_desc_copy(self, devinfo);
printf("%s: %s\n", USBDEVNAME(self), devinfo);
printf("%s: %s\n", device_get_nameunit(self), devinfo);
/* Find endpoints. */
for (i = 0; i < id->bNumEndpoints; i++) {
@ -867,7 +867,7 @@ aue_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->aue_dev));
"-- packet dropped!\n", device_get_nameunit(sc->aue_dev));
ifp->if_ierrors++;
AUE_UNLOCK(sc);
return;

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

@ -444,7 +444,7 @@ USB_ATTACH(axe)
usbd_devinfo(uaa->device, 0, devinfo);
device_set_desc_copy(self, devinfo);
printf("%s: %s\n", USBDEVNAME(self), devinfo);
printf("%s: %s\n", device_get_nameunit(self), devinfo);
/* Find endpoints. */
for (i = 0; i < id->bNumEndpoints; i++) {
@ -599,7 +599,7 @@ axe_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->axe_dev));
"-- packet dropped!\n", device_get_nameunit(sc->axe_dev));
ifp->if_ierrors++;
AXE_UNLOCK(sc);
return;

44
sys/dev/usb/if_cdce.c
View File

@ -149,7 +149,7 @@ USB_ATTACH(cdce)
sc->cdce_dev = self;
usbd_devinfo(dev, 0, sc->devinfo);
device_set_desc_copy(self, sc->devinfo);
printf("%s: %s\n", USBDEVNAME(sc->cdce_dev), sc->devinfo);
printf("%s: %s\n", device_get_nameunit(sc->cdce_dev), sc->devinfo);
sc->cdce_udev = uaa->device;
sc->cdce_unit = device_get_unit(self);
@ -165,7 +165,7 @@ USB_ATTACH(cdce)
UDESC_CS_INTERFACE, UDESCSUB_CDC_UNION);
if (ud == NULL) {
printf("%s: no union descriptor\n",
USBDEVNAME(sc->cdce_dev));
device_get_nameunit(sc->cdce_dev));
USB_ATTACH_ERROR_RETURN;
}
data_ifcno = ud->bSlaveInterface[0];
@ -184,7 +184,7 @@ USB_ATTACH(cdce)
}
if (sc->cdce_data_iface == NULL) {
printf("%s: no data interface\n", USBDEVNAME(sc->cdce_dev));
printf("%s: no data interface\n", device_get_nameunit(sc->cdce_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -213,7 +213,7 @@ USB_ATTACH(cdce)
for (j = 0; j < numalts; j++) {
if (usbd_set_interface(sc->cdce_data_iface, j)) {
printf("%s: setting alternate interface failed\n",
USBDEVNAME(sc->cdce_dev));
device_get_nameunit(sc->cdce_dev));
USB_ATTACH_ERROR_RETURN;
}
/* Find endpoints. */
@ -223,7 +223,7 @@ USB_ATTACH(cdce)
ed = usbd_interface2endpoint_descriptor(sc->cdce_data_iface, i);
if (!ed) {
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->cdce_dev));
device_get_nameunit(sc->cdce_dev));
USB_ATTACH_ERROR_RETURN;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
@ -238,7 +238,7 @@ USB_ATTACH(cdce)
* needed for simple host-to-host applications. */
} else {
printf("%s: unexpected endpoint\n",
USBDEVNAME(sc->cdce_dev));
device_get_nameunit(sc->cdce_dev));
}
}
/* If we found something, try and use it... */
@ -248,16 +248,16 @@ USB_ATTACH(cdce)
if (sc->cdce_bulkin_no == -1) {
printf("%s: could not find data bulk in\n",
USBDEVNAME(sc->cdce_dev));
device_get_nameunit(sc->cdce_dev));
USB_ATTACH_ERROR_RETURN;
}
if (sc->cdce_bulkout_no == -1 ) {
printf("%s: could not find data bulk out\n",
USBDEVNAME(sc->cdce_dev));
device_get_nameunit(sc->cdce_dev));
USB_ATTACH_ERROR_RETURN;
}
mtx_init(&sc->cdce_mtx, USBDEVNAME(sc->cdce_dev), MTX_NETWORK_LOCK,
mtx_init(&sc->cdce_mtx, device_get_nameunit(sc->cdce_dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
ifmedia_init(&sc->cdce_ifmedia, 0, cdce_ifmedia_upd, cdce_ifmedia_sts);
CDCE_LOCK(sc);
@ -266,7 +266,7 @@ USB_ATTACH(cdce)
UDESC_INTERFACE, UDESCSUB_CDC_ENF);
if (!ue || usbd_get_string(dev, ue->iMacAddress, eaddr_str)) {
/* Fake MAC address */
printf("%s: faking MAC address\n", USBDEVNAME(sc->cdce_dev));
printf("%s: faking MAC address\n", device_get_nameunit(sc->cdce_dev));
eaddr[0]= 0x2a;
memcpy(&eaddr[1], &ticks, sizeof(u_int32_t));
eaddr[5] = (u_int8_t)(sc->cdce_unit);
@ -290,7 +290,7 @@ USB_ATTACH(cdce)
ifp = GET_IFP(sc) = if_alloc(IFT_ETHER);
if (ifp == NULL) {
printf("%s: can not if_alloc()\n", USBDEVNAME(sc->cdce_dev));
printf("%s: can not if_alloc()\n", device_get_nameunit(sc->cdce_dev));
CDCE_UNLOCK(sc);
mtx_destroy(&sc->cdce_mtx);
USB_ATTACH_ERROR_RETURN;
@ -437,11 +437,11 @@ cdce_stop(struct cdce_softc *sc)
err = usbd_abort_pipe(sc->cdce_bulkin_pipe);
if (err)
printf("%s: abort rx pipe failed: %s\n",
USBDEVNAME(sc->cdce_dev), usbd_errstr(err));
device_get_nameunit(sc->cdce_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->cdce_bulkin_pipe);
if (err)
printf("%s: close rx pipe failed: %s\n",
USBDEVNAME(sc->cdce_dev), usbd_errstr(err));
device_get_nameunit(sc->cdce_dev), usbd_errstr(err));
sc->cdce_bulkin_pipe = NULL;
}
@ -449,11 +449,11 @@ cdce_stop(struct cdce_softc *sc)
err = usbd_abort_pipe(sc->cdce_bulkout_pipe);
if (err)
printf("%s: abort tx pipe failed: %s\n",
USBDEVNAME(sc->cdce_dev), usbd_errstr(err));
device_get_nameunit(sc->cdce_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->cdce_bulkout_pipe);
if (err)
printf("%s: close tx pipe failed: %s\n",
USBDEVNAME(sc->cdce_dev), usbd_errstr(err));
device_get_nameunit(sc->cdce_dev), usbd_errstr(err));
sc->cdce_bulkout_pipe = NULL;
}
@ -536,14 +536,14 @@ cdce_init(void *xsc)
if (usb_ether_tx_list_init(sc, &sc->cdce_cdata,
sc->cdce_udev) == ENOBUFS) {
printf("%s: tx list init failed\n", USBDEVNAME(sc->cdce_dev));
printf("%s: tx list init failed\n", device_get_nameunit(sc->cdce_dev));
CDCE_UNLOCK(sc);
return;
}
if (usb_ether_rx_list_init(sc, &sc->cdce_cdata,
sc->cdce_udev) == ENOBUFS) {
printf("%s: rx list init failed\n", USBDEVNAME(sc->cdce_dev));
printf("%s: rx list init failed\n", device_get_nameunit(sc->cdce_dev));
CDCE_UNLOCK(sc);
return;
}
@ -553,7 +553,7 @@ cdce_init(void *xsc)
err = usbd_open_pipe(sc->cdce_data_iface, sc->cdce_bulkin_no,
USBD_EXCLUSIVE_USE, &sc->cdce_bulkin_pipe);
if (err) {
printf("%s: open rx pipe failed: %s\n", USBDEVNAME(sc->cdce_dev),
printf("%s: open rx pipe failed: %s\n", device_get_nameunit(sc->cdce_dev),
usbd_errstr(err));
CDCE_UNLOCK(sc);
return;
@ -562,7 +562,7 @@ cdce_init(void *xsc)
err = usbd_open_pipe(sc->cdce_data_iface, sc->cdce_bulkout_no,
USBD_EXCLUSIVE_USE, &sc->cdce_bulkout_pipe);
if (err) {
printf("%s: open tx pipe failed: %s\n", USBDEVNAME(sc->cdce_dev),
printf("%s: open tx pipe failed: %s\n", device_get_nameunit(sc->cdce_dev),
usbd_errstr(err));
CDCE_UNLOCK(sc);
return;
@ -608,7 +608,7 @@ cdce_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
}
if (sc->cdce_rxeof_errors == 0)
printf("%s: usb error on rx: %s\n",
USBDEVNAME(sc->cdce_dev), usbd_errstr(status));
device_get_nameunit(sc->cdce_dev), usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall(sc->cdce_bulkin_pipe);
DELAY(sc->cdce_rxeof_errors * 10000);
@ -675,7 +675,7 @@ cdce_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
ifp->if_oerrors++;
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->cdce_dev),
printf("%s: usb error on tx: %s\n", device_get_nameunit(sc->cdce_dev),
usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall(sc->cdce_bulkout_pipe);
@ -721,7 +721,7 @@ cdce_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->cdce_dev));
"-- packet dropped!\n", device_get_nameunit(sc->cdce_dev));
ifp->if_ierrors++;
CDCE_UNLOCK(sc);
return;

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

@ -465,7 +465,7 @@ USB_ATTACH(cue)
usbd_devinfo(uaa->device, 0, devinfo);
device_set_desc_copy(self, devinfo);
printf("%s: %s\n", USBDEVNAME(self), devinfo);
printf("%s: %s\n", device_get_nameunit(self), devinfo);
/* Find endpoints. */
for (i = 0; i < id->bNumEndpoints; i++) {
@ -589,7 +589,7 @@ cue_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->cue_dev));
"-- packet dropped!\n", device_get_nameunit(sc->cue_dev));
ifp->if_ierrors++;
CUE_UNLOCK(sc);
return;

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

@ -428,7 +428,7 @@ USB_ATTACH(kue)
usbd_devinfo(uaa->device, 0, devinfo);
device_set_desc_copy(self, devinfo);
printf("%s: %s\n", USBDEVNAME(self), devinfo);
printf("%s: %s\n", device_get_nameunit(self), devinfo);
/* Find endpoints. */
for (i = 0; i < id->bNumEndpoints; i++) {
@ -566,7 +566,7 @@ kue_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->kue_dev));
"-- packet dropped!\n", device_get_nameunit(sc->kue_dev));
ifp->if_ierrors++;
KUE_UNLOCK(sc);
return;

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

@ -630,7 +630,7 @@ USB_ATTACH(rue)
usbd_devinfo(uaa->device, 0, devinfo);
device_set_desc_copy(self, devinfo);
printf("%s: %s\n", USBDEVNAME(self), devinfo);
printf("%s: %s\n", device_get_nameunit(self), devinfo);
/* Find endpoints */
for (i = 0; i < id->bNumEndpoints; i++) {
@ -808,7 +808,7 @@ rue_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->rue_dev));
"-- packet dropped!\n", device_get_nameunit(sc->rue_dev));
ifp->if_ierrors++;
RUE_UNLOCK(sc);
return;

134
sys/dev/usb/if_udav.c
View File

@ -303,7 +303,7 @@ USB_ATTACH(udav)
usbd_devinfo(dev, 0, devinfo);
USB_ATTACH_SETUP;
devname = USBDEVNAME(sc->sc_dev);
devname = device_get_nameunit(sc->sc_dev);
printf("%s: %s\n", devname, devinfo);
/* Move the device into the configured state. */
@ -447,7 +447,7 @@ USB_ATTACH(udav)
#elif defined(__FreeBSD__)
if (mii_phy_probe(self, &sc->sc_miibus,
udav_ifmedia_change, udav_ifmedia_status)) {
printf("%s: MII without any PHY!\n", USBDEVNAME(sc->sc_dev));
printf("%s: MII without any PHY!\n", device_get_nameunit(sc->sc_dev));
if_free(ifp);
UDAV_UNLOCK(sc);
mtx_destroy(&sc->sc_mtx);
@ -497,7 +497,7 @@ USB_DETACH(udav)
int s;
#endif
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
/* Detached before attached finished */
if (!sc->sc_attached)
@ -546,13 +546,13 @@ USB_DETACH(udav)
#ifdef DIAGNOSTIC
if (sc->sc_pipe_tx != NULL)
printf("%s: detach has active tx endpoint.\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
if (sc->sc_pipe_rx != NULL)
printf("%s: detach has active rx endpoint.\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
if (sc->sc_pipe_intr != NULL)
printf("%s: detach has active intr endpoint.\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
#endif
sc->sc_attached = 0;
@ -583,7 +583,7 @@ udav_mem_read(struct udav_softc *sc, int offset, void *buf, int len)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -603,7 +603,7 @@ udav_mem_read(struct udav_softc *sc, int offset, void *buf, int len)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err) {
DPRINTF(("%s: %s: read failed. off=%04x, err=%d\n",
USBDEVNAME(sc->sc_dev), __func__, offset, err));
device_get_nameunit(sc->sc_dev), __func__, offset, err));
}
return (err);
@ -620,7 +620,7 @@ udav_mem_write(struct udav_softc *sc, int offset, void *buf, int len)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -640,7 +640,7 @@ udav_mem_write(struct udav_softc *sc, int offset, void *buf, int len)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
USBDEVNAME(sc->sc_dev), __func__, offset, err));
device_get_nameunit(sc->sc_dev), __func__, offset, err));
}
return (err);
@ -657,7 +657,7 @@ udav_mem_write1(struct udav_softc *sc, int offset, unsigned char ch)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -676,7 +676,7 @@ udav_mem_write1(struct udav_softc *sc, int offset, unsigned char ch)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
USBDEVNAME(sc->sc_dev), __func__, offset, err));
device_get_nameunit(sc->sc_dev), __func__, offset, err));
}
return (err);
@ -694,7 +694,7 @@ udav_csr_read(struct udav_softc *sc, int offset, void *buf, int len)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -714,7 +714,7 @@ udav_csr_read(struct udav_softc *sc, int offset, void *buf, int len)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err) {
DPRINTF(("%s: %s: read failed. off=%04x, err=%d\n",
USBDEVNAME(sc->sc_dev), __func__, offset, err));
device_get_nameunit(sc->sc_dev), __func__, offset, err));
}
return (err);
@ -731,7 +731,7 @@ udav_csr_write(struct udav_softc *sc, int offset, void *buf, int len)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -751,7 +751,7 @@ udav_csr_write(struct udav_softc *sc, int offset, void *buf, int len)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
USBDEVNAME(sc->sc_dev), __func__, offset, err));
device_get_nameunit(sc->sc_dev), __func__, offset, err));
}
return (err);
@ -766,7 +766,7 @@ udav_csr_read1(struct udav_softc *sc, int offset)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -785,7 +785,7 @@ udav_csr_write1(struct udav_softc *sc, int offset, unsigned char ch)
return (0);
DPRINTFN(0x200,
("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -804,7 +804,7 @@ udav_csr_write1(struct udav_softc *sc, int offset, unsigned char ch)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err) {
DPRINTF(("%s: %s: write failed. off=%04x, err=%d\n",
USBDEVNAME(sc->sc_dev), __func__, offset, err));
device_get_nameunit(sc->sc_dev), __func__, offset, err));
}
return (err);
@ -830,7 +830,7 @@ udav_init(void *xsc)
int s;
#endif
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
#if defined(__NetBSD__)
@ -871,7 +871,7 @@ udav_init(void *xsc)
/* Initialize transmit ring */
if (usb_ether_tx_list_init(sc, &sc->sc_cdata,
sc->sc_udev) == ENOBUFS) {
printf("%s: tx list init failed\n", USBDEVNAME(sc->sc_dev));
printf("%s: tx list init failed\n", device_get_nameunit(sc->sc_dev));
#if defined(__NetBSD__)
splx(s);
return (EIO);
@ -885,7 +885,7 @@ udav_init(void *xsc)
/* Initialize receive ring */
if (usb_ether_rx_list_init(sc, &sc->sc_cdata,
sc->sc_udev) == ENOBUFS) {
printf("%s: rx list init failed\n", USBDEVNAME(sc->sc_dev));
printf("%s: rx list init failed\n", device_get_nameunit(sc->sc_dev));
#if defined(__NetBSD__)
splx(s);
return (EIO);
@ -947,7 +947,7 @@ udav_reset(struct udav_softc *sc)
{
int i;
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return;
@ -983,7 +983,7 @@ udav_activate(device_t self, enum devact act)
{
struct udav_softc *sc = (struct udav_softc *)self;
DPRINTF(("%s: %s: enter, act=%d\n", USBDEVNAME(sc->sc_dev),
DPRINTF(("%s: %s: enter, act=%d\n", device_get_nameunit(sc->sc_dev),
__func__, act));
switch (act) {
case DVACT_ACTIVATE:
@ -1017,7 +1017,7 @@ udav_setmulti(struct udav_softc *sc)
u_int8_t hashes[8];
int h = 0;
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return;
@ -1097,7 +1097,7 @@ udav_openpipes(struct udav_softc *sc)
USBD_EXCLUSIVE_USE, &sc->sc_pipe_rx);
if (err) {
printf("%s: open rx pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
error = EIO;
goto done;
}
@ -1107,7 +1107,7 @@ udav_openpipes(struct udav_softc *sc)
USBD_EXCLUSIVE_USE, &sc->sc_pipe_tx);
if (err) {
printf("%s: open tx pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
error = EIO;
goto done;
}
@ -1121,7 +1121,7 @@ udav_openpipes(struct udav_softc *sc)
udav_intr, UDAV_INTR_INTERVAL);
if (err) {
printf("%s: open intr pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
error = EIO;
goto done;
}
@ -1136,7 +1136,7 @@ udav_openpipes(struct udav_softc *sc)
USBD_SHORT_XFER_OK | USBD_NO_COPY,
USBD_NO_TIMEOUT, udav_rxeof);
(void)usbd_transfer(c->ue_xfer);
DPRINTF(("%s: %s: start read\n", USBDEVNAME(sc->sc_dev),
DPRINTF(("%s: %s: start read\n", device_get_nameunit(sc->sc_dev),
__func__));
}
@ -1153,7 +1153,7 @@ udav_start(struct ifnet *ifp)
struct udav_softc *sc = ifp->if_softc;
struct mbuf *m_head = NULL;
DPRINTF(("%s: %s: enter, link=%d\n", USBDEVNAME(sc->sc_dev),
DPRINTF(("%s: %s: enter, link=%d\n", device_get_nameunit(sc->sc_dev),
__func__, sc->sc_link));
if (sc->sc_dying)
@ -1211,7 +1211,7 @@ udav_send(struct udav_softc *sc, struct mbuf *m, int idx)
struct ue_chain *c;
usbd_status err;
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev),__func__));
c = &sc->sc_cdata.ue_tx_chain[idx];
@ -1241,14 +1241,14 @@ udav_send(struct udav_softc *sc, struct mbuf *m, int idx)
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
if (err != USBD_IN_PROGRESS) {
printf("%s: udav_send error=%s\n", USBDEVNAME(sc->sc_dev),
printf("%s: udav_send error=%s\n", device_get_nameunit(sc->sc_dev),
usbd_errstr(err));
/* Stop the interface */
usb_add_task(sc->sc_udev, &sc->sc_stop_task);
return (EIO);
}
DPRINTF(("%s: %s: send %d bytes\n", USBDEVNAME(sc->sc_dev),
DPRINTF(("%s: %s: send %d bytes\n", device_get_nameunit(sc->sc_dev),
__func__, total_len));
sc->sc_cdata.ue_tx_cnt++;
@ -1275,7 +1275,7 @@ udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
UDAV_LOCK(sc);
#endif
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
ifp->if_timer = 0;
#if defined(__FreeBSD__)
@ -1294,7 +1294,7 @@ udav_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
}
ifp->if_oerrors++;
printf("%s: usb error on tx: %s\n", USBDEVNAME(sc->sc_dev),
printf("%s: usb error on tx: %s\n", device_get_nameunit(sc->sc_dev),
usbd_errstr(status));
if (status == USBD_STALLED) {
sc->sc_refcnt++;
@ -1342,7 +1342,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
int s;
#endif
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),__func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev),__func__));
if (sc->sc_dying)
return;
@ -1353,7 +1353,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_rx_errs++;
if (usbd_ratecheck(&sc->sc_rx_notice)) {
printf("%s: %u usb errors on rx: %s\n",
USBDEVNAME(sc->sc_dev), sc->sc_rx_errs,
device_get_nameunit(sc->sc_dev), sc->sc_rx_errs,
usbd_errstr(status));
sc->sc_rx_errs = 0;
}
@ -1375,7 +1375,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
/* first byte in received data */
pktstat = mtod(m, u_int8_t *);
m_adj(m, sizeof(u_int8_t));
DPRINTF(("%s: RX Status: 0x%02x\n", USBDEVNAME(sc->sc_dev), *pktstat));
DPRINTF(("%s: RX Status: 0x%02x\n", device_get_nameunit(sc->sc_dev), *pktstat));
total_len = UGETW(mtod(m, u_int8_t *));
m_adj(m, sizeof(u_int16_t));
@ -1411,7 +1411,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->sc_dev));
"-- packet dropped!\n", device_get_nameunit(sc->sc_dev));
ifp->if_ierrors++;
goto done1;
}
@ -1421,7 +1421,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
BPF_MTAP(ifp, m);
#endif
DPRINTF(("%s: %s: deliver %d\n", USBDEVNAME(sc->sc_dev),
DPRINTF(("%s: %s: deliver %d\n", device_get_nameunit(sc->sc_dev),
__func__, m->m_len));
#if defined(__NetBSD__)
IF_INPUT(ifp, m);
@ -1448,7 +1448,7 @@ udav_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(USBDEV(sc->sc_dev));
DPRINTF(("%s: %s: start rx\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: start rx\n", device_get_nameunit(sc->sc_dev), __func__));
}
#if 0
@ -1468,7 +1468,7 @@ udav_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
#endif
int error = 0;
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (EIO);
@ -1545,10 +1545,10 @@ udav_watchdog(struct ifnet *ifp)
int s;
#endif
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
ifp->if_oerrors++;
printf("%s: watchdog timeout\n", USBDEVNAME(sc->sc_dev));
printf("%s: watchdog timeout\n", device_get_nameunit(sc->sc_dev));
#if defined(__NetBSD__)
s = splusb();
@ -1585,7 +1585,7 @@ udav_stop(struct ifnet *ifp, int disable)
struct udav_softc *sc = ifp->if_softc;
usbd_status err;
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
ifp->if_timer = 0;
@ -1599,11 +1599,11 @@ udav_stop(struct ifnet *ifp, int disable)
err = usbd_abort_pipe(sc->sc_pipe_rx);
if (err)
printf("%s: abort rx pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->sc_pipe_rx);
if (err)
printf("%s: close rx pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
sc->sc_pipe_rx = NULL;
}
@ -1612,11 +1612,11 @@ udav_stop(struct ifnet *ifp, int disable)
err = usbd_abort_pipe(sc->sc_pipe_tx);
if (err)
printf("%s: abort tx pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->sc_pipe_tx);
if (err)
printf("%s: close tx pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
sc->sc_pipe_tx = NULL;
}
@ -1627,11 +1627,11 @@ udav_stop(struct ifnet *ifp, int disable)
err = usbd_abort_pipe(sc->sc_pipe_intr);
if (err)
printf("%s: abort intr pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->sc_pipe_intr);
if (err)
printf("%s: close intr pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
sc->sc_pipe_intr = NULL;
}
#endif
@ -1656,7 +1656,7 @@ udav_ifmedia_change(struct ifnet *ifp)
struct udav_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return (0);
@ -1679,7 +1679,7 @@ udav_ifmedia_status(struct ifnet *ifp, struct ifmediareq *ifmr)
struct udav_softc *sc = ifp->if_softc;
struct mii_data *mii = GET_MII(sc);
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
if (sc->sc_dying)
return;
@ -1707,7 +1707,7 @@ udav_tick(void *xsc)
if (sc == NULL)
return;
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
DPRINTFN(0xff, ("%s: %s: enter\n", device_get_nameunit(sc->sc_dev),
__func__));
if (sc->sc_dying)
@ -1730,7 +1730,7 @@ udav_tick_task(void *xsc)
if (sc == NULL)
return;
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
DPRINTFN(0xff, ("%s: %s: enter\n", device_get_nameunit(sc->sc_dev),
__func__));
if (sc->sc_dying)
@ -1754,7 +1754,7 @@ udav_tick_task(void *xsc)
if (mii->mii_media_status & IFM_ACTIVE &&
IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
DPRINTF(("%s: %s: got link\n",
USBDEVNAME(sc->sc_dev), __func__));
device_get_nameunit(sc->sc_dev), __func__));
sc->sc_link++;
#if defined(__NetBSD__)
if (IFQ_IS_EMPTY(&ifp->if_snd) == 0)
@ -1778,7 +1778,7 @@ udav_tick_task(void *xsc)
static void
udav_lock_mii(struct udav_softc *sc)
{
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
DPRINTFN(0xff, ("%s: %s: enter\n", device_get_nameunit(sc->sc_dev),
__func__));
sc->sc_refcnt++;
@ -1792,7 +1792,7 @@ udav_lock_mii(struct udav_softc *sc)
static void
udav_unlock_mii(struct udav_softc *sc)
{
DPRINTFN(0xff, ("%s: %s: enter\n", USBDEVNAME(sc->sc_dev),
DPRINTFN(0xff, ("%s: %s: enter\n", device_get_nameunit(sc->sc_dev),
__func__));
#if defined(__NetBSD__)
@ -1817,11 +1817,11 @@ udav_miibus_readreg(device_t dev, int phy, int reg)
sc = USBGETSOFTC(dev);
DPRINTFN(0xff, ("%s: %s: enter, phy=%d reg=0x%04x\n",
USBDEVNAME(sc->sc_dev), __func__, phy, reg));
device_get_nameunit(sc->sc_dev), __func__, phy, reg));
if (sc->sc_dying) {
#ifdef DIAGNOSTIC
printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
printf("%s: %s: dying\n", device_get_nameunit(sc->sc_dev),
__func__);
#endif
return (0);
@ -1830,7 +1830,7 @@ udav_miibus_readreg(device_t dev, int phy, int reg)
/* XXX: one PHY only for the internal PHY */
if (phy != 0) {
DPRINTFN(0xff, ("%s: %s: phy=%d is not supported\n",
USBDEVNAME(sc->sc_dev), __func__, phy));
device_get_nameunit(sc->sc_dev), __func__, phy));
return (0);
}
@ -1856,7 +1856,7 @@ udav_miibus_readreg(device_t dev, int phy, int reg)
data16 = val[0] | (val[1] << 8);
DPRINTFN(0xff, ("%s: %s: phy=%d reg=0x%04x => 0x%04x\n",
USBDEVNAME(sc->sc_dev), __func__, phy, reg, data16));
device_get_nameunit(sc->sc_dev), __func__, phy, reg, data16));
return (data16);
}
@ -1873,11 +1873,11 @@ udav_miibus_writereg(device_t dev, int phy, int reg, int data)
sc = USBGETSOFTC(dev);
DPRINTFN(0xff, ("%s: %s: enter, phy=%d reg=0x%04x data=0x%04x\n",
USBDEVNAME(sc->sc_dev), __func__, phy, reg, data));
device_get_nameunit(sc->sc_dev), __func__, phy, reg, data));
if (sc->sc_dying) {
#ifdef DIAGNOSTIC
printf("%s: %s: dying\n", USBDEVNAME(sc->sc_dev),
printf("%s: %s: dying\n", device_get_nameunit(sc->sc_dev),
__func__);
#endif
return;
@ -1886,7 +1886,7 @@ udav_miibus_writereg(device_t dev, int phy, int reg, int data)
/* XXX: one PHY only for the internal PHY */
if (phy != 0) {
DPRINTFN(0xff, ("%s: %s: phy=%d is not supported\n",
USBDEVNAME(sc->sc_dev), __func__, phy));
device_get_nameunit(sc->sc_dev), __func__, phy));
return;
}
@ -1924,7 +1924,7 @@ udav_miibus_statchg(device_t dev)
return;
sc = USBGETSOFTC(dev);
DPRINTF(("%s: %s: enter\n", USBDEVNAME(sc->sc_dev), __func__));
DPRINTF(("%s: %s: enter\n", device_get_nameunit(sc->sc_dev), __func__));
#endif
/* Nothing to do */
}
@ -1959,7 +1959,7 @@ udav_rxstart(struct ifnet *ifp)
c->ue_mbuf = usb_ether_newbuf();
if (c->ue_mbuf == NULL) {
printf("%s: no memory for rx list "
"-- packet dropped!\n", USBDEVNAME(sc->sc_dev));
"-- packet dropped!\n", device_get_nameunit(sc->sc_dev));
ifp->if_ierrors++;
UDAV_UNLOCK(sc);
return;

2
sys/dev/usb/if_udavreg.h
View File

@ -164,7 +164,7 @@ struct udav_softc {
#if defined(__FreeBSD__)
struct ifnet *sc_ifp;
#endif
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
/* USB */

64
sys/dev/usb/if_ural.c
View File

@ -378,7 +378,7 @@ USB_ATTACH(ural)
if (usbd_set_config_no(sc->sc_udev, RAL_CONFIG_NO, 0) != 0) {
printf("%s: could not set configuration no\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -387,7 +387,7 @@ USB_ATTACH(ural)
&sc->sc_iface);
if (error != 0) {
printf("%s: could not get interface handle\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -401,7 +401,7 @@ USB_ATTACH(ural)
ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
if (ed == NULL) {
printf("%s: no endpoint descriptor for %d\n",
USBDEVNAME(sc->sc_dev), i);
device_get_nameunit(sc->sc_dev), i);
USB_ATTACH_ERROR_RETURN;
}
@ -413,11 +413,11 @@ USB_ATTACH(ural)
sc->sc_tx_no = ed->bEndpointAddress;
}
if (sc->sc_rx_no == -1 || sc->sc_tx_no == -1) {
printf("%s: missing endpoint\n", USBDEVNAME(sc->sc_dev));
printf("%s: missing endpoint\n", device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
mtx_init(&sc->sc_mtx, USBDEVNAME(sc->sc_dev), MTX_NETWORK_LOCK,
mtx_init(&sc->sc_mtx, device_get_nameunit(sc->sc_dev), MTX_NETWORK_LOCK,
MTX_DEF | MTX_RECURSE);
usb_init_task(&sc->sc_task, ural_task, sc);
@ -431,16 +431,16 @@ USB_ATTACH(ural)
ural_read_eeprom(sc);
printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s\n",
USBDEVNAME(sc->sc_dev), sc->asic_rev, ural_get_rf(sc->rf_rev));
device_get_nameunit(sc->sc_dev), sc->asic_rev, ural_get_rf(sc->rf_rev));
ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
if (ifp == NULL) {
printf("%s: can not if_alloc()\n", USBDEVNAME(sc->sc_dev));
printf("%s: can not if_alloc()\n", device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
ifp->if_softc = sc;
if_initname(ifp, "ural", USBDEVUNIT(sc->sc_dev));
if_initname(ifp, "ural", device_get_unit(sc->sc_dev));
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST |
IFF_NEEDSGIANT; /* USB stack is still under Giant lock */
ifp->if_init = ural_init;
@ -583,7 +583,7 @@ ural_alloc_tx_list(struct ural_softc *sc)
data->xfer = usbd_alloc_xfer(sc->sc_udev);
if (data->xfer == NULL) {
printf("%s: could not allocate tx xfer\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
error = ENOMEM;
goto fail;
}
@ -592,7 +592,7 @@ ural_alloc_tx_list(struct ural_softc *sc)
RAL_TX_DESC_SIZE + MCLBYTES);
if (data->buf == NULL) {
printf("%s: could not allocate tx buffer\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
error = ENOMEM;
goto fail;
}
@ -639,14 +639,14 @@ ural_alloc_rx_list(struct ural_softc *sc)
data->xfer = usbd_alloc_xfer(sc->sc_udev);
if (data->xfer == NULL) {
printf("%s: could not allocate rx xfer\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
error = ENOMEM;
goto fail;
}
if (usbd_alloc_buffer(data->xfer, MCLBYTES) == NULL) {
printf("%s: could not allocate rx buffer\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
error = ENOMEM;
goto fail;
}
@ -654,7 +654,7 @@ ural_alloc_rx_list(struct ural_softc *sc)
data->m = m_getcl(M_DONTWAIT, MT_DATA, M_PKTHDR);
if (data->m == NULL) {
printf("%s: could not allocate rx mbuf\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
error = ENOMEM;
goto fail;
}
@ -778,13 +778,13 @@ ural_task(void *arg)
m = ieee80211_beacon_alloc(ic, ni, &sc->sc_bo);
if (m == NULL) {
printf("%s: could not allocate beacon\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
return;
}
if (ural_tx_bcn(sc, m, ni) != 0) {
printf("%s: could not send beacon\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
return;
}
}
@ -875,7 +875,7 @@ ural_txeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
printf("%s: could not transmit buffer: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
device_get_nameunit(sc->sc_dev), usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_rx_pipeh);
@ -924,7 +924,7 @@ ural_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
usbd_get_xfer_status(xfer, NULL, NULL, &len, NULL);
if (len < RAL_RX_DESC_SIZE + IEEE80211_MIN_LEN) {
DPRINTF(("%s: xfer too short %d\n", USBDEVNAME(sc->sc_dev),
DPRINTF(("%s: xfer too short %d\n", device_get_nameunit(sc->sc_dev),
len));
ifp->if_ierrors++;
goto skip;
@ -1576,7 +1576,7 @@ ural_set_testmode(struct ural_softc *sc)
error = usbd_do_request(sc->sc_udev, &req, NULL);
if (error != 0) {
printf("%s: could not set test mode: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
}
}
@ -1595,7 +1595,7 @@ ural_eeprom_read(struct ural_softc *sc, uint16_t addr, void *buf, int len)
error = usbd_do_request(sc->sc_udev, &req, buf);
if (error != 0) {
printf("%s: could not read EEPROM: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
}
}
@ -1615,7 +1615,7 @@ ural_read(struct ural_softc *sc, uint16_t reg)
error = usbd_do_request(sc->sc_udev, &req, &val);
if (error != 0) {
printf("%s: could not read MAC register: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
return 0;
}
@ -1637,7 +1637,7 @@ ural_read_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len)
error = usbd_do_request(sc->sc_udev, &req, buf);
if (error != 0) {
printf("%s: could not read MAC register: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
}
}
@ -1656,7 +1656,7 @@ ural_write(struct ural_softc *sc, uint16_t reg, uint16_t val)
error = usbd_do_request(sc->sc_udev, &req, NULL);
if (error != 0) {
printf("%s: could not write MAC register: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
}
}
@ -1675,7 +1675,7 @@ ural_write_multi(struct ural_softc *sc, uint16_t reg, void *buf, int len)
error = usbd_do_request(sc->sc_udev, &req, buf);
if (error != 0) {
printf("%s: could not write MAC register: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
}
}
@ -1690,7 +1690,7 @@ ural_bbp_write(struct ural_softc *sc, uint8_t reg, uint8_t val)
break;
}
if (ntries == 5) {
printf("%s: could not write to BBP\n", USBDEVNAME(sc->sc_dev));
printf("%s: could not write to BBP\n", device_get_nameunit(sc->sc_dev));
return;
}
@ -1712,7 +1712,7 @@ ural_bbp_read(struct ural_softc *sc, uint8_t reg)
break;
}
if (ntries == 5) {
printf("%s: could not read BBP\n", USBDEVNAME(sc->sc_dev));
printf("%s: could not read BBP\n", device_get_nameunit(sc->sc_dev));
return 0;
}
@ -1730,7 +1730,7 @@ ural_rf_write(struct ural_softc *sc, uint8_t reg, uint32_t val)
break;
}
if (ntries == 5) {
printf("%s: could not write to RF\n", USBDEVNAME(sc->sc_dev));
printf("%s: could not write to RF\n", device_get_nameunit(sc->sc_dev));
return;
}
@ -2161,7 +2161,7 @@ ural_init(void *priv)
}
if (ntries == 100) {
printf("%s: timeout waiting for BBP/RF to wakeup\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto fail;
}
@ -2201,7 +2201,7 @@ ural_init(void *priv)
sc->amrr_xfer = usbd_alloc_xfer(sc->sc_udev);
if (sc->amrr_xfer == NULL) {
printf("%s: could not allocate AMRR xfer\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto fail;
}
@ -2212,7 +2212,7 @@ ural_init(void *priv)
&sc->sc_tx_pipeh);
if (error != 0) {
printf("%s: could not open Tx pipe: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
goto fail;
}
@ -2220,7 +2220,7 @@ ural_init(void *priv)
&sc->sc_rx_pipeh);
if (error != 0) {
printf("%s: could not open Rx pipe: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(error));
device_get_nameunit(sc->sc_dev), usbd_errstr(error));
goto fail;
}
@ -2230,14 +2230,14 @@ ural_init(void *priv)
error = ural_alloc_tx_list(sc);
if (error != 0) {
printf("%s: could not allocate Tx list\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto fail;
}
error = ural_alloc_rx_list(sc);
if (error != 0) {
printf("%s: could not allocate Rx list\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto fail;
}

2
sys/dev/usb/if_uralvar.h
View File

@ -82,7 +82,7 @@ struct ural_softc {
struct ieee80211com sc_ic;
int (*sc_newstate)(struct ieee80211com *,
enum ieee80211_state, int);
USBBASEDEVICE sc_dev;
device_t sc_dev;
usbd_device_handle sc_udev;
usbd_interface_handle sc_iface;

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

@ -750,7 +750,7 @@ ohci_init(ohci_softc_t *sc)
#if defined(__OpenBSD__)
printf(",");
#else
printf("%s:", USBDEVNAME(sc->sc_bus.bdev));
printf("%s:", device_get_nameunit(sc->sc_bus.bdev));
#endif
rev = OREAD4(sc, OHCI_REVISION);
printf(" OHCI version %d.%d%s\n", OHCI_REV_HI(rev), OHCI_REV_LO(rev),
@ -758,7 +758,7 @@ ohci_init(ohci_softc_t *sc)
if (OHCI_REV_HI(rev) != 1 || OHCI_REV_LO(rev) != 0) {
printf("%s: unsupported OHCI revision\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
sc->sc_bus.usbrev = USBREV_UNKNOWN;
return (USBD_INVAL);
}
@ -769,7 +769,7 @@ ohci_init(ohci_softc_t *sc)
for (i = 0; i < OHCI_HASH_SIZE; i++)
LIST_INIT(&sc->sc_hash_itds[i]);
SIMPLEQ_INIT(&sc->sc_free_xfers);
STAILQ_INIT(&sc->sc_free_xfers);
/* XXX determine alignment by R/W */
/* Allocate the HCCA area. */
@ -895,7 +895,7 @@ ohci_controller_init(ohci_softc_t *sc)
}
if ((ctl & OHCI_IR) == 0) {
printf("%s: SMM does not respond, resetting\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
goto reset;
}
@ -920,7 +920,7 @@ ohci_controller_init(ohci_softc_t *sc)
* This reset should not be necessary according to the OHCI spec, but
* without it some controllers do not start.
*/
DPRINTF(("%s: resetting\n", USBDEVNAME(sc->sc_bus.bdev)));
DPRINTF(("%s: resetting\n", device_get_nameunit(sc->sc_bus.bdev)));
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
usb_delay_ms(&sc->sc_bus, USB_BUS_RESET_DELAY);
@ -936,7 +936,7 @@ ohci_controller_init(ohci_softc_t *sc)
break;
}
if (hcr) {
printf("%s: reset timeout\n", USBDEVNAME(sc->sc_bus.bdev));
printf("%s: reset timeout\n", device_get_nameunit(sc->sc_bus.bdev));
return (USBD_IOERROR);
}
#ifdef USB_DEBUG
@ -1014,9 +1014,9 @@ ohci_allocx(struct usbd_bus *bus)
struct ohci_softc *sc = (struct ohci_softc *)bus;
usbd_xfer_handle xfer;
xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
xfer = STAILQ_FIRST(&sc->sc_free_xfers);
if (xfer != NULL) {
SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
#ifdef DIAGNOSTIC
if (xfer->busy_free != XFER_FREE) {
printf("ohci_allocx: xfer=%p not free, 0x%08x\n", xfer,
@ -1051,7 +1051,7 @@ ohci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
}
xfer->busy_free = XFER_FREE;
#endif
SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
STAILQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
}
/*
@ -1248,7 +1248,7 @@ ohci_intr1(ohci_softc_t *sc)
sc->sc_overrun_cnt++;
if (usbd_ratecheck(&sc->sc_overrun_ntc)) {
printf("%s: %u scheduling overruns\n",
USBDEVNAME(sc->sc_bus.bdev), sc->sc_overrun_cnt);
device_get_nameunit(sc->sc_bus.bdev), sc->sc_overrun_cnt);
sc->sc_overrun_cnt = 0;
}
/* XXX do what */
@ -1260,12 +1260,12 @@ ohci_intr1(ohci_softc_t *sc)
eintrs &= ~OHCI_WDH;
}
if (eintrs & OHCI_RD) {
printf("%s: resume detect\n", USBDEVNAME(sc->sc_bus.bdev));
printf("%s: resume detect\n", device_get_nameunit(sc->sc_bus.bdev));
/* XXX process resume detect */
}
if (eintrs & OHCI_UE) {
printf("%s: unrecoverable error, controller halted\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
OWRITE4(sc, OHCI_CONTROL, OHCI_HCFS_RESET);
/* XXX what else */
}
@ -1288,7 +1288,7 @@ ohci_intr1(ohci_softc_t *sc)
OWRITE4(sc, OHCI_INTERRUPT_DISABLE, eintrs);
sc->sc_eintrs &= ~eintrs;
printf("%s: blocking intrs 0x%x\n",
USBDEVNAME(sc->sc_bus.bdev), eintrs);
device_get_nameunit(sc->sc_bus.bdev), eintrs);
}
return (1);
@ -1933,7 +1933,7 @@ ohci_hash_find_td(ohci_softc_t *sc, ohci_physaddr_t a)
* stage.
*/
KASSERT((a&~OHCI_HEADMASK) == 0, ("%s: 0x%b has lower bits set\n",
USBDEVNAME(sc->sc_bus.bdev),
device_get_nameunit(sc->sc_bus.bdev),
(int) a, "\20\1HALT\2TOGGLE"));
for (std = LIST_FIRST(&sc->sc_hash_tds[h]);
@ -1943,7 +1943,7 @@ ohci_hash_find_td(ohci_softc_t *sc, ohci_physaddr_t a)
return (std);
DPRINTF(("%s: ohci_hash_find_td: addr 0x%08lx not found\n",
USBDEVNAME(sc->sc_bus.bdev), (u_long) a));
device_get_nameunit(sc->sc_bus.bdev), (u_long) a));
return (NULL);
}
@ -2492,7 +2492,7 @@ ohci_root_ctrl_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ohci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ohci_root_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -2828,7 +2828,7 @@ ohci_root_intr_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ohci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ohci_root_intr_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -2885,7 +2885,7 @@ ohci_device_ctrl_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ohci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ohci_device_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -2960,7 +2960,7 @@ ohci_device_bulk_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ohci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ohci_device_bulk_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -3099,7 +3099,7 @@ ohci_device_intr_transfer(usbd_xfer_handle xfer)
return (err);
/* Pipe isn't running, start first */
return (ohci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (ohci_device_intr_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
static usbd_status
@ -3241,7 +3241,7 @@ ohci_device_intr_close(usbd_pipe_handle pipe)
if ((le32toh(sed->ed.ed_tailp) & OHCI_HEADMASK) !=
(le32toh(sed->ed.ed_headp) & OHCI_HEADMASK))
panic("%s: Intr pipe %p still has TDs queued",
USBDEVNAME(sc->sc_bus.bdev), pipe);
device_get_nameunit(sc->sc_bus.bdev), pipe);
#endif
for (p = sc->sc_eds[pos]; p && p->next != sed; p = p->next)
@ -3346,7 +3346,7 @@ ohci_device_isoc_transfer(usbd_xfer_handle xfer)
/* and start if the pipe wasn't running */
if (!err)
ohci_device_isoc_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
ohci_device_isoc_start(STAILQ_FIRST(&xfer->pipe->queue));
return (err);
}
@ -3451,7 +3451,7 @@ ohci_device_isoc_enter(usbd_xfer_handle xfer)
if (nsitd == NULL) {
/* XXX what now? */
printf("%s: isoc TD alloc failed\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
return;
}

2
sys/dev/usb/ohcivar.h
View File

@ -124,7 +124,7 @@ typedef struct ohci_softc {
ohci_soft_td_t *sc_freetds;
ohci_soft_itd_t *sc_freeitds;
SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
STAILQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
usbd_xfer_handle sc_intrxfer;

18
sys/dev/usb/sl811hs.c
View File

@ -374,7 +374,7 @@ slhci_attach(struct slhci_softc *sc)
return -1;
printf("%s: ScanLogic %s USB Host Controller",
USBDEVNAME(sc->sc_bus.bdev), sltypestr[(rev > 0)]);
device_get_nameunit(sc->sc_bus.bdev), sltypestr[(rev > 0)]);
switch (rev) {
case SLTYPE_SL11H:
break;
@ -397,7 +397,7 @@ slhci_attach(struct slhci_softc *sc)
sc->sc_bus.pipe_size = sizeof(struct slhci_pipe);
sc->sc_bus.parent_dmatag = NULL; /* XXX */
sc->sc_bus.buffer_dmatag = NULL; /* XXX */
SIMPLEQ_INIT(&sc->sc_free_xfers);
STAILQ_INIT(&sc->sc_free_xfers);
usb_callout_init(sc->sc_poll_handle);
@ -595,9 +595,9 @@ slhci_allocx(struct usbd_bus *bus)
DPRINTF(D_MEM, ("SLallocx"));
xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
xfer = STAILQ_FIRST(&sc->sc_free_xfers);
if (xfer) {
SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
#ifdef DIAGNOSTIC
if (xfer->busy_free != XFER_FREE) {
printf("slhci_allocx: xfer=%p not free, 0x%08x\n",
@ -633,7 +633,7 @@ slhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
}
xfer->busy_free = XFER_FREE;
#endif
SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
STAILQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
}
void
@ -743,7 +743,7 @@ slhci_root_ctrl_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise error would be USBD_INPROG),
* so start it first.
*/
return slhci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
return slhci_root_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue));
}
usbd_status
@ -1113,7 +1113,7 @@ slhci_root_intr_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise error would be USBD_INPROG),
* start first.
*/
return slhci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
return slhci_root_intr_start(STAILQ_FIRST(&xfer->pipe->queue));
}
static usbd_status
@ -1164,7 +1164,7 @@ slhci_device_ctrl_transfer(usbd_xfer_handle xfer)
if (error)
return error;
return slhci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
return slhci_device_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue));
}
static usbd_status
@ -1267,7 +1267,7 @@ slhci_device_intr_transfer(usbd_xfer_handle xfer)
if (error)
return error;
return slhci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
return slhci_device_intr_start(STAILQ_FIRST(&xfer->pipe->queue));
}
static usbd_status

2
sys/dev/usb/sl811hsvar.h
View File

@ -84,7 +84,7 @@ struct slhci_softc {
u_int8_t sc_addr; /* device address of root hub */
u_int8_t sc_conf;
SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers;
STAILQ_HEAD(, usbd_xfer) sc_free_xfers;
/* Information for the root hub interrupt pipe */
int sc_interval;

28
sys/dev/usb/ubsa.c
View File

@ -304,7 +304,7 @@ USB_ATTACH(ubsa)
ucom->sc_udev = dev;
ucom->sc_iface = uaa->iface;
devname = USBDEVNAME(ucom->sc_dev);
devname = device_get_nameunit(ucom->sc_dev);
printf("%s: %s\n", devname, devinfo);
DPRINTF(("ubsa attach: sc = %p\n", sc));
@ -328,7 +328,7 @@ USB_ATTACH(ubsa)
if (cdesc == NULL) {
printf("%s: failed to get configuration descriptor\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
@ -352,7 +352,7 @@ USB_ATTACH(ubsa)
ed = usbd_interface2endpoint_descriptor(ucom->sc_iface, i);
if (ed == NULL) {
printf("%s: no endpoint descriptor for %d\n",
USBDEVNAME(ucom->sc_dev), i);
device_get_nameunit(ucom->sc_dev), i);
ucom->sc_dying = 1;
goto error;
}
@ -374,7 +374,7 @@ USB_ATTACH(ubsa)
if (sc->sc_intr_number == -1) {
printf("%s: Could not find interrupt in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
@ -384,14 +384,14 @@ USB_ATTACH(ubsa)
if (ucom->sc_bulkin_no == -1) {
printf("%s: Could not find data bulk in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
if (ucom->sc_bulkout_no == -1) {
printf("%s: Could not find data bulk out\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
@ -456,7 +456,7 @@ ubsa_request(struct ubsa_softc *sc, u_int8_t request, u_int16_t value)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, 0);
if (err)
printf("%s: ubsa_request: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -542,7 +542,7 @@ ubsa_baudrate(struct ubsa_softc *sc, speed_t speed)
default:
printf("%s: ubsa_param: unsupported baudrate, "
"forcing default of 9600\n",
USBDEVNAME(sc->sc_ucom.sc_dev));
device_get_nameunit(sc->sc_ucom.sc_dev));
value = B230400 / B9600;
break;
};
@ -585,7 +585,7 @@ ubsa_databits(struct ubsa_softc *sc, tcflag_t cflag)
default:
printf("%s: ubsa_param: unsupported databits requested, "
"forcing default of 8\n",
USBDEVNAME(sc->sc_ucom.sc_dev));
device_get_nameunit(sc->sc_ucom.sc_dev));
value = 3;
}
@ -663,7 +663,7 @@ ubsa_open(void *addr, int portno)
UBSA_INTR_INTERVAL);
if (err) {
printf("%s: cannot open interrupt pipe (addr %d)\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
sc->sc_intr_number);
return (EIO);
}
@ -688,12 +688,12 @@ ubsa_close(void *addr, int portno)
err = usbd_abort_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: abort interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(err));
err = usbd_close_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: close interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(err));
free(sc->sc_intr_buf, M_USBDEV);
sc->sc_intr_pipe = NULL;
@ -716,7 +716,7 @@ ubsa_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
DPRINTF(("%s: ubsa_intr: abnormal status: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(status)));
usbd_clear_endpoint_stall_async(sc->sc_intr_pipe);
return;
@ -727,7 +727,7 @@ ubsa_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
sc->sc_msr = buf[3];
DPRINTF(("%s: ubsa lsr = 0x%02x, msr = 0x%02x\n",
USBDEVNAME(sc->sc_ucom.sc_dev), sc->sc_lsr, sc->sc_msr));
device_get_nameunit(sc->sc_ucom.sc_dev), sc->sc_lsr, sc->sc_msr));
taskqueue_enqueue(taskqueue_swi_giant, &sc->sc_task);
}

34
sys/dev/usb/ubser.c
View File

@ -137,7 +137,7 @@ struct ubser_port {
};
struct ubser_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
usbd_device_handle sc_udev;
usbd_interface_handle sc_iface; /* data interface */
int sc_ifaceno;
@ -262,16 +262,16 @@ USB_ATTACH(ubser)
USBD_SHORT_XFER_OK, &alen, USBD_DEFAULT_TIMEOUT);
if (err) {
printf("%s: failed to get number of serials\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto bad;
} else if (alen != 1) {
printf("%s: bogus answer on get_numser\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto bad;
}
if (sc->sc_numser > MAX_SER)
sc->sc_numser = MAX_SER;
printf("%s: found %i serials\n", USBDEVNAME(sc->sc_dev), sc->sc_numser);
printf("%s: found %i serials\n", device_get_nameunit(sc->sc_dev), sc->sc_numser);
sc->sc_port = malloc(sizeof(*sc->sc_port) * sc->sc_numser,
M_USBDEV, M_WAITOK);
@ -285,7 +285,7 @@ USB_ATTACH(ubser)
ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
if (ed == NULL) {
printf("%s: couldn't get ep %d\n",
USBDEVNAME(sc->sc_dev), i);
device_get_nameunit(sc->sc_dev), i);
USB_ATTACH_ERROR_RETURN;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
@ -302,7 +302,7 @@ USB_ATTACH(ubser)
}
if (sc->sc_bulkin_no == -1 || sc->sc_bulkout_no == -1) {
printf("%s: could not find bulk in/out endpoint\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
goto bad;
}
@ -313,7 +313,7 @@ USB_ATTACH(ubser)
&sc->sc_bulkin_pipe);
if (err) {
printf("%s: open bulk in error (addr %d): %s\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkin_no,
device_get_nameunit(sc->sc_dev), sc->sc_bulkin_no,
usbd_errstr(err));
goto fail_0;
}
@ -322,7 +322,7 @@ USB_ATTACH(ubser)
USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
if (err) {
printf("%s: open bulk out error (addr %d): %s\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkout_no,
device_get_nameunit(sc->sc_dev), sc->sc_bulkout_no,
usbd_errstr(err));
goto fail_1;
}
@ -353,7 +353,7 @@ USB_ATTACH(ubser)
tp->t_open = ubseropen;
tp->t_close = ubserclose;
tp->t_modem = ubsermodem;
ttycreate(tp, 0, "y%r%r", USBDEVUNIT(sc->sc_dev), i);
ttycreate(tp, 0, "y%r%r", device_get_unit(sc->sc_dev), i);
}
@ -630,7 +630,7 @@ ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (status != USBD_NORMAL_COMPLETION) {
printf("%s: ubserwritecb: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
device_get_nameunit(sc->sc_dev), usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
/* XXX we should restart after some delay. */
@ -641,7 +641,7 @@ ubserwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
DPRINTF(("ubserwritecb: cc = %d\n", cc));
if (cc <= sc->sc_opkthdrlen) {
printf("%s: sent size too small, cc = %d\n",
USBDEVNAME(sc->sc_dev), cc);
device_get_nameunit(sc->sc_dev), cc);
goto error;
}
@ -699,7 +699,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (status == USBD_IOERROR) {
printf("%s: ubserreadcb: %s - restarting\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
device_get_nameunit(sc->sc_dev), usbd_errstr(status));
goto resubmit;
}
@ -708,7 +708,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (status != USBD_NORMAL_COMPLETION) {
if (status != USBD_CANCELLED) {
printf("%s: ubserreadcb: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
device_get_nameunit(sc->sc_dev), usbd_errstr(status));
}
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
@ -723,7 +723,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (cc > sc->sc_ibufsizepad) {
printf("%s: invalid receive data size, %d chars\n",
USBDEVNAME(sc->sc_dev), cc);
device_get_nameunit(sc->sc_dev), cc);
goto resubmit;
}
@ -757,7 +757,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
ubserstart(tp);
}
if (lostcc > 0)
printf("%s: lost %d chars\n", USBDEVNAME(sc->sc_dev),
printf("%s: lost %d chars\n", device_get_nameunit(sc->sc_dev),
lostcc);
} else {
/* Give characters to tty layer. */
@ -766,7 +766,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (ttyld_rint(tp, *cp) == -1) {
/* XXX what should we do? */
printf("%s: lost %d chars\n",
USBDEVNAME(sc->sc_dev), cc);
device_get_nameunit(sc->sc_dev), cc);
break;
}
cc--;
@ -777,7 +777,7 @@ ubserreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
resubmit:
err = ubserstartread(sc);
if (err) {
printf("%s: read start failed\n", USBDEVNAME(sc->sc_dev));
printf("%s: read start failed\n", device_get_nameunit(sc->sc_dev));
/* XXX what should we do now? */
}

22
sys/dev/usb/ucom.c
View File

@ -227,7 +227,7 @@ ucomopen(struct tty *tp, struct cdev *dev)
if (sc->sc_dying)
return (ENXIO);
DPRINTF(("%s: ucomopen: tp = %p\n", USBDEVNAME(sc->sc_dev), tp));
DPRINTF(("%s: ucomopen: tp = %p\n", device_get_nameunit(sc->sc_dev), tp));
sc->sc_poll = 0;
sc->sc_lsr = sc->sc_msr = sc->sc_mcr = 0;
@ -253,7 +253,7 @@ ucomopen(struct tty *tp, struct cdev *dev)
&sc->sc_bulkin_pipe);
if (err) {
printf("%s: open bulk in error (addr %d): %s\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkin_no,
device_get_nameunit(sc->sc_dev), sc->sc_bulkin_no,
usbd_errstr(err));
error = EIO;
goto fail;
@ -263,7 +263,7 @@ ucomopen(struct tty *tp, struct cdev *dev)
USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
if (err) {
printf("%s: open bulk out error (addr %d): %s\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkout_no,
device_get_nameunit(sc->sc_dev), sc->sc_bulkout_no,
usbd_errstr(err));
error = EIO;
goto fail;
@ -316,7 +316,7 @@ ucomclose(struct tty *tp)
sc = tp->t_sc;
DPRINTF(("%s: ucomclose \n", USBDEVNAME(sc->sc_dev)));
DPRINTF(("%s: ucomclose \n", device_get_nameunit(sc->sc_dev)));
ucom_cleanup(sc);
@ -659,7 +659,7 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (status != USBD_NORMAL_COMPLETION) {
printf("%s: ucomwritecb: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
device_get_nameunit(sc->sc_dev), usbd_errstr(status));
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
/* XXX we should restart after some delay. */
@ -670,7 +670,7 @@ ucomwritecb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
DPRINTF(("ucomwritecb: cc = %d\n", cc));
if (cc <= sc->sc_opkthdrlen) {
printf("%s: sent size too small, cc = %d\n",
USBDEVNAME(sc->sc_dev), cc);
device_get_nameunit(sc->sc_dev), cc);
goto error;
}
@ -738,7 +738,7 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (status != USBD_NORMAL_COMPLETION) {
if (!(sc->sc_state & UCS_RXSTOP))
printf("%s: ucomreadcb: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(status));
device_get_nameunit(sc->sc_dev), usbd_errstr(status));
sc->sc_state |= UCS_RXSTOP;
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
@ -758,7 +758,7 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (cc > sc->sc_ibufsize) {
printf("%s: invalid receive data size, %d chars\n",
USBDEVNAME(sc->sc_dev), cc);
device_get_nameunit(sc->sc_dev), cc);
goto resubmit;
}
if (cc < 1)
@ -782,7 +782,7 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
ucomstart(tp);
}
if (lostcc > 0)
printf("%s: lost %d chars\n", USBDEVNAME(sc->sc_dev),
printf("%s: lost %d chars\n", device_get_nameunit(sc->sc_dev),
lostcc);
} else {
/* Give characters to tty layer. */
@ -791,7 +791,7 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
if (ttyld_rint(tp, *cp) == -1) {
/* XXX what should we do? */
printf("%s: lost %d chars\n",
USBDEVNAME(sc->sc_dev), cc);
device_get_nameunit(sc->sc_dev), cc);
break;
}
cc--;
@ -803,7 +803,7 @@ ucomreadcb(usbd_xfer_handle xfer, usbd_private_handle p, usbd_status status)
resubmit:
err = ucomstartread(sc);
if (err) {
printf("%s: read start failed\n", USBDEVNAME(sc->sc_dev));
printf("%s: read start failed\n", device_get_nameunit(sc->sc_dev));
/* XXX what should we dow now? */
}

2
sys/dev/usb/ucomvar.h
View File

@ -120,7 +120,7 @@ struct ucom_callback {
#define UCS_RTS_IFLOW 0x0008 /* use RTS input flow control */
struct ucom_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev; /* USB device */
usbd_interface_handle sc_iface; /* data interface */

28
sys/dev/usb/udbp.c
View File

@ -275,7 +275,7 @@ USB_ATTACH(udbp)
ed = usbd_interface2endpoint_descriptor(iface, i);
if (!ed) {
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -294,14 +294,14 @@ USB_ATTACH(udbp)
/* Verify that we goething sensible */
if (ed_bulkin == NULL || ed_bulkout == NULL) {
printf("%s: bulk-in and/or bulk-out endpoint not found\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
if (ed_bulkin->wMaxPacketSize[0] != ed_bulkout->wMaxPacketSize[0] ||
ed_bulkin->wMaxPacketSize[1] != ed_bulkout->wMaxPacketSize[1]) {
printf("%s: bulk-in and bulk-out have different packet sizes %d %d %d %d\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
ed_bulkin->wMaxPacketSize[0],
ed_bulkout->wMaxPacketSize[0],
ed_bulkin->wMaxPacketSize[1],
@ -313,7 +313,7 @@ USB_ATTACH(udbp)
sc->sc_bulkout = ed_bulkout->bEndpointAddress;
DPRINTF(("%s: Bulk-in: 0x%02x, bulk-out 0x%02x, packet size = %d\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkin, sc->sc_bulkout,
device_get_nameunit(sc->sc_dev), sc->sc_bulkin, sc->sc_bulkout,
ed_bulkin->wMaxPacketSize[0]));
/* Allocate the in transfer struct */
@ -341,14 +341,14 @@ USB_ATTACH(udbp)
USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe);
if (err) {
printf("%s: cannot open bulk-in pipe (addr %d)\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkin);
device_get_nameunit(sc->sc_dev), sc->sc_bulkin);
goto bad;
}
err = usbd_open_pipe(iface, sc->sc_bulkout,
USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
if (err) {
printf("%s: cannot open bulk-out pipe (addr %d)\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkout);
device_get_nameunit(sc->sc_dev), sc->sc_bulkout);
goto bad;
}
@ -362,7 +362,7 @@ USB_ATTACH(udbp)
if ((err = ng_make_node_common(&ng_udbp_typestruct, &sc->node)) == 0) {
char nodename[128];
sprintf(nodename, "%s", USBDEVNAME(sc->sc_dev));
sprintf(nodename, "%s", device_get_nameunit(sc->sc_dev));
if ((err = ng_name_node(sc->node, nodename))) {
NG_NODE_UNREF(sc->node);
sc->node = NULL;
@ -416,7 +416,7 @@ USB_DETACH(udbp)
sc->flags |= DISCONNECTED;
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
DPRINTF(("%s: disconnected\n", device_get_nameunit(self)));
if (sc->sc_bulkin_pipe) {
usbd_abort_pipe(sc->sc_bulkin_pipe);
@ -475,7 +475,7 @@ udbp_setup_in_transfer(udbp_p sc)
err = usbd_transfer(sc->sc_bulkin_xfer);
if (err && err != USBD_IN_PROGRESS) {
DPRINTF(("%s: failed to setup in-transfer, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
return(err);
}
@ -494,7 +494,7 @@ udbp_in_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
if (err) {
if (err != USBD_CANCELLED) {
DPRINTF(("%s: bulk-out transfer failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
} else {
/* USBD_CANCELLED happens at unload of the driver */
return;
@ -552,7 +552,7 @@ udbp_setup_out_transfer(udbp_p sc)
pktlen = m->m_pkthdr.len;
if (pktlen > sc->sc_bulkout_bufferlen) {
printf("%s: Packet too large, %d > %d\n",
USBDEVNAME(sc->sc_dev), pktlen,
device_get_nameunit(sc->sc_dev), pktlen,
sc->sc_bulkout_bufferlen);
return (USBD_IOERROR);
}
@ -574,7 +574,7 @@ udbp_setup_out_transfer(udbp_p sc)
err = usbd_transfer(sc->sc_bulkout_xfer);
if (err && err != USBD_IN_PROGRESS) {
DPRINTF(("%s: failed to setup out-transfer, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
return(err);
}
@ -590,7 +590,7 @@ udbp_out_transfer_cb(usbd_xfer_handle xfer, usbd_private_handle priv,
if (err) {
DPRINTF(("%s: bulk-out transfer failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
/* Transfer has failed, packet is not transmitted */
/* XXX Invalidate packet */
return;
@ -797,7 +797,7 @@ ng_udbp_rmnode(node_p node)
if ((err = ng_make_node_common(&ng_udbp_typestruct, &sc->node)) == 0) {
char nodename[128];
sprintf(nodename, "%s", USBDEVNAME(sc->sc_dev));
sprintf(nodename, "%s", device_get_nameunit(sc->sc_dev));
if ((err = ng_name_node(sc->node, nodename))) {
NG_NODE_UNREF(sc->node); /* out damned spot! */
sc->flags &= ~NETGRAPH_INITIALISED;

6
sys/dev/usb/ufm.c
View File

@ -106,7 +106,7 @@ static struct cdevsw ufm_cdevsw = {
#define FM_CMD2 0x02
struct ufm_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
usbd_device_handle sc_udev;
usbd_interface_handle sc_iface;
@ -217,7 +217,7 @@ USB_ATTACH(ufm)
USB_ATTACH_SUCCESS_RETURN;
nobulk:
printf("%s: could not find %s\n", USBDEVNAME(sc->sc_dev),ermsg);
printf("%s: could not find %s\n", device_get_nameunit(sc->sc_dev),ermsg);
USB_ATTACH_ERROR_RETURN;
}
@ -465,7 +465,7 @@ USB_DETACH(ufm)
static int
ufm_detach(device_t self)
{
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
DPRINTF(("%s: disconnected\n", device_get_nameunit(self)));
return 0;
}

20
sys/dev/usb/ufoma.c
View File

@ -329,7 +329,7 @@ USB_ATTACH(ufoma)
id = usbd_get_interface_descriptor(sc->sc_ctl_iface);
sc->sc_ctl_iface_no = id->bInterfaceNumber;
devname = USBDEVNAME(self);
devname = device_get_nameunit(self);
devinfo = malloc(1024, M_USBDEV, M_WAITOK);
usbd_devinfo(dev, 0, devinfo);
printf("%s: %s, iclass %d/%d ifno:%d\n", devname, devinfo,
@ -539,13 +539,13 @@ static int ufoma_activate_state(struct ufoma_softc *sc, int state)
err = usbd_do_request(ucom->sc_udev, &req, NULL);
if(err){
printf("%s:ACTIVATE:%s\n", USBDEVNAME(ucom->sc_dev), usbd_errstr(err));
printf("%s:ACTIVATE:%s\n", device_get_nameunit(ucom->sc_dev), usbd_errstr(err));
return EIO;
}
err = tsleep(&sc->sc_currentmode, PZERO|PCATCH, "fmaact", UFOMA_MAX_TIMEOUT*hz);
if(err){
printf("%s:NO response", USBDEVNAME(ucom->sc_dev));
printf("%s:NO response", device_get_nameunit(ucom->sc_dev));
return EIO;
}
if(sc->sc_currentmode != state){
@ -606,7 +606,7 @@ static void ufoma_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_sta
if (status != USBD_NORMAL_COMPLETION) {
if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
return;
printf("%s: abnormal status: %s\n", USBDEVNAME(ucom->sc_dev),
printf("%s: abnormal status: %s\n", device_get_nameunit(ucom->sc_dev),
usbd_errstr(status));
return;
}
@ -615,7 +615,7 @@ static void ufoma_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_sta
a = UGETW(sc->sc_notify_buf.wValue);
sc->sc_currentmode = a>>8;
if(!(a&0xff)){
printf("%s:Mode change Failed\n", USBDEVNAME(ucom->sc_dev));
printf("%s:Mode change Failed\n", device_get_nameunit(ucom->sc_dev));
}
wakeup(&sc->sc_currentmode);
}
@ -625,7 +625,7 @@ static void ufoma_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_sta
switch(sc->sc_notify_buf.bNotification){
case UCDC_N_RESPONSE_AVAILABLE:
if(sc->sc_is_ucom){
printf("%s:wrong response request?\n", USBDEVNAME(ucom->sc_dev));
printf("%s:wrong response request?\n", device_get_nameunit(ucom->sc_dev));
break;
}
mtx_lock(&sc->sc_mtx);
@ -641,7 +641,7 @@ static void ufoma_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_sta
break;
case UCDC_N_SERIAL_STATE:
if(!sc->sc_is_ucom){
printf("%s:wrong sereal request?\n",USBDEVNAME(ucom->sc_dev));
printf("%s:wrong sereal request?\n",device_get_nameunit(ucom->sc_dev));
break;
}
@ -651,12 +651,12 @@ static void ufoma_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_sta
*/
if (UGETW(sc->sc_notify_buf.wLength) != 2) {
printf("%s: Invalid notification length! (%d)\n",
USBDEVNAME(ucom->sc_dev),
device_get_nameunit(ucom->sc_dev),
UGETW(sc->sc_notify_buf.wLength));
break;
}
DPRINTF(("%s: notify bytes = %02x%02x\n",
USBDEVNAME(ucom->sc_dev),
device_get_nameunit(ucom->sc_dev),
sc->sc_notify_buf.data[0],
sc->sc_notify_buf.data[1]));
/* Currently, lsr is always zero. */
@ -948,7 +948,7 @@ static int ufoma_init_modem(struct ufoma_softc *sc,struct usb_attach_arg *uaa)
usb_cdc_cm_descriptor_t *cmd;
usb_endpoint_descriptor_t *ed;
usb_interface_descriptor_t *id;
const char *devname = USBDEVNAME(ucom->sc_dev);
const char *devname = device_get_nameunit(ucom->sc_dev);
int i;
cd = usbd_get_config_descriptor(ucom->sc_udev);
id = usbd_get_interface_descriptor(sc->sc_ctl_iface);

2
sys/dev/usb/uftdi.c
View File

@ -201,7 +201,7 @@ USB_ATTACH(uftdi)
ucom->sc_dev = self;
ucom->sc_udev = dev;
devname = USBDEVNAME(ucom->sc_dev);
devname = device_get_nameunit(ucom->sc_dev);
if (uaa->iface == NULL) {
/* Move the device into the configured state. */

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

@ -535,7 +535,7 @@ uhci_init(uhci_softc_t *sc)
LIST_INIT(&sc->sc_intrhead);
SIMPLEQ_INIT(&sc->sc_free_xfers);
STAILQ_INIT(&sc->sc_free_xfers);
usb_callout_init(sc->sc_poll_handle);
@ -604,10 +604,10 @@ uhci_detach(struct uhci_softc *sc, int flags)
/* Free all xfers associated with this HC. */
for (;;) {
xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
xfer = STAILQ_FIRST(&sc->sc_free_xfers);
if (xfer == NULL)
break;
SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
free(xfer, M_USB);
}
@ -635,9 +635,9 @@ uhci_allocx(struct usbd_bus *bus)
struct uhci_softc *sc = (struct uhci_softc *)bus;
usbd_xfer_handle xfer;
xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
xfer = STAILQ_FIRST(&sc->sc_free_xfers);
if (xfer != NULL) {
SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
STAILQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
#ifdef DIAGNOSTIC
if (xfer->busy_free != XFER_FREE) {
printf("uhci_allocx: xfer=%p not free, 0x%08x\n", xfer,
@ -678,7 +678,7 @@ uhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
return;
}
#endif
SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
STAILQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next);
}
/*
@ -782,7 +782,7 @@ uhci_dumpregs(uhci_softc_t *sc)
{
DPRINTFN(-1,("%s regs: cmd=%04x, sts=%04x, intr=%04x, frnum=%04x, "
"flbase=%08x, sof=%04x, portsc1=%04x, portsc2=%04x\n",
USBDEVNAME(sc->sc_bus.bdev),
device_get_nameunit(sc->sc_bus.bdev),
UREAD2(sc, UHCI_CMD),
UREAD2(sc, UHCI_STS),
UREAD2(sc, UHCI_INTR),
@ -1222,7 +1222,7 @@ uhci_intr1(uhci_softc_t *sc)
#ifdef USB_DEBUG
if (uhcidebug > 15) {
DPRINTF(("%s: uhci_intr1\n", USBDEVNAME(sc->sc_bus.bdev)));
DPRINTF(("%s: uhci_intr1\n", device_get_nameunit(sc->sc_bus.bdev)));
uhci_dumpregs(sc);
}
#endif
@ -1237,7 +1237,7 @@ uhci_intr1(uhci_softc_t *sc)
if (sc->sc_suspend != PWR_RESUME) {
printf("%s: interrupt while not operating ignored\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
UWRITE2(sc, UHCI_STS, status); /* acknowledge the ints */
return (0);
}
@ -1250,23 +1250,23 @@ uhci_intr1(uhci_softc_t *sc)
if (status & UHCI_STS_RD) {
ack |= UHCI_STS_RD;
#ifdef USB_DEBUG
printf("%s: resume detect\n", USBDEVNAME(sc->sc_bus.bdev));
printf("%s: resume detect\n", device_get_nameunit(sc->sc_bus.bdev));
#endif
}
if (status & UHCI_STS_HSE) {
ack |= UHCI_STS_HSE;
printf("%s: host system error\n", USBDEVNAME(sc->sc_bus.bdev));
printf("%s: host system error\n", device_get_nameunit(sc->sc_bus.bdev));
}
if (status & UHCI_STS_HCPE) {
ack |= UHCI_STS_HCPE;
printf("%s: host controller process error\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
}
if (status & UHCI_STS_HCH) {
/* no acknowledge needed */
if (!sc->sc_dying) {
printf("%s: host controller halted\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
#ifdef USB_DEBUG
uhci_dump_all(sc);
#endif
@ -1281,7 +1281,7 @@ uhci_intr1(uhci_softc_t *sc)
sc->sc_bus.no_intrs++;
usb_schedsoftintr(&sc->sc_bus);
DPRINTFN(15, ("%s: uhci_intr: exit\n", USBDEVNAME(sc->sc_bus.bdev)));
DPRINTFN(15, ("%s: uhci_intr: exit\n", device_get_nameunit(sc->sc_bus.bdev)));
return (1);
}
@ -1292,7 +1292,7 @@ uhci_softintr(void *v)
uhci_softc_t *sc = v;
uhci_intr_info_t *ii, *nextii;
DPRINTFN(10,("%s: uhci_softintr (%d)\n", USBDEVNAME(sc->sc_bus.bdev),
DPRINTFN(10,("%s: uhci_softintr (%d)\n", device_get_nameunit(sc->sc_bus.bdev),
sc->sc_bus.intr_context));
sc->sc_bus.intr_context++;
@ -1601,7 +1601,7 @@ uhci_reset(uhci_softc_t *sc)
usb_delay_ms(&sc->sc_bus, 1);
if (n >= UHCI_RESET_TIMEOUT)
printf("%s: controller did not reset\n",
USBDEVNAME(sc->sc_bus.bdev));
device_get_nameunit(sc->sc_bus.bdev));
}
usbd_status
@ -1631,7 +1631,7 @@ uhci_run(uhci_softc_t *sc, int run)
usb_delay_ms(&sc->sc_bus, 1);
}
splx(s);
printf("%s: cannot %s\n", USBDEVNAME(sc->sc_bus.bdev),
printf("%s: cannot %s\n", device_get_nameunit(sc->sc_bus.bdev),
run ? "start" : "stop");
return (USBD_IOERROR);
}
@ -1930,7 +1930,7 @@ uhci_device_bulk_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise err would be USBD_INPROG),
* so start it first.
*/
return (uhci_device_bulk_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (uhci_device_bulk_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
usbd_status
@ -2192,7 +2192,7 @@ uhci_device_ctrl_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise err would be USBD_INPROG),
* so start it first.
*/
return (uhci_device_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (uhci_device_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
usbd_status
@ -2232,7 +2232,7 @@ uhci_device_intr_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise err would be USBD_INPROG),
* so start it first.
*/
return (uhci_device_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (uhci_device_intr_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
usbd_status
@ -2518,7 +2518,7 @@ uhci_device_isoc_transfer(usbd_xfer_handle xfer)
/* and start if the pipe wasn't running */
if (!err)
uhci_device_isoc_start(SIMPLEQ_FIRST(&xfer->pipe->queue));
uhci_device_isoc_start(STAILQ_FIRST(&xfer->pipe->queue));
return (err);
}
@ -3353,7 +3353,7 @@ uhci_root_ctrl_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise err would be USBD_INPROG),
* so start it first.
*/
return (uhci_root_ctrl_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (uhci_root_ctrl_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
usbd_status
@ -3727,7 +3727,7 @@ uhci_root_intr_transfer(usbd_xfer_handle xfer)
* Pipe isn't running (otherwise err would be USBD_INPROG),
* so start it first.
*/
return (uhci_root_intr_start(SIMPLEQ_FIRST(&xfer->pipe->queue)));
return (uhci_root_intr_start(STAILQ_FIRST(&xfer->pipe->queue)));
}
/* Start a transfer on the root interrupt pipe */

2
sys/dev/usb/uhcivar.h
View File

@ -169,7 +169,7 @@ typedef struct uhci_softc {
uhci_soft_td_t *sc_freetds; /* TD free list */
uhci_soft_qh_t *sc_freeqhs; /* QH free list */
SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
STAILQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
u_int8_t sc_addr; /* device address */
u_int8_t sc_conf; /* device configuration */

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

@ -109,7 +109,7 @@ SYSCTL_INT(_hw_usb_uhid, OID_AUTO, debug, CTLFLAG_RW,
#endif
struct uhid_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
usbd_interface_handle sc_iface; /* interface */
usbd_pipe_handle sc_intrpipe; /* interrupt pipe */
@ -234,7 +234,7 @@ USB_ATTACH(uhid)
ed = usbd_interface2endpoint_descriptor(iface, 0);
if (ed == NULL) {
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
USB_ATTACH_ERROR_RETURN;
}
@ -250,7 +250,7 @@ USB_ATTACH(uhid)
if (UE_GET_DIR(ed->bEndpointAddress) != UE_DIR_IN ||
(ed->bmAttributes & UE_XFERTYPE) != UE_INTERRUPT) {
printf("%s: unexpected endpoint\n", USBDEVNAME(sc->sc_dev));
printf("%s: unexpected endpoint\n", device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
USB_ATTACH_ERROR_RETURN;
}
@ -305,7 +305,7 @@ USB_ATTACH(uhid)
}
if (err) {
printf("%s: no report descriptor\n", USBDEVNAME(sc->sc_dev));
printf("%s: no report descriptor\n", device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
USB_ATTACH_ERROR_RETURN;
}

46
sys/dev/usb/uhub.c
View File

@ -81,7 +81,7 @@ SYSCTL_INT(_hw_usb_uhub, OID_AUTO, debug, CTLFLAG_RW,
#endif
struct uhub_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_hub; /* USB device */
usbd_pipe_handle sc_ipipe; /* interrupt pipe */
u_int8_t sc_status[1]; /* XXX more ports */
@ -186,21 +186,21 @@ USB_ATTACH(uhub)
if (dev->depth > 0 && UHUB_IS_HIGH_SPEED(sc)) {
printf("%s: %s transaction translator%s\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
UHUB_IS_SINGLE_TT(sc) ? "single" : "multiple",
UHUB_IS_SINGLE_TT(sc) ? "" : "s");
}
err = usbd_set_config_index(dev, 0, 1);
if (err) {
DPRINTF(("%s: configuration failed, error=%s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
free(devinfo, M_TEMP);
USB_ATTACH_ERROR_RETURN;
}
if (dev->depth > USB_HUB_MAX_DEPTH) {
printf("%s: hub depth (%d) exceeded, hub ignored\n",
USBDEVNAME(sc->sc_dev), USB_HUB_MAX_DEPTH);
device_get_nameunit(sc->sc_dev), USB_HUB_MAX_DEPTH);
free(devinfo, M_TEMP);
USB_ATTACH_ERROR_RETURN;
}
@ -220,7 +220,7 @@ USB_ATTACH(uhub)
}
if (err) {
DPRINTF(("%s: getting hub descriptor failed, error=%s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
free(devinfo, M_TEMP);
USB_ATTACH_ERROR_RETURN;
}
@ -229,11 +229,11 @@ USB_ATTACH(uhub)
if (!UHD_NOT_REMOV(&hubdesc, port))
nremov++;
printf("%s: %d port%s with %d removable, %s powered\n",
USBDEVNAME(sc->sc_dev), nports, nports != 1 ? "s" : "",
device_get_nameunit(sc->sc_dev), nports, nports != 1 ? "s" : "",
nremov, dev->self_powered ? "self" : "bus");
if (nports == 0) {
printf("%s: no ports, hub ignored\n", USBDEVNAME(sc->sc_dev));
printf("%s: no ports, hub ignored\n", device_get_nameunit(sc->sc_dev));
goto bad;
}
@ -257,23 +257,23 @@ USB_ATTACH(uhub)
if (!dev->self_powered && dev->powersrc->parent != NULL &&
!dev->powersrc->parent->self_powered) {
printf("%s: bus powered hub connected to bus powered hub, "
"ignored\n", USBDEVNAME(sc->sc_dev));
"ignored\n", device_get_nameunit(sc->sc_dev));
goto bad;
}
/* Set up interrupt pipe. */
err = usbd_device2interface_handle(dev, 0, &iface);
if (err) {
printf("%s: no interface handle\n", USBDEVNAME(sc->sc_dev));
printf("%s: no interface handle\n", device_get_nameunit(sc->sc_dev));
goto bad;
}
ed = usbd_interface2endpoint_descriptor(iface, 0);
if (ed == NULL) {
printf("%s: no endpoint descriptor\n", USBDEVNAME(sc->sc_dev));
printf("%s: no endpoint descriptor\n", device_get_nameunit(sc->sc_dev));
goto bad;
}
if ((ed->bmAttributes & UE_XFERTYPE) != UE_INTERRUPT) {
printf("%s: bad interrupt endpoint\n", USBDEVNAME(sc->sc_dev));
printf("%s: bad interrupt endpoint\n", device_get_nameunit(sc->sc_dev));
goto bad;
}
@ -282,7 +282,7 @@ USB_ATTACH(uhub)
sizeof(sc->sc_status), uhub_intr, UHUB_INTR_INTERVAL);
if (err) {
printf("%s: cannot open interrupt pipe\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
goto bad;
}
@ -352,7 +352,7 @@ USB_ATTACH(uhub)
err = usbd_set_port_feature(dev, port, UHF_PORT_POWER);
if (err)
printf("%s: port %d power on failed, %s\n",
USBDEVNAME(sc->sc_dev), port,
device_get_nameunit(sc->sc_dev), port,
usbd_errstr(err));
DPRINTF(("usb_init_port: turn on port %d power\n", port));
/* Wait for stable power. */
@ -404,7 +404,7 @@ uhub_explore(usbd_device_handle dev)
status = UGETW(up->status.wPortStatus);
change = UGETW(up->status.wPortChange);
DPRINTFN(3,("uhub_explore: %s port %d status 0x%04x 0x%04x\n",
USBDEVNAME(sc->sc_dev), port, status, change));
device_get_nameunit(sc->sc_dev), port, status, change));
if (change & UPS_C_PORT_ENABLED) {
DPRINTF(("uhub_explore: C_PORT_ENABLED 0x%x\n", change));
usbd_clear_port_feature(dev, port, UHF_C_PORT_ENABLE);
@ -413,20 +413,20 @@ uhub_explore(usbd_device_handle dev)
vanished. */
} else if (status & UPS_PORT_ENABLED) {
printf("%s: illegal enable change, port %d\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
} else {
/* Port error condition. */
if (up->restartcnt) /* no message first time */
printf("%s: port error, restarting "
"port %d\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
if (up->restartcnt++ < USBD_RESTART_MAX)
goto disco;
else
printf("%s: port error, giving up "
"port %d\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
}
}
if (!(change & UPS_C_CONNECT_STATUS)) {
@ -439,7 +439,7 @@ uhub_explore(usbd_device_handle dev)
if (up->device == NULL &&
(status & UPS_CURRENT_CONNECT_STATUS))
printf("%s: connected, no device\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
#endif
continue;
}
@ -477,7 +477,7 @@ uhub_explore(usbd_device_handle dev)
if (!(status & UPS_PORT_POWER))
printf("%s: strange, connected port %d has no power\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
/* Wait for maximum device power up time. */
usbd_delay_ms(dev, USB_PORT_POWERUP_DELAY);
@ -485,7 +485,7 @@ uhub_explore(usbd_device_handle dev)
/* Reset port, which implies enabling it. */
if (usbd_reset_port(dev, port, &up->status)) {
printf("%s: port %d reset failed\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
continue;
}
/* Get port status again, it might have changed during reset */
@ -501,7 +501,7 @@ uhub_explore(usbd_device_handle dev)
/* Nothing connected, just ignore it. */
#ifdef DIAGNOSTIC
printf("%s: port %d, device disappeared after reset\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
#endif
continue;
}
@ -510,7 +510,7 @@ uhub_explore(usbd_device_handle dev)
if (UHUB_IS_HIGH_SPEED(sc) && !(status & UPS_HIGH_SPEED)) {
printf("%s: port %d, transaction translation not "
"implemented, low/full speed device ignored\n",
USBDEVNAME(sc->sc_dev), port);
device_get_nameunit(sc->sc_dev), port);
continue;
}
#endif
@ -538,7 +538,7 @@ uhub_explore(usbd_device_handle dev)
* at 0 we have to disable the port instead.
*/
printf("%s: device problem (%s), disabling port %d\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err), port);
device_get_nameunit(sc->sc_dev), usbd_errstr(err), port);
usbd_clear_port_feature(dev, port, UHF_PORT_ENABLE);
} else {
/* The port set up succeeded, reset error count. */

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

@ -201,7 +201,7 @@ ukbd_detach(device_t self)
kbd = kbd_get_keyboard(kbd_find_keyboard(DRIVER_NAME,
device_get_unit(self)));
if (kbd == NULL) {
DPRINTF(("%s: keyboard not attached!?\n", USBDEVNAME(self)));
DPRINTF(("%s: keyboard not attached!?\n", device_get_nameunit(self)));
return ENXIO;
}
(*kbdsw[kbd->kb_index]->disable)(kbd);
@ -215,7 +215,7 @@ ukbd_detach(device_t self)
if (error)
return error;
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
DPRINTF(("%s: disconnected\n", device_get_nameunit(self)));
return (0);
}

24
sys/dev/usb/ulpt.c
View File

@ -100,7 +100,7 @@ SYSCTL_INT(_hw_usb_ulpt, OID_AUTO, debug, CTLFLAG_RW,
#define LPS_MASK (LPS_SELECT|LPS_NERR|LPS_NOPAPER)
struct ulpt_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
usbd_device_handle sc_udev; /* device */
usbd_interface_handle sc_iface; /* interface */
int sc_ifaceno;
@ -235,7 +235,7 @@ USB_ATTACH(ulpt)
cdesc = usbd_get_config_descriptor(dev);
if (cdesc == NULL) {
printf("%s: failed to get configuration descriptor\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
iend = (usb_interface_descriptor_t *)
@ -267,7 +267,7 @@ USB_ATTACH(ulpt)
err = usbd_set_interface(iface, altno);
if (err) {
printf("%s: setting alternate interface failed\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
USB_ATTACH_ERROR_RETURN;
}
@ -282,7 +282,7 @@ USB_ATTACH(ulpt)
ed = usbd_interface2endpoint_descriptor(iface, i);
if (ed == NULL) {
printf("%s: couldn't get ep %d\n",
USBDEVNAME(sc->sc_dev), i);
device_get_nameunit(sc->sc_dev), i);
USB_ATTACH_ERROR_RETURN;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN &&
@ -295,7 +295,7 @@ USB_ATTACH(ulpt)
}
if (sc->sc_out == -1) {
printf("%s: could not find bulk out endpoint\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
USB_ATTACH_ERROR_RETURN;
}
@ -305,7 +305,7 @@ USB_ATTACH(ulpt)
sc->sc_in = -1;
}
printf("%s: using %s-directional mode\n", USBDEVNAME(sc->sc_dev),
printf("%s: using %s-directional mode\n", device_get_nameunit(sc->sc_dev),
sc->sc_in >= 0 ? "bi" : "uni");
DPRINTFN(10, ("ulpt_attach: bulk=%d\n", sc->sc_out));
@ -333,17 +333,17 @@ USB_ATTACH(ulpt)
err = usbd_do_request_flags(dev, &req, devinfo, USBD_SHORT_XFER_OK,
&alen, USBD_DEFAULT_TIMEOUT);
if (err) {
printf("%s: cannot get device id\n", USBDEVNAME(sc->sc_dev));
printf("%s: cannot get device id\n", device_get_nameunit(sc->sc_dev));
} else if (alen <= 2) {
printf("%s: empty device id, no printer connected?\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
} else {
/* devinfo now contains an IEEE-1284 device ID */
len = ((devinfo[0] & 0xff) << 8) | (devinfo[1] & 0xff);
if (len > sizeof devinfo - 3)
len = sizeof devinfo - 3;
devinfo[len] = 0;
printf("%s: device id <", USBDEVNAME(sc->sc_dev));
printf("%s: device id <", device_get_nameunit(sc->sc_dev));
ieee1284_print_id(devinfo+2);
printf(">\n");
}
@ -622,11 +622,11 @@ ulpt_statusmsg(u_char status, struct ulpt_softc *sc)
sc->sc_laststatus = status;
if (new & LPS_SELECT)
log(LOG_NOTICE, "%s: offline\n", USBDEVNAME(sc->sc_dev));
log(LOG_NOTICE, "%s: offline\n", device_get_nameunit(sc->sc_dev));
else if (new & LPS_NOPAPER)
log(LOG_NOTICE, "%s: out of paper\n", USBDEVNAME(sc->sc_dev));
log(LOG_NOTICE, "%s: out of paper\n", device_get_nameunit(sc->sc_dev));
else if (new & LPS_NERR)
log(LOG_NOTICE, "%s: output error\n", USBDEVNAME(sc->sc_dev));
log(LOG_NOTICE, "%s: output error\n", device_get_nameunit(sc->sc_dev));
return (status);
}

204
sys/dev/usb/umass.c
View File

@ -516,7 +516,7 @@ static struct umass_devdescr_t umass_devdescrs[] = {
/* the per device structure */
struct umass_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev; /* USB device */
struct cam_sim *umass_sim; /* SCSI Interface Module */
@ -872,7 +872,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
break;
default:
DPRINTF(UDMASS_GEN, ("%s: Unsupported command protocol %d\n",
USBDEVNAME(sc->sc_dev), id->bInterfaceSubClass));
device_get_nameunit(sc->sc_dev), id->bInterfaceSubClass));
return(UMATCH_NONE);
}
@ -889,7 +889,7 @@ umass_match_proto(struct umass_softc *sc, usbd_interface_handle iface,
break;
default:
DPRINTF(UDMASS_GEN, ("%s: Unsupported wire protocol %d\n",
USBDEVNAME(sc->sc_dev), id->bInterfaceProtocol));
device_get_nameunit(sc->sc_dev), id->bInterfaceProtocol));
return(UMATCH_NONE);
}
@ -935,7 +935,7 @@ USB_ATTACH(umass)
id = usbd_get_interface_descriptor(sc->iface);
#ifdef USB_DEBUG
printf("%s: ", USBDEVNAME(sc->sc_dev));
printf("%s: ", device_get_nameunit(sc->sc_dev));
switch (sc->proto&UMASS_PROTO_COMMAND) {
case UMASS_PROTO_SCSI:
printf("SCSI");
@ -985,7 +985,7 @@ USB_ATTACH(umass)
if (err) {
DPRINTF(UDMASS_USB, ("%s: could not switch to "
"Alt Interface %d\n",
USBDEVNAME(sc->sc_dev), 1));
device_get_nameunit(sc->sc_dev), 1));
umass_detach(self);
USB_ATTACH_ERROR_RETURN;
}
@ -1006,7 +1006,7 @@ USB_ATTACH(umass)
ed = usbd_interface2endpoint_descriptor(sc->iface, i);
if (!ed) {
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
if (UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN
@ -1022,7 +1022,7 @@ USB_ATTACH(umass)
#ifdef USB_DEBUG
if (UGETW(ed->wMaxPacketSize) > 2) {
DPRINTF(UDMASS_CBI, ("%s: intr size is %d\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
UGETW(ed->wMaxPacketSize)));
}
#endif
@ -1033,7 +1033,7 @@ USB_ATTACH(umass)
if (!sc->bulkin || !sc->bulkout
|| (sc->proto & UMASS_PROTO_CBI_I && !sc->intrin) ) {
DPRINTF(UDMASS_USB, ("%s: endpoint not found %d/%d/%d\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->bulkin, sc->bulkout, sc->intrin));
umass_detach(self);
USB_ATTACH_ERROR_RETURN;
@ -1044,7 +1044,7 @@ USB_ATTACH(umass)
USBD_EXCLUSIVE_USE, &sc->bulkout_pipe);
if (err) {
DPRINTF(UDMASS_USB, ("%s: cannot open %d-out pipe (bulk)\n",
USBDEVNAME(sc->sc_dev), sc->bulkout));
device_get_nameunit(sc->sc_dev), sc->bulkout));
umass_detach(self);
USB_ATTACH_ERROR_RETURN;
}
@ -1052,7 +1052,7 @@ USB_ATTACH(umass)
USBD_EXCLUSIVE_USE, &sc->bulkin_pipe);
if (err) {
DPRINTF(UDMASS_USB, ("%s: could not open %d-in pipe (bulk)\n",
USBDEVNAME(sc->sc_dev), sc->bulkin));
device_get_nameunit(sc->sc_dev), sc->bulkin));
umass_detach(self);
USB_ATTACH_ERROR_RETURN;
}
@ -1072,7 +1072,7 @@ USB_ATTACH(umass)
USBD_EXCLUSIVE_USE, &sc->intrin_pipe);
if (err) {
DPRINTF(UDMASS_USB, ("%s: couldn't open %d-in (intr)\n",
USBDEVNAME(sc->sc_dev), sc->intrin));
device_get_nameunit(sc->sc_dev), sc->intrin));
umass_detach(self);
USB_ATTACH_ERROR_RETURN;
}
@ -1086,7 +1086,7 @@ USB_ATTACH(umass)
sc->transfer_xfer[i] = usbd_alloc_xfer(uaa->device);
if (!sc->transfer_xfer[i]) {
DPRINTF(UDMASS_USB, ("%s: Out of memory\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
umass_detach(self);
USB_ATTACH_ERROR_RETURN;
}
@ -1162,7 +1162,7 @@ USB_ATTACH(umass)
}
sc->transfer_state = TSTATE_IDLE;
DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", USBDEVNAME(sc->sc_dev)));
DPRINTF(UDMASS_GEN, ("%s: Attach finished\n", device_get_nameunit(sc->sc_dev)));
USB_ATTACH_SUCCESS_RETURN;
}
@ -1173,7 +1173,7 @@ USB_DETACH(umass)
int err = 0;
int i;
DPRINTF(UDMASS_USB, ("%s: detached\n", USBDEVNAME(sc->sc_dev)));
DPRINTF(UDMASS_USB, ("%s: detached\n", device_get_nameunit(sc->sc_dev)));
sc->flags |= UMASS_FLAGS_GONE;
@ -1226,7 +1226,7 @@ umass_init_shuttle(struct umass_softc *sc)
(void) usbd_do_request(sc->sc_udev, &req, &status);
DPRINTF(UDMASS_GEN, ("%s: Shuttle init returned 0x%02x%02x\n",
USBDEVNAME(sc->sc_dev), status[0], status[1]));
device_get_nameunit(sc->sc_dev), status[0], status[1]));
}
/*
@ -1248,7 +1248,7 @@ umass_setup_transfer(struct umass_softc *sc, usbd_pipe_handle pipe,
err = usbd_transfer(xfer);
if (err && err != USBD_IN_PROGRESS) {
DPRINTF(UDMASS_BBB, ("%s: failed to setup transfer, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
return(err);
}
@ -1272,7 +1272,7 @@ umass_setup_ctrl_transfer(struct umass_softc *sc, usbd_device_handle udev,
err = usbd_transfer(xfer);
if (err && err != USBD_IN_PROGRESS) {
DPRINTF(UDMASS_BBB, ("%s: failed to setup ctrl transfer, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err)));
device_get_nameunit(sc->sc_dev), usbd_errstr(err)));
/* do not reset, as this would make us loop */
return(err);
@ -1289,7 +1289,7 @@ umass_clear_endpoint_stall(struct umass_softc *sc,
usbd_device_handle udev;
DPRINTF(UDMASS_BBB, ("%s: Clear endpoint 0x%02x stall\n",
USBDEVNAME(sc->sc_dev), endpt));
device_get_nameunit(sc->sc_dev), endpt));
usbd_interface2device_handle(sc->iface, &udev);
@ -1326,7 +1326,7 @@ umass_bbb_reset(struct umass_softc *sc, int status)
KASSERT(sc->proto & UMASS_PROTO_BBB,
("%s: umass_bbb_reset: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
/*
* Reset recovery (5.3.4 in Universal Serial Bus Mass Storage Class)
@ -1345,7 +1345,7 @@ umass_bbb_reset(struct umass_softc *sc, int status)
*/
DPRINTF(UDMASS_BBB, ("%s: Bulk Reset\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
sc->transfer_state = TSTATE_BBB_RESET1;
sc->transfer_status = status;
@ -1369,7 +1369,7 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
{
KASSERT(sc->proto & UMASS_PROTO_BBB,
("%s: umass_bbb_transfer: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
/* Be a little generous. */
sc->timeout = timeout + UMASS_TIMEOUT;
@ -1396,23 +1396,23 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
/* check the given arguments */
KASSERT(datalen == 0 || data != NULL,
("%s: datalen > 0, but no buffer",USBDEVNAME(sc->sc_dev)));
("%s: datalen > 0, but no buffer",device_get_nameunit(sc->sc_dev)));
KASSERT(cmdlen <= CBWCDBLENGTH,
("%s: cmdlen exceeds CDB length in CBW (%d > %d)",
USBDEVNAME(sc->sc_dev), cmdlen, CBWCDBLENGTH));
device_get_nameunit(sc->sc_dev), cmdlen, CBWCDBLENGTH));
KASSERT(dir == DIR_NONE || datalen > 0,
("%s: datalen == 0 while direction is not NONE\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
KASSERT(datalen == 0 || dir != DIR_NONE,
("%s: direction is NONE while datalen is not zero\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
KASSERT(sizeof(umass_bbb_cbw_t) == UMASS_BBB_CBW_SIZE,
("%s: CBW struct does not have the right size (%ld vs. %d)\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
(long)sizeof(umass_bbb_cbw_t), UMASS_BBB_CBW_SIZE));
KASSERT(sizeof(umass_bbb_csw_t) == UMASS_BBB_CSW_SIZE,
("%s: CSW struct does not have the right size (%ld vs. %d)\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
(long)sizeof(umass_bbb_csw_t), UMASS_BBB_CSW_SIZE));
/*
@ -1480,7 +1480,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
KASSERT(sc->proto & UMASS_PROTO_BBB,
("%s: umass_bbb_state: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
/*
* State handling for BBB transfers.
@ -1494,7 +1494,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
*/
DPRINTF(UDMASS_BBB, ("%s: Handling BBB state %d (%s), xfer=%p, %s\n",
USBDEVNAME(sc->sc_dev), sc->transfer_state,
device_get_nameunit(sc->sc_dev), sc->transfer_state,
states[sc->transfer_state], xfer, usbd_errstr(err)));
/* Give up if the device has detached. */
@ -1512,7 +1512,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/* Command transport phase, error handling */
if (err) {
DPRINTF(UDMASS_BBB, ("%s: failed to send CBW\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
/* If the device detects that the CBW is invalid, then
* the device may STALL both bulk endpoints and require
* a Bulk-Reset
@ -1541,7 +1541,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
return;
} else {
DPRINTF(UDMASS_BBB, ("%s: no data phase\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
}
/* FALLTHROUGH if no data phase, err == 0 */
@ -1555,7 +1555,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
if (err) {
DPRINTF(UDMASS_BBB, ("%s: Data-%s %db failed, "
"%s\n", USBDEVNAME(sc->sc_dev),
"%s\n", device_get_nameunit(sc->sc_dev),
(sc->transfer_dir == DIR_IN?"in":"out"),
sc->transfer_datalen,usbd_errstr(err)));
@ -1596,7 +1596,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
if (err) { /* should not occur */
/* try the transfer below, even if clear stall failed */
DPRINTF(UDMASS_BBB, ("%s: bulk-%s stall clear failed"
", %s\n", USBDEVNAME(sc->sc_dev),
", %s\n", device_get_nameunit(sc->sc_dev),
(sc->transfer_dir == DIR_IN? "in":"out"),
usbd_errstr(err)));
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
@ -1632,7 +1632,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/* Status transfer, error handling */
if (err) {
DPRINTF(UDMASS_BBB, ("%s: Failed to read CSW, %s%s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err),
device_get_nameunit(sc->sc_dev), usbd_errstr(err),
(sc->transfer_state == TSTATE_BBB_STATUS1?
", retrying":"")));
@ -1673,7 +1673,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
* indicate that the device is confused -> reset it.
*/
printf("%s: Invalid CSW: sig 0x%08x should be 0x%08x\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
UGETDW(sc->csw.dCSWSignature),
CSWSIGNATURE);
@ -1682,7 +1682,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
} else if (UGETDW(sc->csw.dCSWTag)
!= UGETDW(sc->cbw.dCBWTag)) {
printf("%s: Invalid CSW: tag %d should be %d\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
UGETDW(sc->csw.dCSWTag),
UGETDW(sc->cbw.dCBWTag));
@ -1692,7 +1692,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/* CSW is valid here */
} else if (sc->csw.bCSWStatus > CSWSTATUS_PHASE) {
printf("%s: Invalid CSW: status %d > %d\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->csw.bCSWStatus,
CSWSTATUS_PHASE);
@ -1700,7 +1700,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
return;
} else if (sc->csw.bCSWStatus == CSWSTATUS_PHASE) {
printf("%s: Phase Error, residue = %d\n",
USBDEVNAME(sc->sc_dev), Residue);
device_get_nameunit(sc->sc_dev), Residue);
umass_bbb_reset(sc, STATUS_WIRE_FAILED);
return;
@ -1708,12 +1708,12 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
} else if (sc->transfer_actlen > sc->transfer_datalen) {
/* Buffer overrun! Don't let this go by unnoticed */
panic("%s: transferred %db instead of %db",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->transfer_actlen, sc->transfer_datalen);
} else if (sc->csw.bCSWStatus == CSWSTATUS_FAILED) {
DPRINTF(UDMASS_BBB, ("%s: Command Failed, res = %d\n",
USBDEVNAME(sc->sc_dev), Residue));
device_get_nameunit(sc->sc_dev), Residue));
/* SCSI command failed but transfer was succesful */
sc->transfer_state = TSTATE_IDLE;
@ -1733,7 +1733,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_BBB_RESET1:
if (err)
printf("%s: BBB reset failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
umass_clear_endpoint_stall(sc,
sc->bulkin, sc->bulkin_pipe, TSTATE_BBB_RESET2,
@ -1743,7 +1743,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_BBB_RESET2:
if (err) /* should not occur */
printf("%s: BBB bulk-in clear stall failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
/* no error recovery, otherwise we end up in a loop */
umass_clear_endpoint_stall(sc,
@ -1754,7 +1754,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_BBB_RESET3:
if (err) /* should not occur */
printf("%s: BBB bulk-out clear stall failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
/* no error recovery, otherwise we end up in a loop */
sc->transfer_state = TSTATE_IDLE;
@ -1769,7 +1769,7 @@ umass_bbb_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/***** Default *****/
default:
panic("%s: Unknown state %d",
USBDEVNAME(sc->sc_dev), sc->transfer_state);
device_get_nameunit(sc->sc_dev), sc->transfer_state);
}
}
@ -1798,14 +1798,14 @@ umass_bbb_get_max_lun(struct umass_softc *sc)
case USBD_NORMAL_COMPLETION:
maxlun = buf;
DPRINTF(UDMASS_BBB, ("%s: Max Lun is %d\n",
USBDEVNAME(sc->sc_dev), maxlun));
device_get_nameunit(sc->sc_dev), maxlun));
break;
case USBD_STALLED:
case USBD_SHORT_XFER:
default:
/* Device doesn't support Get Max Lun request. */
printf("%s: Get Max Lun not supported (%s)\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
/* XXX Should we port_reset the device? */
break;
}
@ -1825,7 +1825,7 @@ umass_cbi_adsc(struct umass_softc *sc, char *buffer, int buflen,
KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
("%s: umass_cbi_adsc: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
usbd_interface2device_handle(sc->iface, &udev);
@ -1847,7 +1847,7 @@ umass_cbi_reset(struct umass_softc *sc, int status)
KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
("%s: umass_cbi_reset: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
/*
* Command Block Reset Protocol
@ -1864,11 +1864,11 @@ umass_cbi_reset(struct umass_softc *sc, int status)
*/
DPRINTF(UDMASS_CBI, ("%s: CBI Reset\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
KASSERT(sizeof(sc->cbl) >= SEND_DIAGNOSTIC_CMDLEN,
("%s: CBL struct is too small (%ld < %d)\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
(long)sizeof(sc->cbl), SEND_DIAGNOSTIC_CMDLEN));
sc->transfer_state = TSTATE_CBI_RESET1;
@ -1895,7 +1895,7 @@ umass_cbi_transfer(struct umass_softc *sc, int lun,
{
KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
("%s: umass_cbi_transfer: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
/* Be a little generous. */
sc->timeout = timeout + UMASS_TIMEOUT;
@ -1919,10 +1919,10 @@ umass_cbi_transfer(struct umass_softc *sc, int lun,
/* check the given arguments */
KASSERT(datalen == 0 || data != NULL,
("%s: datalen > 0, but no buffer",USBDEVNAME(sc->sc_dev)));
("%s: datalen > 0, but no buffer",device_get_nameunit(sc->sc_dev)));
KASSERT(datalen == 0 || dir != DIR_NONE,
("%s: direction is NONE while datalen is not zero\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
/* store the details for the data transfer phase */
sc->transfer_dir = dir;
@ -1951,14 +1951,14 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
KASSERT(sc->proto & (UMASS_PROTO_CBI|UMASS_PROTO_CBI_I),
("%s: umass_cbi_state: wrong sc->proto 0x%02x\n",
USBDEVNAME(sc->sc_dev), sc->proto));
device_get_nameunit(sc->sc_dev), sc->proto));
/*
* State handling for CBI transfers.
*/
DPRINTF(UDMASS_CBI, ("%s: Handling CBI state %d (%s), xfer=%p, %s\n",
USBDEVNAME(sc->sc_dev), sc->transfer_state,
device_get_nameunit(sc->sc_dev), sc->transfer_state,
states[sc->transfer_state], xfer, usbd_errstr(err)));
/* Give up if the device has detached. */
@ -1975,7 +1975,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_COMMAND:
if (err == USBD_STALLED) {
DPRINTF(UDMASS_CBI, ("%s: Command Transport failed\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
/* Status transport by control pipe (section 2.3.2.1).
* The command contained in the command block failed.
*
@ -1993,7 +1993,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
return;
} else if (err) {
DPRINTF(UDMASS_CBI, ("%s: failed to send ADSC\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
umass_cbi_reset(sc, STATUS_WIRE_FAILED);
return;
@ -2016,7 +2016,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
} else if (sc->proto & UMASS_PROTO_CBI_I) {
DPRINTF(UDMASS_CBI, ("%s: no data phase\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
sc->transfer_state = TSTATE_CBI_STATUS;
if (umass_setup_transfer(sc, sc->intrin_pipe,
&sc->sbl, sizeof(sc->sbl),
@ -2026,7 +2026,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
}
} else {
DPRINTF(UDMASS_CBI, ("%s: no data phase\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
/* No command completion interrupt. Request
* sense data.
*/
@ -2043,7 +2043,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
if (err) {
DPRINTF(UDMASS_CBI, ("%s: Data-%s %db failed, "
"%s\n", USBDEVNAME(sc->sc_dev),
"%s\n", device_get_nameunit(sc->sc_dev),
(sc->transfer_dir == DIR_IN?"in":"out"),
sc->transfer_datalen,usbd_errstr(err)));
@ -2084,7 +2084,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_STATUS:
if (err) {
DPRINTF(UDMASS_CBI, ("%s: Status Transport failed\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
/* Status transport by interrupt pipe (section 2.3.2.2).
*/
@ -2111,7 +2111,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
DPRINTF(UDMASS_CBI, ("%s: UFI CCI, ASC = 0x%02x, "
"ASCQ = 0x%02x\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->sbl.ufi.asc, sc->sbl.ufi.ascq));
if (sc->sbl.ufi.asc == 0 && sc->sbl.ufi.ascq == 0)
@ -2126,7 +2126,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
} else {
/* Command Interrupt Data Block */
DPRINTF(UDMASS_CBI, ("%s: type=0x%02x, value=0x%02x\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->sbl.common.type, sc->sbl.common.value));
if (sc->sbl.common.type == IDB_TYPE_CCI) {
@ -2155,7 +2155,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_DCLEAR:
if (err) { /* should not occur */
printf("%s: CBI bulk-in/out stall clear failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
umass_cbi_reset(sc, STATUS_WIRE_FAILED);
}
@ -2168,7 +2168,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_SCLEAR:
if (err) /* should not occur */
printf("%s: CBI intr-in stall clear failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
/* Something really bad is going on. Reset the device */
umass_cbi_reset(sc, STATUS_CMD_FAILED);
@ -2178,7 +2178,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_RESET1:
if (err)
printf("%s: CBI reset failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
umass_clear_endpoint_stall(sc,
sc->bulkin, sc->bulkin_pipe, TSTATE_CBI_RESET2,
@ -2188,7 +2188,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_RESET2:
if (err) /* should not occur */
printf("%s: CBI bulk-in stall clear failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
/* no error recovery, otherwise we end up in a loop */
umass_clear_endpoint_stall(sc,
@ -2199,7 +2199,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
case TSTATE_CBI_RESET3:
if (err) /* should not occur */
printf("%s: CBI bulk-out stall clear failed, %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
/* no error recovery, otherwise we end up in a loop */
sc->transfer_state = TSTATE_IDLE;
@ -2215,7 +2215,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv,
/***** Default *****/
default:
panic("%s: Unknown state %d",
USBDEVNAME(sc->sc_dev), sc->transfer_state);
device_get_nameunit(sc->sc_dev), sc->transfer_state);
}
}
@ -2244,7 +2244,7 @@ umass_cam_attach_sim(struct umass_softc *sc)
sc->umass_sim = cam_sim_alloc(umass_cam_action, umass_cam_poll,
DEVNAME_SIM,
sc /*priv*/,
USBDEVUNIT(sc->sc_dev) /*unit number*/,
device_get_unit(sc->sc_dev) /*unit number*/,
1 /*maximum device openings*/,
0 /*maximum tagged device openings*/,
devq);
@ -2253,7 +2253,7 @@ umass_cam_attach_sim(struct umass_softc *sc)
return(ENOMEM);
}
if(xpt_bus_register(sc->umass_sim, USBDEVUNIT(sc->sc_dev)) !=
if(xpt_bus_register(sc->umass_sim, device_get_unit(sc->sc_dev)) !=
CAM_SUCCESS)
return(ENOMEM);
@ -2287,8 +2287,8 @@ umass_cam_rescan(void *addr)
DPRINTF(UDMASS_SCSI, ("scbus%d: scanning for %s:%d:%d:%d\n",
cam_sim_path(sc->umass_sim),
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
USBDEVUNIT(sc->sc_dev), CAM_LUN_WILDCARD));
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_unit(sc->sc_dev), CAM_LUN_WILDCARD));
ccb = malloc(sizeof(union ccb), M_USBDEV, M_NOWAIT | M_ZERO);
if (ccb == NULL)
@ -2316,8 +2316,8 @@ umass_cam_attach(struct umass_softc *sc)
if (bootverbose)
#endif
printf("%s:%d:%d:%d: Attached to scbus%d\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
USBDEVUNIT(sc->sc_dev), CAM_LUN_WILDCARD,
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_unit(sc->sc_dev), CAM_LUN_WILDCARD,
cam_sim_path(sc->umass_sim));
if (!cold) {
@ -2369,7 +2369,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
if (sc && (sc->flags & UMASS_FLAGS_GONE)) {
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:func_code 0x%04x: "
"Invalid target (gone)\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
ccb->ccb_h.func_code));
ccb->ccb_h.status = CAM_TID_INVALID;
@ -2440,7 +2440,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_SCSI_IO: "
"cmd: 0x%02x, flags: 0x%02x, "
"%db cmd/%db data/%db sense\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
csio->cdb_io.cdb_bytes[0],
ccb->ccb_h.flags & CAM_DIR_MASK,
@ -2458,7 +2458,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
if (sc->transfer_state != TSTATE_IDLE) {
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_SCSI_IO: "
"I/O in progress, deferring (state %d, %s)\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
sc->transfer_state,states[sc->transfer_state]));
ccb->ccb_h.status = CAM_SCSI_BUSY;
@ -2549,7 +2549,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
struct ccb_pathinq *cpi = &ccb->cpi;
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_PATH_INQ:.\n",
(sc == NULL? DEVNAME_SIM:USBDEVNAME(sc->sc_dev)),
(sc == NULL? DEVNAME_SIM:device_get_nameunit(sc->sc_dev)),
cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
@ -2565,7 +2565,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
strncpy(cpi->hba_vid, "USB SCSI", HBA_IDLEN);
strncpy(cpi->dev_name, cam_sim_name(sim), DEV_IDLEN);
cpi->unit_number = cam_sim_unit(sim);
cpi->bus_id = USBDEVUNIT(sc->sc_dev);
cpi->bus_id = device_get_unit(sc->sc_dev);
if (sc == NULL) {
cpi->base_transfer_speed = 0;
@ -2592,7 +2592,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
case XPT_RESET_DEV:
{
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_RESET_DEV:.\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
ccb->ccb_h.status = CAM_REQ_INPROG;
@ -2604,7 +2604,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
struct ccb_trans_settings *cts = &ccb->cts;
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_GET_TRAN_SETTINGS:.\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
cts->valid = 0;
@ -2617,7 +2617,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
case XPT_SET_TRAN_SETTINGS:
{
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_SET_TRAN_SETTINGS:.\n",
USBDEVNAME(sc->sc_dev), cam_sim_path(sc->umass_sim),
device_get_nameunit(sc->sc_dev), cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
ccb->ccb_h.status = CAM_FUNC_NOTAVAIL;
@ -2633,7 +2633,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
case XPT_NOOP:
{
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_NOOP:.\n",
(sc == NULL? DEVNAME_SIM:USBDEVNAME(sc->sc_dev)),
(sc == NULL? DEVNAME_SIM:device_get_nameunit(sc->sc_dev)),
cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
@ -2644,7 +2644,7 @@ umass_cam_action(struct cam_sim *sim, union ccb *ccb)
default:
DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:func_code 0x%04x: "
"Not implemented\n",
(sc == NULL? DEVNAME_SIM:USBDEVNAME(sc->sc_dev)),
(sc == NULL? DEVNAME_SIM:device_get_nameunit(sc->sc_dev)),
cam_sim_path(sc->umass_sim),
ccb->ccb_h.target_id, ccb->ccb_h.target_lun,
ccb->ccb_h.func_code));
@ -2661,7 +2661,7 @@ umass_cam_poll(struct cam_sim *sim)
struct umass_softc *sc = (struct umass_softc *) sim->softc;
DPRINTF(UDMASS_SCSI, ("%s: CAM poll\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
usbd_set_polling(sc->sc_udev, 1);
usbd_dopoll(sc->iface);
@ -2707,7 +2707,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
sc->cam_scsi_sense.length = csio->sense_len;
DPRINTF(UDMASS_SCSI,("%s: Fetching %db sense data\n",
USBDEVNAME(sc->sc_dev), csio->sense_len));
device_get_nameunit(sc->sc_dev), csio->sense_len));
rcmd = (unsigned char *) &sc->cam_scsi_command;
rcmdlen = sizeof(sc->cam_scsi_command);
@ -2749,7 +2749,7 @@ umass_cam_cb(struct umass_softc *sc, void *priv, int residue, int status)
break;
default:
panic("%s: Unknown status %d in umass_cam_cb",
USBDEVNAME(sc->sc_dev), status);
device_get_nameunit(sc->sc_dev), status);
}
}
@ -2814,7 +2814,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status)
DPRINTF(UDMASS_SCSI,("%s: Doing a sneaky"
"TEST_UNIT_READY\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
/* the rest of the command was filled in at attach */
@ -2844,7 +2844,7 @@ umass_cam_sense_cb(struct umass_softc *sc, void *priv, int residue, int status)
default:
DPRINTF(UDMASS_SCSI, ("%s: Autosense failed, status %d\n",
USBDEVNAME(sc->sc_dev), status));
device_get_nameunit(sc->sc_dev), status));
ccb->ccb_h.status = CAM_AUTOSENSE_FAIL;
xpt_done(ccb);
}
@ -2861,7 +2861,7 @@ umass_cam_quirk_cb(struct umass_softc *sc, void *priv, int residue, int status)
union ccb *ccb = (union ccb *) priv;
DPRINTF(UDMASS_SCSI, ("%s: Test unit ready returned status %d\n",
USBDEVNAME(sc->sc_dev), status));
device_get_nameunit(sc->sc_dev), status));
if (sc->flags & UMASS_FLAGS_GONE) {
ccb->ccb_h.status = CAM_TID_INVALID;
@ -2904,7 +2904,7 @@ umass_scsi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
*rcmdlen,
(long)sizeof(struct scsi_start_stop_unit)));
DPRINTF(UDMASS_SCSI, ("%s: Converted TEST_UNIT_READY "
"to START_UNIT\n", USBDEVNAME(sc->sc_dev)));
"to START_UNIT\n", device_get_nameunit(sc->sc_dev)));
memset(*rcmd, 0, *rcmdlen);
(*rcmd)[0] = START_STOP_UNIT;
(*rcmd)[4] = SSS_START;
@ -2962,7 +2962,7 @@ umass_rbc_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
/* All other commands are not legal in RBC */
default:
printf("%s: Unsupported RBC command 0x%02x",
USBDEVNAME(sc->sc_dev), cmd[0]);
device_get_nameunit(sc->sc_dev), cmd[0]);
printf("\n");
return 0; /* failure */
}
@ -2993,7 +2993,7 @@ umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
* Start Stop Unit should give the same results
*/
DPRINTF(UDMASS_UFI, ("%s: Converted TEST_UNIT_READY "
"to START_UNIT\n", USBDEVNAME(sc->sc_dev)));
"to START_UNIT\n", device_get_nameunit(sc->sc_dev)));
(*rcmd)[0] = START_STOP_UNIT;
(*rcmd)[4] = SSS_START;
} else {
@ -3024,7 +3024,7 @@ umass_ufi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
default:
printf("%s: Unsupported UFI command 0x%02x\n",
USBDEVNAME(sc->sc_dev), cmd[0]);
device_get_nameunit(sc->sc_dev), cmd[0]);
return 0; /* failure */
}
}
@ -3062,7 +3062,7 @@ umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
*rcmdlen,
(long)sizeof(struct scsi_start_stop_unit)));
DPRINTF(UDMASS_SCSI, ("%s: Converted TEST_UNIT_READY "
"to START_UNIT\n", USBDEVNAME(sc->sc_dev)));
"to START_UNIT\n", device_get_nameunit(sc->sc_dev)));
memset(*rcmd, 0, *rcmdlen);
(*rcmd)[0] = START_STOP_UNIT;
(*rcmd)[4] = SSS_START;
@ -3110,7 +3110,7 @@ umass_atapi_transform(struct umass_softc *sc, unsigned char *cmd, int cmdlen,
default:
printf("%s: Unsupported ATAPI command 0x%02x"
" - trying anyway\n",
USBDEVNAME(sc->sc_dev), cmd[0]);
device_get_nameunit(sc->sc_dev), cmd[0]);
memcpy(*rcmd, cmd, cmdlen);
return 1;
}
@ -3136,7 +3136,7 @@ umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw)
DPRINTF(UDMASS_BBB, ("%s: CBW %d: cmd = %db "
"(0x%02x%02x%02x%02x%02x%02x%s), "
"data = %db, dir = %s\n",
USBDEVNAME(sc->sc_dev), tag, clen,
device_get_nameunit(sc->sc_dev), tag, clen,
c[0], c[1], c[2], c[3], c[4], c[5], (clen > 6? "...":""),
dlen, (flags == CBWFLAGS_IN? "in":
(flags == CBWFLAGS_OUT? "out":"<invalid>"))));
@ -3151,7 +3151,7 @@ umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw)
int status = csw->bCSWStatus;
DPRINTF(UDMASS_BBB, ("%s: CSW %d: sig = 0x%08x (%s), tag = %d, "
"res = %d, status = 0x%02x (%s)\n", USBDEVNAME(sc->sc_dev),
"res = %d, status = 0x%02x (%s)\n", device_get_nameunit(sc->sc_dev),
tag, sig, (sig == CSWSIGNATURE? "valid":"invalid"),
tag, res,
status, (status == CSWSTATUS_GOOD? "good":
@ -3168,7 +3168,7 @@ umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, int cmdlen)
DPRINTF(UDMASS_BBB, ("%s: cmd = %db "
"(0x%02x%02x%02x%02x%02x%02x%s), "
"data = %db, dir = %s\n",
USBDEVNAME(sc->sc_dev), cmdlen,
device_get_nameunit(sc->sc_dev), cmdlen,
c[0], c[1], c[2], c[3], c[4], c[5], (cmdlen > 6? "...":""),
sc->transfer_datalen,
(dir == DIR_IN? "in":
@ -3193,7 +3193,7 @@ umass_dump_buffer(struct umass_softc *sc, u_int8_t *buffer, int buflen,
j = i % 16;
if (j == 0 && i != 0) {
DPRINTF(UDMASS_GEN, ("%s: 0x %s%s\n",
USBDEVNAME(sc->sc_dev), s1, s2));
device_get_nameunit(sc->sc_dev), s1, s2));
s2[0] = '\0';
}
sprintf(&s1[j*2], "%02x", buffer[i] & 0xff);
@ -3201,6 +3201,6 @@ umass_dump_buffer(struct umass_softc *sc, u_int8_t *buffer, int buflen,
if (buflen > printlen)
sprintf(s3, " ...");
DPRINTF(UDMASS_GEN, ("%s: 0x %s%s%s\n",
USBDEVNAME(sc->sc_dev), s1, s2, s3));
device_get_nameunit(sc->sc_dev), s1, s2, s3));
}
#endif

10
sys/dev/usb/umct.c
View File

@ -181,7 +181,7 @@ USB_ATTACH(umct)
usbd_devinfo(dev, 0, devinfo);
device_set_desc_copy(self, devinfo);
devname = USBDEVNAME(ucom->sc_dev);
devname = device_get_nameunit(ucom->sc_dev);
printf("%s: %s\n", devname, devinfo);
ucom->sc_bulkout_no = -1;
@ -320,7 +320,7 @@ umct_request(struct umct_softc *sc, uint8_t request, int len, uint32_t value)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, oval);
if (err)
printf("%s: ubsa_request: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -481,7 +481,7 @@ umct_open(void *addr, int portno)
sc->sc_isize, umct_intr, UMCT_INTR_INTERVAL);
if (err) {
printf("%s: cannot open interrupt pipe (addr %d)\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
sc->sc_intr_number);
free(sc->sc_intr_buf, M_USBDEV);
return (EIO);
@ -505,11 +505,11 @@ umct_close(void *addr, int portno)
err = usbd_abort_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: abort interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: close interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
free(sc->sc_intr_buf, M_USBDEV);
sc->sc_intr_pipe = NULL;
}

18
sys/dev/usb/umodem.c
View File

@ -143,7 +143,7 @@ static const struct umodem_product {
struct umodem_softc {
struct ucom_softc sc_ucom;
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev; /* USB device */
@ -297,7 +297,7 @@ USB_ATTACH(umodem)
sc->sc_udev = dev;
sc->sc_ctl_iface = uaa->iface;
devname = USBDEVNAME(sc->sc_dev);
devname = device_get_nameunit(sc->sc_dev);
/* XXX ? use something else ? XXX */
id = usbd_get_interface_descriptor(sc->sc_ctl_iface);
printf("%s: %s, iclass %d/%d\n", devname, devinfo,
@ -469,11 +469,11 @@ umodem_close(void *addr, int portno)
err = usbd_abort_pipe(sc->sc_notify_pipe);
if (err)
printf("%s: abort notify pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
err = usbd_close_pipe(sc->sc_notify_pipe);
if (err)
printf("%s: close notify pipe failed: %s\n",
USBDEVNAME(sc->sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_dev), usbd_errstr(err));
sc->sc_notify_pipe = NULL;
}
}
@ -490,14 +490,14 @@ umodem_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
if (status != USBD_NORMAL_COMPLETION) {
if (status == USBD_NOT_STARTED || status == USBD_CANCELLED)
return;
printf("%s: abnormal status: %s\n", USBDEVNAME(sc->sc_dev),
printf("%s: abnormal status: %s\n", device_get_nameunit(sc->sc_dev),
usbd_errstr(status));
return;
}
if (sc->sc_notify_buf.bmRequestType != UCDC_NOTIFICATION) {
DPRINTF(("%s: unknown message type (%02x) on notify pipe\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->sc_notify_buf.bmRequestType));
return;
}
@ -510,12 +510,12 @@ umodem_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
*/
if (UGETW(sc->sc_notify_buf.wLength) != 2) {
printf("%s: Invalid notification length! (%d)\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
UGETW(sc->sc_notify_buf.wLength));
break;
}
DPRINTF(("%s: notify bytes = %02x%02x\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->sc_notify_buf.data[0],
sc->sc_notify_buf.data[1]));
/* Currently, lsr is always zero. */
@ -533,7 +533,7 @@ umodem_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
break;
default:
DPRINTF(("%s: unknown notify message: %02x\n",
USBDEVNAME(sc->sc_dev),
device_get_nameunit(sc->sc_dev),
sc->sc_notify_buf.bNotification));
break;
}

22
sys/dev/usb/ums.c
View File

@ -220,7 +220,7 @@ USB_ATTACH(ums)
ed = usbd_interface2endpoint_descriptor(iface, 0);
if (!ed) {
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -236,7 +236,7 @@ USB_ATTACH(ums)
if (UE_GET_DIR(ed->bEndpointAddress) != UE_DIR_IN ||
UE_GET_XFERTYPE(ed->bmAttributes) != UE_INTERRUPT) {
printf("%s: unexpected endpoint\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -246,23 +246,23 @@ USB_ATTACH(ums)
if (!hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_X),
hid_input, &sc->sc_loc_x, &flags)) {
printf("%s: mouse has no X report\n", USBDEVNAME(sc->sc_dev));
printf("%s: mouse has no X report\n", device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) {
printf("%s: X report 0x%04x not supported\n",
USBDEVNAME(sc->sc_dev), flags);
device_get_nameunit(sc->sc_dev), flags);
USB_ATTACH_ERROR_RETURN;
}
if (!hid_locate(desc, size, HID_USAGE2(HUP_GENERIC_DESKTOP, HUG_Y),
hid_input, &sc->sc_loc_y, &flags)) {
printf("%s: mouse has no Y report\n", USBDEVNAME(sc->sc_dev));
printf("%s: mouse has no Y report\n", device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
if ((flags & MOUSE_FLAGS_MASK) != MOUSE_FLAGS) {
printf("%s: Y report 0x%04x not supported\n",
USBDEVNAME(sc->sc_dev), flags);
device_get_nameunit(sc->sc_dev), flags);
USB_ATTACH_ERROR_RETURN;
}
@ -300,11 +300,11 @@ USB_ATTACH(ums)
sc->sc_loc_btn = malloc(sizeof(struct hid_location)*sc->nbuttons,
M_USBDEV, M_NOWAIT);
if (!sc->sc_loc_btn) {
printf("%s: no memory\n", USBDEVNAME(sc->sc_dev));
printf("%s: no memory\n", device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
printf("%s: %d buttons%s%s.\n", USBDEVNAME(sc->sc_dev),
printf("%s: %d buttons%s%s.\n", device_get_nameunit(sc->sc_dev),
sc->nbuttons, sc->flags & UMS_Z? " and Z dir" : "",
sc->flags & UMS_T?" and a TILT dir": "");
@ -315,7 +315,7 @@ USB_ATTACH(ums)
sc->sc_isize = hid_report_size(desc, size, hid_input, &sc->sc_iid);
sc->sc_ibuf = malloc(sc->sc_isize, M_USB, M_NOWAIT);
if (!sc->sc_ibuf) {
printf("%s: no memory\n", USBDEVNAME(sc->sc_dev));
printf("%s: no memory\n", device_get_nameunit(sc->sc_dev));
free(sc->sc_loc_btn, M_USB);
USB_ATTACH_ERROR_RETURN;
}
@ -373,7 +373,7 @@ USB_ATTACH(ums)
usb_callout_init(sc->callout_handle);
if (usbd_get_quirks(uaa->device)->uq_flags & UQ_SPUR_BUT_UP) {
DPRINTF(("%s: Spurious button up events\n",
USBDEVNAME(sc->sc_dev)));
device_get_nameunit(sc->sc_dev)));
sc->flags |= UMS_SPUR_BUT_UP;
}
@ -389,7 +389,7 @@ ums_detach(device_t self)
if (sc->sc_enabled)
ums_disable(sc);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
DPRINTF(("%s: disconnected\n", device_get_nameunit(self)));
free(sc->sc_loc_btn, M_USB);
free(sc->sc_ibuf, M_USB);

38
sys/dev/usb/uplcom.c
View File

@ -368,7 +368,7 @@ USB_ATTACH(uplcom)
ucom->sc_udev = dev;
ucom->sc_iface = uaa->iface;
devname = USBDEVNAME(ucom->sc_dev);
devname = device_get_nameunit(ucom->sc_dev);
printf("%s: %s\n", devname, devinfo);
DPRINTF(("uplcom attach: sc = %p\n", sc));
@ -422,7 +422,7 @@ USB_ATTACH(uplcom)
if (cdesc == NULL) {
printf("%s: failed to get configuration descriptor\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
@ -446,7 +446,7 @@ USB_ATTACH(uplcom)
ed = usbd_interface2endpoint_descriptor(ucom->sc_iface, i);
if (ed == NULL) {
printf("%s: no endpoint descriptor for %d\n",
USBDEVNAME(ucom->sc_dev), i);
device_get_nameunit(ucom->sc_dev), i);
ucom->sc_dying = 1;
goto error;
}
@ -460,7 +460,7 @@ USB_ATTACH(uplcom)
if (sc->sc_intr_number == -1) {
printf("%s: Could not find interrupt in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
@ -501,7 +501,7 @@ USB_ATTACH(uplcom)
ed = usbd_interface2endpoint_descriptor(ucom->sc_iface, i);
if (ed == NULL) {
printf("%s: no endpoint descriptor for %d\n",
USBDEVNAME(ucom->sc_dev), i);
device_get_nameunit(ucom->sc_dev), i);
ucom->sc_dying = 1;
goto error;
}
@ -517,14 +517,14 @@ USB_ATTACH(uplcom)
if (ucom->sc_bulkin_no == -1) {
printf("%s: Could not find data bulk in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
if (ucom->sc_bulkout_no == -1) {
printf("%s: Could not find data bulk out\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
ucom->sc_dying = 1;
goto error;
}
@ -543,7 +543,7 @@ USB_ATTACH(uplcom)
if (err) {
printf("%s: reset failed: %s\n",
USBDEVNAME(ucom->sc_dev), usbd_errstr(err));
device_get_nameunit(ucom->sc_dev), usbd_errstr(err));
ucom->sc_dying = 1;
goto error;
}
@ -598,7 +598,7 @@ uplcom_reset(struct uplcom_softc *sc)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, 0);
if (err) {
printf("%s: uplcom_reset: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (EIO);
}
@ -645,7 +645,7 @@ uplcom_pl2303x_init(struct uplcom_softc *sc)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, 0);
if (err) {
printf("%s: uplcom_pl2303x_init: %d: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), i,
device_get_nameunit(sc->sc_ucom.sc_dev), i,
usbd_errstr(err));
return (EIO);
}
@ -672,7 +672,7 @@ uplcom_set_line_state(struct uplcom_softc *sc)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, 0);
if (err)
printf("%s: uplcom_set_line_status: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
}
static void
@ -736,7 +736,7 @@ uplcom_break(struct uplcom_softc *sc, int onoff)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, 0);
if (err)
printf("%s: uplcom_break: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
}
static usbd_status
@ -759,7 +759,7 @@ uplcom_set_crtscts(struct uplcom_softc *sc)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, 0);
if (err) {
printf("%s: uplcom_set_crtscts: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -791,7 +791,7 @@ uplcom_set_line_coding(struct uplcom_softc *sc, usb_cdc_line_state_t *state)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, state);
if (err) {
printf("%s: uplcom_set_line_coding: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -895,7 +895,7 @@ uplcom_open(void *addr, int portno)
uplcominterval);
if (err) {
printf("%s: cannot open interrupt pipe (addr %d)\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
sc->sc_intr_number);
return (EIO);
}
@ -922,12 +922,12 @@ uplcom_close(void *addr, int portno)
err = usbd_abort_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: abort interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(err));
err = usbd_close_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: close interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(err));
free(sc->sc_intr_buf, M_USBDEV);
sc->sc_intr_pipe = NULL;
@ -949,14 +949,14 @@ uplcom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
DPRINTF(("%s: uplcom_intr: abnormal status: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(status)));
usbd_clear_endpoint_stall_async(sc->sc_intr_pipe);
return;
}
DPRINTF(("%s: uplcom status = %02x\n",
USBDEVNAME(sc->sc_ucom.sc_dev), buf[8]));
device_get_nameunit(sc->sc_ucom.sc_dev), buf[8]));
sc->sc_lsr = sc->sc_msr = 0;
pstatus = buf[8];

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

@ -137,7 +137,7 @@ static struct cdevsw urio_cdevsw = {
#define URIO_BBSIZE 1024
struct urio_softc {
USBBASEDEVICE sc_dev;
device_t sc_dev;
usbd_device_handle sc_udev;
usbd_interface_handle sc_iface;
@ -275,7 +275,7 @@ USB_ATTACH(urio)
USB_ATTACH_SUCCESS_RETURN;
nobulk:
printf("%s: could not find %s\n", USBDEVNAME(sc->sc_dev),ermsg);
printf("%s: could not find %s\n", device_get_nameunit(sc->sc_dev),ermsg);
USB_ATTACH_ERROR_RETURN;
}
@ -555,7 +555,7 @@ urioioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag, usb_proc_ptr p)
uio.uio_rw =
req.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
uio.uio_procp = p;
uio.uio_td = p;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@ -676,7 +676,7 @@ urio_detach(device_t self)
{
struct urio_softc *sc = device_get_softc(self);
DPRINTF(("%s: disconnected\n", USBDEVNAME(self)));
DPRINTF(("%s: disconnected\n", device_get_nameunit(self)));
destroy_dev(sc->sc_dev_t);
/* XXX not implemented yet */
device_set_desc(self, NULL);

24
sys/dev/usb/usb.c
View File

@ -127,7 +127,7 @@ int usb_noexplore = 0;
#endif
struct usb_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
#ifdef __FreeBSD__
struct cdev *sc_usbdev; /* /dev/usbN device */
TAILQ_ENTRY(usb_softc) sc_coldexplist; /* cold needs-explore list */
@ -242,7 +242,7 @@ USB_ATTACH(usb)
sc->sc_port.power = USB_MAX_POWER;
#if defined(__FreeBSD__)
printf("%s", USBDEVNAME(sc->sc_dev));
printf("%s", device_get_nameunit(sc->sc_dev));
#endif
usbrev = sc->sc_bus->usbrev;
printf(": USB revision %s", usbrev_str[usbrev]);
@ -265,7 +265,7 @@ USB_ATTACH(usb)
if (cold)
sc->sc_bus->use_polling++;
ue.u.ue_ctrlr.ue_bus = USBDEVUNIT(sc->sc_dev);
ue.u.ue_ctrlr.ue_bus = device_get_unit(sc->sc_dev);
usb_add_event(USB_EVENT_CTRLR_ATTACH, &ue);
#ifdef USB_USE_SOFTINTR
@ -274,7 +274,7 @@ USB_ATTACH(usb)
sc->sc_bus->soft = softintr_establish(IPL_SOFTNET,
sc->sc_bus->methods->soft_intr, sc->sc_bus);
if (sc->sc_bus->soft == NULL) {
printf("%s: can't register softintr\n", USBDEVNAME(sc->sc_dev));
printf("%s: can't register softintr\n", device_get_nameunit(sc->sc_dev));
sc->sc_dying = 1;
USB_ATTACH_ERROR_RETURN;
}
@ -290,7 +290,7 @@ USB_ATTACH(usb)
if (dev->hub == NULL) {
sc->sc_dying = 1;
printf("%s: root device is not a hub\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
sc->sc_bus->root_hub = dev;
@ -316,7 +316,7 @@ USB_ATTACH(usb)
#endif
} else {
printf("%s: root hub problem, error=%d\n",
USBDEVNAME(sc->sc_dev), err);
device_get_nameunit(sc->sc_dev), err);
sc->sc_dying = 1;
}
if (cold)
@ -349,9 +349,9 @@ usb_create_event_thread(void *arg)
struct usb_softc *sc = arg;
if (usb_kthread_create1(usb_event_thread, sc, &sc->sc_event_thread,
"%s", USBDEVNAME(sc->sc_dev))) {
"%s", device_get_nameunit(sc->sc_dev))) {
printf("%s: unable to create event thread for\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
panic("usb_create_event_thread");
}
if (usb_taskcreated == 0) {
@ -643,7 +643,7 @@ usbioctl(struct cdev *devt, u_long cmd, caddr_t data, int flag, usb_proc_ptr p)
uio.uio_rw =
ur->ucr_request.bmRequestType & UT_READ ?
UIO_READ : UIO_WRITE;
uio.uio_procp = p;
uio.uio_td = p;
ptr = malloc(len, M_TEMP, M_WAITOK);
if (uio.uio_rw == UIO_WRITE) {
error = uiomove(ptr, len, &uio);
@ -809,7 +809,7 @@ usbd_add_drv_event(int type, usbd_device_handle udev, device_t dev)
struct usb_event ue;
ue.u.ue_driver.ue_cookie = udev->cookie;
strncpy(ue.u.ue_driver.ue_devname, USBDEVPTRNAME(dev),
strncpy(ue.u.ue_driver.ue_devname, device_get_nameunit(dev),
sizeof ue.u.ue_driver.ue_devname);
usb_add_event(type, &ue);
}
@ -923,7 +923,7 @@ USB_DETACH(usb)
wakeup(&sc->sc_bus->needs_explore);
if (tsleep(sc, PWAIT, "usbdet", hz * 60))
printf("%s: event thread didn't die\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
DPRINTF(("usb_detach: event thread dead\n"));
}
@ -951,7 +951,7 @@ USB_DETACH(usb)
#endif
#endif
ue.u.ue_ctrlr.ue_bus = USBDEVUNIT(sc->sc_dev);
ue.u.ue_ctrlr.ue_bus = device_get_unit(sc->sc_dev);
usb_add_event(USB_EVENT_CTRLR_DETACH, &ue);
return (0);

47
sys/dev/usb/usb_port.h
View File

@ -71,12 +71,7 @@ MALLOC_DECLARE(M_USBHC);
#define USB_USE_SOFTINTR
#endif
#define USBBASEDEVICE device_t
#define USBDEV(bdev) (bdev)
#define USBDEVNAME(bdev) device_get_nameunit(bdev)
#define USBDEVUNIT(bdev) device_get_unit(bdev)
#define USBDEVPTRNAME(bdev) device_get_nameunit(bdev)
#define USBDEVUNIT(bdev) device_get_unit(bdev)
#define USBGETSOFTC(bdev) (device_get_softc(bdev))
#define DECLARE_USB_DMA_T \
@ -87,11 +82,8 @@ MALLOC_DECLARE(M_USBHC);
u_int len; \
} usb_dma_t
#if __FreeBSD_version >= 500000
typedef struct thread *usb_proc_ptr;
#define uio_procp uio_td
#define usb_kthread_create1(f, s, p, a0, a1) \
kthread_create((f), (s), (p), RFHIGHPID, 0, (a0), (a1))
#define usb_kthread_create2(f, s, p, a0) \
@ -106,32 +98,6 @@ typedef struct callout usb_callout_t;
#define usb_callout(h, t, f, d) callout_reset(&(h), (t), (f), (d))
#define usb_uncallout(h, f, d) callout_stop(&(h))
#define usb_uncallout_drain(h, f, d) callout_drain(&(h))
#else
typedef struct proc *usb_proc_ptr;
#define PROC_LOCK(p)
#define PROC_UNLOCK(p)
#define usb_kthread_create1(f, s, p, a0, a1) \
kthread_create((f), (s), (p), (a0), (a1))
#define usb_kthread_create2(f, s, p, a0) \
kthread_create((f), (s), (p), (a0))
#define usb_kthread_create kthread_create
#define config_pending_incr()
#define config_pending_decr()
typedef struct callout usb_callout_t;
#define usb_callout_init(h) callout_init(&(h))
#define usb_callout(h, t, f, d) callout_reset(&(h), (t), (f), (d))
#define usb_uncallout(h, f, d) callout_stop(&(h))
#define usb_lockmgr lockmgr
#define BUS_DMA_COHERENT 0
#define ETHER_ALIGN 2
#define BPF_MTAP(ifp, m) if ((ifp)->if_bpf) bpf_mtap((ifp), (m));
#endif
#define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0)
#define clfree(p) clist_free_cblocks((p))
@ -221,19 +187,6 @@ __CONCAT(dname,_detach)(device_t self)
#define USB_DO_ATTACH(dev, bdev, parent, args, print, sub) \
(device_probe_and_attach((bdev)) == 0 ? (bdev) : 0)
/* conversion from one type of queue to the other */
#define SIMPLEQ_REMOVE_HEAD STAILQ_REMOVE_HEAD
#define SIMPLEQ_INSERT_HEAD STAILQ_INSERT_HEAD
#define SIMPLEQ_INSERT_TAIL STAILQ_INSERT_TAIL
#define SIMPLEQ_NEXT STAILQ_NEXT
#define SIMPLEQ_FIRST STAILQ_FIRST
#define SIMPLEQ_HEAD STAILQ_HEAD
#define SIMPLEQ_EMPTY STAILQ_EMPTY
#define SIMPLEQ_FOREACH STAILQ_FOREACH
#define SIMPLEQ_INIT STAILQ_INIT
#define SIMPLEQ_HEAD_INITIALIZER STAILQ_HEAD_INITIALIZER
#define SIMPLEQ_ENTRY STAILQ_ENTRY
#include <sys/syslog.h>
/*
#define logprintf(args...) log(LOG_DEBUG, args)

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

@ -699,7 +699,7 @@ usbd_set_config_index(usbd_device_handle dev, int index, int msg)
if (msg)
printf("%s: device addr %d (config %d) exceeds power "
"budget, %d mA > %d mA\n",
USBDEVNAME(dev->bus->bdev), dev->address,
device_get_nameunit(dev->bus->bdev), dev->address,
cdp->bConfigurationValue,
power, dev->powersrc->power);
err = USBD_NO_POWER;
@ -770,7 +770,7 @@ usbd_setup_pipe(usbd_device_handle dev, usbd_interface_handle iface,
p->aborting = 0;
p->repeat = 0;
p->interval = ival;
SIMPLEQ_INIT(&p->queue);
STAILQ_INIT(&p->queue);
err = dev->bus->methods->open_pipe(p);
if (err) {
DPRINTFN(-1,("usbd_setup_pipe: endpoint=0x%x failed, error="
@ -904,11 +904,11 @@ usbd_probe_and_attach(device_t parent, usbd_device_handle dev,
if (err) {
#ifdef USB_DEBUG
DPRINTF(("%s: port %d, set config at addr %d failed, "
"error=%s\n", USBDEVPTRNAME(parent), port,
"error=%s\n", device_get_nameunit(parent), port,
addr, usbd_errstr(err)));
#else
printf("%s: port %d, set config at addr %d failed\n",
USBDEVPTRNAME(parent), port, addr);
device_get_nameunit(parent), port, addr);
#endif
free(devinfo, M_USB);
return (err);
@ -1043,7 +1043,7 @@ usbd_new_device(device_t parent, usbd_bus_handle bus, int depth,
addr = usbd_getnewaddr(bus);
if (addr < 0) {
printf("%s: No free USB addresses, new device ignored.\n",
USBDEVNAME(bus->bdev));
device_get_nameunit(bus->bdev));
return (USBD_NO_ADDR);
}
@ -1334,7 +1334,7 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di,
struct usbd_port *p;
int i, err, s;
di->udi_bus = USBDEVUNIT(dev->bus->bdev);
di->udi_bus = device_get_unit(dev->bus->bdev);
di->udi_addr = dev->address;
di->udi_cookie = dev->cookie;
usbd_devinfo_vp(dev, di->udi_vendor, di->udi_product, usedev);
@ -1353,7 +1353,7 @@ usbd_fill_deviceinfo(usbd_device_handle dev, struct usb_device_info *di,
for (i = 0; dev->subdevs[i] && i < USB_MAX_DEVNAMES; i++) {
if (device_is_attached(dev->subdevs[i]))
strlcpy(di->udi_devnames[i],
USBDEVPTRNAME(dev->subdevs[i]),
device_get_nameunit(dev->subdevs[i]),
USB_MAX_DEVNAMELEN);
else
di->udi_devnames[i][0] = 0;
@ -1433,7 +1433,7 @@ void
usb_disconnect_port(struct usbd_port *up, device_t parent)
{
usbd_device_handle dev = up->device;
const char *hubname = USBDEVPTRNAME(parent);
const char *hubname = device_get_nameunit(parent);
int i;
DPRINTFN(3,("uhub_disconnect: up=%p dev=%p port=%d\n",
@ -1449,7 +1449,7 @@ usb_disconnect_port(struct usbd_port *up, device_t parent)
if (dev->subdevs != NULL) {
DPRINTFN(3,("usb_disconnect_port: disconnect subdevs\n"));
for (i = 0; dev->subdevs[i]; i++) {
printf("%s: at %s", USBDEVPTRNAME(dev->subdevs[i]),
printf("%s: at %s", device_get_nameunit(dev->subdevs[i]),
hubname);
if (up->portno != 0)
printf(" port %d", up->portno);

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

@ -158,7 +158,7 @@ usbd_dump_queue(usbd_pipe_handle pipe)
usbd_xfer_handle xfer;
printf("usbd_dump_queue: pipe=%p\n", pipe);
SIMPLEQ_FOREACH(xfer, &pipe->queue, next) {
STAILQ_FOREACH(xfer, &pipe->queue, next) {
printf(" xfer=%p\n", xfer);
}
}
@ -271,7 +271,7 @@ usbd_close_pipe(usbd_pipe_handle pipe)
if (--pipe->refcnt != 0)
return (USBD_NORMAL_COMPLETION);
if (! SIMPLEQ_EMPTY(&pipe->queue))
if (! STAILQ_EMPTY(&pipe->queue))
return (USBD_PENDING_REQUESTS);
LIST_REMOVE(pipe, next);
pipe->endpoint->refcnt--;
@ -866,12 +866,12 @@ usbd_ar_pipe(usbd_pipe_handle pipe)
#endif
pipe->repeat = 0;
pipe->aborting = 1;
while ((xfer = SIMPLEQ_FIRST(&pipe->queue)) != NULL) {
while ((xfer = STAILQ_FIRST(&pipe->queue)) != NULL) {
DPRINTFN(2,("usbd_ar_pipe: pipe=%p xfer=%p (methods=%p)\n",
pipe, xfer, pipe->methods));
/* Make the HC abort it (and invoke the callback). */
pipe->methods->abort(xfer);
KASSERT(SIMPLEQ_FIRST(&pipe->queue) != xfer, ("usbd_ar_pipe"));
KASSERT(STAILQ_FIRST(&pipe->queue) != xfer, ("usbd_ar_pipe"));
/* XXX only for non-0 usbd_clear_endpoint_stall(pipe); */
}
pipe->aborting = 0;
@ -936,12 +936,12 @@ usb_transfer_complete(usbd_xfer_handle xfer)
#ifdef DIAGNOSTIC
xfer->busy_free = XFER_BUSY;
#endif
KASSERT(SIMPLEQ_FIRST(&pipe->queue) == xfer,
KASSERT(STAILQ_FIRST(&pipe->queue) == xfer,
("usb_transfer_complete: bad dequeue"));
SIMPLEQ_REMOVE_HEAD(&pipe->queue, next);
STAILQ_REMOVE_HEAD(&pipe->queue, next);
}
DPRINTFN(5,("usb_transfer_complete: repeat=%d new head=%p\n",
repeat, SIMPLEQ_FIRST(&pipe->queue)));
repeat, STAILQ_FIRST(&pipe->queue)));
/* Count completed transfers. */
++pipe->device->bus->stats.uds_requests
@ -1001,8 +1001,8 @@ usb_insert_transfer(usbd_xfer_handle xfer)
xfer->busy_free = XFER_ONQU;
#endif
s = splusb();
KASSERT(SIMPLEQ_FIRST(&pipe->queue) != xfer, ("usb_insert_transfer"));
SIMPLEQ_INSERT_TAIL(&pipe->queue, xfer, next);
KASSERT(STAILQ_FIRST(&pipe->queue) != xfer, ("usb_insert_transfer"));
STAILQ_INSERT_TAIL(&pipe->queue, xfer, next);
if (pipe->running)
err = USBD_IN_PROGRESS;
else {
@ -1034,7 +1034,7 @@ usbd_start_next(usbd_pipe_handle pipe)
#endif
/* Get next request in queue. */
xfer = SIMPLEQ_FIRST(&pipe->queue);
xfer = STAILQ_FIRST(&pipe->queue);
DPRINTFN(5, ("usbd_start_next: pipe=%p, xfer=%p\n", pipe, xfer));
if (xfer == NULL) {
pipe->running = 0;

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

@ -512,17 +512,17 @@ usbd_intr_transfer(usbd_xfer_handle xfer, usbd_pipe_handle pipe,
void
usb_detach_wait(device_t dv)
{
DPRINTF(("usb_detach_wait: waiting for %s\n", USBDEVPTRNAME(dv)));
DPRINTF(("usb_detach_wait: waiting for %s\n", device_get_nameunit(dv)));
if (tsleep(dv, PZERO, "usbdet", hz * 60))
printf("usb_detach_wait: %s didn't detach\n",
USBDEVPTRNAME(dv));
DPRINTF(("usb_detach_wait: %s done\n", USBDEVPTRNAME(dv)));
device_get_nameunit(dv));
DPRINTF(("usb_detach_wait: %s done\n", device_get_nameunit(dv)));
}
void
usb_detach_wakeup(device_t dv)
{
DPRINTF(("usb_detach_wakeup: for %s\n", USBDEVPTRNAME(dv)));
DPRINTF(("usb_detach_wakeup: for %s\n", device_get_nameunit(dv)));
wakeup(dv);
}

6
sys/dev/usb/usbdivar.h
View File

@ -102,7 +102,7 @@ struct usb_softc;
struct usbd_bus {
/* Filled by HC driver */
USBBASEDEVICE bdev; /* base device, host adapter */
device_t bdev; /* base device, host adapter */
struct usbd_bus_methods *methods;
u_int32_t pipe_size; /* size of a pipe struct */
/* Filled by usb driver */
@ -177,7 +177,7 @@ struct usbd_pipe {
int refcnt;
char running;
char aborting;
SIMPLEQ_HEAD(, usbd_xfer) queue;
STAILQ_HEAD(, usbd_xfer) queue;
LIST_ENTRY(usbd_pipe) next;
usbd_xfer_handle intrxfer; /* used for repeating requests */
@ -232,7 +232,7 @@ struct usbd_xfer {
#define URQ_AUTO_DMABUF 0x10
#define URQ_DEV_DMABUF 0x20
SIMPLEQ_ENTRY(usbd_xfer) next;
STAILQ_ENTRY(usbd_xfer) next;
void *hcpriv; /* private use by the HC driver */

22
sys/dev/usb/uscanner.c
View File

@ -241,7 +241,7 @@ static const struct uscan_info uscanner_devs[] = {
#define USCANNER_BUFFERSIZE 1024
struct uscanner_softc {
USBBASEDEVICE sc_dev; /* base device */
device_t sc_dev; /* base device */
usbd_device_handle sc_udev;
usbd_interface_handle sc_iface;
#if defined(__FreeBSD__)
@ -334,7 +334,7 @@ USB_ATTACH(uscanner)
err = usbd_set_config_no(uaa->device, 1, 1); /* XXX */
if (err) {
printf("%s: setting config no failed\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -344,7 +344,7 @@ USB_ATTACH(uscanner)
id = usbd_get_interface_descriptor(sc->sc_iface);
if (err || id == 0) {
printf("%s: could not get interface descriptor, err=%d,id=%p\n",
USBDEVNAME(sc->sc_dev), err, id);
device_get_nameunit(sc->sc_dev), err, id);
USB_ATTACH_ERROR_RETURN;
}
@ -353,7 +353,7 @@ USB_ATTACH(uscanner)
ed = usbd_interface2endpoint_descriptor(sc->sc_iface, i);
if (ed == 0) {
printf("%s: could not read endpoint descriptor\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -372,7 +372,7 @@ USB_ATTACH(uscanner)
/* Verify that we goething sensible */
if (ed_bulkin == NULL || ed_bulkout == NULL) {
printf("%s: bulk-in and/or bulk-out endpoint not found\n",
USBDEVNAME(sc->sc_dev));
device_get_nameunit(sc->sc_dev));
USB_ATTACH_ERROR_RETURN;
}
@ -381,8 +381,8 @@ USB_ATTACH(uscanner)
#ifdef __FreeBSD__
/* the main device, ctrl endpoint */
sc->dev = make_dev(&uscanner_cdevsw, USBDEVUNIT(sc->sc_dev),
UID_ROOT, GID_OPERATOR, 0644, "%s", USBDEVNAME(sc->sc_dev));
sc->dev = make_dev(&uscanner_cdevsw, device_get_unit(sc->sc_dev),
UID_ROOT, GID_OPERATOR, 0644, "%s", device_get_nameunit(sc->sc_dev));
#endif
usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, sc->sc_udev,
@ -424,7 +424,7 @@ uscanneropen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
USBD_EXCLUSIVE_USE, &sc->sc_bulkin_pipe);
if (err) {
printf("%s: cannot open bulk-in pipe (addr %d)\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkin);
device_get_nameunit(sc->sc_dev), sc->sc_bulkin);
uscanner_do_close(sc);
return (EIO);
}
@ -434,7 +434,7 @@ uscanneropen(struct cdev *dev, int flag, int mode, usb_proc_ptr p)
USBD_EXCLUSIVE_USE, &sc->sc_bulkout_pipe);
if (err) {
printf("%s: cannot open bulk-out pipe (addr %d)\n",
USBDEVNAME(sc->sc_dev), sc->sc_bulkout);
device_get_nameunit(sc->sc_dev), sc->sc_bulkout);
uscanner_do_close(sc);
return (EIO);
}
@ -520,7 +520,7 @@ uscanner_do_read(struct uscanner_softc *sc, struct uio *uio, int flag)
usbd_status err;
int error = 0;
DPRINTFN(5, ("%s: uscannerread\n", USBDEVNAME(sc->sc_dev)));
DPRINTFN(5, ("%s: uscannerread\n", device_get_nameunit(sc->sc_dev)));
if (sc->sc_dying)
return (EIO);
@ -575,7 +575,7 @@ uscanner_do_write(struct uscanner_softc *sc, struct uio *uio, int flag)
int error = 0;
usbd_status err;
DPRINTFN(5, ("%s: uscanner_do_write\n", USBDEVNAME(sc->sc_dev)));
DPRINTFN(5, ("%s: uscanner_do_write\n", device_get_nameunit(sc->sc_dev)));
if (sc->sc_dying)
return (EIO);

16
sys/dev/usb/uvisor.c
View File

@ -287,7 +287,7 @@ USB_ATTACH(uvisor)
ucom->sc_udev = dev;
ucom->sc_iface = uaa->iface;
devname = USBDEVNAME(ucom->sc_dev);
devname = device_get_nameunit(ucom->sc_dev);
printf("%s: %s\n", devname, devinfo);
DPRINTFN(10,("\nuvisor_attach: sc=%p\n", sc));
@ -340,12 +340,12 @@ USB_ATTACH(uvisor)
}
if (ucom->sc_bulkin_no == -1) {
printf("%s: Could not find data bulk in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
goto bad;
}
if (ucom->sc_bulkout_no == -1) {
printf("%s: Could not find data bulk out\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
goto bad;
}
@ -367,7 +367,7 @@ USB_ATTACH(uvisor)
err = uvisor_init(sc);
if (err) {
printf("%s: init failed, %s\n", USBDEVNAME(ucom->sc_dev),
printf("%s: init failed, %s\n", device_get_nameunit(ucom->sc_dev),
usbd_errstr(err));
goto bad;
}
@ -455,7 +455,7 @@ uvisor_init(struct uvisor_softc *sc)
char *string;
np = UGETW(coninfo.num_ports);
printf("%s: Number of ports: %d\n", USBDEVNAME(sc->sc_ucom.sc_dev), np);
printf("%s: Number of ports: %d\n", device_get_nameunit(sc->sc_ucom.sc_dev), np);
for (i = 0; i < np; ++i) {
switch (coninfo.connections[i].port_function_id) {
case UVISOR_FUNCTION_GENERIC:
@ -475,7 +475,7 @@ uvisor_init(struct uvisor_softc *sc)
break;
}
printf("%s: port %d, is for %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), coninfo.connections[i].port,
device_get_nameunit(sc->sc_ucom.sc_dev), coninfo.connections[i].port,
string);
}
}
@ -596,7 +596,7 @@ clie_3_5_init(struct uvisor_softc *sc)
char *string;
np = UGETW(coninfo.num_ports);
DPRINTF(("%s: Number of ports: %d\n", USBDEVNAME(sc->sc_ucom.sc_dev), np));
DPRINTF(("%s: Number of ports: %d\n", device_get_nameunit(sc->sc_ucom.sc_dev), np));
for (i = 0; i < np; ++i) {
switch (coninfo.connections[i].port_function_id) {
case UVISOR_FUNCTION_GENERIC:
@ -616,7 +616,7 @@ clie_3_5_init(struct uvisor_softc *sc)
break;
}
DPRINTF(("%s: port %d, is for %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), coninfo.connections[i].port,
device_get_nameunit(sc->sc_ucom.sc_dev), coninfo.connections[i].port,
string));
}
}

62
sys/dev/usb/uvscom.c
View File

@ -341,7 +341,7 @@ USB_ATTACH(uvscom)
ucom->sc_udev = dev;
ucom->sc_iface = uaa->iface;
devname = USBDEVNAME(ucom->sc_dev);
devname = device_get_nameunit(ucom->sc_dev);
printf("%s: %s\n", devname, devinfo);
DPRINTF(("uvscom attach: sc = %p\n", sc));
@ -364,7 +364,7 @@ USB_ATTACH(uvscom)
if (cdesc == NULL) {
printf("%s: failed to get configuration descriptor\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
goto error;
}
@ -385,7 +385,7 @@ USB_ATTACH(uvscom)
ed = usbd_interface2endpoint_descriptor(ucom->sc_iface, i);
if (ed == NULL) {
printf("%s: no endpoint descriptor for %d\n",
USBDEVNAME(ucom->sc_dev), i);
device_get_nameunit(ucom->sc_dev), i);
goto error;
}
@ -404,17 +404,17 @@ USB_ATTACH(uvscom)
if (ucom->sc_bulkin_no == -1) {
printf("%s: Could not find data bulk in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
goto error;
}
if (ucom->sc_bulkout_no == -1) {
printf("%s: Could not find data bulk out\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
goto error;
}
if (sc->sc_intr_number == -1) {
printf("%s: Could not find interrupt in\n",
USBDEVNAME(ucom->sc_dev));
device_get_nameunit(ucom->sc_dev));
goto error;
}
@ -433,7 +433,7 @@ USB_ATTACH(uvscom)
err = uvscom_reset(sc);
if (err) {
printf("%s: reset failed, %s\n", USBDEVNAME(ucom->sc_dev),
printf("%s: reset failed, %s\n", device_get_nameunit(ucom->sc_dev),
usbd_errstr(err));
goto error;
}
@ -481,7 +481,7 @@ uvscom_readstat(struct uvscom_softc *sc)
usbd_status err;
uint16_t r;
DPRINTF(("%s: send readstat\n", USBDEVNAME(sc->sc_ucom.sc_dev)));
DPRINTF(("%s: send readstat\n", device_get_nameunit(sc->sc_ucom.sc_dev)));
req.bmRequestType = UT_READ_VENDOR_DEVICE;
req.bRequest = UVSCOM_READ_STATUS;
@ -492,12 +492,12 @@ uvscom_readstat(struct uvscom_softc *sc)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, &r);
if (err) {
printf("%s: uvscom_readstat: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
DPRINTF(("%s: uvscom_readstat: r = %d\n",
USBDEVNAME(sc->sc_ucom.sc_dev), r));
device_get_nameunit(sc->sc_ucom.sc_dev), r));
return (USBD_NORMAL_COMPLETION);
}
@ -508,7 +508,7 @@ uvscom_shutdown(struct uvscom_softc *sc)
usb_device_request_t req;
usbd_status err;
DPRINTF(("%s: send shutdown\n", USBDEVNAME(sc->sc_ucom.sc_dev)));
DPRINTF(("%s: send shutdown\n", device_get_nameunit(sc->sc_ucom.sc_dev)));
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = UVSCOM_SHUTDOWN;
@ -519,7 +519,7 @@ uvscom_shutdown(struct uvscom_softc *sc)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, NULL);
if (err) {
printf("%s: uvscom_shutdown: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -529,7 +529,7 @@ uvscom_shutdown(struct uvscom_softc *sc)
static usbd_status
uvscom_reset(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_reset\n", USBDEVNAME(sc->sc_ucom.sc_dev)));
DPRINTF(("%s: uvscom_reset\n", device_get_nameunit(sc->sc_ucom.sc_dev)));
return (USBD_NORMAL_COMPLETION);
}
@ -537,7 +537,7 @@ uvscom_reset(struct uvscom_softc *sc)
static usbd_status
uvscom_set_crtscts(struct uvscom_softc *sc)
{
DPRINTF(("%s: uvscom_set_crtscts\n", USBDEVNAME(sc->sc_ucom.sc_dev)));
DPRINTF(("%s: uvscom_set_crtscts\n", device_get_nameunit(sc->sc_ucom.sc_dev)));
return (USBD_NORMAL_COMPLETION);
}
@ -549,7 +549,7 @@ uvscom_set_line(struct uvscom_softc *sc, uint16_t line)
usbd_status err;
DPRINTF(("%s: uvscom_set_line: %04x\n",
USBDEVNAME(sc->sc_ucom.sc_dev), line));
device_get_nameunit(sc->sc_ucom.sc_dev), line));
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = UVSCOM_LINE_CTL;
@ -560,7 +560,7 @@ uvscom_set_line(struct uvscom_softc *sc, uint16_t line)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, NULL);
if (err) {
printf("%s: uvscom_set_line: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -574,7 +574,7 @@ uvscom_set_line_coding(struct uvscom_softc *sc, uint16_t lsp, uint16_t ls)
usbd_status err;
DPRINTF(("%s: uvscom_set_line_coding: %02x %02x\n",
USBDEVNAME(sc->sc_ucom.sc_dev), lsp, ls));
device_get_nameunit(sc->sc_ucom.sc_dev), lsp, ls));
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = UVSCOM_SET_SPEED;
@ -585,7 +585,7 @@ uvscom_set_line_coding(struct uvscom_softc *sc, uint16_t lsp, uint16_t ls)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, NULL);
if (err) {
printf("%s: uvscom_set_line_coding: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -598,7 +598,7 @@ uvscom_set_line_coding(struct uvscom_softc *sc, uint16_t lsp, uint16_t ls)
err = usbd_do_request(sc->sc_ucom.sc_udev, &req, NULL);
if (err) {
printf("%s: uvscom_set_line_coding: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev), usbd_errstr(err));
device_get_nameunit(sc->sc_ucom.sc_dev), usbd_errstr(err));
return (err);
}
@ -609,7 +609,7 @@ static void
uvscom_dtr(struct uvscom_softc *sc, int onoff)
{
DPRINTF(("%s: uvscom_dtr: onoff = %d\n",
USBDEVNAME(sc->sc_ucom.sc_dev), onoff));
device_get_nameunit(sc->sc_ucom.sc_dev), onoff));
if (sc->sc_dtr == onoff)
return; /* no change */
@ -628,7 +628,7 @@ static void
uvscom_rts(struct uvscom_softc *sc, int onoff)
{
DPRINTF(("%s: uvscom_rts: onoff = %d\n",
USBDEVNAME(sc->sc_ucom.sc_dev), onoff));
device_get_nameunit(sc->sc_ucom.sc_dev), onoff));
if (sc->sc_rts == onoff)
return; /* no change */
@ -647,7 +647,7 @@ static void
uvscom_break(struct uvscom_softc *sc, int onoff)
{
DPRINTF(("%s: uvscom_break: onoff = %d\n",
USBDEVNAME(sc->sc_ucom.sc_dev), onoff));
device_get_nameunit(sc->sc_ucom.sc_dev), onoff));
if (onoff)
uvscom_set_line(sc, SET(sc->sc_lcr, UVSCOM_BREAK));
@ -682,7 +682,7 @@ uvscom_param(void *addr, int portno, struct termios *t)
uint16_t ls;
DPRINTF(("%s: uvscom_param: sc = %p\n",
USBDEVNAME(sc->sc_ucom.sc_dev), sc));
device_get_nameunit(sc->sc_ucom.sc_dev), sc));
ls = 0;
@ -790,7 +790,7 @@ uvscom_open(void *addr, int portno)
err = uvscom_readstat(sc);
if (err) {
DPRINTF(("%s: uvscom_open: readstat faild\n",
USBDEVNAME(sc->sc_ucom.sc_dev)));
device_get_nameunit(sc->sc_ucom.sc_dev)));
return (ENXIO);
}
@ -806,7 +806,7 @@ uvscom_open(void *addr, int portno)
uvscominterval);
if (err) {
printf("%s: cannot open interrupt pipe (addr %d)\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
sc->sc_intr_number);
return (ENXIO);
}
@ -824,14 +824,14 @@ uvscom_open(void *addr, int portno)
}
if (i == 0) {
DPRINTF(("%s: unit is not ready\n",
USBDEVNAME(sc->sc_ucom.sc_dev)));
device_get_nameunit(sc->sc_ucom.sc_dev)));
return (ENXIO);
}
/* check PC Card was inserted */
if (ISSET(sc->sc_usr, UVSCOM_NOCARD)) {
DPRINTF(("%s: no card\n",
USBDEVNAME(sc->sc_ucom.sc_dev)));
device_get_nameunit(sc->sc_ucom.sc_dev)));
return (ENXIO);
}
}
@ -856,12 +856,12 @@ uvscom_close(void *addr, int portno)
err = usbd_abort_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: abort interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(err));
err = usbd_close_pipe(sc->sc_intr_pipe);
if (err)
printf("%s: close interrupt pipe failed: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(err));
free(sc->sc_intr_buf, M_USBDEV);
sc->sc_intr_pipe = NULL;
@ -883,14 +883,14 @@ uvscom_intr(usbd_xfer_handle xfer, usbd_private_handle priv, usbd_status status)
return;
printf("%s: uvscom_intr: abnormal status: %s\n",
USBDEVNAME(sc->sc_ucom.sc_dev),
device_get_nameunit(sc->sc_ucom.sc_dev),
usbd_errstr(status));
usbd_clear_endpoint_stall_async(sc->sc_intr_pipe);
return;
}
DPRINTFN(2, ("%s: uvscom status = %02x %02x\n",
USBDEVNAME(sc->sc_ucom.sc_dev), buf[0], buf[1]));
device_get_nameunit(sc->sc_ucom.sc_dev), buf[0], buf[1]));
sc->sc_lsr = sc->sc_msr = 0;
sc->sc_usr = buf[1];