Add API support signature to the CDC and DFU class bootloaders, so that the applicati...

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

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 25307d3..6dc1859 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -64,16 +64,16 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface =
        };
 
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */
        };
 
 /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */

-RingBuffer_t USBtoUART_Buffer;
+RingBuffer_t   USBtoUART_Buffer;

 
 /** Underlying data buffer for \ref USBtoUART_Buffer, where the stored bytes are located. */
 
 /** Underlying data buffer for \ref USBtoUART_Buffer, where the stored bytes are located. */

-uint8_t      USBtoUART_Buffer_Data[128];
+static uint8_t USBtoUART_Buffer_Data[128];

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

-RingBuffer_t UARTtoUSB_Buffer;
+RingBuffer_t   UARTtoUSB_Buffer;

 
 /** Underlying data buffer for \ref UARTtoUSB_Buffer, where the stored bytes are located. */
 
 /** Underlying data buffer for \ref UARTtoUSB_Buffer, where the stored bytes are located. */

-uint8_t      UARTtoUSB_Buffer_Data[128];
+static uint8_t UARTtoUSB_Buffer_Data[128];

 
 
 /** Main program entry point. This routine contains the overall program flow, including initial
 
 
 /** Main program entry point. This routine contains the overall program flow, including initial


@@ -134,7 +134,7 @@ void UARTBridge_Task(void)
                if (!(ReceivedByte < 0))
                  RingBuffer_Insert(&USBtoUART_Buffer, ReceivedByte);
        }
                if (!(ReceivedByte < 0))
                  RingBuffer_Insert(&USBtoUART_Buffer, ReceivedByte);
        }

-       
+

        /* Check if the UART receive buffer flush timer has expired or buffer is nearly full */
        uint16_t BufferCount = RingBuffer_GetCount(&UARTtoUSB_Buffer);
        if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))
        /* Check if the UART receive buffer flush timer has expired or buffer is nearly full */
        uint16_t BufferCount = RingBuffer_GetCount(&UARTtoUSB_Buffer);
        if ((TIFR0 & (1 << TOV0)) || (BufferCount > 200))


@@ -181,7 +181,7 @@ void SetupHardware(void)
 
        /* Enable pull-up on the JTAG TDI pin so we can use it to select the mode */
        PORTF |= (1 << 7);
 
        /* Enable pull-up on the JTAG TDI pin so we can use it to select the mode */
        PORTF |= (1 << 7);

-       _delay_ms(10);
+       Delay_MS(10);

 
        /* Select the firmware mode based on the JTD pin's value */
        CurrentFirmwareMode = (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER;
 
        /* Select the firmware mode based on the JTD pin's value */
        CurrentFirmwareMode = (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER;