Documentation improvements - put driver example code into its own section, fix incorr...

[pub/USBasp.git] / Projects / USBtoSerial / USBtoSerial.c

diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c
index 1dfd708..e775541 100644 (file)
--- a/Projects/USBtoSerial/USBtoSerial.c
+++ b/Projects/USBtoSerial/USBtoSerial.c
@@ -39,9 +39,16 @@
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
 RingBuff_t USBtoUSART_Buffer;
 
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
 RingBuff_t USBtoUSART_Buffer;
 

+/** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */
+uint8_t    USBtoUSART_Buffer_Data[128];
+

 /** Circular buffer to hold data from the serial port before it is sent to the host. */
 RingBuff_t USARTtoUSB_Buffer;
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */
 RingBuff_t USARTtoUSB_Buffer;
 

+/** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */
+uint8_t    USARTtoUSB_Buffer_Data[128];
+
+

 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.
 /** LUFA CDC Class driver interface configuration and state information. This structure is
  *  passed to all CDC Class driver functions, so that multiple instances of the same class
  *  within a device can be differentiated from one another.


@@ -73,8 +80,8 @@ int main(void)
 {
        SetupHardware();
 
 {
        SetupHardware();
 

-       RingBuffer_InitBuffer(&USBtoUSART_Buffer);
-       RingBuffer_InitBuffer(&USARTtoUSB_Buffer);
+       RingBuffer_InitBuffer(&USBtoUSART_Buffer, USBtoUSART_Buffer_Data, sizeof(USBtoUSART_Buffer_Data));
+       RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));

 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();


@@ -92,7 +99,7 @@ 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 */

-               RingBuff_Count_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);
+               uint16_t BufferCount = RingBuffer_GetCount(&USARTtoUSB_Buffer);

                if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))
                {
                        /* Clear flush timer expiry flag */
                if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))
                {
                        /* Clear flush timer expiry flag */


@@ -100,7 +107,17 @@ int main(void)
 
                        /* Read bytes from the USART receive buffer into the USB IN endpoint */
                        while (BufferCount--)
 
                        /* Read bytes from the USART receive buffer into the USB IN endpoint */
                        while (BufferCount--)

-                         CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&USARTtoUSB_Buffer));
+                       {
+                               /* Try to send the next byte of data to the host, abort if there is an error without dequeuing */
+                               if (CDC_Device_SendByte(&VirtualSerial_CDC_Interface,
+                                                       RingBuffer_Peek(&USARTtoUSB_Buffer)) != ENDPOINT_READYWAIT_NoError)
+                               {
+                                       break;
+                               }
+
+                               /* Dequeue the already sent byte from the buffer now we have confirmed that no transmission error occurred */
+                               RingBuffer_Remove(&USARTtoUSB_Buffer);
+                       }

                }
 
                /* Load the next byte from the USART transmit buffer into the USART */
                }
 
                /* Load the next byte from the USART transmit buffer into the USART */