Switch to using the correct intptr_t type use where a pointer must be cast to an...

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

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index ef311d0..d92e2b4 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;
 
@@ -77,9 +77,9 @@ int main(void)
 {
        SetupHardware();
        
-       Buffer_Initialize(&USBtoUART_Buffer);
-       Buffer_Initialize(&UARTtoUSB_Buffer);
-
+       RingBuffer_InitBuffer(&USBtoUART_Buffer);
+       RingBuffer_InitBuffer(&UARTtoUSB_Buffer);
+       
        LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
        sei();
 
@@ -122,25 +122,12 @@ void USARTBridge_Task(void)
 
        /* 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));
-       }
+         RingBuffer_Insert(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
        
        /* 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);
 }