kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #883 from hathach/fix-rp2040-host-transferred-bytes 

fix computing transferred bytes with E4
This commit is contained in:
Ha Thach 2021-06-10 11:35:51 +07:00 committed by GitHub
parent 14fc0987ac 501de2a5e8
commit 3c4ab6bd8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/portable/raspberrypi/rp2040/rp2040_usb.c
View File

@ -205,10 +205,7 @@ void _hw_endpoint_xfer_sync(struct hw_endpoint *ep)
// Update hw endpoint struct with info from hardware // Update hw endpoint struct with info from hardware
// after a buff status interrupt // after a buff status interrupt
// Get the buffer state and amount of bytes we have
// transferred
uint32_t buf_ctrl = _hw_endpoint_buffer_control_get_value32(ep); uint32_t buf_ctrl = _hw_endpoint_buffer_control_get_value32(ep);
uint16_t transferred_bytes = buf_ctrl & USB_BUF_CTRL_LEN_MASK;
#if TUSB_OPT_HOST_ENABLED #if TUSB_OPT_HOST_ENABLED
// RP2040-E4 // RP2040-E4
@ -227,6 +224,9 @@ void _hw_endpoint_xfer_sync(struct hw_endpoint *ep)
// end::host_buf_sel_fix[] // end::host_buf_sel_fix[]
#endif #endif
// Get tranferred bytes after adjusted buf sel
uint16_t const transferred_bytes = buf_ctrl & USB_BUF_CTRL_LEN_MASK;
// We are continuing a transfer here. If we are TX, we have successfullly // We are continuing a transfer here. If we are TX, we have successfullly
// sent some data can increase the length we have sent // sent some data can increase the length we have sent
if (!ep->rx) if (!ep->rx)
@ -249,7 +249,7 @@ void _hw_endpoint_xfer_sync(struct hw_endpoint *ep)
// Sometimes the host will send less data than we expect... // Sometimes the host will send less data than we expect...
// If this is a short out transfer update the total length of the transfer // If this is a short out transfer update the total length of the transfer
// to be the current length // to be the current length
if ((ep->rx) && (transferred_bytes < ep->transfer_size)) if ((ep->rx) && (transferred_bytes < ep->wMaxPacketSize))
{ {
pico_trace("Short rx transfer\n"); pico_trace("Short rx transfer\n");
// Reduce total length as this is last packet // Reduce total length as this is last packet
@ -289,8 +289,7 @@ bool _hw_endpoint_xfer_continue(struct hw_endpoint *ep)
{ {
pico_trace("Completed transfer of %d bytes on ep %d %s\n", pico_trace("Completed transfer of %d bytes on ep %d %s\n",
ep->len, tu_edpt_number(ep->ep_addr), ep_dir_string[tu_edpt_dir(ep->ep_addr)]); ep->len, tu_edpt_number(ep->ep_addr), ep_dir_string[tu_edpt_dir(ep->ep_addr)]);
// Notify caller we are done so it can notify the tinyusb // Notify caller we are done so it can notify the tinyusb stack
// stack
_hw_endpoint_lock_update(ep, -1); _hw_endpoint_lock_update(ep, -1);
return true; return true;
} }