Altered the CDC Deivice and Host Class drivers' receive byte routines, so that no data is indicated by a negative return value.
Added auto flushing of OUT data to the CDC Host Class driver's USBTask function to automatically flush the send pipe buffer.
This commit is contained in:
parent
7c8d16fd7a
commit
24e621a8d8
13 changed files with 89 additions and 59 deletions
|
@ -92,9 +92,10 @@ int main(void)
|
|||
for (;;)
|
||||
{
|
||||
/* Echo bytes from the host to the target via the hardware USART */
|
||||
if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface) && (UCSR1A & (1 << UDRE1)))
|
||||
int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
|
||||
if (!(ReceivedByte < 0) && (UCSR1A & (1 << UDRE1)))
|
||||
{
|
||||
UDR1 = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
|
||||
UDR1 = ReceivedByte;
|
||||
|
||||
LEDs_TurnOnLEDs(LEDMASK_TX);
|
||||
PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;
|
||||
|
|
|
@ -82,13 +82,9 @@ int main(void)
|
|||
for (;;)
|
||||
{
|
||||
/* Read bytes from the USB OUT endpoint into the USART transmit buffer */
|
||||
for (uint8_t DataBytesRem = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); DataBytesRem != 0; DataBytesRem--)
|
||||
{
|
||||
if (RingBuffer_IsFull(&USBtoUSART_Buffer))
|
||||
break;
|
||||
|
||||
RingBuffer_AtomicInsert(&USBtoUSART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
|
||||
}
|
||||
int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
|
||||
if (!(ReceivedByte < 0) && !(RingBuffer_IsFull(&USBtoUSART_Buffer)))
|
||||
RingBuffer_AtomicInsert(&USBtoUSART_Buffer, (uint8_t)ReceivedByte);
|
||||
|
||||
/* Check if the software USART flush timer has expired */
|
||||
if (TIFR0 & (1 << TOV0))
|
||||
|
|
|
@ -120,7 +120,8 @@ void UARTBridge_Task(void)
|
|||
return;
|
||||
|
||||
/* Read bytes from the USB OUT endpoint into the UART transmit buffer */
|
||||
if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface) && !(RingBuffer_IsFull(&USBtoUART_Buffer)))
|
||||
int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
|
||||
if (!(ReceivedByte < 0) && !(RingBuffer_IsFull(&USBtoUART_Buffer)))
|
||||
RingBuffer_AtomicInsert(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
|
||||
|
||||
/* Check if the software UART flush timer has expired */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue