s/usb2_/usb_/ on all C structs for the USB stack.

3 files changed, 42 insertions, 42 deletions

diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
index b140639..b8281dd 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
@@ -246,7 +246,7 @@ static usb2_callback_t	ubt_isoc_read_callback;
 static usb2_callback_t	ubt_isoc_write_callback;
 
 static int		ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **);
-static int		ubt_isoc_read_one_frame(struct usb2_xfer *, int);
+static int		ubt_isoc_read_one_frame(struct usb_xfer *, int);
 
 /*
  * USB config
@@ -263,7 +263,7 @@ static int		ubt_isoc_read_one_frame(struct usb2_xfer *, int);
  *	2) Isochronous OUT endpoint to send SCO data
  */
 
-static const struct usb2_config		ubt_config[UBT_N_TRANSFER] =
+static const struct usb_config		ubt_config[UBT_N_TRANSFER] =
 {
 	/*
 	 * Interface #0
@@ -370,14 +370,14 @@ static const struct usb2_config		ubt_config[UBT_N_TRANSFER] =
  * where VENDOR_ID and PRODUCT_ID are hex numbers.
  */
 
-static const struct usb2_device_id ubt_ignore_devs[] = 
+static const struct usb_device_id ubt_ignore_devs[] = 
 {
 	/* AVM USB Bluetooth-Adapter BlueFritz! v1.0 */
 	{ USB_VPI(USB_VENDOR_AVM, 0x2200, 0) },
 };
 
 /* List of supported bluetooth devices */
-static const struct usb2_device_id ubt_devs[] =
+static const struct usb_device_id ubt_devs[] =
 {
 	/* Generic Bluetooth class devices */
 	{ USB_IFACE_CLASS(UDCLASS_WIRELESS),
@@ -396,7 +396,7 @@ static const struct usb2_device_id ubt_devs[] =
 static int
 ubt_probe(device_t dev)
 {
-	struct usb2_attach_arg	*uaa = device_get_ivars(dev);
+	struct usb_attach_arg	*uaa = device_get_ivars(dev);
 
 	if (uaa->usb_mode != USB_MODE_HOST)
 		return (ENXIO);
@@ -422,10 +422,10 @@ ubt_probe(device_t dev)
 static int
 ubt_attach(device_t dev)
 {
-	struct usb2_attach_arg		*uaa = device_get_ivars(dev);
+	struct usb_attach_arg		*uaa = device_get_ivars(dev);
 	struct ubt_softc		*sc = device_get_softc(dev);
-	struct usb2_endpoint_descriptor	*ed;
-	struct usb2_interface_descriptor *id;
+	struct usb_endpoint_descriptor	*ed;
+	struct usb_interface_descriptor *id;
 	uint16_t			wMaxPacketSize;
 	uint8_t				alt_index, i, j;
 	uint8_t				iface_index[2] = { 0, 1 };
@@ -502,13 +502,13 @@ ubt_attach(device_t dev)
 	 * Search through all the descriptors looking for the largest
 	 * packet size:
 	 */
-	while ((ed = (struct usb2_endpoint_descriptor *)usb2_desc_foreach(
+	while ((ed = (struct usb_endpoint_descriptor *)usb2_desc_foreach(
 	    usb2_get_config_descriptor(uaa->device), 
-	    (struct usb2_descriptor *)ed))) {
+	    (struct usb_descriptor *)ed))) {
 
 		if ((ed->bDescriptorType == UDESC_INTERFACE) &&
 		    (ed->bLength >= sizeof(*id))) {
-			id = (struct usb2_interface_descriptor *)ed;
+			id = (struct usb_interface_descriptor *)ed;
 			i = id->bInterfaceNumber;
 			j = id->bAlternateSetting;
 		}
@@ -597,10 +597,10 @@ ubt_detach(device_t dev)
  */
 
 static void
-ubt_ctrl_write_callback(struct usb2_xfer *xfer)
+ubt_ctrl_write_callback(struct usb_xfer *xfer)
 {
 	struct ubt_softc		*sc = xfer->priv_sc;
-	struct usb2_device_request	req;
+	struct usb_device_request	req;
 	struct mbuf			*m;
 
 	switch (USB_GET_STATE(xfer)) {
@@ -664,7 +664,7 @@ send_next:
  */
 
 static void
-ubt_intr_read_callback(struct usb2_xfer *xfer)
+ubt_intr_read_callback(struct usb_xfer *xfer)
 {
 	struct ubt_softc	*sc = xfer->priv_sc;
 	struct mbuf		*m;
@@ -759,7 +759,7 @@ submit_next:
  */
 
 static void
-ubt_bulk_read_callback(struct usb2_xfer *xfer)
+ubt_bulk_read_callback(struct usb_xfer *xfer)
 {
 	struct ubt_softc	*sc = xfer->priv_sc;
 	struct mbuf		*m;
@@ -855,7 +855,7 @@ submit_next:
  */
 
 static void
-ubt_bulk_write_callback(struct usb2_xfer *xfer)
+ubt_bulk_write_callback(struct usb_xfer *xfer)
 {
 	struct ubt_softc	*sc = xfer->priv_sc;
 	struct mbuf		*m;
@@ -918,7 +918,7 @@ send_next:
  */
 
 static void
-ubt_isoc_read_callback(struct usb2_xfer *xfer)
+ubt_isoc_read_callback(struct usb_xfer *xfer)
 {
 	struct ubt_softc	*sc = xfer->priv_sc;
 	int			n;
@@ -956,7 +956,7 @@ read_next:
  */
 
 static int
-ubt_isoc_read_one_frame(struct usb2_xfer *xfer, int frame_no)
+ubt_isoc_read_one_frame(struct usb_xfer *xfer, int frame_no)
 {
 	struct ubt_softc	*sc = xfer->priv_sc;
 	struct mbuf		*m;
@@ -1039,7 +1039,7 @@ ubt_isoc_read_one_frame(struct usb2_xfer *xfer, int frame_no)
  */
 
 static void
-ubt_isoc_write_callback(struct usb2_xfer *xfer)
+ubt_isoc_write_callback(struct usb_xfer *xfer)
 {
 	struct ubt_softc	*sc = xfer->priv_sc;
 	struct mbuf		*m;
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
index 721e2f1..10063c4 100644
--- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
+++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h
@@ -90,13 +90,13 @@ struct ubt_softc {
 
 	/* USB device specific */
 	struct mtx		sc_if_mtx;	/* interfaces lock */
-	struct usb2_xfer	*sc_xfer[UBT_N_TRANSFER];
+	struct usb_xfer	*sc_xfer[UBT_N_TRANSFER];
 
 	struct mtx		sc_ng_mtx;	/* lock for shared NG data */
 
 	/* HCI commands */
 	struct ng_bt_mbufq	sc_cmdq;	/* HCI command queue */
-#define	UBT_CTRL_BUFFER_SIZE	(sizeof(struct usb2_device_request) +	\
+#define	UBT_CTRL_BUFFER_SIZE	(sizeof(struct usb_device_request) +	\
 				 sizeof(ng_hci_cmd_pkt_t) + NG_HCI_CMD_PKT_SIZE)
 #define	UBT_INTR_BUFFER_SIZE	(MCLBYTES-1)	/* reserve 1 byte for ID-tag */
 
diff --git a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
index 2c53e82..116e3d8 100644
--- a/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
+++ b/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
@@ -65,10 +65,10 @@ enum {
 };
 
 struct ubtbcmfw_softc {
-	struct usb2_device	*sc_udev;
+	struct usb_device	*sc_udev;
 	struct mtx		sc_mtx;
-	struct usb2_xfer	*sc_xfer[UBTBCMFW_N_TRANSFER];
-	struct usb2_fifo_sc	sc_fifo;
+	struct usb_xfer	*sc_xfer[UBTBCMFW_N_TRANSFER];
+	struct usb_fifo_sc	sc_fifo;
 };
 
 /*
@@ -90,7 +90,7 @@ static usb2_fifo_cmd_t		ubtbcmfw_stop_write;
 static usb2_fifo_ioctl_t	ubtbcmfw_ioctl;
 static usb2_fifo_open_t		ubtbcmfw_open;
 
-static struct usb2_fifo_methods	ubtbcmfw_fifo_methods = 
+static struct usb_fifo_methods	ubtbcmfw_fifo_methods = 
 {
 	.f_close =		&ubtbcmfw_close,
 	.f_ioctl =		&ubtbcmfw_ioctl,
@@ -111,7 +111,7 @@ static struct usb2_fifo_methods	ubtbcmfw_fifo_methods =
  * Device's config structure
  */
 
-static const struct usb2_config	ubtbcmfw_config[UBTBCMFW_N_TRANSFER] =
+static const struct usb_config	ubtbcmfw_config[UBTBCMFW_N_TRANSFER] =
 {
 	[UBTBCMFW_BULK_DT_WR] = {
 		.type =		UE_BULK,
@@ -167,12 +167,12 @@ MODULE_DEPEND(ubtbcmfw, usb, 1, 1, 1);
 static int
 ubtbcmfw_probe(device_t dev)
 {
-	const struct usb2_device_id	devs[] = {
+	const struct usb_device_id	devs[] = {
 	/* Broadcom BCM2033 devices only */
 	{ USB_VPI(USB_VENDOR_BROADCOM, USB_PRODUCT_BROADCOM_BCM2033, 0) },
 	};
 
-	struct usb2_attach_arg	*uaa = device_get_ivars(dev);
+	struct usb_attach_arg	*uaa = device_get_ivars(dev);
 
 	if (uaa->usb_mode != USB_MODE_HOST)
 		return (ENXIO);
@@ -190,7 +190,7 @@ ubtbcmfw_probe(device_t dev)
 static int
 ubtbcmfw_attach(device_t dev)
 {
-	struct usb2_attach_arg	*uaa = device_get_ivars(dev);
+	struct usb_attach_arg	*uaa = device_get_ivars(dev);
 	struct ubtbcmfw_softc	*sc = device_get_softc(dev);
 	uint8_t			iface_index;
 	int			error;
@@ -252,10 +252,10 @@ ubtbcmfw_detach(device_t dev)
  */
 
 static void
-ubtbcmfw_write_callback(struct usb2_xfer *xfer)
+ubtbcmfw_write_callback(struct usb_xfer *xfer)
 {
 	struct ubtbcmfw_softc	*sc = xfer->priv_sc;
-	struct usb2_fifo	*f = sc->sc_fifo.fp[USB_FIFO_TX];
+	struct usb_fifo	*f = sc->sc_fifo.fp[USB_FIFO_TX];
 	uint32_t		actlen;
 
 	switch (USB_GET_STATE(xfer)) {
@@ -284,10 +284,10 @@ setup_next:
  */
 
 static void
-ubtbcmfw_read_callback(struct usb2_xfer *xfer)
+ubtbcmfw_read_callback(struct usb_xfer *xfer)
 {
 	struct ubtbcmfw_softc	*sc = xfer->priv_sc;
-	struct usb2_fifo	*fifo = sc->sc_fifo.fp[USB_FIFO_RX];
+	struct usb_fifo	*fifo = sc->sc_fifo.fp[USB_FIFO_RX];
 
 	switch (USB_GET_STATE(xfer)) {
 	case USB_ST_TRANSFERRED:
@@ -317,7 +317,7 @@ setup_next:
  */
 
 static void
-ubtbcmfw_start_read(struct usb2_fifo *fifo)
+ubtbcmfw_start_read(struct usb_fifo *fifo)
 {
 	struct ubtbcmfw_softc	*sc = fifo->priv_sc0;
 
@@ -329,7 +329,7 @@ ubtbcmfw_start_read(struct usb2_fifo *fifo)
  */
 
 static void
-ubtbcmfw_stop_read(struct usb2_fifo *fifo)
+ubtbcmfw_stop_read(struct usb_fifo *fifo)
 {
 	struct ubtbcmfw_softc	*sc = fifo->priv_sc0;
 
@@ -342,7 +342,7 @@ ubtbcmfw_stop_read(struct usb2_fifo *fifo)
  */
 
 static void
-ubtbcmfw_start_write(struct usb2_fifo *fifo)
+ubtbcmfw_start_write(struct usb_fifo *fifo)
 {
 	struct ubtbcmfw_softc	*sc = fifo->priv_sc0;
 
@@ -354,7 +354,7 @@ ubtbcmfw_start_write(struct usb2_fifo *fifo)
  */
 
 static void
-ubtbcmfw_stop_write(struct usb2_fifo *fifo)
+ubtbcmfw_stop_write(struct usb_fifo *fifo)
 {
 	struct ubtbcmfw_softc	*sc = fifo->priv_sc0;
 
@@ -366,10 +366,10 @@ ubtbcmfw_stop_write(struct usb2_fifo *fifo)
  */
 
 static int
-ubtbcmfw_open(struct usb2_fifo *fifo, int fflags)
+ubtbcmfw_open(struct usb_fifo *fifo, int fflags)
 {
 	struct ubtbcmfw_softc	*sc = fifo->priv_sc0;
-	struct usb2_xfer	*xfer;
+	struct usb_xfer	*xfer;
 
 	/*
 	 * f_open fifo method can only be called with either FREAD
@@ -395,7 +395,7 @@ ubtbcmfw_open(struct usb2_fifo *fifo, int fflags)
  */
 
 static void
-ubtbcmfw_close(struct usb2_fifo *fifo, int fflags)
+ubtbcmfw_close(struct usb_fifo *fifo, int fflags)
 {
 	if (fflags & (FREAD | FWRITE))
 		usb2_fifo_free_buffer(fifo);
@@ -406,7 +406,7 @@ ubtbcmfw_close(struct usb2_fifo *fifo, int fflags)
  */
 
 static int
-ubtbcmfw_ioctl(struct usb2_fifo *fifo, u_long cmd, void *data,
+ubtbcmfw_ioctl(struct usb_fifo *fifo, u_long cmd, void *data,
     int fflags)
 {
 	struct ubtbcmfw_softc	*sc = fifo->priv_sc0;
@@ -415,7 +415,7 @@ ubtbcmfw_ioctl(struct usb2_fifo *fifo, u_long cmd, void *data,
 	switch (cmd) {
 	case USB_GET_DEVICE_DESC:
 		memcpy(data, usb2_get_device_descriptor(sc->sc_udev),
-			sizeof(struct usb2_device_descriptor));
+			sizeof(struct usb_device_descriptor));
 		break;
 
 	default: