Make XPLAINBridge serial bridge much more reliable for the reception of characters...

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

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 5d76052..2a71c56 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,
                        },
        };
                                .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;
 
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
 RingBuff_t USBtoUART_Buffer;
 


@@ -77,16 +77,16 @@ int main(void)
 {
        SetupHardware();
        
 {
        SetupHardware();
        

-       Buffer_Initialize(&USBtoUART_Buffer);
-       Buffer_Initialize(&UARTtoUSB_Buffer);
-
+       RingBuffer_InitBuffer(&USBtoUART_Buffer);
+       RingBuffer_InitBuffer(&UARTtoUSB_Buffer);
+       

        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        for (;;)
        {
                if (CurrentFirmwareMode == MODE_USART_BRIDGE)
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
        for (;;)
        {
                if (CurrentFirmwareMode == MODE_USART_BRIDGE)

-                 USARTBridge_Task();
+                 UARTBridge_Task();

                else
                  AVRISP_Task();
 
                else
                  AVRISP_Task();
 


@@ -100,6 +100,8 @@ void AVRISP_Task(void)
        if (USB_DeviceState != DEVICE_STATE_Configured)
          return;
 
        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 */
        Endpoint_SelectEndpoint(AVRISP_DATA_OUT_EPNUM);
        
        /* Check to see if a V2 Protocol command has been received */


@@ -114,32 +116,19 @@ 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 */
 {
        /* 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 (!(BUFF_STATICSIZE - USBtoUART_Buffer.Elements))
-                 break;
-                 
-               Buffer_StoreElement(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
-       }
+       if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
+         RingBuffer_Insert(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));

        
        /* Read bytes from the UART receive buffer into the USB IN endpoint */
        
        /* 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());
+       if (UARTtoUSB_Buffer.Count)
+         CDC_Device_SendByte(&VirtualSerial_CDC_Interface, RingBuffer_Remove(&UARTtoUSB_Buffer));

 
        CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
 }
 
        CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
 }


@@ -159,12 +148,12 @@ void SetupHardware(void)
        LEDs_Init();
        USB_Init();
        V2Protocol_Init();
        LEDs_Init();
        USB_Init();
        V2Protocol_Init();

-       
+

        /* Disable JTAG debugging */
        MCUCR |= (1 << JTD);
        MCUCR |= (1 << JTD);
 
        /* 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);
 
        PORTF |= (1 << 7);
        _delay_ms(10);
 


@@ -192,7 +181,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
                                                                                                    ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,
                                                                                                    ENDPOINT_BANK_SINGLE);
 
                                                                                                    ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,
                                                                                                    ENDPOINT_BANK_SINGLE);
 

-               #if defined(LIBUSB_FILTERDRV_COMPAT)
+               #if defined(LIBUSB_DRIVER_COMPAT)

                EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,
                                                                    ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
                                                                    ENDPOINT_BANK_SINGLE);
                EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,
                                                                    ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
                                                                    ENDPOINT_BANK_SINGLE);