1 files changed, 21 insertions, 21 deletions

diff --git a/sys/dev/usb/usb_msctest.c b/sys/dev/usb/usb_msctest.c
index f8981ac..e813bcc 100644
--- a/sys/dev/usb/usb_msctest.c
+++ b/sys/dev/usb/usb_msctest.c
@@ -36,7 +36,7 @@
 #include <dev/usb/usb_error.h>
 #include <dev/usb/usb.h>
 
-#define	USB_DEBUG_VAR usb2_debug
+#define	USB_DEBUG_VAR usb_debug
 
 #include <dev/usb/usb_core.h>
 #include <dev/usb/usb_busdma.h>
@@ -221,7 +221,7 @@ static void
 bbb_transfer_start(struct bbb_transfer *sc, uint8_t xfer_index)
 {
 	sc->state = xfer_index;
-	usb2_transfer_start(sc->xfer[xfer_index]);
+	usbd_transfer_start(sc->xfer[xfer_index]);
 }
 
 static void
@@ -230,7 +230,7 @@ bbb_data_clear_stall_callback(struct usb_xfer *xfer,
 {
 	struct bbb_transfer *sc = xfer->priv_sc;
 
-	if (usb2_clear_stall_callback(xfer, sc->xfer[stall_xfer])) {
+	if (usbd_clear_stall_callback(xfer, sc->xfer[stall_xfer])) {
 		switch (USB_GET_STATE(xfer)) {
 		case USB_ST_SETUP:
 		case USB_ST_TRANSFERRED:
@@ -272,8 +272,8 @@ bbb_command_callback(struct usb_xfer *xfer)
 		}
 		xfer->frlengths[0] = sizeof(sc->cbw);
 
-		usb2_set_frame_data(xfer, &sc->cbw, 0);
-		usb2_start_hardware(xfer);
+		usbd_set_frame_data(xfer, &sc->cbw, 0);
+		usbd_transfer_submit(xfer);
 		break;
 
 	default:			/* Error */
@@ -312,8 +312,8 @@ bbb_data_read_callback(struct usb_xfer *xfer)
 		xfer->timeout = sc->data_timeout;
 		xfer->frlengths[0] = max_bulk;
 
-		usb2_set_frame_data(xfer, sc->data_ptr, 0);
-		usb2_start_hardware(xfer);
+		usbd_set_frame_data(xfer, sc->data_ptr, 0);
+		usbd_transfer_submit(xfer);
 		break;
 
 	default:			/* Error */
@@ -363,8 +363,8 @@ bbb_data_write_callback(struct usb_xfer *xfer)
 		xfer->timeout = sc->data_timeout;
 		xfer->frlengths[0] = max_bulk;
 
-		usb2_set_frame_data(xfer, sc->data_ptr, 0);
-		usb2_start_hardware(xfer);
+		usbd_set_frame_data(xfer, sc->data_ptr, 0);
+		usbd_transfer_submit(xfer);
 		return;
 
 	default:			/* Error */
@@ -407,13 +407,13 @@ bbb_status_callback(struct usb_xfer *xfer)
 	case USB_ST_SETUP:
 		xfer->frlengths[0] = sizeof(sc->csw);
 
-		usb2_set_frame_data(xfer, &sc->csw, 0);
-		usb2_start_hardware(xfer);
+		usbd_set_frame_data(xfer, &sc->csw, 0);
+		usbd_transfer_submit(xfer);
 		break;
 
 	default:
 		DPRINTFN(0, "Failed to read CSW: %s, try %d\n",
-		    usb2_errstr(xfer->error), sc->status_try);
+		    usbd_errstr(xfer->error), sc->status_try);
 
 		if ((xfer->error == USB_ERR_CANCELLED) ||
 		    (sc->status_try)) {
@@ -447,23 +447,23 @@ bbb_command_start(struct bbb_transfer *sc, uint8_t dir, uint8_t lun,
 	sc->actlen = 0;
 	sc->cmd_len = cmd_len;
 
-	usb2_transfer_start(sc->xfer[sc->state]);
+	usbd_transfer_start(sc->xfer[sc->state]);
 
-	while (usb2_transfer_pending(sc->xfer[sc->state])) {
+	while (usbd_transfer_pending(sc->xfer[sc->state])) {
 		cv_wait(&sc->cv, &sc->mtx);
 	}
 	return (sc->error);
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_test_autoinstall
+ *	usb_test_autoinstall
  *
  * Return values:
  * 0: This interface is an auto install disk (CD-ROM)
  * Else: Not an auto install disk.
  *------------------------------------------------------------------------*/
 usb_error_t
-usb2_test_autoinstall(struct usb_device *udev, uint8_t iface_index,
+usb_test_autoinstall(struct usb_device *udev, uint8_t iface_index,
     uint8_t do_eject)
 {
 	struct usb_interface *iface;
@@ -476,7 +476,7 @@ usb2_test_autoinstall(struct usb_device *udev, uint8_t iface_index,
 	if (udev == NULL) {
 		return (USB_ERR_INVAL);
 	}
-	iface = usb2_get_iface(udev, iface_index);
+	iface = usbd_get_iface(udev, iface_index);
 	if (iface == NULL) {
 		return (USB_ERR_INVAL);
 	}
@@ -510,7 +510,7 @@ usb2_test_autoinstall(struct usb_device *udev, uint8_t iface_index,
 	mtx_init(&sc->mtx, "USB autoinstall", NULL, MTX_DEF);
 	cv_init(&sc->cv, "WBBB");
 
-	err = usb2_transfer_setup(udev,
+	err = usbd_transfer_setup(udev,
 	    &iface_index, sc->xfer, bbb_config,
 	    ST_MAX, sc, &sc->mtx);
 
@@ -552,13 +552,13 @@ repeat_inquiry:
 				    NULL, 0, 6, USB_MS_HZ);
 
 				DPRINTFN(0, "Eject CD command "
-				    "status: %s\n", usb2_errstr(err));
+				    "status: %s\n", usbd_errstr(err));
 			}
 			err = 0;
 			goto done;
 		}
 	} else if ((err != 2) && --timeout) {
-		usb2_pause_mtx(&sc->mtx, hz);
+		usb_pause_mtx(&sc->mtx, hz);
 		goto repeat_inquiry;
 	}
 	err = USB_ERR_INVAL;
@@ -566,7 +566,7 @@ repeat_inquiry:
 
 done:
 	mtx_unlock(&sc->mtx);
-	usb2_transfer_unsetup(sc->xfer, ST_MAX);
+	usbd_transfer_unsetup(sc->xfer, ST_MAX);
 	mtx_destroy(&sc->mtx);
 	cv_destroy(&sc->cv);
 	free(sc, M_USB);