diff options
| author | Cristian Maglie <c.maglie@arduino.cc> | 2017-01-04 18:40:13 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2017-03-16 19:35:47 +0200 |
| commit | 3b0765979d6ed1b689e65381e264c34b071a01b4 (patch) | |
| tree | 732cfe11af23e1232d562fb31e10cc423b5e8bfd | |
| parent | f27e8fe194508afca766d21098a841e87a82b099 (diff) | |
[AVR] USB send ZLP when needed
See #5732 #4864 #4138 #3946
| -rw-r--r-- | cores/arduino/USBCore.cpp | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/cores/arduino/USBCore.cpp b/cores/arduino/USBCore.cpp index efac25e..e85c613 100644 --- a/cores/arduino/USBCore.cpp +++ b/cores/arduino/USBCore.cpp @@ -273,7 +273,9 @@ int USB_Send(u8 ep, const void* d, int len) int r = len; const u8* data = (const u8*)d; u8 timeout = 250; // 250ms timeout on send? TODO - while (len) + bool sendZlp = false; + + while (len || sendZlp) { u8 n = USB_SendSpace(ep); if (n == 0) @@ -284,13 +286,16 @@ int USB_Send(u8 ep, const void* d, int len) continue; } - if (n > len) + if (n > len) { n = len; + } + { LockEP lock(ep); // Frame may have been released by the SOF interrupt handler if (!ReadWriteAllowed()) continue; + len -= n; if (ep & TRANSFER_ZERO) { @@ -307,8 +312,17 @@ int USB_Send(u8 ep, const void* d, int len) while (n--) Send8(*data++); } - if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE))) // Release full buffer + + if (sendZlp) { + ReleaseTX(); + sendZlp = false; + } else if (!ReadWriteAllowed()) { // ...release if buffer is full... ReleaseTX(); + if (len == 0) sendZlp = true; + } else if ((len == 0) && (ep & TRANSFER_RELEASE)) { // ...or if forced with TRANSFER_RELEASE + // XXX: TRANSFER_RELEASE is never used can be removed? + ReleaseTX(); + } } } TXLED1; // light the TX LED @@ -473,7 +487,7 @@ static bool SendConfiguration(int maxlen) { // Count and measure interfaces - InitControl(0); + InitControl(0); u8 interfaces = SendInterfaces(); ConfigDescriptor config = D_CONFIG(_cmark + sizeof(ConfigDescriptor),interfaces); |