diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-30 03:52:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-07-30 03:52:11 +0000 |
| commit | 24e621a8d8424721ed21ce329d2a28dbf8c35343 (patch) | |
| tree | a014f41c82dfbb50706e1a911a5da2414b9766fd /Projects | |
| parent | 7c8d16fd7adae430f94004048a7702b7338f5eb1 (diff) | |
| download | lufa-24e621a8d8424721ed21ce329d2a28dbf8c35343.tar.gz lufa-24e621a8d8424721ed21ce329d2a28dbf8c35343.tar.bz2 lufa-24e621a8d8424721ed21ce329d2a28dbf8c35343.zip | |
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.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/Benito/Benito.c | 5 | ||||
| -rw-r--r-- | Projects/USBtoSerial/USBtoSerial.c | 10 | ||||
| -rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 3 |
3 files changed, 8 insertions, 10 deletions
diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c index 23786fb9e..ac1e064d5 100644 --- a/Projects/Benito/Benito.c +++ b/Projects/Benito/Benito.c @@ -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; diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c index 2c2d0c006..d7df3d91f 100644 --- a/Projects/USBtoSerial/USBtoSerial.c +++ b/Projects/USBtoSerial/USBtoSerial.c @@ -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)) diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 28354812f..7a1bcb34d 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -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 */ |