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

1 files changed, 19 insertions, 19 deletions

diff --git a/sys/dev/usb/usb_debug.c b/sys/dev/usb/usb_debug.c
index 5a18701..d8be33a 100644
--- a/sys/dev/usb/usb_debug.c
+++ b/sys/dev/usb/usb_debug.c
@@ -37,21 +37,21 @@
  * Define this unconditionally in case a kernel module is loaded that
  * has been compiled with debugging options.
  */
-int	usb2_debug = 0;
+int	usb_debug = 0;
 
 SYSCTL_NODE(_hw, OID_AUTO, usb, CTLFLAG_RW, 0, "USB debugging");
 SYSCTL_INT(_hw_usb, OID_AUTO, debug, CTLFLAG_RW,
-    &usb2_debug, 0, "Debug level");
+    &usb_debug, 0, "Debug level");
 
 /*------------------------------------------------------------------------*
- *	usb2_dump_iface
+ *	usb_dump_iface
  *
  * This function dumps information about an USB interface.
  *------------------------------------------------------------------------*/
 void
-usb2_dump_iface(struct usb_interface *iface)
+usb_dump_iface(struct usb_interface *iface)
 {
-	printf("usb2_dump_iface: iface=%p\n", iface);
+	printf("usb_dump_iface: iface=%p\n", iface);
 	if (iface == NULL) {
 		return;
 	}
@@ -60,14 +60,14 @@ usb2_dump_iface(struct usb_interface *iface)
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_dump_device
+ *	usb_dump_device
  *
  * This function dumps information about an USB device.
  *------------------------------------------------------------------------*/
 void
-usb2_dump_device(struct usb_device *udev)
+usb_dump_device(struct usb_device *udev)
 {
-	printf("usb2_dump_device: dev=%p\n", udev);
+	printf("usb_dump_device: dev=%p\n", udev);
 	if (udev == NULL) {
 		return;
 	}
@@ -80,16 +80,16 @@ usb2_dump_device(struct usb_device *udev)
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_dump_queue
+ *	usb_dump_queue
  *
  * This function dumps the USB transfer that are queued up on an USB endpoint.
  *------------------------------------------------------------------------*/
 void
-usb2_dump_queue(struct usb_endpoint *ep)
+usb_dump_queue(struct usb_endpoint *ep)
 {
 	struct usb_xfer *xfer;
 
-	printf("usb2_dump_queue: endpoint=%p xfer: ", ep);
+	printf("usb_dump_queue: endpoint=%p xfer: ", ep);
 	TAILQ_FOREACH(xfer, &ep->endpoint_q.head, wait_entry) {
 		printf(" %p", xfer);
 	}
@@ -97,15 +97,15 @@ usb2_dump_queue(struct usb_endpoint *ep)
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_dump_endpoint
+ *	usb_dump_endpoint
  *
  * This function dumps information about an USB endpoint.
  *------------------------------------------------------------------------*/
 void
-usb2_dump_endpoint(struct usb_endpoint *ep)
+usb_dump_endpoint(struct usb_endpoint *ep)
 {
 	if (ep) {
-		printf("usb2_dump_endpoint: endpoint=%p", ep);
+		printf("usb_dump_endpoint: endpoint=%p", ep);
 
 		printf(" edesc=%p isoc_next=%d toggle_next=%d",
 		    ep->edesc, ep->isoc_next, ep->toggle_next);
@@ -115,22 +115,22 @@ usb2_dump_endpoint(struct usb_endpoint *ep)
 			    ep->edesc->bEndpointAddress);
 		}
 		printf("\n");
-		usb2_dump_queue(ep);
+		usb_dump_queue(ep);
 	} else {
-		printf("usb2_dump_endpoint: endpoint=NULL\n");
+		printf("usb_dump_endpoint: endpoint=NULL\n");
 	}
 }
 
 /*------------------------------------------------------------------------*
- *	usb2_dump_xfer
+ *	usb_dump_xfer
  *
  * This function dumps information about an USB transfer.
  *------------------------------------------------------------------------*/
 void
-usb2_dump_xfer(struct usb_xfer *xfer)
+usb_dump_xfer(struct usb_xfer *xfer)
 {
 	struct usb_device *udev;
-	printf("usb2_dump_xfer: xfer=%p\n", xfer);
+	printf("usb_dump_xfer: xfer=%p\n", xfer);
 	if (xfer == NULL) {
 		return;
 	}