summaryrefslogtreecommitdiff
path: root/firmware/usbstack/usb_storage.c
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/usbstack/usb_storage.c
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/usbstack/usb_storage.c')
-rw-r--r--firmware/usbstack/usb_storage.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c
index 8e1b507ac4..947006c1ec 100644
--- a/firmware/usbstack/usb_storage.c
+++ b/firmware/usbstack/usb_storage.c
@@ -470,7 +470,7 @@ void usb_storage_init_connection(void)
470 ramdisk_buffer = tb.transfer_buffer + ALLOCATE_BUFFER_SIZE; 470 ramdisk_buffer = tb.transfer_buffer + ALLOCATE_BUFFER_SIZE;
471#endif 471#endif
472#endif 472#endif
473 usb_drv_recv(ep_out, cbw_buffer, MAX_CBW_SIZE); 473 usb_drv_recv_nonblocking(ep_out, cbw_buffer, MAX_CBW_SIZE);
474 474
475 int i; 475 int i;
476 for(i=0;i<storage_num_drives();i++) { 476 for(i=0;i<storage_num_drives();i++) {
@@ -685,7 +685,7 @@ bool usb_storage_control_request(struct usb_ctrlrequest* req, unsigned char* des
685 if(skip_first) (*tb.max_lun) --; 685 if(skip_first) (*tb.max_lun) --;
686#endif 686#endif
687 logf("ums: getmaxlun"); 687 logf("ums: getmaxlun");
688 usb_drv_recv(EP_CONTROL, NULL, 0); /* ack */ 688 usb_drv_recv_nonblocking(EP_CONTROL, NULL, 0); /* ack */
689 usb_drv_send(EP_CONTROL, tb.max_lun, 1); 689 usb_drv_send(EP_CONTROL, tb.max_lun, 1);
690 handled = true; 690 handled = true;
691 break; 691 break;
@@ -1187,14 +1187,14 @@ static void send_command_failed_result(void)
1187#if CONFIG_RTC 1187#if CONFIG_RTC
1188static void receive_time(void) 1188static void receive_time(void)
1189{ 1189{
1190 usb_drv_recv(ep_out, tb.transfer_buffer, 12); 1190 usb_drv_recv_nonblocking(ep_out, tb.transfer_buffer, 12);
1191 state = RECEIVING_TIME; 1191 state = RECEIVING_TIME;
1192} 1192}
1193#endif /* CONFIG_RTC */ 1193#endif /* CONFIG_RTC */
1194 1194
1195static void receive_block_data(void *data,int size) 1195static void receive_block_data(void *data,int size)
1196{ 1196{
1197 usb_drv_recv(ep_out, data, size); 1197 usb_drv_recv_nonblocking(ep_out, data, size);
1198 state = RECEIVING_BLOCKS; 1198 state = RECEIVING_BLOCKS;
1199} 1199}
1200 1200
@@ -1210,7 +1210,7 @@ static void send_csw(int status)
1210 state = WAITING_FOR_CSW_COMPLETION_OR_COMMAND; 1210 state = WAITING_FOR_CSW_COMPLETION_OR_COMMAND;
1211 //logf("CSW: %X",status); 1211 //logf("CSW: %X",status);
1212 /* Already start waiting for the next command */ 1212 /* Already start waiting for the next command */
1213 usb_drv_recv(ep_out, cbw_buffer, MAX_CBW_SIZE); 1213 usb_drv_recv_nonblocking(ep_out, cbw_buffer, MAX_CBW_SIZE);
1214 /* The next completed transfer will be either the CSW one 1214 /* The next completed transfer will be either the CSW one
1215 * or the new command */ 1215 * or the new command */
1216 1216