Minor documentation improvements.

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

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index fbb8184..4c96450 100644 (file)
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -37,7 +37,10 @@
 #include "Benito.h"
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */
 #include "Benito.h"
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */

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

 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 volatile struct
 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 volatile struct


@@ -85,7 +88,7 @@ int main(void)
 {
        SetupHardware();
 
 {
        SetupHardware();
 

-       RingBuffer_InitBuffer(&Tx_Buffer);
+       RingBuffer_InitBuffer(&USARTtoUSB_Buffer, USARTtoUSB_Buffer_Data, sizeof(USARTtoUSB_Buffer_Data));

 
        sei();
 
 
        sei();
 


@@ -126,15 +129,25 @@ int main(void)
                          LEDs_TurnOffLEDs(LEDMASK_RX);
 
                        /* Check if the receive buffer flush period has expired */
                          LEDs_TurnOffLEDs(LEDMASK_RX);
 
                        /* Check if the receive buffer flush period has expired */

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

                        if (!(--FlushPeriodRemaining) || (BufferCount > 200))
                        {
                                /* Echo bytes from the target to the host via the virtual serial port */
                                if (BufferCount)
                                {
                                        while (BufferCount--)
                        if (!(--FlushPeriodRemaining) || (BufferCount > 200))
                        {
                                /* Echo bytes from the target to the host via the virtual serial port */
                                if (BufferCount)
                                {
                                        while (BufferCount--)

-                                         CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&Tx_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);
+                                       }
+                       

                                        LEDs_TurnOnLEDs(LEDMASK_RX);
                                        PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
                                }
                                        LEDs_TurnOnLEDs(LEDMASK_RX);
                                        PulseMSRemaining.RxLEDPulse = TX_RX_LED_PULSE_MS;
                                }


@@ -263,7 +276,7 @@ ISR(USART1_RX_vect, ISR_BLOCK)
        uint8_t ReceivedByte = UDR1;
 
        if (USB_DeviceState == DEVICE_STATE_Configured)
        uint8_t ReceivedByte = UDR1;
 
        if (USB_DeviceState == DEVICE_STATE_Configured)

-         RingBuffer_Insert(&Tx_Buffer, ReceivedByte);
+         RingBuffer_Insert(&USARTtoUSB_Buffer, ReceivedByte);

 }
 
 /** Event handler for the CDC Class driver Host-to-Device Line Encoding Changed event.
 }
 
 /** Event handler for the CDC Class driver Host-to-Device Line Encoding Changed event.