yemai/CherryUSB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(usbh_serial): don't resubmit the read urb when rx short packet

Browse Source
This commit is contained in:
MDLZCOOL
2025-12-14 00:36:26 +08:00
committed by sakumisu
parent b1ca0406a5
commit 11b91a0283
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
class/serial/usbh_serial.c
View File

@@ -174,6 +174,13 @@ static void usbh_serial_callback(void *arg, int nbytes)
return;
}
if (nbytes < serial->driver->ignore_rx_header) {
USB_LOG_ERR("serial rx short packet: %d\n", nbytes);
serial->rx_errorcode = -USB_ERR_IO;
usb_osal_sem_give(serial->rx_complete_sem);
return;
}
if (nbytes >= serial->driver->ignore_rx_header) {
/* resubmit the read urb */
usbh_bulk_urb_fill(&serial->bulkin_urb, serial->hport, serial->bulkin, &serial->iobuffer[serial->rx_buf_index ? USBH_SERIAL_RX_NOCACHE_OFFSET : USBH_SERIAL_RX2_NOCACHE_OFFSET], serial->bulkin->wMaxPacketSize,
@@ -181,6 +188,9 @@ static void usbh_serial_callback(void *arg, int nbytes)
ret = usbh_submit_urb(&serial->bulkin_urb);
if (ret < 0) {
USB_LOG_ERR("serial submit failed: %d\n", ret);
serial->rx_errorcode = ret;
usb_osal_sem_give(serial->rx_complete_sem);
return;
}
usbh_serial_ringbuffer_write(&serial->rx_rb,
@@ -193,15 +203,6 @@ static void usbh_serial_callback(void *arg, int nbytes)
serial->rx_buf_index ^= 1;
serial->rx_errorcode = 0;
usb_osal_sem_give(serial->rx_complete_sem);
} else {
serial->rx_errorcode = nbytes;
usb_osal_sem_give(serial->rx_complete_sem);
usbh_bulk_urb_fill(&serial->bulkin_urb, serial->hport, serial->bulkin, &serial->iobuffer[serial->rx_buf_index ? USBH_SERIAL_RX2_NOCACHE_OFFSET : USBH_SERIAL_RX_NOCACHE_OFFSET], serial->bulkin->wMaxPacketSize,
0, usbh_serial_callback, serial);
ret = usbh_submit_urb(&serial->bulkin_urb);
if (ret < 0) {
USB_LOG_ERR("serial resubmit short packet failed: %d\n", ret);
}
}
}