s/usb2_/usb_|usbd_/ on all function names for the USB stack.

1 files changed, 18 insertions, 18 deletions

diff --git a/sys/dev/usb/usb_device.h b/sys/dev/usb/usb_device.h
index fc2925a..32af2e2 100644
--- a/sys/dev/usb/usb_device.h
+++ b/sys/dev/usb/usb_device.h
@@ -32,13 +32,13 @@ struct usb_device;		/* linux compat */
 
 #define	USB_DEFAULT_XFER_MAX 2
 
-/* "usb2_parse_config()" commands */
+/* "usb_parse_config()" commands */
 
 #define	USB_CFG_ALLOC 0
 #define	USB_CFG_FREE 1
 #define	USB_CFG_INIT 2
 
-/* "usb2_unconfigure()" flags */
+/* "usb_unconfigure()" flags */
 
 #define	USB_UNCFG_FLAG_NONE 0x00
 #define	USB_UNCFG_FLAG_FREE_SUBDEV 0x01		/* subdevices are freed */
@@ -166,7 +166,7 @@ struct usb_device {
 	struct usb_config_descriptor *cdesc;	/* full config descr */
 	struct usb_hub *hub;		/* only if this is a hub */
 	struct usb_xfer *default_xfer[USB_DEFAULT_XFER_MAX];
-	struct usb_temp_data *usb2_template_ptr;
+	struct usb_temp_data *usb_template_ptr;
 	struct usb_endpoint *ep_curr;	/* current clear stall endpoint */
 #if USB_HAVE_UGEN
 	struct usb_fifo *fifo[USB_FIFO_MAX];
@@ -224,36 +224,36 @@ struct usb_device {
 
 /* globals */
 
-extern int usb2_template;
+extern int usb_template;
 
 /* function prototypes */
 
-struct usb_device *usb2_alloc_device(device_t parent_dev, struct usb_bus *bus,
+struct usb_device *usb_alloc_device(device_t parent_dev, struct usb_bus *bus,
 		    struct usb_device *parent_hub, uint8_t depth,
 		    uint8_t port_index, uint8_t port_no,
 		    enum usb_dev_speed speed, enum usb_hc_mode mode);
-struct usb_endpoint *usb2_get_endpoint(struct usb_device *udev, uint8_t iface_index,
+struct usb_endpoint *usbd_get_endpoint(struct usb_device *udev, uint8_t iface_index,
 		    const struct usb_config *setup);
-struct usb_endpoint *usb2_get_ep_by_addr(struct usb_device *udev, uint8_t ea_val);
-usb_error_t	usb2_interface_count(struct usb_device *udev, uint8_t *count);
-usb_error_t	usb2_probe_and_attach(struct usb_device *udev,
+struct usb_endpoint *usbd_get_ep_by_addr(struct usb_device *udev, uint8_t ea_val);
+usb_error_t	usb_interface_count(struct usb_device *udev, uint8_t *count);
+usb_error_t	usb_probe_and_attach(struct usb_device *udev,
 		    uint8_t iface_index);
-usb_error_t	usb2_reset_iface_endpoints(struct usb_device *udev,
+usb_error_t	usb_reset_iface_endpoints(struct usb_device *udev,
 		    uint8_t iface_index);
-usb_error_t	usb2_set_config_index(struct usb_device *udev, uint8_t index);
-usb_error_t	usb2_set_endpoint_stall(struct usb_device *udev,
+usb_error_t	usbd_set_config_index(struct usb_device *udev, uint8_t index);
+usb_error_t	usbd_set_endpoint_stall(struct usb_device *udev,
 		    struct usb_endpoint *ep, uint8_t do_stall);
-usb_error_t	usb2_suspend_resume(struct usb_device *udev,
+usb_error_t	usb_suspend_resume(struct usb_device *udev,
 		    uint8_t do_suspend);
-void	usb2_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len);
-void	usb2_free_device(struct usb_device *, uint8_t);
+void	usb_devinfo(struct usb_device *udev, char *dst_ptr, uint16_t dst_len);
+void	usb_free_device(struct usb_device *, uint8_t);
 void	*usb2_find_descriptor(struct usb_device *udev, void *id,
 	    uint8_t iface_index, uint8_t type, uint8_t type_mask,
 	    uint8_t subtype, uint8_t subtype_mask);
 void	usb_linux_free_device(struct usb_device *dev);
-uint8_t	usb2_peer_can_wakeup(struct usb_device *udev);
-struct usb_endpoint *usb2_endpoint_foreach(struct usb_device *udev, struct usb_endpoint *ep);
-void	usb2_set_device_state(struct usb_device *udev,
+uint8_t	usb_peer_can_wakeup(struct usb_device *udev);
+struct usb_endpoint *usb_endpoint_foreach(struct usb_device *udev, struct usb_endpoint *ep);
+void	usb_set_device_state(struct usb_device *udev,
 	    enum usb_dev_state state);
 
 #endif					/* _USB2_DEVICE_H_ */