summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/net/if_kue.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/net/if_kue.c')
-rw-r--r--sys/dev/usb/net/if_kue.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/sys/dev/usb/net/if_kue.c b/sys/dev/usb/net/if_kue.c
index a2a1c2d..555b493 100644
--- a/sys/dev/usb/net/if_kue.c
+++ b/sys/dev/usb/net/if_kue.c
@@ -223,7 +223,7 @@ kue_do_request(struct kue_softc *sc, struct usb_device_request *req,
{
usb_error_t err;
- err = usb2_ether_do_request(&sc->sc_ue, req, data, 60000);
+ err = uether_do_request(&sc->sc_ue, req, data, 60000);
return (err);
}
@@ -269,7 +269,7 @@ kue_load_fw(struct kue_softc *sc)
uint16_t hwrev;
usb_error_t err;
- dd = usb2_get_device_descriptor(sc->sc_ue.ue_udev);
+ dd = usbd_get_device_descriptor(sc->sc_ue.ue_udev);
hwrev = UGETW(dd->bcdDevice);
/*
@@ -294,7 +294,7 @@ kue_load_fw(struct kue_softc *sc)
0, kue_code_seg, sizeof(kue_code_seg));
if (err) {
device_printf(sc->sc_ue.ue_dev, "failed to load code segment: %s\n",
- usb2_errstr(err));
+ usbd_errstr(err));
return(ENXIO);
}
@@ -303,7 +303,7 @@ kue_load_fw(struct kue_softc *sc)
0, kue_fix_seg, sizeof(kue_fix_seg));
if (err) {
device_printf(sc->sc_ue.ue_dev, "failed to load fixup segment: %s\n",
- usb2_errstr(err));
+ usbd_errstr(err));
return(ENXIO);
}
@@ -312,7 +312,7 @@ kue_load_fw(struct kue_softc *sc)
0, kue_trig_seg, sizeof(kue_trig_seg));
if (err) {
device_printf(sc->sc_ue.ue_dev, "failed to load trigger segment: %s\n",
- usb2_errstr(err));
+ usbd_errstr(err));
return(ENXIO);
}
@@ -322,8 +322,8 @@ kue_load_fw(struct kue_softc *sc)
static void
kue_setpromisc(struct usb_ether *ue)
{
- struct kue_softc *sc = usb2_ether_getsc(ue);
- struct ifnet *ifp = usb2_ether_getifp(ue);
+ struct kue_softc *sc = uether_getsc(ue);
+ struct ifnet *ifp = uether_getifp(ue);
KUE_LOCK_ASSERT(sc, MA_OWNED);
@@ -338,8 +338,8 @@ kue_setpromisc(struct usb_ether *ue)
static void
kue_setmulti(struct usb_ether *ue)
{
- struct kue_softc *sc = usb2_ether_getsc(ue);
- struct ifnet *ifp = usb2_ether_getifp(ue);
+ struct kue_softc *sc = uether_getsc(ue);
+ struct ifnet *ifp = uether_getifp(ue);
struct ifmultiaddr *ifma;
int i = 0;
@@ -393,21 +393,21 @@ kue_reset(struct kue_softc *sc)
struct usb_config_descriptor *cd;
usb_error_t err;
- cd = usb2_get_config_descriptor(sc->sc_ue.ue_udev);
+ cd = usbd_get_config_descriptor(sc->sc_ue.ue_udev);
- err = usb2_req_set_config(sc->sc_ue.ue_udev, &sc->sc_mtx,
+ err = usbd_req_set_config(sc->sc_ue.ue_udev, &sc->sc_mtx,
cd->bConfigurationValue);
if (err)
DPRINTF("reset failed (ignored)\n");
/* wait a little while for the chip to get its brains in order */
- usb2_ether_pause(&sc->sc_ue, hz / 100);
+ uether_pause(&sc->sc_ue, hz / 100);
}
static void
kue_attach_post(struct usb_ether *ue)
{
- struct kue_softc *sc = usb2_ether_getsc(ue);
+ struct kue_softc *sc = uether_getsc(ue);
int error;
/* load the firmware into the NIC */
@@ -443,7 +443,7 @@ kue_probe(device_t dev)
if (uaa->info.bIfaceIndex != KUE_IFACE_IDX)
return (ENXIO);
- return (usb2_lookup_id_by_uaa(kue_devs, sizeof(kue_devs), uaa));
+ return (usbd_lookup_id_by_uaa(kue_devs, sizeof(kue_devs), uaa));
}
/*
@@ -459,11 +459,11 @@ kue_attach(device_t dev)
uint8_t iface_index;
int error;
- device_set_usb2_desc(dev);
+ device_set_usb_desc(dev);
mtx_init(&sc->sc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);
iface_index = KUE_IFACE_IDX;
- error = usb2_transfer_setup(uaa->device, &iface_index,
+ error = usbd_transfer_setup(uaa->device, &iface_index,
sc->sc_xfer, kue_config, KUE_N_TRANSFER, sc, &sc->sc_mtx);
if (error) {
device_printf(dev, "allocating USB transfers failed!\n");
@@ -483,7 +483,7 @@ kue_attach(device_t dev)
ue->ue_mtx = &sc->sc_mtx;
ue->ue_methods = &kue_ue_methods;
- error = usb2_ether_ifattach(ue);
+ error = uether_ifattach(ue);
if (error) {
device_printf(dev, "could not attach interface\n");
goto detach;
@@ -501,8 +501,8 @@ kue_detach(device_t dev)
struct kue_softc *sc = device_get_softc(dev);
struct usb_ether *ue = &sc->sc_ue;
- usb2_transfer_unsetup(sc->sc_xfer, KUE_N_TRANSFER);
- usb2_ether_ifdetach(ue);
+ usbd_transfer_unsetup(sc->sc_xfer, KUE_N_TRANSFER);
+ uether_ifdetach(ue);
mtx_destroy(&sc->sc_mtx);
free(sc->sc_mcfilters, M_USBDEV);
@@ -518,7 +518,7 @@ kue_bulk_read_callback(struct usb_xfer *xfer)
{
struct kue_softc *sc = xfer->priv_sc;
struct usb_ether *ue = &sc->sc_ue;
- struct ifnet *ifp = usb2_ether_getifp(ue);
+ struct ifnet *ifp = uether_getifp(ue);
uint8_t buf[2];
int len;
@@ -529,23 +529,23 @@ kue_bulk_read_callback(struct usb_xfer *xfer)
ifp->if_ierrors++;
goto tr_setup;
}
- usb2_copy_out(xfer->frbuffers, 0, buf, 2);
+ usbd_copy_out(xfer->frbuffers, 0, buf, 2);
xfer->actlen -= 2;
len = buf[0] | (buf[1] << 8);
len = min(xfer->actlen, len);
- usb2_ether_rxbuf(ue, xfer->frbuffers, 2, len);
+ uether_rxbuf(ue, xfer->frbuffers, 2, len);
/* FALLTHROUGH */
case USB_ST_SETUP:
tr_setup:
xfer->frlengths[0] = xfer->max_data_length;
- usb2_start_hardware(xfer);
- usb2_ether_rxflush(ue);
+ usbd_transfer_submit(xfer);
+ uether_rxflush(ue);
return;
default: /* Error */
DPRINTF("bulk read error, %s\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
if (xfer->error != USB_ERR_CANCELLED) {
/* try to clear stall first */
@@ -561,7 +561,7 @@ static void
kue_bulk_write_callback(struct usb_xfer *xfer)
{
struct kue_softc *sc = xfer->priv_sc;
- struct ifnet *ifp = usb2_ether_getifp(&sc->sc_ue);
+ struct ifnet *ifp = uether_getifp(&sc->sc_ue);
struct mbuf *m;
int total_len;
int temp_len;
@@ -589,12 +589,12 @@ tr_setup:
buf[0] = (uint8_t)(m->m_pkthdr.len);
buf[1] = (uint8_t)(m->m_pkthdr.len >> 8);
- usb2_copy_in(xfer->frbuffers, 0, buf, 2);
+ usbd_copy_in(xfer->frbuffers, 0, buf, 2);
- usb2_m_copy_in(xfer->frbuffers, 2,
+ usbd_m_copy_in(xfer->frbuffers, 2,
m, 0, m->m_pkthdr.len);
- usb2_bzero(xfer->frbuffers, temp_len,
+ usbd_frame_zero(xfer->frbuffers, temp_len,
total_len - temp_len);
xfer->frlengths[0] = total_len;
@@ -607,13 +607,13 @@ tr_setup:
m_freem(m);
- usb2_start_hardware(xfer);
+ usbd_transfer_submit(xfer);
return;
default: /* Error */
DPRINTFN(11, "transfer error, %s\n",
- usb2_errstr(xfer->error));
+ usbd_errstr(xfer->error));
ifp->if_oerrors++;
@@ -630,20 +630,20 @@ tr_setup:
static void
kue_start(struct usb_ether *ue)
{
- struct kue_softc *sc = usb2_ether_getsc(ue);
+ struct kue_softc *sc = uether_getsc(ue);
/*
* start the USB transfers, if not already started:
*/
- usb2_transfer_start(sc->sc_xfer[KUE_BULK_DT_RD]);
- usb2_transfer_start(sc->sc_xfer[KUE_BULK_DT_WR]);
+ usbd_transfer_start(sc->sc_xfer[KUE_BULK_DT_RD]);
+ usbd_transfer_start(sc->sc_xfer[KUE_BULK_DT_WR]);
}
static void
kue_init(struct usb_ether *ue)
{
- struct kue_softc *sc = usb2_ether_getsc(ue);
- struct ifnet *ifp = usb2_ether_getifp(ue);
+ struct kue_softc *sc = uether_getsc(ue);
+ struct ifnet *ifp = uether_getifp(ue);
KUE_LOCK_ASSERT(sc, MA_OWNED);
@@ -664,7 +664,7 @@ kue_init(struct usb_ether *ue)
/* load the multicast filter */
kue_setpromisc(ue);
- usb2_transfer_set_stall(sc->sc_xfer[KUE_BULK_DT_WR]);
+ usbd_transfer_set_stall(sc->sc_xfer[KUE_BULK_DT_WR]);
ifp->if_drv_flags |= IFF_DRV_RUNNING;
kue_start(ue);
@@ -673,8 +673,8 @@ kue_init(struct usb_ether *ue)
static void
kue_stop(struct usb_ether *ue)
{
- struct kue_softc *sc = usb2_ether_getsc(ue);
- struct ifnet *ifp = usb2_ether_getifp(ue);
+ struct kue_softc *sc = uether_getsc(ue);
+ struct ifnet *ifp = uether_getifp(ue);
KUE_LOCK_ASSERT(sc, MA_OWNED);
@@ -683,6 +683,6 @@ kue_stop(struct usb_ether *ue)
/*
* stop all the transfers, if not already stopped:
*/
- usb2_transfer_stop(sc->sc_xfer[KUE_BULK_DT_WR]);
- usb2_transfer_stop(sc->sc_xfer[KUE_BULK_DT_RD]);
+ usbd_transfer_stop(sc->sc_xfer[KUE_BULK_DT_WR]);
+ usbd_transfer_stop(sc->sc_xfer[KUE_BULK_DT_RD]);
}
OpenPOWER on IntegriCloud