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

1 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/usb/usb_controller.h b/sys/dev/usb/usb_controller.h
index 0cd4a07..2d96af9 100644
--- a/sys/dev/usb/usb_controller.h
+++ b/sys/dev/usb/usb_controller.h
@@ -45,8 +45,8 @@ struct usb_endpoint_descriptor;
 
 /* typedefs */
 
-typedef void (usb2_bus_mem_sub_cb_t)(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, usb2_size_t size, usb2_size_t align);
-typedef void (usb2_bus_mem_cb_t)(struct usb_bus *bus, usb2_bus_mem_sub_cb_t *scb);
+typedef void (usb_bus_mem_sub_cb_t)(struct usb_bus *bus, struct usb_page_cache *pc, struct usb_page *pg, size_t size, size_t align);
+typedef void (usb_bus_mem_cb_t)(struct usb_bus *bus, usb_bus_mem_sub_cb_t *scb);
 
 /*
  * The following structure is used to define all the USB BUS
@@ -56,7 +56,7 @@ struct usb_bus_methods {
 
 	/* USB Device and Host mode - Mandatory */
 
-	usb2_handle_request_t *roothub_exec;
+	usb_handle_req_t *roothub_exec;
 
 	void    (*pipe_init) (struct usb_device *, struct usb_endpoint_descriptor *, struct usb_pipe *);
 	void    (*xfer_setup) (struct usb_setup_params *);
@@ -108,11 +108,11 @@ struct usb_pipe_methods {
 
 	/* Mandatory USB Device and Host mode callbacks: */
 
-	usb2_callback_t *open;
-	usb2_callback_t *close;
+	usb_callback_t *open;
+	usb_callback_t *close;
 
-	usb2_callback_t *enter;
-	usb2_callback_t *start;
+	usb_callback_t *enter;
+	usb_callback_t *start;
 
 	/* Optional */
 
@@ -170,21 +170,21 @@ struct usb_hw_ep_scratch {
  */
 struct usb_temp_setup {
 	void   *buf;
-	usb2_size_t size;
+	size_t size;
 	enum usb_dev_speed	usb_speed;
 	uint8_t	self_powered;
 	uint8_t	bNumEndpoints;
 	uint8_t	bInterfaceNumber;
 	uint8_t	bAlternateSetting;
 	uint8_t	bConfigurationValue;
-	usb2_error_t err;
+	usb_error_t err;
 };
 
 /* prototypes */
 
-void	usb2_bus_mem_flush_all(struct usb_bus *bus, usb2_bus_mem_cb_t *cb);
-uint8_t	usb2_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb2_bus_mem_cb_t *cb);
-void	usb2_bus_mem_free_all(struct usb_bus *bus, usb2_bus_mem_cb_t *cb);
+void	usb2_bus_mem_flush_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
+uint8_t	usb2_bus_mem_alloc_all(struct usb_bus *bus, bus_dma_tag_t dmat, usb_bus_mem_cb_t *cb);
+void	usb2_bus_mem_free_all(struct usb_bus *bus, usb_bus_mem_cb_t *cb);
 uint16_t usb2_isoc_time_expand(struct usb_bus *bus, uint16_t isoc_time_curr);
 uint16_t usb2_fs_isoc_schedule_isoc_time_expand(struct usb_device *udev, struct usb_fs_isoc_schedule **pp_start, struct usb_fs_isoc_schedule **pp_end, uint16_t isoc_time);
 uint8_t	usb2_fs_isoc_schedule_alloc(struct usb_fs_isoc_schedule *fss, uint8_t *pstart, uint16_t len);