1 files changed, 28 insertions, 28 deletions

diff --git a/sys/dev/usb/serial/uark.c b/sys/dev/usb/serial/uark.c
index 69c5602..04861ba 100644
--- a/sys/dev/usb/serial/uark.c
+++ b/sys/dev/usb/serial/uark.c
@@ -29,7 +29,7 @@
 #include <dev/usb/usb_error.h>
 #include <dev/usb/usb_cdc.h>
 
-#define	USB_DEBUG_VAR usb2_debug
+#define	USB_DEBUG_VAR usb_debug
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
@@ -122,14 +122,14 @@ static const struct usb_config
 };
 
 static const struct ucom_callback uark_callback = {
-	.usb2_com_cfg_get_status = &uark_cfg_get_status,
-	.usb2_com_cfg_set_break = &uark_cfg_set_break,
-	.usb2_com_cfg_param = &uark_cfg_param,
-	.usb2_com_pre_param = &uark_pre_param,
-	.usb2_com_start_read = &uark_start_read,
-	.usb2_com_stop_read = &uark_stop_read,
-	.usb2_com_start_write = &uark_start_write,
-	.usb2_com_stop_write = &uark_stop_write,
+	.ucom_cfg_get_status = &uark_cfg_get_status,
+	.ucom_cfg_set_break = &uark_cfg_set_break,
+	.ucom_cfg_param = &uark_cfg_param,
+	.ucom_pre_param = &uark_pre_param,
+	.ucom_start_read = &uark_start_read,
+	.ucom_stop_read = &uark_stop_read,
+	.ucom_start_write = &uark_start_write,
+	.ucom_stop_write = &uark_stop_write,
 };
 
 static device_method_t uark_methods[] = {
@@ -170,7 +170,7 @@ uark_probe(device_t dev)
 	if (uaa->info.bIfaceIndex != UARK_IFACE_INDEX) {
 		return (ENXIO);
 	}
-	return (usb2_lookup_id_by_uaa(uark_devs, sizeof(uark_devs), uaa));
+	return (usbd_lookup_id_by_uaa(uark_devs, sizeof(uark_devs), uaa));
 }
 
 static int
@@ -181,13 +181,13 @@ uark_attach(device_t dev)
 	int32_t error;
 	uint8_t iface_index;
 
-	device_set_usb2_desc(dev);
+	device_set_usb_desc(dev);
 	mtx_init(&sc->sc_mtx, "uark", NULL, MTX_DEF);
 
 	sc->sc_udev = uaa->device;
 
 	iface_index = UARK_IFACE_INDEX;
-	error = usb2_transfer_setup
+	error = usbd_transfer_setup
 	    (uaa->device, &iface_index, sc->sc_xfer,
 	    uark_xfer_config, UARK_N_TRANSFER, sc, &sc->sc_mtx);
 
@@ -198,14 +198,14 @@ uark_attach(device_t dev)
 	}
 	/* clear stall at first run */
 	mtx_lock(&sc->sc_mtx);
-	usb2_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_WR]);
-	usb2_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_RD]);
+	usbd_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_WR]);
+	usbd_transfer_set_stall(sc->sc_xfer[UARK_BULK_DT_RD]);
 	mtx_unlock(&sc->sc_mtx);
 
-	error = usb2_com_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
+	error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc,
 	    &uark_callback, &sc->sc_mtx);
 	if (error) {
-		DPRINTF("usb2_com_attach failed\n");
+		DPRINTF("ucom_attach failed\n");
 		goto detach;
 	}
 	return (0);			/* success */
@@ -220,8 +220,8 @@ uark_detach(device_t dev)
 {
 	struct uark_softc *sc = device_get_softc(dev);
 
-	usb2_com_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
-	usb2_transfer_unsetup(sc->sc_xfer, UARK_N_TRANSFER);
+	ucom_detach(&sc->sc_super_ucom, &sc->sc_ucom, 1);
+	usbd_transfer_unsetup(sc->sc_xfer, UARK_N_TRANSFER);
 	mtx_destroy(&sc->sc_mtx);
 
 	return (0);
@@ -237,10 +237,10 @@ uark_bulk_write_callback(struct usb_xfer *xfer)
 	case USB_ST_SETUP:
 	case USB_ST_TRANSFERRED:
 tr_setup:
-		if (usb2_com_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
+		if (ucom_get_data(&sc->sc_ucom, xfer->frbuffers, 0,
 		    UARK_BUF_SIZE, &actlen)) {
 			xfer->frlengths[0] = actlen;
-			usb2_start_hardware(xfer);
+			usbd_transfer_submit(xfer);
 		}
 		return;
 
@@ -262,13 +262,13 @@ uark_bulk_read_callback(struct usb_xfer *xfer)
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
-		usb2_com_put_data(&sc->sc_ucom, xfer->frbuffers, 0,
+		ucom_put_data(&sc->sc_ucom, xfer->frbuffers, 0,
 		    xfer->actlen);
 
 	case USB_ST_SETUP:
 tr_setup:
 		xfer->frlengths[0] = xfer->max_data_length;
-		usb2_start_hardware(xfer);
+		usbd_transfer_submit(xfer);
 		return;
 
 	default:			/* Error */
@@ -286,7 +286,7 @@ uark_start_read(struct ucom_softc *ucom)
 {
 	struct uark_softc *sc = ucom->sc_parent;
 
-	usb2_transfer_start(sc->sc_xfer[UARK_BULK_DT_RD]);
+	usbd_transfer_start(sc->sc_xfer[UARK_BULK_DT_RD]);
 }
 
 static void
@@ -294,7 +294,7 @@ uark_stop_read(struct ucom_softc *ucom)
 {
 	struct uark_softc *sc = ucom->sc_parent;
 
-	usb2_transfer_stop(sc->sc_xfer[UARK_BULK_DT_RD]);
+	usbd_transfer_stop(sc->sc_xfer[UARK_BULK_DT_RD]);
 }
 
 static void
@@ -302,7 +302,7 @@ uark_start_write(struct ucom_softc *ucom)
 {
 	struct uark_softc *sc = ucom->sc_parent;
 
-	usb2_transfer_start(sc->sc_xfer[UARK_BULK_DT_WR]);
+	usbd_transfer_start(sc->sc_xfer[UARK_BULK_DT_WR]);
 }
 
 static void
@@ -310,7 +310,7 @@ uark_stop_write(struct ucom_softc *ucom)
 {
 	struct uark_softc *sc = ucom->sc_parent;
 
-	usb2_transfer_stop(sc->sc_xfer[UARK_BULK_DT_WR]);
+	usbd_transfer_stop(sc->sc_xfer[UARK_BULK_DT_WR]);
 }
 
 static int
@@ -402,10 +402,10 @@ uark_cfg_write(struct uark_softc *sc, uint16_t index, uint16_t value)
 	USETW(req.wIndex, index);
 	USETW(req.wLength, 0);
 
-	err = usb2_com_cfg_do_request(sc->sc_udev, &sc->sc_ucom, 
+	err = ucom_cfg_do_request(sc->sc_udev, &sc->sc_ucom, 
 	    &req, NULL, 0, 1000);
 	if (err) {
 		DPRINTFN(0, "device request failed, err=%s "
-		    "(ignored)\n", usb2_errstr(err));
+		    "(ignored)\n", usbd_errstr(err));
 	}
 }