eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Increased throughput in the USBtoSerial project now that data transmission is non-blocking (thanks to Joseph Lacerte).

This commit is contained in:
Dean Camera 2012-10-20 11:31:24 +00:00
parent 1f33bc2fd3
commit fe49fd51b2
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/DoxygenPages/ChangeLog.txt
View File

@ -22,7 +22,7 @@
* - Added workaround for broken VBUS detection on AVR8 devices when a bootloader starts the application * - Added workaround for broken VBUS detection on AVR8 devices when a bootloader starts the application
* via a software jump without first turning off the OTG pad (thanks to Simon Inns) * via a software jump without first turning off the OTG pad (thanks to Simon Inns)
* - Library Applications: * - Library Applications:
* - <i>None</i> * - Increased throughput in the USBtoSerial project now that data transmission is non-blocking (thanks to Joseph Lacerte)
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - Core: * - Core:

10
Projects/USBtoSerial/USBtoSerial.c
View File

@ -106,17 +106,14 @@ int main(void)
/* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */ /* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer); uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
if ((TIFR0 & (1 << TOV0)) || (BufferCount > (uint8_t)(sizeof(USARTtoUSB_Buffer_Data) * .75))) if (BufferCount)
{ {
Endpoint_SelectEndpoint(VirtualSerial_CDC_Interface.Config.DataINEndpoint.Address); Endpoint_SelectEndpoint(VirtualSerial_CDC_Interface.Config.DataINEndpoint.Address);
/* Check if a packet is already enqueued to the host - if so, we shouldn't try to send more data /* Check if a packet is already enqueued to the host - if so, we shouldn't try to send more data
* until it completes as there is a chance nothing is listening and a lengthy timeout could occur */ * until it completes as there is a chance nothing is listening and a lengthy timeout could occur */
if (Endpoint_IsINReady()) if (Endpoint_IsINReady())
{ {
/* Clear flush timer expiry flag */
TIFR0 |= (1 << TOV0);
/* Never send more than one bank size less one byte to the host at a time, so that we don't block /* Never send more than one bank size less one byte to the host at a time, so that we don't block
* while a Zero Length Packet (ZLP) to terminate the transfer is sent if the host isn't listening */ * while a Zero Length Packet (ZLP) to terminate the transfer is sent if the host isn't listening */
uint8_t BytesToSend = MIN(BufferCount, (CDC_TXRX_EPSIZE - 1)); uint8_t BytesToSend = MIN(BufferCount, (CDC_TXRX_EPSIZE - 1));
@ -159,9 +156,6 @@ void SetupHardware(void)
/* Hardware Initialization */ /* Hardware Initialization */
LEDs_Init(); LEDs_Init();
USB_Init(); USB_Init();
/* Start the flush timer so that overflows occur rapidly to push received bytes to the USB interface */
TCCR0B = (1 << CS02);
} }
/** Event handler for the library USB Connection event. */ /** Event handler for the library USB Connection event. */