andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Repeat xfer on USB_PID_OUT if data is larger than MaxPacketSize

Browse Source
This commit is contained in:
verylowfreq
2024-09-09 19:00:46 +09:00
parent c61dfc7c7a
commit dc3e6a59a9
1 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/portable/wch/hcd_ch32_usbfs.c
View File

@@ -405,9 +405,28 @@ void hcd_int_handler(uint8_t rhport, bool in_isr)
case USB_PID_SETUP: case USB_PID_SETUP:
case USB_PID_OUT: case USB_PID_OUT:
{ {
uint16_t xferred_len = edpt_info->current_xfer_bufferlen; uint16_t tx_len = USBOTG_H_FS->HOST_TX_LEN;
hcd_event_xfer_complete(dev_addr, ep_addr, xferred_len, XFER_RESULT_SUCCESS, true); edpt_info->current_xfer_bufferlen -= tx_len;
return; edpt_info->current_xfer_xferred_len += tx_len;
if (edpt_info->current_xfer_bufferlen == 0)
{
LOG_CH32_USBFSH("USB_PID_OUT completed %d bytes\r\n", edpt_info->current_xfer_xferred_len);
hcd_event_xfer_complete(dev_addr, ep_addr, edpt_info->current_xfer_xferred_len, XFER_RESULT_SUCCESS, true);
return;
}
else
{
LOG_CH32_USBFSH("USB_PID_OUT continue...\r\n");
edpt_info->current_xfer_buffer += tx_len;
uint16_t copylen = USBFS_TX_BUF_LEN;
if (copylen > edpt_info->current_xfer_bufferlen)
{
copylen = edpt_info->current_xfer_bufferlen;
}
memcpy(USBFS_TX_Buf, edpt_info->current_xfer_buffer, copylen);
hardware_start_xfer(USB_PID_OUT, ep_addr, edpt_info->data_toggle);
return;
}
} }
case USB_PID_IN: case USB_PID_IN:
{ {
@@ -541,8 +560,13 @@ bool hcd_edpt_xfer(uint8_t rhport, uint8_t dev_addr, uint8_t ep_addr, uint8_t *
else else
{ {
LOG_CH32_USBFSH("hcd_edpt_xfer(): WRITE, ep_addr=0x%02x, len=%d\r\n", ep_addr, buflen); LOG_CH32_USBFSH("hcd_edpt_xfer(): WRITE, ep_addr=0x%02x, len=%d\r\n", ep_addr, buflen);
USBOTG_H_FS->HOST_TX_LEN = buflen; uint16_t copylen = USBFS_TX_BUF_LEN;
memcpy(USBFS_TX_Buf, buffer, buflen); if (copylen > buflen)
{
copylen = buflen;
}
USBOTG_H_FS->HOST_TX_LEN = copylen;
memcpy(USBFS_TX_Buf, buffer, copylen);
return hardware_start_xfer(USB_PID_OUT, ep_addr, edpt_info->data_toggle); return hardware_start_xfer(USB_PID_OUT, ep_addr, edpt_info->data_toggle);
} }
} }