diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2021-09-19 10:54:26 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2021-09-20 22:41:29 +0100 |
commit | 672bbe434b12d4730cf270f7245753fb98cf162d (patch) | |
tree | 3fdaa08ddc41f942336c968bb169e8806c7c3fa8 /firmware/usbstack/usb_core.c | |
parent | 99f333c64f13c3f9a62b9f5e184ae87f053bf65a (diff) | |
download | rockbox-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/usbstack/usb_core.c')
-rw-r--r-- | firmware/usbstack/usb_core.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index b291dc7655..bf73c58abc 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c | |||
@@ -674,7 +674,7 @@ static void request_handler_device_get_descriptor(struct usb_ctrlrequest* req) | |||
674 | if (ptr != response_data) | 674 | if (ptr != response_data) |
675 | memcpy(response_data, ptr, length); | 675 | memcpy(response_data, ptr, length); |
676 | 676 | ||
677 | usb_drv_recv(EP_CONTROL, NULL, 0); | 677 | usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); |
678 | usb_drv_send(EP_CONTROL, response_data, length); | 678 | usb_drv_send(EP_CONTROL, response_data, length); |
679 | } | 679 | } |
680 | } | 680 | } |
@@ -725,7 +725,7 @@ static void request_handler_device(struct usb_ctrlrequest* req) | |||
725 | case USB_REQ_GET_CONFIGURATION: { | 725 | case USB_REQ_GET_CONFIGURATION: { |
726 | logf("usb_core: GET_CONFIG"); | 726 | logf("usb_core: GET_CONFIG"); |
727 | response_data[0] = (usb_state == ADDRESS ? 0 : 1); | 727 | response_data[0] = (usb_state == ADDRESS ? 0 : 1); |
728 | usb_drv_recv(EP_CONTROL, NULL, 0); | 728 | usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); |
729 | usb_drv_send(EP_CONTROL, response_data, 1); | 729 | usb_drv_send(EP_CONTROL, response_data, 1); |
730 | break; | 730 | break; |
731 | } | 731 | } |
@@ -759,7 +759,7 @@ static void request_handler_device(struct usb_ctrlrequest* req) | |||
759 | case USB_REQ_GET_STATUS: | 759 | case USB_REQ_GET_STATUS: |
760 | response_data[0] = 0; | 760 | response_data[0] = 0; |
761 | response_data[1] = 0; | 761 | response_data[1] = 0; |
762 | usb_drv_recv(EP_CONTROL, NULL, 0); | 762 | usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); |
763 | usb_drv_send(EP_CONTROL, response_data, 2); | 763 | usb_drv_send(EP_CONTROL, response_data, 2); |
764 | break; | 764 | break; |
765 | default: | 765 | default: |
@@ -781,7 +781,7 @@ static void request_handler_interface_standard(struct usb_ctrlrequest* req) | |||
781 | case USB_REQ_GET_INTERFACE: | 781 | case USB_REQ_GET_INTERFACE: |
782 | logf("usb_core: GET_INTERFACE"); | 782 | logf("usb_core: GET_INTERFACE"); |
783 | response_data[0] = 0; | 783 | response_data[0] = 0; |
784 | usb_drv_recv(EP_CONTROL, NULL, 0); | 784 | usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); |
785 | usb_drv_send(EP_CONTROL, response_data, 1); | 785 | usb_drv_send(EP_CONTROL, response_data, 1); |
786 | break; | 786 | break; |
787 | case USB_REQ_CLEAR_FEATURE: | 787 | case USB_REQ_CLEAR_FEATURE: |
@@ -791,7 +791,7 @@ static void request_handler_interface_standard(struct usb_ctrlrequest* req) | |||
791 | case USB_REQ_GET_STATUS: | 791 | case USB_REQ_GET_STATUS: |
792 | response_data[0] = 0; | 792 | response_data[0] = 0; |
793 | response_data[1] = 0; | 793 | response_data[1] = 0; |
794 | usb_drv_recv(EP_CONTROL, NULL, 0); | 794 | usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); |
795 | usb_drv_send(EP_CONTROL, response_data, 2); | 795 | usb_drv_send(EP_CONTROL, response_data, 2); |
796 | break; | 796 | break; |
797 | default: | 797 | default: |
@@ -860,7 +860,7 @@ static void request_handler_endpoint_standard(struct usb_ctrlrequest* req) | |||
860 | response_data[0] = usb_drv_stalled(EP_NUM(req->wIndex), | 860 | response_data[0] = usb_drv_stalled(EP_NUM(req->wIndex), |
861 | EP_DIR(req->wIndex)); | 861 | EP_DIR(req->wIndex)); |
862 | 862 | ||
863 | usb_drv_recv(EP_CONTROL, NULL, 0); | 863 | usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); |
864 | usb_drv_send(EP_CONTROL, response_data, 2); | 864 | usb_drv_send(EP_CONTROL, response_data, 2); |
865 | break; | 865 | break; |
866 | default: | 866 | default: |