Re-add in old Endpoint/Pipe workaround for unordered pipes - add new ORDERED_EP_CONFI...

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

diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c
index 37a5850..c6cbf02 100644 (file)
--- a/Projects/Benito/Benito.c
+++ b/Projects/Benito/Benito.c
@@ -37,7 +37,7 @@
 #include "Benito.h"
 
 /** Circular buffer to hold data from the serial port before it is sent to the host. */
-RingBuff_t Tx_Buffer;
+RingBuff_t USARTtoUSB_Buffer;
 
 /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */
 volatile struct
@@ -85,17 +85,16 @@ int main(void)
 {
        SetupHardware();
 
-       RingBuffer_InitBuffer(&Tx_Buffer);
+       RingBuffer_InitBuffer(&USARTtoUSB_Buffer);
 
        sei();
 
        for (;;)
        {
                /* Echo bytes from the host to the target via the hardware USART */
-               int16_t ReceivedByte = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
-               if (!(ReceivedByte < 0) && (UCSR1A & (1 << UDRE1)))
+               if ((UCSR1A & (1 << UDRE1)) && CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
                {
-                       UDR1 = ReceivedByte;
+                       UDR1 = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
 
                        LEDs_TurnOnLEDs(LEDMASK_TX);
                        PulseMSRemaining.TxLEDPulse = TX_RX_LED_PULSE_MS;
@@ -127,15 +126,25 @@ int main(void)
                          LEDs_TurnOffLEDs(LEDMASK_RX);
 
                        /* Check if the receive buffer flush period has expired */
-                       RingBuff_Count_t BufferCount = RingBuffer_GetCount(&Tx_Buffer);
+                       RingBuff_Count_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--)
-                                         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;
                                }
@@ -199,8 +208,11 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        LEDs_SetAllLEDs(ConfigSuccess ? LEDS_NO_LEDS : LEDMASK_ERROR);
 }
 
-/** Event handler for the library USB Unhandled Control Request event. */
-void EVENT_USB_Device_UnhandledControlRequest(void)
+/** Event handler for the USB_ControlRequest event. This is used to catch and process control requests sent to
+ *  the device from the USB host before passing along unhandled control requests to the library for processing
+ *  internally.
+ */
+void EVENT_USB_Device_ControlRequest(void)
 {
        CDC_Device_ProcessControlRequest(&VirtualSerial_CDC_Interface);
 }
@@ -261,7 +273,7 @@ ISR(USART1_RX_vect, ISR_BLOCK)
        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.