usb: Rename ?hci_control() to ?hci_send_control()

This is just function renaming - no code implementation changes.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/src/hw/usb-ehci.c b/src/hw/usb-ehci.c
index f5ee5bf7aee0bc44d40f974ed1b883dbd8de2d7d..6e32e044bed85ed05d48d15a90d9cb4579e7c9ed 100644 (file)
--- a/src/hw/usb-ehci.c
+++ b/src/hw/usb-ehci.c
@@ -550,8 +550,8 @@ fillTDbuffer(struct ehci_qtd *td, u16 maxpacket, const void *buf, int bytes)
 }
 
 int
-ehci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-             , void *data, int datasize)
+ehci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                  , void *data, int datasize)
 {
     ASSERT32FLAT();
     if (! CONFIG_USB_EHCI)

diff --git a/src/hw/usb-ehci.h b/src/hw/usb-ehci.h
index fcb8d949e03f3b40d5cd5bc67307bfe1a186a2cf..6346d78a3445b69cb36016314ab91655267a40e4 100644 (file)
--- a/src/hw/usb-ehci.h
+++ b/src/hw/usb-ehci.h
@@ -8,8 +8,8 @@ struct usb_endpoint_descriptor;
 struct usb_pipe *ehci_alloc_pipe(struct usbdevice_s *usbdev
                                  , struct usb_endpoint_descriptor *epdesc);
 struct usb_pipe;
-int ehci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-                 , void *data, int datasize);
+int ehci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                      , void *data, int datasize);
 int ehci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize);
 int ehci_poll_intr(struct usb_pipe *p, void *data);
 

diff --git a/src/hw/usb-ohci.c b/src/hw/usb-ohci.c
index 7a22057710dd3f651be977bf085f8f2cedf0dad1..b9c5d4c88b892e1e577a3d9a9fe70886dafdfdd3 100644 (file)
--- a/src/hw/usb-ohci.c
+++ b/src/hw/usb-ohci.c
@@ -443,8 +443,8 @@ wait_ed(struct ohci_ed *ed, int timeout)
 }
 
 int
-ohci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-             , void *data, int datasize)
+ohci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                  , void *data, int datasize)
 {
     if (! CONFIG_USB_OHCI)
         return -1;

diff --git a/src/hw/usb-ohci.h b/src/hw/usb-ohci.h
index 3cae21ff26afee6dde34c1dc234c7ab88fa49588..14d2b1ab0a491051a0b92d2ec7637c4b60e08a9c 100644 (file)
--- a/src/hw/usb-ohci.h
+++ b/src/hw/usb-ohci.h
@@ -8,8 +8,8 @@ struct usb_endpoint_descriptor;
 struct usb_pipe *ohci_alloc_pipe(struct usbdevice_s *usbdev
                                  , struct usb_endpoint_descriptor *epdesc);
 struct usb_pipe;
-int ohci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-                 , void *data, int datasize);
+int ohci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                      , void *data, int datasize);
 int ohci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize);
 int ohci_poll_intr(struct usb_pipe *p, void *data);
 

diff --git a/src/hw/usb-uhci.c b/src/hw/usb-uhci.c
index a34f6dbf988f0e9ace730e8b821ef10ad92f288c..bd9e31746b482832fdc486f5606918c20f0694c2 100644 (file)
--- a/src/hw/usb-uhci.c
+++ b/src/hw/usb-uhci.c
@@ -441,8 +441,8 @@ wait_td(struct uhci_td *td, u32 end)
 }
 
 int
-uhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-             , void *data, int datasize)
+uhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                  , void *data, int datasize)
 {
     ASSERT32FLAT();
     if (! CONFIG_USB_UHCI)

diff --git a/src/hw/usb-uhci.h b/src/hw/usb-uhci.h
index 2916465627c34b0a451a3c47a240987c75f6304e..6b675bbdd204f2563a2934ae86f59391be6f19eb 100644 (file)
--- a/src/hw/usb-uhci.h
+++ b/src/hw/usb-uhci.h
@@ -8,8 +8,8 @@ struct usb_endpoint_descriptor;
 struct usb_pipe *uhci_alloc_pipe(struct usbdevice_s *usbdev
                                  , struct usb_endpoint_descriptor *epdesc);
 struct usb_pipe;
-int uhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-                 , void *data, int datasize);
+int uhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                      , void *data, int datasize);
 int uhci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize);
 int uhci_poll_intr(struct usb_pipe *p, void *data);
 

diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c
index eafa4cb4884678ed878bb81807bc03d7ee6ec9cb..470cece6ee303474b1496914f615671899fa577e 100644 (file)
--- a/src/hw/usb-xhci.c
+++ b/src/hw/usb-xhci.c
@@ -1113,8 +1113,8 @@ xhci_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *upipe
 }
 
 int
-xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-             , void *data, int datalen)
+xhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                  , void *data, int datalen)
 {
     if (!CONFIG_USB_XHCI)
         return -1;

diff --git a/src/hw/usb-xhci.h b/src/hw/usb-xhci.h
index bd98d173846f88f66a7d3df2c9044c8a0028ffb4..7639409bd6d855063ee742a81a2e92a16cb354d3 100644 (file)
--- a/src/hw/usb-xhci.h
+++ b/src/hw/usb-xhci.h
@@ -14,8 +14,8 @@ struct usb_pipe *xhci_alloc_pipe(struct usbdevice_s *usbdev
 struct usb_pipe *xhci_update_pipe(struct usbdevice_s *usbdev
                                   , struct usb_pipe *pipe
                                   , struct usb_endpoint_descriptor *epdesc);
-int xhci_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
-                 , void *data, int datasize);
+int xhci_send_control(struct usb_pipe *p, int dir, const void *cmd, int cmdsize
+                      , void *data, int datasize);
 int xhci_send_bulk(struct usb_pipe *p, int dir, void *data, int datasize);
 int xhci_poll_intr(struct usb_pipe *p, void *data);
 

diff --git a/src/hw/usb.c b/src/hw/usb.c
index 153e15302538c3b72c3f750d29feedabe1debfa9..f870481b4ffddf4a4f67b5451ecf8a637433f843 100644 (file)
--- a/src/hw/usb.c
+++ b/src/hw/usb.c
@@ -60,20 +60,20 @@ usb_update_pipe(struct usbdevice_s *usbdev, struct usb_pipe *pipe
 
 // Send a message on a control pipe using the default control descriptor.
 static int
-send_control(struct usb_pipe *pipe, int dir, const void *cmd, int cmdsize
-             , void *data, int datasize)
+usb_send_control(struct usb_pipe *pipe, int dir, const void *cmd, int cmdsize
+                 , void *data, int datasize)
 {
     ASSERT32FLAT();
     switch (pipe->type) {
     default:
     case USB_TYPE_UHCI:
-        return uhci_control(pipe, dir, cmd, cmdsize, data, datasize);
+        return uhci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
     case USB_TYPE_OHCI:
-        return ohci_control(pipe, dir, cmd, cmdsize, data, datasize);
+        return ohci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
     case USB_TYPE_EHCI:
-        return ehci_control(pipe, dir, cmd, cmdsize, data, datasize);
+        return ehci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
     case USB_TYPE_XHCI:
-        return xhci_control(pipe, dir, cmd, cmdsize, data, datasize);
+        return xhci_send_control(pipe, dir, cmd, cmdsize, data, datasize);
     }
 }
 
@@ -128,8 +128,8 @@ int
 send_default_control(struct usb_pipe *pipe, const struct usb_ctrlrequest *req
                      , void *data)
 {
-    return send_control(pipe, req->bRequestType & USB_DIR_IN
-                        , req, sizeof(*req), data, req->wLength);
+    return usb_send_control(pipe, req->bRequestType & USB_DIR_IN
+                            , req, sizeof(*req), data, req->wLength);
 }
 
 // Free an allocated control or bulk pipe.