ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix XPLAINBridge project discarding characters from the USB interface due to a double read from the endpoint.

Browse source 
Make XPLAINBridge and USBtoSerial projects more reliable by forcing a flush if the UART-to-USB buffer becomes nearly full.

Reduce locking in the LightweightRingBuffer.h header files by only locking on the update of the buffer count, and require insertions and removals from each buffer to occur in only one execution thread.

Fix CDC_*_ReceiveByte() returning 0 when the interface is not configured, instead of the new -1 error value.

Fix CDC_Host_ReceiveByte() not re-freezing the pipe if no packet has been received.

Remove redundant Pipe token set commands in the CDC and RNDIS host class drivers.
This commit is contained in:
Dean Camera 2010-08-01 14:03:13 +00:00
parent fb0e6597b6
commit ff09cf9c73
13 changed files with 278 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/USBtoSerial/USBtoSerial.c
View file

@ -84,21 +84,22 @@ int main(void)
/* Read bytes from the USB OUT endpoint into the USART transmit buffer */
int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
if (!(ReceivedByte < 0) && !(RingBuffer_IsFull(&USBtoUSART_Buffer)))
RingBuffer_AtomicInsert(&USBtoUSART_Buffer, (uint8_t)ReceivedByte);
RingBuffer_Insert(&USBtoUSART_Buffer, ReceivedByte);
/* Check if the UART receive buffer flush timer has expired */
if (TIFR0 & (1 << TOV0))
/* Check if the UART receive buffer flush timer has expired or the buffer is nearly full */
RingBuff_Count_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))
{
TIFR0 |= (1 << TOV0);
/* Read bytes from the USART receive buffer into the USB IN endpoint */
while (USARTtoUSB_Buffer.Count)
CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_AtomicRemove(&USARTtoUSB_Buffer));
while (BufferCount--)
CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&USARTtoUSB_Buffer));
}
/* Load the next byte from the USART transmit buffer into the USART */
if (USBtoUSART_Buffer.Count)
Serial_TxByte(RingBuffer_AtomicRemove(&USBtoUSART_Buffer));
if (!(RingBuffer_IsEmpty(&USBtoUSART_Buffer)))
Serial_TxByte(RingBuffer_Remove(&USBtoUSART_Buffer));
CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
USB_USBTask();