usb: Rename usb_getFrameExp() to usb_get_period()

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 6e32e044bed85ed05d48d15a90d9cb4579e7c9ed..2376b1fb1bd8aa983fba4528268ca3787a9927fe 100644 (file)
--- a/src/hw/usb-ehci.c
+++ b/src/hw/usb-ehci.c
@@ -386,7 +386,7 @@ ehci_alloc_intr_pipe(struct usbdevice_s *usbdev
 {
     struct usb_ehci_s *cntl = container_of(
         usbdev->hub->cntl, struct usb_ehci_s, usb);
-    int frameexp = usb_getFrameExp(usbdev, epdesc);
+    int frameexp = usb_get_period(usbdev, epdesc);
     dprintf(7, "ehci_alloc_intr_pipe %p %d\n", &cntl->usb, frameexp);
 
     if (frameexp > 10)

diff --git a/src/hw/usb-ohci.c b/src/hw/usb-ohci.c
index b9c5d4c88b892e1e577a3d9a9fe70886dafdfdd3..a91e24d7f70eb394c8245a3448f03e9ea4d98f3d 100644 (file)
--- a/src/hw/usb-ohci.c
+++ b/src/hw/usb-ohci.c
@@ -328,7 +328,7 @@ ohci_alloc_intr_pipe(struct usbdevice_s *usbdev
 {
     struct usb_ohci_s *cntl = container_of(
         usbdev->hub->cntl, struct usb_ohci_s, usb);
-    int frameexp = usb_getFrameExp(usbdev, epdesc);
+    int frameexp = usb_get_period(usbdev, epdesc);
     dprintf(7, "ohci_alloc_intr_pipe %p %d\n", &cntl->usb, frameexp);
 
     if (frameexp > 5)

diff --git a/src/hw/usb-uhci.c b/src/hw/usb-uhci.c
index bd9e31746b482832fdc486f5606918c20f0694c2..a270a82b8997da3bcfa42caa43d1e2038c3cfbbc 100644 (file)
--- a/src/hw/usb-uhci.c
+++ b/src/hw/usb-uhci.c
@@ -287,7 +287,7 @@ uhci_alloc_intr_pipe(struct usbdevice_s *usbdev
 {
     struct usb_uhci_s *cntl = container_of(
         usbdev->hub->cntl, struct usb_uhci_s, usb);
-    int frameexp = usb_getFrameExp(usbdev, epdesc);
+    int frameexp = usb_get_period(usbdev, epdesc);
     dprintf(7, "uhci_alloc_intr_pipe %p %d\n", &cntl->usb, frameexp);
 
     if (frameexp > 10)

diff --git a/src/hw/usb-xhci.c b/src/hw/usb-xhci.c
index 470cece6ee303474b1496914f615671899fa577e..0b8ed641dd1f9542ab3f77e316c3535c47a2730b 100644 (file)
--- a/src/hw/usb-xhci.c
+++ b/src/hw/usb-xhci.c
@@ -1014,7 +1014,7 @@ xhci_alloc_pipe(struct usbdevice_s *usbdev
     in->add = 0x01 | (1 << epid);
     struct xhci_epctx *ep = (void*)&in[(pipe->epid+1) << xhci->context64];
     if (eptype == USB_ENDPOINT_XFER_INT)
-        ep->ctx[0] = (usb_getFrameExp(usbdev, epdesc) + 3) << 16;
+        ep->ctx[0] = (usb_get_period(usbdev, epdesc) + 3) << 16;
     ep->ctx[1]   |= eptype << 3;
     if (epdesc->bEndpointAddress & USB_DIR_IN
         || eptype == USB_ENDPOINT_XFER_CONTROL)

diff --git a/src/hw/usb.c b/src/hw/usb.c
index f870481b4ffddf4a4f67b5451ecf8a637433f843..720e8b07bb07d408af32f63a0bafe9075010501a 100644 (file)
--- a/src/hw/usb.c
+++ b/src/hw/usb.c
@@ -178,8 +178,8 @@ usb_desc2pipe(struct usb_pipe *pipe, struct usbdevice_s *usbdev
 
 // Find the exponential period of the requested interrupt end point.
 int
-usb_getFrameExp(struct usbdevice_s *usbdev
-                , struct usb_endpoint_descriptor *epdesc)
+usb_get_period(struct usbdevice_s *usbdev
+               , struct usb_endpoint_descriptor *epdesc)
 {
     int period = epdesc->bInterval;
     if (usbdev->speed != USB_HIGHSPEED)

diff --git a/src/hw/usb.h b/src/hw/usb.h
index fe80ea638dccb28529c86695a1b845ee41c036aa..0d07032cf3f96205974ec089efee395f568e8965 100644 (file)
--- a/src/hw/usb.h
+++ b/src/hw/usb.h
@@ -239,8 +239,8 @@ void free_pipe(struct usb_pipe *pipe);
 struct usb_pipe *usb_getFreePipe(struct usb_s *cntl, u8 eptype);
 void usb_desc2pipe(struct usb_pipe *pipe, struct usbdevice_s *usbdev
                    , struct usb_endpoint_descriptor *epdesc);
-int usb_getFrameExp(struct usbdevice_s *usbdev
-                    , struct usb_endpoint_descriptor *epdesc);
+int usb_get_period(struct usbdevice_s *usbdev
+                   , struct usb_endpoint_descriptor *epdesc);
 int usb_xfer_time(struct usb_pipe *pipe, int datalen);
 struct usb_endpoint_descriptor *findEndPointDesc(struct usbdevice_s *usbdev
                                                  , int type, int dir);