1 files changed, 48 insertions, 28 deletions

diff --git a/sys/dev/usb/serial/ubser.c b/sys/dev/usb/serial/ubser.c
index f184ecd..a2c29f9 100644
--- a/sys/dev/usb/serial/ubser.c
+++ b/sys/dev/usb/serial/ubser.c
@@ -76,20 +76,34 @@ __FBSDID("$FreeBSD$");
  * BWCT serial adapter driver
  */
 
+#include <sys/stdint.h>
+#include <sys/stddef.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/linker_set.h>
+#include <sys/module.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/condvar.h>
+#include <sys/sysctl.h>
+#include <sys/sx.h>
+#include <sys/unistd.h>
+#include <sys/callout.h>
+#include <sys/malloc.h>
+#include <sys/priv.h>
+
 #include <dev/usb/usb.h>
-#include <dev/usb/usb_mfunc.h>
-#include <dev/usb/usb_error.h>
-#include <dev/usb/usb_cdc.h>
+#include <dev/usb/usbdi.h>
+#include <dev/usb/usbdi_util.h>
+#include "usbdevs.h"
 
 #define	USB_DEBUG_VAR ubser_debug
-
-#include <dev/usb/usb_core.h>
 #include <dev/usb/usb_debug.h>
 #include <dev/usb/usb_process.h>
-#include <dev/usb/usb_request.h>
-#include <dev/usb/usb_lookup.h>
-#include <dev/usb/usb_util.h>
-#include <dev/usb/usb_busdma.h>
 #include <dev/usb/usb_device.h>
 
 #include <dev/usb/serial/usb_serial.h>
@@ -263,7 +277,7 @@ ubser_attach(device_t dev)
 	if (error) {
 		goto detach;
 	}
-	sc->sc_tx_size = sc->sc_xfer[UBSER_BULK_DT_WR]->max_data_length;
+	sc->sc_tx_size = usbd_xfer_max_len(sc->sc_xfer[UBSER_BULK_DT_WR]);
 
 	if (sc->sc_tx_size == 0) {
 		DPRINTFN(0, "invalid tx_size!\n");
@@ -282,8 +296,8 @@ ubser_attach(device_t dev)
 	}
 
 	mtx_lock(&sc->sc_mtx);
-	usbd_transfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_WR]);
-	usbd_transfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_RD]);
+	usbd_xfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_WR]);
+	usbd_xfer_set_stall(sc->sc_xfer[UBSER_BULK_DT_RD]);
 	usbd_transfer_start(sc->sc_xfer[UBSER_BULK_DT_RD]);
 	mtx_unlock(&sc->sc_mtx);
 
@@ -367,9 +381,10 @@ ubser_inc_tx_unit(struct ubser_softc *sc)
 }
 
 static void
-ubser_write_callback(struct usb_xfer *xfer)
+ubser_write_callback(struct usb_xfer *xfer, usb_error_t error)
 {
-	struct ubser_softc *sc = xfer->priv_sc;
+	struct ubser_softc *sc = usbd_xfer_softc(xfer);
+	struct usb_page_cache *pc;
 	uint8_t buf[1];
 	uint8_t first_unit = sc->sc_curr_tx_unit;
 	uint32_t actlen;
@@ -378,16 +393,17 @@ ubser_write_callback(struct usb_xfer *xfer)
 	case USB_ST_SETUP:
 	case USB_ST_TRANSFERRED:
 tr_setup:
+		pc = usbd_xfer_get_frame(xfer, 0);
 		do {
 			if (ucom_get_data(sc->sc_ucom + sc->sc_curr_tx_unit,
-			    xfer->frbuffers, 1, sc->sc_tx_size - 1,
+			    pc, 1, sc->sc_tx_size - 1,
 			    &actlen)) {
 
 				buf[0] = sc->sc_curr_tx_unit;
 
-				usbd_copy_in(xfer->frbuffers, 0, buf, 1);
+				usbd_copy_in(pc, 0, buf, 1);
 
-				xfer->frlengths[0] = actlen + 1;
+				usbd_xfer_set_frame_len(xfer, 0, actlen + 1);
 				usbd_transfer_submit(xfer);
 
 				ubser_inc_tx_unit(sc);	/* round robin */
@@ -401,9 +417,9 @@ tr_setup:
 		return;
 
 	default:			/* Error */
-		if (xfer->error != USB_ERR_CANCELLED) {
+		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
-			xfer->flags.stall_pipe = 1;
+			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		return;
@@ -412,36 +428,40 @@ tr_setup:
 }
 
 static void
-ubser_read_callback(struct usb_xfer *xfer)
+ubser_read_callback(struct usb_xfer *xfer, usb_error_t error)
 {
-	struct ubser_softc *sc = xfer->priv_sc;
+	struct ubser_softc *sc = usbd_xfer_softc(xfer);
+	struct usb_page_cache *pc;
 	uint8_t buf[1];
+	int actlen;
+
+	usbd_xfer_status(xfer, &actlen, NULL, NULL, NULL);
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
-		if (xfer->actlen < 1) {
+		if (actlen < 1) {
 			DPRINTF("invalid actlen=0!\n");
 			goto tr_setup;
 		}
-		usbd_copy_out(xfer->frbuffers, 0, buf, 1);
+		pc = usbd_xfer_get_frame(xfer, 0);
+		usbd_copy_out(pc, 0, buf, 1);
 
 		if (buf[0] >= sc->sc_numser) {
 			DPRINTF("invalid serial number!\n");
 			goto tr_setup;
 		}
-		ucom_put_data(sc->sc_ucom + buf[0],
-		    xfer->frbuffers, 1, xfer->actlen - 1);
+		ucom_put_data(sc->sc_ucom + buf[0], pc, 1, actlen - 1);
 
 	case USB_ST_SETUP:
 tr_setup:
-		xfer->frlengths[0] = xfer->max_data_length;
+		usbd_xfer_set_frame_len(xfer, 0, usbd_xfer_max_len(xfer));
 		usbd_transfer_submit(xfer);
 		return;
 
 	default:			/* Error */
-		if (xfer->error != USB_ERR_CANCELLED) {
+		if (error != USB_ERR_CANCELLED) {
 			/* try to clear stall first */
-			xfer->flags.stall_pipe = 1;
+			usbd_xfer_set_stall(xfer);
 			goto tr_setup;
 		}
 		return;