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

1 files changed, 17 insertions, 17 deletions

diff --git a/sys/dev/usb/usb_transfer.h b/sys/dev/usb/usb_transfer.h
index 68cf393570d9..9b5a33c81265 100644
--- a/sys/dev/usb/usb_transfer.h
+++ b/sys/dev/usb/usb_transfer.h
@@ -111,28 +111,28 @@ struct usb_setup_params {
 
 /* function prototypes */
 
-uint8_t	usb2_transfer_setup_sub_malloc(struct usb_setup_params *parm,
+uint8_t	usbd_transfer_setup_sub_malloc(struct usb_setup_params *parm,
 	    struct usb_page_cache **ppc, usb_size_t size, usb_size_t align,
 	    usb_size_t count);
-void	usb2_command_wrapper(struct usb_xfer_queue *pq,
+void	usb_command_wrapper(struct usb_xfer_queue *pq,
 	    struct usb_xfer *xfer);
-void	usb2_pipe_enter(struct usb_xfer *xfer);
-void	usb2_pipe_start(struct usb_xfer_queue *pq);
-void	usb2_transfer_dequeue(struct usb_xfer *xfer);
-void	usb2_transfer_done(struct usb_xfer *xfer, usb_error_t error);
-void	usb2_transfer_enqueue(struct usb_xfer_queue *pq,
+void	usbd_pipe_enter(struct usb_xfer *xfer);
+void	usbd_pipe_start(struct usb_xfer_queue *pq);
+void	usbd_transfer_dequeue(struct usb_xfer *xfer);
+void	usbd_transfer_done(struct usb_xfer *xfer, usb_error_t error);
+void	usbd_transfer_enqueue(struct usb_xfer_queue *pq,
 	    struct usb_xfer *xfer);
-void	usb2_transfer_setup_sub(struct usb_setup_params *parm);
-void	usb2_default_transfer_setup(struct usb_device *udev);
-void	usb2_clear_data_toggle(struct usb_device *udev,
+void	usbd_transfer_setup_sub(struct usb_setup_params *parm);
+void	usbd_default_transfer_setup(struct usb_device *udev);
+void	usbd_clear_data_toggle(struct usb_device *udev,
 	    struct usb_endpoint *ep);
-void	usb2_do_poll(struct usb_xfer **ppxfer, uint16_t max);
-usb_callback_t usb2_do_request_callback;
-usb_callback_t usb2_handle_request_callback;
-usb_callback_t usb2_do_clear_stall_callback;
-void	usb2_transfer_timeout_ms(struct usb_xfer *xfer,
+void	usbd_do_poll(struct usb_xfer **ppxfer, uint16_t max);
+usb_callback_t usbd_do_request_callback;
+usb_callback_t usb_handle_request_callback;
+usb_callback_t usb_do_clear_stall_callback;
+void	usbd_transfer_timeout_ms(struct usb_xfer *xfer,
 	    void (*cb) (void *arg), usb_timeout_t ms);
-usb_timeout_t usb2_get_dma_delay(struct usb_bus *bus);
-void	usb2_transfer_power_ref(struct usb_xfer *xfer, int val);
+usb_timeout_t usbd_get_dma_delay(struct usb_bus *bus);
+void	usbd_transfer_power_ref(struct usb_xfer *xfer, int val);
 
 #endif					/* _USB2_TRANSFER_H_ */