From 672bbe434b12d4730cf270f7245753fb98cf162d Mon Sep 17 00:00:00 2001 From: Aidan MacDonald Date: Sun, 19 Sep 2021 10:54:26 +0100 Subject: 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 --- firmware/drivers/isp1583.c | 4 ++-- firmware/drivers/m66591.c | 2 +- firmware/drivers/usb-designware.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/drivers') 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) usb_core_transfer_complete(ep, false, 0, len); } -int usb_drv_recv(int ep, void* ptr, int length) +int usb_drv_recv_nonblocking(int ep, void* ptr, int length) { - logf("usb_drv_recv(%d, 0x%x, %d)", ep, (int)ptr, length); + logf("usb_drv_recv_nonblocking(%d, 0x%x, %d)", ep, (int)ptr, length); if(ep == EP_CONTROL && length == 0 && ptr == NULL) { 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) /* This function begins a receive (on an OUT endpoint), it should not block * so the actual receive is done in the interrupt handler. */ -int usb_drv_recv(int endpoint, void* ptr, int length) +int usb_drv_recv_nonblocking(int endpoint, void* ptr, int length) { return mxx_queue(endpoint, ptr, length, false, false); } 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) usb_dw_target_enable_irq(); } -int usb_drv_recv(int endpoint, void* ptr, int length) +int usb_drv_recv_nonblocking(int endpoint, void* ptr, int length) { int epnum = EP_NUM(endpoint); struct usb_dw_ep* dw_ep = usb_dw_get_ep(epnum, USB_DW_EPDIR_OUT); -- cgit v1.2.3