summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2021-09-19 10:54:26 +0100
committerAidan MacDonald <amachronic@protonmail.com>2021-09-20 22:41:29 +0100
commit672bbe434b12d4730cf270f7245753fb98cf162d (patch)
tree3fdaa08ddc41f942336c968bb169e8806c7c3fa8 /firmware/drivers
parent99f333c64f13c3f9a62b9f5e184ae87f053bf65a (diff)
downloadrockbox-672bbe434b12d4730cf270f7245753fb98cf162d.tar.gz
rockbox-672bbe434b12d4730cf270f7245753fb98cf162d.zip
usb: rename usb_drv_recv() to usb_recv_recv_nonblocking()
IMHO the current name is somewhat misleading: - usb_drv_send() is blocking and we have usb_drv_send_nonblocking() for the non-blocking case. This inconsistent naming can only promote confusion. (And what would we call a blocking receive?) - Other hardware abstraction APIs in Rockbox are usually blocking: storage, LCD, backlight, audio... in other words, blocking is the default expected behavior, with non-blocking calls being a rarity. Change-Id: I05b41088d09eab582697674f4f06fdca0c8950af
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/isp1583.c4
-rw-r--r--firmware/drivers/m66591.c2
-rw-r--r--firmware/drivers/usb-designware.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/firmware/drivers/isp1583.c b/firmware/drivers/isp1583.c
index c028d2fa01..18a4e9c720 100644
--- a/firmware/drivers/isp1583.c
+++ b/firmware/drivers/isp1583.c
@@ -531,9 +531,9 @@ static void in_callback(int ep, unsigned char *buf, int len)
531 usb_core_transfer_complete(ep, false, 0, len); 531 usb_core_transfer_complete(ep, false, 0, len);
532} 532}
533 533
534int usb_drv_recv(int ep, void* ptr, int length) 534int usb_drv_recv_nonblocking(int ep, void* ptr, int length)
535{ 535{
536 logf("usb_drv_recv(%d, 0x%x, %d)", ep, (int)ptr, length); 536 logf("usb_drv_recv_nonblocking(%d, 0x%x, %d)", ep, (int)ptr, length);
537 if(ep == EP_CONTROL && length == 0 && ptr == NULL) 537 if(ep == EP_CONTROL && length == 0 && ptr == NULL)
538 { 538 {
539 usb_status_ack(ep, DIR_TX); 539 usb_status_ack(ep, DIR_TX);
diff --git a/firmware/drivers/m66591.c b/firmware/drivers/m66591.c
index d09b269f33..5da1908290 100644
--- a/firmware/drivers/m66591.c
+++ b/firmware/drivers/m66591.c
@@ -869,7 +869,7 @@ int usb_drv_send(int endpoint, void* ptr, int length)
869/* This function begins a receive (on an OUT endpoint), it should not block 869/* This function begins a receive (on an OUT endpoint), it should not block
870 * so the actual receive is done in the interrupt handler. 870 * so the actual receive is done in the interrupt handler.
871 */ 871 */
872int usb_drv_recv(int endpoint, void* ptr, int length) 872int usb_drv_recv_nonblocking(int endpoint, void* ptr, int length)
873{ 873{
874 return mxx_queue(endpoint, ptr, length, false, false); 874 return mxx_queue(endpoint, ptr, length, false, false);
875} 875}
diff --git a/firmware/drivers/usb-designware.c b/firmware/drivers/usb-designware.c
index 375fd8be74..ab4c6037b5 100644
--- a/firmware/drivers/usb-designware.c
+++ b/firmware/drivers/usb-designware.c
@@ -1333,7 +1333,7 @@ void usb_drv_release_endpoint(int endpoint)
1333 usb_dw_target_enable_irq(); 1333 usb_dw_target_enable_irq();
1334} 1334}
1335 1335
1336int usb_drv_recv(int endpoint, void* ptr, int length) 1336int usb_drv_recv_nonblocking(int endpoint, void* ptr, int length)
1337{ 1337{
1338 int epnum = EP_NUM(endpoint); 1338 int epnum = EP_NUM(endpoint);
1339 struct usb_dw_ep* dw_ep = usb_dw_get_ep(epnum, USB_DW_EPDIR_OUT); 1339 struct usb_dw_ep* dw_ep = usb_dw_get_ep(epnum, USB_DW_EPDIR_OUT);