Send ZLP in USB_Send if TRANSFER_RELEASE is set on ep

sandeepmistry · sandeepmistry · commit bc808248d75e · 2015-11-17T11:41:09.000-05:00
as suggested by @embmicro
diff --git a/hardware/arduino/avr/cores/arduino/USBCore.cpp b/hardware/arduino/avr/cores/arduino/USBCore.cpp
@@ -302,9 +302,15 @@ int USB_Send(u8 ep, const void* d, int len)
 				while (n--)
 					Send8(*data++);
 			}
-			_sendZlp[ep & USB_ENDPOINTS_MASK] = !ReadWriteAllowed() && (len == 0);
-			if (!ReadWriteAllowed() || ((len == 0) && (ep & TRANSFER_RELEASE)))	// Release full buffer
+			_sendZlp[ep & USB_ENDPOINTS_MASK] = !ReadWriteAllowed() && (len == 0) && !(ep & TRANSFER_RELEASE);
+
+			if (!ReadWriteAllowed())	// Release full buffer
+				ReleaseTX();
+
+			if ((len == 0) && (ep & TRANSFER_RELEASE)) {
+				while(!ReadWriteAllowed());
 				ReleaseTX();
+			}
 		}
 	}
 	TXLED1;					// light the TX LED

Original file line number	Diff line number	Diff line change
`@@ -302,9 +302,15 @@ int USB_Send(u8 ep, const void* d, int len)`
`302`	`302`	`while (n--)`
`303`	`303`	`Send8(*data++);`
`304`	`304`	`}`
`305`		`- _sendZlp[ep & USB_ENDPOINTS_MASK] = !ReadWriteAllowed() && (len == 0);`
`306`		`- if (!ReadWriteAllowed() \|\| ((len == 0) && (ep & TRANSFER_RELEASE))) // Release full buffer`
	`305`	`+ _sendZlp[ep & USB_ENDPOINTS_MASK] = !ReadWriteAllowed() && (len == 0) && !(ep & TRANSFER_RELEASE);`
	`306`	`+`
	`307`	`+ if (!ReadWriteAllowed()) // Release full buffer`
	`308`	`+ ReleaseTX();`
	`309`	`+`
	`310`	`+ if ((len == 0) && (ep & TRANSFER_RELEASE)) {`
	`311`	`+ while(!ReadWriteAllowed());`
`307`	`312`	`ReleaseTX();`
	`313`	`+ }`
`308`	`314`	`}`
`309`	`315`	`}`
`310`	`316`	`TXLED1; // light the TX LED`