1c1
< /* $FreeBSD: head/sys/dev/usb/usb_msctest.c 194227 2009-06-15 00:33:18Z thompsa $ */
---
> /* $FreeBSD: head/sys/dev/usb/usb_msctest.c 194228 2009-06-15 01:02:43Z thompsa $ */
39c39
< #define USB_DEBUG_VAR usb2_debug
---
> #define USB_DEBUG_VAR usb_debug
224c224
< usb2_transfer_start(sc->xfer[xfer_index]);
---
> usbd_transfer_start(sc->xfer[xfer_index]);
233c233
< if (usb2_clear_stall_callback(xfer, sc->xfer[stall_xfer])) {
---
> if (usbd_clear_stall_callback(xfer, sc->xfer[stall_xfer])) {
275,276c275,276
< usb2_set_frame_data(xfer, &sc->cbw, 0);
< usb2_start_hardware(xfer);
---
> usbd_set_frame_data(xfer, &sc->cbw, 0);
> usbd_transfer_submit(xfer);
315,316c315,316
< 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);
366,367c366,367
< 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);
410,411c410,411
< usb2_set_frame_data(xfer, &sc->csw, 0);
< usb2_start_hardware(xfer);
---
> usbd_set_frame_data(xfer, &sc->csw, 0);
> usbd_transfer_submit(xfer);
416c416
< usb2_errstr(xfer->error), sc->status_try);
---
> usbd_errstr(xfer->error), sc->status_try);
450c450
< usb2_transfer_start(sc->xfer[sc->state]);
---
> usbd_transfer_start(sc->xfer[sc->state]);
452c452
< while (usb2_transfer_pending(sc->xfer[sc->state])) {
---
> while (usbd_transfer_pending(sc->xfer[sc->state])) {
459c459
< * usb2_test_autoinstall
---
> * usb_test_autoinstall
466c466
< usb2_test_autoinstall(struct usb_device *udev, uint8_t iface_index,
---
> usb_test_autoinstall(struct usb_device *udev, uint8_t iface_index,
479c479
< iface = usb2_get_iface(udev, iface_index);
---
> iface = usbd_get_iface(udev, iface_index);
513c513
< err = usb2_transfer_setup(udev,
---
> err = usbd_transfer_setup(udev,
555c555
< "status: %s\n", usb2_errstr(err));
---
> "status: %s\n", usbd_errstr(err));
561c561
< usb2_pause_mtx(&sc->mtx, hz);
---
> usb_pause_mtx(&sc->mtx, hz);
569c569
< usb2_transfer_unsetup(sc->xfer, ST_MAX);
---
> usbd_transfer_unsetup(sc->xfer, ST_MAX);