1 files changed, 18 insertions, 18 deletions

diff --git a/sys/dev/usb/usb_dynamic.h b/sys/dev/usb/usb_dynamic.h
index ec1d783..1c47c52 100644
--- a/sys/dev/usb/usb_dynamic.h
+++ b/sys/dev/usb/usb_dynamic.h
@@ -30,38 +30,38 @@
 /* prototypes */
 
 struct usb_device;
-struct usb_lookup_info;
+struct usbd_lookup_info;
 struct usb_device_request;
 
 /* typedefs */
 
-typedef usb_error_t	(usb2_temp_setup_by_index_t)(struct usb_device *udev,
+typedef usb_error_t	(usb_temp_setup_by_index_t)(struct usb_device *udev,
 			    uint16_t index);
-typedef usb_error_t	(usb2_test_huawei_autoinst_t)(struct usb_device *udev, 
+typedef usb_error_t	(usb_test_huawei_autoinst_t)(struct usb_device *udev, 
 			    struct usb_attach_arg *uaa);
-typedef uint8_t		(usb2_test_quirk_t)(const struct usb_lookup_info *info,
+typedef uint8_t		(usb_test_quirk_t)(const struct usbd_lookup_info *info,
 			    uint16_t quirk);
-typedef int		(usb2_quirk_ioctl_t)(unsigned long cmd, caddr_t data,
+typedef int		(usb_quirk_ioctl_t)(unsigned long cmd, caddr_t data,
 			    int fflag, struct thread *td);
-typedef void		(usb2_temp_unsetup_t)(struct usb_device *udev);
+typedef void		(usb_temp_unsetup_t)(struct usb_device *udev);
 
 /* global function pointers */
 
-extern usb_handle_req_t *usb2_temp_get_desc_p;
-extern usb2_temp_setup_by_index_t *usb2_temp_setup_by_index_p;
-extern usb2_temp_unsetup_t *usb2_temp_unsetup_p;
-extern usb2_test_quirk_t *usb2_test_quirk_p;
-extern usb2_test_huawei_autoinst_t *usb2_test_huawei_autoinst_p;
-extern usb2_quirk_ioctl_t *usb2_quirk_ioctl_p;
-extern devclass_t usb2_devclass_ptr;
+extern usb_handle_req_t *usb_temp_get_desc_p;
+extern usb_temp_setup_by_index_t *usb_temp_setup_by_index_p;
+extern usb_temp_unsetup_t *usb_temp_unsetup_p;
+extern usb_test_quirk_t *usb_test_quirk_p;
+extern usb_test_huawei_autoinst_t *usb_test_huawei_autoinst_p;
+extern usb_quirk_ioctl_t *usb_quirk_ioctl_p;
+extern devclass_t usb_devclass_ptr;
 
 /* function prototypes */
 
-void	usb2_test_huawei_unload(void *);
-void	usb2_temp_unload(void *);
-void	usb2_quirk_unload(void *);
-void	usb2_bus_unload(void *);
+void	usb_test_huawei_unload(void *);
+void	usb_temp_unload(void *);
+void	usb_quirk_unload(void *);
+void	usb_bus_unload(void *);
 
-uint8_t	usb2_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk);
+uint8_t	usb_test_quirk(const struct usb_attach_arg *uaa, uint16_t quirk);
 
 #endif					/* _USB2_DYNAMIC_H_ */