svn commit: r193045 - in head/sys: compat/ndis dev/ata dev/if_ndis dev/sound/usb dev/usb dev/usb/controller dev/usb/input dev/usb/misc dev/usb/net dev/usb/serial dev/usb/storage dev/usb/template de...

Andrew Thompson thompsa at FreeBSD.org
Fri May 29 18:46:59 UTC 2009 

Author: thompsa
Date: Fri May 29 18:46:57 2009
New Revision: 193045
URL: http://svn.freebsd.org/changeset/base/193045

Log:
  s/usb2_/usb_/ on all typedefs for the USB stack.

Modified:
  head/sys/compat/ndis/subr_usbd.c
  head/sys/dev/ata/ata-usb.c
  head/sys/dev/if_ndis/if_ndisvar.h
  head/sys/dev/sound/usb/uaudio.c
  head/sys/dev/usb/controller/at91dci.c
  head/sys/dev/usb/controller/at91dci.h
  head/sys/dev/usb/controller/atmegadci.c
  head/sys/dev/usb/controller/atmegadci.h
  head/sys/dev/usb/controller/avr32dci.c
  head/sys/dev/usb/controller/avr32dci.h
  head/sys/dev/usb/controller/ehci.c
  head/sys/dev/usb/controller/ehci.h
  head/sys/dev/usb/controller/musb_otg.c
  head/sys/dev/usb/controller/musb_otg.h
  head/sys/dev/usb/controller/ohci.c
  head/sys/dev/usb/controller/ohci.h
  head/sys/dev/usb/controller/uhci.c
  head/sys/dev/usb/controller/uhci.h
  head/sys/dev/usb/controller/usb_controller.c
  head/sys/dev/usb/controller/uss820dci.c
  head/sys/dev/usb/controller/uss820dci.h
  head/sys/dev/usb/input/uhid.c
  head/sys/dev/usb/input/ukbd.c
  head/sys/dev/usb/input/ums.c
  head/sys/dev/usb/misc/udbp.c
  head/sys/dev/usb/misc/ufm.c
  head/sys/dev/usb/net/if_aue.c
  head/sys/dev/usb/net/if_axe.c
  head/sys/dev/usb/net/if_cdce.c
  head/sys/dev/usb/net/if_cue.c
  head/sys/dev/usb/net/if_kue.c
  head/sys/dev/usb/net/if_rue.c
  head/sys/dev/usb/net/if_udav.c
  head/sys/dev/usb/net/usb_ethernet.c
  head/sys/dev/usb/net/usb_ethernet.h
  head/sys/dev/usb/serial/u3g.c
  head/sys/dev/usb/serial/uark.c
  head/sys/dev/usb/serial/ubsa.c
  head/sys/dev/usb/serial/ubser.c
  head/sys/dev/usb/serial/uchcom.c
  head/sys/dev/usb/serial/ucycom.c
  head/sys/dev/usb/serial/ufoma.c
  head/sys/dev/usb/serial/uftdi.c
  head/sys/dev/usb/serial/ugensa.c
  head/sys/dev/usb/serial/uipaq.c
  head/sys/dev/usb/serial/ulpt.c
  head/sys/dev/usb/serial/umct.c
  head/sys/dev/usb/serial/umodem.c
  head/sys/dev/usb/serial/umoscom.c
  head/sys/dev/usb/serial/uplcom.c
  head/sys/dev/usb/serial/usb_serial.c
  head/sys/dev/usb/serial/uslcom.c
  head/sys/dev/usb/serial/uvisor.c
  head/sys/dev/usb/serial/uvscom.c
  head/sys/dev/usb/storage/umass.c
  head/sys/dev/usb/storage/urio.c
  head/sys/dev/usb/storage/ustorage_fs.c
  head/sys/dev/usb/template/usb_template.c
  head/sys/dev/usb/usb_bus.h
  head/sys/dev/usb/usb_busdma.c
  head/sys/dev/usb/usb_busdma.h
  head/sys/dev/usb/usb_compat_linux.c
  head/sys/dev/usb/usb_compat_linux.h
  head/sys/dev/usb/usb_controller.h
  head/sys/dev/usb/usb_core.h
  head/sys/dev/usb/usb_dev.c
  head/sys/dev/usb/usb_dev.h
  head/sys/dev/usb/usb_device.c
  head/sys/dev/usb/usb_device.h
  head/sys/dev/usb/usb_dynamic.c
  head/sys/dev/usb/usb_dynamic.h
  head/sys/dev/usb/usb_error.c
  head/sys/dev/usb/usb_generic.c
  head/sys/dev/usb/usb_handle_request.c
  head/sys/dev/usb/usb_hid.c
  head/sys/dev/usb/usb_hid.h
  head/sys/dev/usb/usb_hub.c
  head/sys/dev/usb/usb_hub.h
  head/sys/dev/usb/usb_lookup.c
  head/sys/dev/usb/usb_lookup.h
  head/sys/dev/usb/usb_mbuf.c
  head/sys/dev/usb/usb_mbuf.h
  head/sys/dev/usb/usb_msctest.c
  head/sys/dev/usb/usb_msctest.h
  head/sys/dev/usb/usb_process.c
  head/sys/dev/usb/usb_process.h
  head/sys/dev/usb/usb_request.c
  head/sys/dev/usb/usb_request.h
  head/sys/dev/usb/usb_transfer.c
  head/sys/dev/usb/usb_transfer.h
  head/sys/dev/usb/usb_util.c
  head/sys/dev/usb/wlan/if_rum.c
  head/sys/dev/usb/wlan/if_uath.c
  head/sys/dev/usb/wlan/if_upgt.c
  head/sys/dev/usb/wlan/if_ural.c
  head/sys/dev/usb/wlan/if_urtw.c
  head/sys/dev/usb/wlan/if_urtwvar.h
  head/sys/dev/usb/wlan/if_zyd.c
  head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c
  head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c

