djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atmel-samd: Fix non-DEBUG USB cdc. 

I believe the issue was that LTO exacerbates a problem where a CDC
read is initiated but fails and leaves pending_read true
preventing further reads.
This commit is contained in:
Scott Shawcroft 2017-10-31 15:43:45 -07:00
parent 8c7571a75d
commit 268bf6f99e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/atmel-samd/usb.c
View File

@ -107,7 +107,11 @@ static volatile bool pending_read;
static int32_t start_read(void) {
pending_read = true;
return cdcdf_acm_read(cdc_packet_buffer, 64);
int32_t result = cdcdf_acm_read(cdc_packet_buffer, 64);
if (result != ERR_NONE) {
pending_read = false;
}
return result;
}
static bool read_complete(const uint8_t ep, const enum usb_xfer_code rc, const uint32_t count) {
@ -222,7 +226,7 @@ void init_usb(void) {
usbdc_attach();
}
static inline bool cdc_enabled(void) {
static bool cdc_enabled(void) {
if (mp_cdc_enabled) {
return true;
}
@ -239,11 +243,10 @@ static inline bool cdc_enabled(void) {
}
bool usb_bytes_available(void) {
if (!pending_read) {
if (cdc_enabled() && !pending_read) {
start_read();
}
if (usb_rx_count == 0) {
cdc_enabled();
return false;
}
return usb_rx_count > 0;