Add AVRStudio 4 project files to the ClassDriver Device mode demos.

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

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index ef311d0..f08dfc5 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -62,7 +62,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
                                .NotificationEndpointDoubleBank = false,
                        },
        };
-       
+
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
 RingBuff_t USBtoUART_Buffer;
 
@@ -76,9 +76,6 @@ RingBuff_t UARTtoUSB_Buffer;
 int main(void)
 {
        SetupHardware();
-       
-       Buffer_Initialize(&USBtoUART_Buffer);
-       Buffer_Initialize(&UARTtoUSB_Buffer);
 
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
@@ -86,7 +83,7 @@ int main(void)
        for (;;)
        {
                if (CurrentFirmwareMode == MODE_USART_BRIDGE)
-                 USARTBridge_Task();
+                 UARTBridge_Task();
                else
                  AVRISP_Task();
 
@@ -100,6 +97,8 @@ void AVRISP_Task(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
+       V2Params_UpdateParamValues();
+
        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */
@@ -114,32 +113,25 @@ void AVRISP_Task(void)
        }
 }
 
-void USARTBridge_Task(void)
+void UARTBridge_Task(void)
 {
        /* Must be in the configured state for the USART Bridge code to process data */
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
        /* Read bytes from the USB OUT endpoint into the UART transmit buffer */
-       for (uint8_t DataBytesRem = CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface); DataBytesRem != 0; DataBytesRem--)
+       if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
+         RingBuffer_AtomicInsert(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
+       
+       /* Check if the software UART flush timer has expired */
+       if (TIFR0 & (1 << TOV0))
        {
-               if (!(BUFF_STATICSIZE - USBtoUART_Buffer.Elements))
-                 break;
-                 
-               Buffer_StoreElement(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
+               TIFR0 |= (1 << TOV0);
+
+               /* Read bytes from the UART receive buffer into the USB IN endpoint */
+               while (UARTtoUSB_Buffer.Count)
+                 CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_AtomicRemove(&UARTtoUSB_Buffer));
        }
-       
-       /* Read bytes from the UART receive buffer into the USB IN endpoint */
-       if (UARTtoUSB_Buffer.Elements)
-         CDC_Device_SendByte(&VirtualSerial_CDC_Interface, Buffer_GetElement(&UARTtoUSB_Buffer));
-       
-       /* Load bytes from the UART transmit buffer into the UART */
-       if ((USBtoUART_Buffer.Elements) && SoftUART_IsReady())
-         SoftUART_TxByte(Buffer_GetElement(&USBtoUART_Buffer));
-       
-       /* Load bytes from the UART into the UART receive buffer */
-       if (SoftUART_IsReceived())
-         Buffer_StoreElement(&UARTtoUSB_Buffer, SoftUART_RxByte());
 
        CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
 }
@@ -158,13 +150,12 @@ void SetupHardware(void)
        SoftUART_Init();
        LEDs_Init();
        USB_Init();
-       V2Protocol_Init();
-       
+
        /* Disable JTAG debugging */
        MCUCR |= (1 << JTD);
        MCUCR |= (1 << JTD);
 
-       /* Enable pullup on the JTAG TDI pin so we can use it to select the mode */
+       /* Enable pull-up on the JTAG TDI pin so we can use it to select the mode */
        PORTF |= (1 << 7);
        _delay_ms(10);
 
@@ -185,6 +176,13 @@ void EVENT_USB_Device_ConfigurationChanged(void)
        if (CurrentFirmwareMode == MODE_USART_BRIDGE)
        {
                EndpointConfigSuccess &= CDC_Device_ConfigureEndpoints(&VirtualSerial_CDC_Interface);
+
+               /* Configure the UART flush timer - run at Fcpu/1024 for maximum interval before overflow */
+               TCCR0B = ((1 << CS02) | (1 << CS00));
+
+               /* Initialize ring buffers used to hold serial data between USB and software UART interfaces */
+               RingBuffer_InitBuffer(&USBtoUART_Buffer);
+               RingBuffer_InitBuffer(&UARTtoUSB_Buffer);
        }
        else
        {
@@ -197,6 +195,9 @@ void EVENT_USB_Device_ConfigurationChanged(void)
                                                                    ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
                                                                    ENDPOINT_BANK_SINGLE);
                #endif
+       
+               /* Configure the V2 protocol packet handler */
+               V2Protocol_Init();
        }
 
        if (EndpointConfigSuccess)