Modified: head/sys/compat/ndis/subr_usbd.c
==============================================================================
--- head/sys/compat/ndis/subr_usbd.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/compat/ndis/subr_usbd.c	Fri May 29 18:46:57 2009	(r193045)
@@ -76,8 +76,8 @@ __FBSDID("$FreeBSD$");
 #include <dev/if_ndis/if_ndisvar.h>
 
 static driver_object usbd_driver;
-static usb2_callback_t usbd_non_isoc_callback;
-static usb2_callback_t usbd_ctrl_callback;
+static usb_callback_t usbd_non_isoc_callback;
+static usb_callback_t usbd_ctrl_callback;
 
 #define	USBD_CTRL_READ_PIPE		0
 #define	USBD_CTRL_WRITE_PIPE		1
@@ -114,10 +114,10 @@ static int32_t		 usbd_func_bulkintr(irp 
 static int32_t		 usbd_func_vendorclass(irp *);
 static int32_t		 usbd_func_selconf(irp *);
 static int32_t		 usbd_func_abort_pipe(irp *);
-static usb2_error_t	 usbd_setup_endpoint(irp *, uint8_t,
+static usb_error_t	 usbd_setup_endpoint(irp *, uint8_t,
 			    struct usb_endpoint_descriptor	*);
-static usb2_error_t	 usbd_setup_endpoint_default(irp *, uint8_t);
-static usb2_error_t	 usbd_setup_endpoint_one(irp *, uint8_t,
+static usb_error_t	 usbd_setup_endpoint_default(irp *, uint8_t);
+static usb_error_t	 usbd_setup_endpoint_one(irp *, uint8_t,
 			    struct ndisusb_ep *, struct usb_config *);
 static int32_t		 usbd_func_getdesc(irp *);
 static union usbd_urb	*usbd_geturb(irp *);
@@ -353,7 +353,7 @@ usbd_urb2nt(status)
 	return (STATUS_FAILURE);
 }
 
-/* Convert FreeBSD's usb2_error_t to USBD_STATUS  */
+/* Convert FreeBSD's usb_error_t to USBD_STATUS  */
 static int32_t
 usbd_usb2urb(int status)
 {
@@ -463,7 +463,7 @@ usbd_func_getdesc(ip)
 	uint32_t len;
 	union usbd_urb *urb;
 	usb_config_descriptor_t *cdp;
-	usb2_error_t status;
+	usb_error_t status;
 
 	urb = usbd_geturb(ip);
 	ctldesc = &urb->uu_ctldesc;
@@ -527,7 +527,7 @@ usbd_func_selconf(ip)
 	union usbd_urb *urb;
 	usb_config_descriptor_t *conf;
 	usb_endpoint_descriptor_t *edesc;
-	usb2_error_t ret;
+	usb_error_t ret;
 
 	urb = usbd_geturb(ip);
 
@@ -592,7 +592,7 @@ usbd_func_selconf(ip)
 	return USBD_STATUS_SUCCESS;
 }
 
-static usb2_error_t
+static usb_error_t
 usbd_setup_endpoint_one(ip, ifidx, ne, epconf)
 	irp				*ip;
 	uint8_t				ifidx;
@@ -602,7 +602,7 @@ usbd_setup_endpoint_one(ip, ifidx, ne, e
 	device_t dev = IRP_NDIS_DEV(ip);
 	struct ndis_softc *sc = device_get_softc(dev);
 	struct usb_xfer *xfer;
-	usb2_error_t status;
+	usb_error_t status;
 
 	InitializeListHead(&ne->ne_active);
 	InitializeListHead(&ne->ne_pending);
@@ -621,14 +621,14 @@ usbd_setup_endpoint_one(ip, ifidx, ne, e
 	return (status);
 }
 
-static usb2_error_t
+static usb_error_t
 usbd_setup_endpoint_default(ip, ifidx)
 	irp				*ip;
 	uint8_t				ifidx;
 {
 	device_t dev = IRP_NDIS_DEV(ip);
 	struct ndis_softc *sc = device_get_softc(dev);
-	usb2_error_t status;
+	usb_error_t status;
 
 	if (ifidx > 0)
 		device_printf(dev, "warning: ifidx > 0 isn't supported.\n");
@@ -643,7 +643,7 @@ usbd_setup_endpoint_default(ip, ifidx)
 	return (status);
 }
 
-static usb2_error_t
+static usb_error_t
 usbd_setup_endpoint(ip, ifidx, ep)
 	irp				*ip;
 	uint8_t				ifidx;
@@ -654,7 +654,7 @@ usbd_setup_endpoint(ip, ifidx, ep)
 	struct ndisusb_ep *ne;
 	struct usb_config cfg;
 	struct usb_xfer *xfer;
-	usb2_error_t status;
+	usb_error_t status;
 
 	/* check for non-supported transfer types */
 	if (UE_GET_XFERTYPE(ep->bmAttributes) == UE_CONTROL ||
@@ -810,7 +810,7 @@ usbd_irpcancel(dobj, ip)
 
 static void
 usbd_xfer_complete(struct ndis_softc *sc, struct ndisusb_ep *ne,
-    struct ndisusb_xfer *nx, usb2_error_t status)
+    struct ndisusb_xfer *nx, usb_error_t status)
 {
 	struct ndisusb_xferdone *nd;
 	uint8_t irql;
@@ -1122,7 +1122,7 @@ usbd_xfertask(dobj, arg)
 	struct usbd_urb_bulk_or_intr_transfer *ubi;
 	struct usbd_urb_vendor_or_class_request *vcreq;
 	union usbd_urb *urb;
-	usb2_error_t status;
+	usb_error_t status;
 	void *priv;
 
 	dev = sc->ndis_dev;

Modified: head/sys/dev/ata/ata-usb.c
==============================================================================
--- head/sys/dev/ata/ata-usb.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/ata/ata-usb.c	Fri May 29 18:46:57 2009	(r193045)
@@ -132,16 +132,16 @@ static device_probe_t atausb2_probe;
 static device_attach_t atausb2_attach;
 static device_detach_t atausb2_detach;
 
-static usb2_callback_t atausb2_t_bbb_reset1_callback;
-static usb2_callback_t atausb2_t_bbb_reset2_callback;
-static usb2_callback_t atausb2_t_bbb_reset3_callback;
-static usb2_callback_t atausb2_t_bbb_command_callback;
-static usb2_callback_t atausb2_t_bbb_data_read_callback;
-static usb2_callback_t atausb2_t_bbb_data_rd_cs_callback;
-static usb2_callback_t atausb2_t_bbb_data_write_callback;
-static usb2_callback_t atausb2_t_bbb_data_wr_cs_callback;
-static usb2_callback_t atausb2_t_bbb_status_callback;
-static usb2_callback_t atausb2_tr_error;
+static usb_callback_t atausb2_t_bbb_reset1_callback;
+static usb_callback_t atausb2_t_bbb_reset2_callback;
+static usb_callback_t atausb2_t_bbb_reset3_callback;
+static usb_callback_t atausb2_t_bbb_command_callback;
+static usb_callback_t atausb2_t_bbb_data_read_callback;
+static usb_callback_t atausb2_t_bbb_data_rd_cs_callback;
+static usb_callback_t atausb2_t_bbb_data_write_callback;
+static usb_callback_t atausb2_t_bbb_data_wr_cs_callback;
+static usb_callback_t atausb2_t_bbb_status_callback;
+static usb_callback_t atausb2_tr_error;
 
 static void atausb2_cancel_request(struct atausb2_softc *sc);
 static void atausb2_transfer_start(struct atausb2_softc *sc, uint8_t xfer_no);

Modified: head/sys/dev/if_ndis/if_ndisvar.h
==============================================================================
--- head/sys/dev/if_ndis/if_ndisvar.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/if_ndis/if_ndisvar.h	Fri May 29 18:46:57 2009	(r193045)
@@ -138,7 +138,7 @@ struct ndisusb_xfer {
 };
 struct ndisusb_xferdone {
 	struct ndisusb_xfer	*nd_xfer;
-	usb2_error_t		nd_status;
+	usb_error_t		nd_status;
 	list_entry		nd_donelist;
 };
 

Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/sound/usb/uaudio.c	Fri May 29 18:46:57 2009	(r193045)
@@ -308,13 +308,13 @@ static device_probe_t uaudio_probe;
 static device_attach_t uaudio_attach;
 static device_detach_t uaudio_detach;
 
-static usb2_callback_t uaudio_chan_play_callback;
-static usb2_callback_t uaudio_chan_record_callback;
-static usb2_callback_t uaudio_mixer_write_cfg_callback;
-static usb2_callback_t umidi_read_clear_stall_callback;
-static usb2_callback_t umidi_bulk_read_callback;
-static usb2_callback_t umidi_write_clear_stall_callback;
-static usb2_callback_t umidi_bulk_write_callback;
+static usb_callback_t uaudio_chan_play_callback;
+static usb_callback_t uaudio_chan_record_callback;
+static usb_callback_t uaudio_mixer_write_cfg_callback;
+static usb_callback_t umidi_read_clear_stall_callback;
+static usb_callback_t umidi_bulk_read_callback;
+static usb_callback_t umidi_write_clear_stall_callback;
+static usb_callback_t umidi_bulk_write_callback;
 
 static void	uaudio_chan_fill_info_sub(struct uaudio_softc *,
 		    struct usb_device *, uint32_t, uint16_t, uint8_t, uint8_t);
@@ -362,7 +362,7 @@ static uint16_t	uaudio_mixer_get(struct 
 		    struct uaudio_mixer_node *);
 static void	uaudio_mixer_ctl_set(struct uaudio_softc *,
 		    struct uaudio_mixer_node *, uint8_t, int32_t val);
-static usb2_error_t uaudio_set_speed(struct usb_device *, uint8_t, uint32_t);
+static usb_error_t uaudio_set_speed(struct usb_device *, uint8_t, uint32_t);
 static int	uaudio_mixer_signext(uint8_t, int);
 static int	uaudio_mixer_bsd2value(struct uaudio_mixer_node *, int32_t val);
 static const void *uaudio_mixer_verify_desc(const void *, uint32_t);
@@ -1295,7 +1295,7 @@ uaudio_chan_init(struct uaudio_softc *sc
 	uint8_t endpoint;
 	uint8_t iface_index;
 	uint8_t alt_index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	/* compute required buffer size */
 	buf_size = (ch->bytes_per_frame * UAUDIO_MINFRAMES);
@@ -2873,7 +2873,7 @@ uaudio_mixer_get(struct usb_device *udev
 	uint16_t val;
 	uint16_t len = MIX_SIZE(mc->type);
 	uint8_t data[4];
-	usb2_error_t err;
+	usb_error_t err;
 
 	if (mc->wValue[0] == -1) {
 		return (0);
@@ -2987,7 +2987,7 @@ tr_setup:
 	}
 }
 
-static usb2_error_t
+static usb_error_t
 uaudio_set_speed(struct usb_device *udev, uint8_t endpt, uint32_t speed)
 {
 	struct usb_device_request req;

Modified: head/sys/dev/usb/controller/at91dci.c
==============================================================================
--- head/sys/dev/usb/controller/at91dci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/at91dci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -92,7 +92,7 @@ static at91dci_cmd_t at91dci_setup_rx;
 static at91dci_cmd_t at91dci_data_rx;
 static at91dci_cmd_t at91dci_data_tx;
 static at91dci_cmd_t at91dci_data_tx_sync;
-static void	at91dci_device_done(struct usb_xfer *, usb2_error_t);
+static void	at91dci_device_done(struct usb_xfer *, usb_error_t);
 static void	at91dci_do_poll(struct usb_bus *);
 static void	at91dci_standard_done(struct usb_xfer *);
 static void	at91dci_root_intr(struct at91dci_softc *sc);
@@ -1070,7 +1070,7 @@ at91dci_root_intr(struct at91dci_softc *
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 at91dci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct at91dci_td *td;
@@ -1137,7 +1137,7 @@ at91dci_standard_done_sub(struct usb_xfe
 static void
 at91dci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1184,7 +1184,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-at91dci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+at91dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct at91dci_softc *sc = AT9100_DCI_BUS2SC(xfer->xroot->bus);
 	uint8_t ep_no;
@@ -1355,7 +1355,7 @@ at91dci_clear_stall(struct usb_device *u
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 at91dci_init(struct at91dci_softc *sc)
 {
 	uint32_t csr_val;
@@ -1745,7 +1745,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, at91dc
 USB_MAKE_STRING_DESC(STRING_VENDOR, at91dci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, at91dci_product);
 
-static usb2_error_t
+static usb_error_t
 at91dci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1754,7 +1754,7 @@ at91dci_roothub_exec(struct usb_device *
 	uint16_t len;
 	uint16_t value;
 	uint16_t index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/at91dci.h
==============================================================================
--- head/sys/dev/usb/controller/at91dci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/at91dci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -233,7 +233,7 @@ struct at91dci_softc {
 
 /* prototypes */
 
-usb2_error_t at91dci_init(struct at91dci_softc *sc);
+usb_error_t at91dci_init(struct at91dci_softc *sc);
 void	at91dci_uninit(struct at91dci_softc *sc);
 void	at91dci_suspend(struct at91dci_softc *sc);
 void	at91dci_resume(struct at91dci_softc *sc);

Modified: head/sys/dev/usb/controller/atmegadci.c
==============================================================================
--- head/sys/dev/usb/controller/atmegadci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/atmegadci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -82,7 +82,7 @@ static atmegadci_cmd_t atmegadci_setup_r
 static atmegadci_cmd_t atmegadci_data_rx;
 static atmegadci_cmd_t atmegadci_data_tx;
 static atmegadci_cmd_t atmegadci_data_tx_sync;
-static void atmegadci_device_done(struct usb_xfer *, usb2_error_t);
+static void atmegadci_device_done(struct usb_xfer *, usb_error_t);
 static void atmegadci_do_poll(struct usb_bus *);
 static void atmegadci_standard_done(struct usb_xfer *);
 static void atmegadci_root_intr(struct atmegadci_softc *sc);
@@ -953,7 +953,7 @@ atmegadci_root_intr(struct atmegadci_sof
 	    sizeof(sc->sc_hub_idata));
  }
 
-static usb2_error_t
+static usb_error_t
 atmegadci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct atmegadci_td *td;
@@ -1020,7 +1020,7 @@ atmegadci_standard_done_sub(struct usb_x
 static void
 atmegadci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1067,7 +1067,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-atmegadci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+atmegadci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct atmegadci_softc *sc = ATMEGA_BUS2SC(xfer->xroot->bus);
 	uint8_t ep_no;
@@ -1205,7 +1205,7 @@ atmegadci_clear_stall(struct usb_device 
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 atmegadci_init(struct atmegadci_softc *sc)
 {
 	uint8_t n;
@@ -1566,7 +1566,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, atmega
 USB_MAKE_STRING_DESC(STRING_VENDOR, atmegadci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, atmegadci_product);
 
-static usb2_error_t
+static usb_error_t
 atmegadci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1576,7 +1576,7 @@ atmegadci_roothub_exec(struct usb_device
 	uint16_t value;
 	uint16_t index;
 	uint8_t temp;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/atmegadci.h
==============================================================================
--- head/sys/dev/usb/controller/atmegadci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/atmegadci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -276,7 +276,7 @@ struct atmegadci_softc {
 
 /* prototypes */
 
-usb2_error_t atmegadci_init(struct atmegadci_softc *sc);
+usb_error_t atmegadci_init(struct atmegadci_softc *sc);
 void	atmegadci_uninit(struct atmegadci_softc *sc);
 void	atmegadci_suspend(struct atmegadci_softc *sc);
 void	atmegadci_resume(struct atmegadci_softc *sc);

Modified: head/sys/dev/usb/controller/avr32dci.c
==============================================================================
--- head/sys/dev/usb/controller/avr32dci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/avr32dci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -82,7 +82,7 @@ static avr32dci_cmd_t avr32dci_setup_rx;
 static avr32dci_cmd_t avr32dci_data_rx;
 static avr32dci_cmd_t avr32dci_data_tx;
 static avr32dci_cmd_t avr32dci_data_tx_sync;
-static void avr32dci_device_done(struct usb_xfer *, usb2_error_t);
+static void avr32dci_device_done(struct usb_xfer *, usb_error_t);
 static void avr32dci_do_poll(struct usb_bus *);
 static void avr32dci_standard_done(struct usb_xfer *);
 static void avr32dci_root_intr(struct avr32dci_softc *sc);
@@ -924,7 +924,7 @@ avr32dci_root_intr(struct avr32dci_softc
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 avr32dci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct avr32dci_td *td;
@@ -991,7 +991,7 @@ avr32dci_standard_done_sub(struct usb_xf
 static void
 avr32dci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1038,7 +1038,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-avr32dci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+avr32dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct avr32dci_softc *sc = AVR32_BUS2SC(xfer->xroot->bus);
 	uint8_t ep_no;
@@ -1175,7 +1175,7 @@ avr32dci_clear_stall(struct usb_device *
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 avr32dci_init(struct avr32dci_softc *sc)
 {
 	uint8_t n;
@@ -1500,7 +1500,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, avr32d
 USB_MAKE_STRING_DESC(STRING_VENDOR, avr32dci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, avr32dci_product);
 
-static usb2_error_t
+static usb_error_t
 avr32dci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1510,7 +1510,7 @@ avr32dci_roothub_exec(struct usb_device 
 	uint16_t value;
 	uint16_t index;
 	uint32_t temp;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/avr32dci.h
==============================================================================
--- head/sys/dev/usb/controller/avr32dci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/avr32dci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -244,7 +244,7 @@ struct avr32dci_softc {
 
 /* prototypes */
 
-usb2_error_t avr32dci_init(struct avr32dci_softc *sc);
+usb_error_t avr32dci_init(struct avr32dci_softc *sc);
 void	avr32dci_uninit(struct avr32dci_softc *sc);
 void	avr32dci_suspend(struct avr32dci_softc *sc);
 void	avr32dci_resume(struct avr32dci_softc *sc);

Modified: head/sys/dev/usb/controller/ehci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/ehci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -94,7 +94,7 @@ extern struct usb_pipe_methods ehci_devi
 extern struct usb_pipe_methods ehci_device_isoc_hs_methods;
 
 static void ehci_do_poll(struct usb_bus *bus);
-static void ehci_device_done(struct usb_xfer *xfer, usb2_error_t error);
+static void ehci_device_done(struct usb_xfer *xfer, usb_error_t error);
 static uint8_t ehci_check_transfer(struct usb_xfer *xfer);
 static void ehci_timeout(void *arg);
 static void ehci_root_intr(ehci_softc_t *sc);
@@ -115,7 +115,7 @@ struct ehci_std_temp {
 };
 
 void
-ehci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
+ehci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(bus);
 	uint32_t i;
@@ -145,7 +145,7 @@ ehci_iterate_hw_softc(struct usb_bus *bu
 	}
 }
 
-usb2_error_t
+usb_error_t
 ehci_reset(ehci_softc_t *sc)
 {
 	uint32_t hcr;
@@ -181,7 +181,7 @@ ehci_reset(ehci_softc_t *sc)
 	return (USB_ERR_IOERROR);
 }
 
-static usb2_error_t
+static usb_error_t
 ehci_hcreset(ehci_softc_t *sc)
 {
 	uint32_t hcr;
@@ -205,7 +205,7 @@ ehci_hcreset(ehci_softc_t *sc)
 	return ehci_reset(sc);
 }
 
-usb2_error_t
+usb_error_t
 ehci_init(ehci_softc_t *sc)
 {
 	struct usb_page_search buf_res;
@@ -217,7 +217,7 @@ ehci_init(ehci_softc_t *sc)
 	uint16_t x;
 	uint16_t y;
 	uint16_t bit;
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTF("start\n");
 
@@ -1120,7 +1120,7 @@ _ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_
 	return (last);
 }
 
-static usb2_error_t
+static usb_error_t
 ehci_non_isoc_done_sub(struct usb_xfer *xfer)
 {
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
@@ -1216,7 +1216,7 @@ ehci_non_isoc_done_sub(struct usb_xfer *
 static void
 ehci_non_isoc_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -2111,7 +2111,7 @@ ehci_isoc_hs_done(ehci_softc_t *sc, stru
  * from close and from interrupt
  */
 static void
-ehci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+ehci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_pipe_methods *methods = xfer->pipe->methods;
 	ehci_softc_t *sc = EHCI_BUS2SC(xfer->xroot->bus);
@@ -2984,7 +2984,7 @@ ehci_disown(ehci_softc_t *sc, uint16_t i
 	EOWRITE4(sc, port, v | EHCI_PS_PO);
 }
 
-static usb2_error_t
+static usb_error_t
 ehci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2998,7 +2998,7 @@ ehci_roothub_exec(struct usb_device *ude
 	uint16_t value;
 	uint16_t index;
 	uint8_t l;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/ehci.h
==============================================================================
--- head/sys/dev/usb/controller/ehci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/ehci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -574,10 +574,10 @@ hc16toh(const struct ehci_softc *sc, con
 }
 #endif
 
-usb2_bus_mem_cb_t ehci_iterate_hw_softc;
+usb_bus_mem_cb_t ehci_iterate_hw_softc;
 
-usb2_error_t ehci_reset(ehci_softc_t *sc);
-usb2_error_t ehci_init(ehci_softc_t *sc);
+usb_error_t ehci_reset(ehci_softc_t *sc);
+usb_error_t ehci_init(ehci_softc_t *sc);
 void	ehci_detach(struct ehci_softc *sc);
 void	ehci_suspend(struct ehci_softc *sc);
 void	ehci_resume(struct ehci_softc *sc);

Modified: head/sys/dev/usb/controller/musb_otg.c
==============================================================================
--- head/sys/dev/usb/controller/musb_otg.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/musb_otg.c	Fri May 29 18:46:57 2009	(r193045)
@@ -86,7 +86,7 @@ static musbotg_cmd_t musbotg_setup_data_
 static musbotg_cmd_t musbotg_setup_status;
 static musbotg_cmd_t musbotg_data_rx;
 static musbotg_cmd_t musbotg_data_tx;
-static void	musbotg_device_done(struct usb_xfer *, usb2_error_t);
+static void	musbotg_device_done(struct usb_xfer *, usb_error_t);
 static void	musbotg_do_poll(struct usb_bus *);
 static void	musbotg_standard_done(struct usb_xfer *);
 static void	musbotg_interrupt_poll(struct musbotg_softc *);
@@ -1321,7 +1321,7 @@ musbotg_root_intr(struct musbotg_softc *
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 musbotg_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct musbotg_td *td;
@@ -1388,7 +1388,7 @@ musbotg_standard_done_sub(struct usb_xfe
 static void
 musbotg_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(12, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1435,7 +1435,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-musbotg_device_done(struct usb_xfer *xfer, usb2_error_t error)
+musbotg_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
@@ -1664,7 +1664,7 @@ musbotg_clear_stall(struct usb_device *u
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 musbotg_init(struct musbotg_softc *sc)
 {
 	struct usb_hw_ep_profile *pf;
@@ -2153,7 +2153,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, musbot
 USB_MAKE_STRING_DESC(STRING_VENDOR, musbotg_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, musbotg_product);
 
-static usb2_error_t
+static usb_error_t
 musbotg_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2162,7 +2162,7 @@ musbotg_roothub_exec(struct usb_device *
 	uint16_t len;
 	uint16_t value;
 	uint16_t index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/musb_otg.h
==============================================================================
--- head/sys/dev/usb/controller/musb_otg.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/musb_otg.h	Fri May 29 18:46:57 2009	(r193045)
@@ -396,7 +396,7 @@ struct musbotg_softc {
 
 /* prototypes */
 
-usb2_error_t musbotg_init(struct musbotg_softc *sc);
+usb_error_t musbotg_init(struct musbotg_softc *sc);
 void	musbotg_uninit(struct musbotg_softc *sc);
 void	musbotg_suspend(struct musbotg_softc *sc);
 void	musbotg_resume(struct musbotg_softc *sc);

Modified: head/sys/dev/usb/controller/ohci.c
==============================================================================
--- head/sys/dev/usb/controller/ohci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/ohci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -94,7 +94,7 @@ extern struct usb_pipe_methods ohci_devi
 extern struct usb_pipe_methods ohci_device_isoc_methods;
 
 static void ohci_do_poll(struct usb_bus *bus);
-static void ohci_device_done(struct usb_xfer *xfer, usb2_error_t error);
+static void ohci_device_done(struct usb_xfer *xfer, usb_error_t error);
 static void ohci_timeout(void *arg);
 static uint8_t ohci_check_transfer(struct usb_xfer *xfer);
 static void ohci_root_intr(ohci_softc_t *sc);
@@ -120,7 +120,7 @@ ohci_get_hcca(ohci_softc_t *sc)
 }
 
 void
-ohci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
+ohci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
 	struct ohci_softc *sc = OHCI_BUS2SC(bus);
 	uint32_t i;
@@ -143,7 +143,7 @@ ohci_iterate_hw_softc(struct usb_bus *bu
 	}
 }
 
-static usb2_error_t
+static usb_error_t
 ohci_controller_init(ohci_softc_t *sc)
 {
 	struct usb_page_search buf_res;
@@ -289,7 +289,7 @@ ohci_init_ed(struct usb_page_cache *pc)
 	return (ed);
 }
 
-usb2_error_t
+usb_error_t
 ohci_init(ohci_softc_t *sc)
 {
 	struct usb_page_search buf_res;
@@ -812,7 +812,7 @@ static const char *const
 
 #endif
 
-static usb2_error_t
+static usb_error_t
 ohci_non_isoc_done_sub(struct usb_xfer *xfer)
 {
 	ohci_td_t *td;
@@ -908,7 +908,7 @@ ohci_non_isoc_done_sub(struct usb_xfer *
 static void
 ohci_non_isoc_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1645,7 +1645,7 @@ ohci_root_intr(ohci_softc_t *sc)
  * from close and from interrupt
  */
 static void
-ohci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+ohci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_pipe_methods *methods = xfer->pipe->methods;
 	ohci_softc_t *sc = OHCI_BUS2SC(xfer->xroot->bus);
@@ -2106,7 +2106,7 @@ struct usb_hub_descriptor ohci_hubd =
 	{0},
 };
 
-static usb2_error_t
+static usb_error_t
 ohci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2119,7 +2119,7 @@ ohci_roothub_exec(struct usb_device *ude
 	uint16_t value;
 	uint16_t index;
 	uint8_t l;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/ohci.h
==============================================================================
--- head/sys/dev/usb/controller/ohci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/ohci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -352,9 +352,9 @@ typedef struct ohci_softc {
 
 } ohci_softc_t;
 
-usb2_bus_mem_cb_t ohci_iterate_hw_softc;
+usb_bus_mem_cb_t ohci_iterate_hw_softc;
 
-usb2_error_t ohci_init(ohci_softc_t *sc);
+usb_error_t ohci_init(ohci_softc_t *sc);
 void	ohci_detach(struct ohci_softc *sc);
 void	ohci_suspend(ohci_softc_t *sc);
 void	ohci_resume(ohci_softc_t *sc);

Modified: head/sys/dev/usb/controller/uhci.c
==============================================================================
--- head/sys/dev/usb/controller/uhci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/uhci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -134,14 +134,14 @@ extern struct usb_pipe_methods uhci_devi
 
 static uint8_t	uhci_restart(uhci_softc_t *sc);
 static void	uhci_do_poll(struct usb_bus *);
-static void	uhci_device_done(struct usb_xfer *, usb2_error_t);
+static void	uhci_device_done(struct usb_xfer *, usb_error_t);
 static void	uhci_transfer_intr_enqueue(struct usb_xfer *);
 static void	uhci_timeout(void *);
 static uint8_t	uhci_check_transfer(struct usb_xfer *);
 static void	uhci_root_intr(uhci_softc_t *sc);
 
 void
-uhci_iterate_hw_softc(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *cb)
+uhci_iterate_hw_softc(struct usb_bus *bus, usb_bus_mem_sub_cb_t *cb)
 {
 	struct uhci_softc *sc = UHCI_BUS2SC(bus);
 	uint32_t i;
@@ -424,7 +424,7 @@ uhci_init_td(struct usb_page_cache *pc)
 	return (td);
 }
 
-usb2_error_t
+usb_error_t
 uhci_init(uhci_softc_t *sc)
 {
 	uint16_t bit;
@@ -1089,7 +1089,7 @@ uhci_isoc_done(uhci_softc_t *sc, struct 
 	xfer->aframes = xfer->nframes;
 }
 
-static usb2_error_t
+static usb_error_t
 uhci_non_isoc_done_sub(struct usb_xfer *xfer)
 {
 	struct usb_page_search res;
@@ -1205,7 +1205,7 @@ uhci_non_isoc_done_sub(struct usb_xfer *
 static void
 uhci_non_isoc_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1857,7 +1857,7 @@ uhci_setup_standard_chain(struct usb_xfe
  */
 
 static void
-uhci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+uhci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	struct usb_pipe_methods *methods = xfer->pipe->methods;
 	uhci_softc_t *sc = UHCI_BUS2SC(xfer->xroot->bus);
@@ -2392,7 +2392,7 @@ struct usb_hub_descriptor_min uhci_hubd_
  * outstanding "port enable change" and "connection status change"
  * events have been reset.
  */
-static usb2_error_t
+static usb_error_t
 uhci_portreset(uhci_softc_t *sc, uint16_t index)
 {
 	uint16_t port;
@@ -2493,7 +2493,7 @@ done:
 	return (USB_ERR_NORMAL_COMPLETION);
 }
 
-static usb2_error_t
+static usb_error_t
 uhci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -2507,7 +2507,7 @@ uhci_roothub_exec(struct usb_device *ude
 	uint16_t status;
 	uint16_t change;
 	uint16_t len;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/uhci.h
==============================================================================
--- head/sys/dev/usb/controller/uhci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/uhci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -309,9 +309,9 @@ typedef struct uhci_softc {
 	char	sc_vendor[16];		/* vendor string for root hub */
 } uhci_softc_t;
 
-usb2_bus_mem_cb_t uhci_iterate_hw_softc;
+usb_bus_mem_cb_t uhci_iterate_hw_softc;
 
-usb2_error_t uhci_init(uhci_softc_t *sc);
+usb_error_t uhci_init(uhci_softc_t *sc);
 void	uhci_suspend(uhci_softc_t *sc);
 void	uhci_resume(uhci_softc_t *sc);
 void	uhci_reset(uhci_softc_t *sc);

Modified: head/sys/dev/usb/controller/usb_controller.c
==============================================================================
--- head/sys/dev/usb/controller/usb_controller.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/usb_controller.c	Fri May 29 18:46:57 2009	(r193045)
@@ -289,7 +289,7 @@ usb2_bus_attach(struct usb_proc_msg *pm)
 	struct usb_bus *bus;
 	struct usb_device *child;
 	device_t dev;
-	usb2_error_t err;
+	usb_error_t err;
 	enum usb_dev_speed speed;
 
 	bus = ((struct usb_bus_msg *)pm)->bus;
@@ -496,7 +496,7 @@ usb2_bus_mem_flush_all_cb(struct usb_bus
  *------------------------------------------------------------------------*/
 #if USB_HAVE_BUSDMA
 void
-usb2_bus_mem_flush_all(struct usb_bus *bus, usb2_bus_mem_cb_t *cb)
+usb2_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb)
 {
 	if (cb) {
 		cb(bus, &usb2_bus_mem_flush_all_cb);
@@ -530,7 +530,7 @@ usb2_bus_mem_alloc_all_cb(struct usb_bus
  *------------------------------------------------------------------------*/
 uint8_t
 usb2_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat,
-    usb2_bus_mem_cb_t *cb)
+    usb_bus_mem_cb_t *cb)
 {
 	bus->alloc_failed = 0;
 
@@ -580,7 +580,7 @@ usb2_bus_mem_free_all_cb(struct usb_bus 
  *	usb2_bus_mem_free_all - factored out code
  *------------------------------------------------------------------------*/
 void
-usb2_bus_mem_free_all(struct usb_bus *bus, usb2_bus_mem_cb_t *cb)
+usb2_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb)
 {
 #if USB_HAVE_BUSDMA
 	if (cb) {

Modified: head/sys/dev/usb/controller/uss820dci.c
==============================================================================
--- head/sys/dev/usb/controller/uss820dci.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/uss820dci.c	Fri May 29 18:46:57 2009	(r193045)
@@ -81,7 +81,7 @@ static uss820dci_cmd_t uss820dci_setup_r
 static uss820dci_cmd_t uss820dci_data_rx;
 static uss820dci_cmd_t uss820dci_data_tx;
 static uss820dci_cmd_t uss820dci_data_tx_sync;
-static void	uss820dci_device_done(struct usb_xfer *, usb2_error_t);
+static void	uss820dci_device_done(struct usb_xfer *, usb_error_t);
 static void	uss820dci_do_poll(struct usb_bus *);
 static void	uss820dci_standard_done(struct usb_xfer *);
 static void	uss820dci_intr_set(struct usb_xfer *, uint8_t);
@@ -1054,7 +1054,7 @@ uss820dci_root_intr(struct uss820dci_sof
 	    sizeof(sc->sc_hub_idata));
 }
 
-static usb2_error_t
+static usb_error_t
 uss820dci_standard_done_sub(struct usb_xfer *xfer)
 {
 	struct uss820dci_td *td;
@@ -1121,7 +1121,7 @@ uss820dci_standard_done_sub(struct usb_x
 static void
 uss820dci_standard_done(struct usb_xfer *xfer)
 {
-	usb2_error_t err = 0;
+	usb_error_t err = 0;
 
 	DPRINTFN(13, "xfer=%p pipe=%p transfer done\n",
 	    xfer, xfer->pipe);
@@ -1168,7 +1168,7 @@ done:
  * same USB transfer!
  *------------------------------------------------------------------------*/
 static void
-uss820dci_device_done(struct usb_xfer *xfer, usb2_error_t error)
+uss820dci_device_done(struct usb_xfer *xfer, usb_error_t error)
 {
 	USB_BUS_LOCK_ASSERT(xfer->xroot->bus, MA_OWNED);
 
@@ -1298,7 +1298,7 @@ uss820dci_clear_stall(struct usb_device 
 	    (ed->bEndpointAddress & (UE_DIR_IN | UE_DIR_OUT)));
 }
 
-usb2_error_t
+usb_error_t
 uss820dci_init(struct uss820dci_softc *sc)
 {
 	const struct usb_hw_ep_profile *pf;
@@ -1790,7 +1790,7 @@ USB_MAKE_STRING_DESC(STRING_LANG, uss820
 USB_MAKE_STRING_DESC(STRING_VENDOR, uss820dci_vendor);
 USB_MAKE_STRING_DESC(STRING_PRODUCT, uss820dci_product);
 
-static usb2_error_t
+static usb_error_t
 uss820dci_roothub_exec(struct usb_device *udev,
     struct usb_device_request *req, const void **pptr, uint16_t *plength)
 {
@@ -1799,7 +1799,7 @@ uss820dci_roothub_exec(struct usb_device
 	uint16_t len;
 	uint16_t value;
 	uint16_t index;
-	usb2_error_t err;
+	usb_error_t err;
 
 	USB_BUS_LOCK_ASSERT(&sc->sc_bus, MA_OWNED);
 

Modified: head/sys/dev/usb/controller/uss820dci.h
==============================================================================
--- head/sys/dev/usb/controller/uss820dci.h	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/controller/uss820dci.h	Fri May 29 18:46:57 2009	(r193045)
@@ -347,7 +347,7 @@ struct uss820dci_softc {
 
 /* prototypes */
 
-usb2_error_t uss820dci_init(struct uss820dci_softc *sc);
+usb_error_t uss820dci_init(struct uss820dci_softc *sc);
 void	uss820dci_uninit(struct uss820dci_softc *sc);
 void	uss820dci_suspend(struct uss820dci_softc *sc);
 void	uss820dci_resume(struct uss820dci_softc *sc);

Modified: head/sys/dev/usb/input/uhid.c
==============================================================================
--- head/sys/dev/usb/input/uhid.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/input/uhid.c	Fri May 29 18:46:57 2009	(r193045)
@@ -126,17 +126,17 @@ static device_probe_t uhid_probe;
 static device_attach_t uhid_attach;
 static device_detach_t uhid_detach;
 
-static usb2_callback_t uhid_intr_callback;
-static usb2_callback_t uhid_write_callback;
-static usb2_callback_t uhid_read_callback;
-
-static usb2_fifo_cmd_t uhid_start_read;
-static usb2_fifo_cmd_t uhid_stop_read;
-static usb2_fifo_cmd_t uhid_start_write;
-static usb2_fifo_cmd_t uhid_stop_write;
-static usb2_fifo_open_t uhid_open;
-static usb2_fifo_close_t uhid_close;
-static usb2_fifo_ioctl_t uhid_ioctl;
+static usb_callback_t uhid_intr_callback;
+static usb_callback_t uhid_write_callback;
+static usb_callback_t uhid_read_callback;
+
+static usb_fifo_cmd_t uhid_start_read;
+static usb_fifo_cmd_t uhid_stop_read;
+static usb_fifo_cmd_t uhid_start_write;
+static usb_fifo_cmd_t uhid_stop_write;
+static usb_fifo_open_t uhid_open;
+static usb_fifo_close_t uhid_close;
+static usb_fifo_ioctl_t uhid_ioctl;
 
 static struct usb_fifo_methods uhid_fifo_methods = {
 	.f_open = &uhid_open,

Modified: head/sys/dev/usb/input/ukbd.c
==============================================================================
--- head/sys/dev/usb/input/ukbd.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/input/ukbd.c	Fri May 29 18:46:57 2009	(r193045)
@@ -688,7 +688,7 @@ ukbd_attach(device_t dev)
 	int32_t unit = device_get_unit(dev);
 	keyboard_t *kbd = &sc->sc_kbd;
 	void *hid_ptr = NULL;
-	usb2_error_t err;
+	usb_error_t err;
 	uint32_t flags;
 	uint16_t n;
 	uint16_t hid_len;

Modified: head/sys/dev/usb/input/ums.c
==============================================================================
--- head/sys/dev/usb/input/ums.c	Fri May 29 18:35:51 2009	(r193044)
+++ head/sys/dev/usb/input/ums.c	Fri May 29 18:46:57 2009	(r193045)
@@ -136,17 +136,17 @@ struct ums_softc {
 
 static void ums_put_queue_timeout(void *__sc);
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-head mailing list