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

Merge branch 'cdc_read' of https://github.com/HiFiPhile/tinyusb into HiFiPhile-cdc_read

Browse Source
This commit is contained in:
hathach
2021-03-12 12:49:44 +07:00
parent 1cdd1b0209 5caad485f1
commit 4310941daa
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/class/cdc/cdc_device.c
View File

@@ -432,25 +432,24 @@ bool cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_
// Received new data // Received new data
if ( ep_addr == p_cdc->ep_out ) if ( ep_addr == p_cdc->ep_out )
{ {
// TODO search for wanted char first for better performance tu_fifo_write_n(&p_cdc->rx_ff, &p_cdc->epout_buf, xferred_bytes);
for(uint32_t i=0; i<xferred_bytes; i++)
{ // Check for wanted char and invoke callback if needed
tu_fifo_write(&p_cdc->rx_ff, &p_cdc->epout_buf[i]); if (tud_cdc_rx_wanted_cb && ( ((signed char) p_cdc->wanted_char) != -1)) {
for (uint32_t i=0; i<xferred_bytes; i++) {
// Check for wanted char and invoke callback if needed if ( p_cdc->wanted_char == p_cdc->epout_buf[i] && tu_fifo_count(&p_cdc->rx_ff) ) {
if ( tud_cdc_rx_wanted_cb && ( ((signed char) p_cdc->wanted_char) != -1 ) && ( p_cdc->wanted_char == p_cdc->epout_buf[i] ) ) tud_cdc_rx_wanted_cb(itf, p_cdc->wanted_char);
{ }
tud_cdc_rx_wanted_cb(itf, p_cdc->wanted_char);
} }
} }
// invoke receive callback (if there is still data) // invoke receive callback (if there is still data)
if (tud_cdc_rx_cb && tu_fifo_count(&p_cdc->rx_ff) ) tud_cdc_rx_cb(itf); if (tud_cdc_rx_cb && tu_fifo_count(&p_cdc->rx_ff) ) tud_cdc_rx_cb(itf);
// prepare for OUT transaction // prepare for OUT transaction
_prep_out_transaction(p_cdc); _prep_out_transaction(p_cdc);
} }
// Data sent to host, we continue to fetch from tx fifo to send. // Data sent to host, we continue to fetch from tx fifo to send.
// Note: This will cause incorrect baudrate set in line coding. // Note: This will cause incorrect baudrate set in line coding.
// Though maybe the baudrate is not really important !!! // Though maybe the baudrate is not really important !!!