s/usb2_/usb_/ on all C structs for the USB stack.

1 files changed, 26 insertions, 26 deletions

diff --git a/sys/dev/usb/usb_handle_request.c b/sys/dev/usb/usb_handle_request.c
index b74939a..5f73154 100644
--- a/sys/dev/usb/usb_handle_request.c
+++ b/sys/dev/usb/usb_handle_request.c
@@ -51,14 +51,14 @@ enum {
 
 /* function prototypes */
 
-static uint8_t usb2_handle_get_stall(struct usb2_device *, uint8_t);
-static usb2_error_t	 usb2_handle_remote_wakeup(struct usb2_xfer *, uint8_t);
-static usb2_error_t	 usb2_handle_request(struct usb2_xfer *);
-static usb2_error_t	 usb2_handle_set_config(struct usb2_xfer *, uint8_t);
-static usb2_error_t	 usb2_handle_set_stall(struct usb2_xfer *, uint8_t,
+static uint8_t usb2_handle_get_stall(struct usb_device *, uint8_t);
+static usb2_error_t	 usb2_handle_remote_wakeup(struct usb_xfer *, uint8_t);
+static usb2_error_t	 usb2_handle_request(struct usb_xfer *);
+static usb2_error_t	 usb2_handle_set_config(struct usb_xfer *, uint8_t);
+static usb2_error_t	 usb2_handle_set_stall(struct usb_xfer *, uint8_t,
 			    uint8_t);
-static usb2_error_t	 usb2_handle_iface_request(struct usb2_xfer *, void **,
-			    uint16_t *, struct usb2_device_request, uint16_t,
+static usb2_error_t	 usb2_handle_iface_request(struct usb_xfer *, void **,
+			    uint16_t *, struct usb_device_request, uint16_t,
 			    uint8_t);
 
 /*------------------------------------------------------------------------*
@@ -68,7 +68,7 @@ static usb2_error_t	 usb2_handle_iface_request(struct usb2_xfer *, void **,
  * transfers.
  *------------------------------------------------------------------------*/
 void
-usb2_handle_request_callback(struct usb2_xfer *xfer)
+usb2_handle_request_callback(struct usb_xfer *xfer)
 {
 	usb2_error_t err;
 
@@ -107,7 +107,7 @@ usb2_handle_request_callback(struct usb2_xfer *xfer)
 	return;
 
 tr_restart:
-	xfer->frlengths[0] = sizeof(struct usb2_device_request);
+	xfer->frlengths[0] = sizeof(struct usb_device_request);
 	xfer->nframes = 1;
 	xfer->flags.manual_status = 1;
 	xfer->flags.force_short_xfer = 0;
@@ -123,9 +123,9 @@ tr_restart:
  * Else: Failure
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_handle_set_config(struct usb2_xfer *xfer, uint8_t conf_no)
+usb2_handle_set_config(struct usb_xfer *xfer, uint8_t conf_no)
 {
-	struct usb2_device *udev = xfer->xroot->udev;
+	struct usb_device *udev = xfer->xroot->udev;
 	usb2_error_t err = 0;
 
 	/*
@@ -171,13 +171,13 @@ done:
  * Else: Failure
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_handle_iface_request(struct usb2_xfer *xfer,
+usb2_handle_iface_request(struct usb_xfer *xfer,
     void **ppdata, uint16_t *plen,
-    struct usb2_device_request req, uint16_t off, uint8_t state)
+    struct usb_device_request req, uint16_t off, uint8_t state)
 {
-	struct usb2_interface *iface;
-	struct usb2_interface *iface_parent;	/* parent interface */
-	struct usb2_device *udev = xfer->xroot->udev;
+	struct usb_interface *iface;
+	struct usb_interface *iface_parent;	/* parent interface */
+	struct usb_device *udev = xfer->xroot->udev;
 	int error;
 	uint8_t iface_index;
 
@@ -334,9 +334,9 @@ tr_stalled:
  * Else: Failure
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_handle_set_stall(struct usb2_xfer *xfer, uint8_t ep, uint8_t do_stall)
+usb2_handle_set_stall(struct usb_xfer *xfer, uint8_t ep, uint8_t do_stall)
 {
-	struct usb2_device *udev = xfer->xroot->udev;
+	struct usb_device *udev = xfer->xroot->udev;
 	usb2_error_t err;
 
 	USB_XFER_UNLOCK(xfer);
@@ -354,9 +354,9 @@ usb2_handle_set_stall(struct usb2_xfer *xfer, uint8_t ep, uint8_t do_stall)
  * Else: Failure
  *------------------------------------------------------------------------*/
 static uint8_t
-usb2_handle_get_stall(struct usb2_device *udev, uint8_t ea_val)
+usb2_handle_get_stall(struct usb_device *udev, uint8_t ea_val)
 {
-	struct usb2_pipe *pipe;
+	struct usb_pipe *pipe;
 	uint8_t halted;
 
 	pipe = usb2_get_pipe_by_addr(udev, ea_val);
@@ -379,10 +379,10 @@ usb2_handle_get_stall(struct usb2_device *udev, uint8_t ea_val)
  * Else: Failure
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_handle_remote_wakeup(struct usb2_xfer *xfer, uint8_t is_on)
+usb2_handle_remote_wakeup(struct usb_xfer *xfer, uint8_t is_on)
 {
-	struct usb2_device *udev;
-	struct usb2_bus *bus;
+	struct usb_device *udev;
+	struct usb_bus *bus;
 
 	udev = xfer->xroot->udev;
 	bus = udev->bus;
@@ -414,10 +414,10 @@ usb2_handle_remote_wakeup(struct usb2_xfer *xfer, uint8_t is_on)
  * Else: Stall current transfer, if any
  *------------------------------------------------------------------------*/
 static usb2_error_t
-usb2_handle_request(struct usb2_xfer *xfer)
+usb2_handle_request(struct usb_xfer *xfer)
 {
-	struct usb2_device_request req;
-	struct usb2_device *udev;
+	struct usb_device_request req;
+	struct usb_device *udev;
 	const void *src_zcopy;		/* zero-copy source pointer */
 	const void *src_mcopy;		/* non zero-copy source pointer */
 	uint16_t off;			/* data offset */