X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/9c037a952f5aaf78c4e13398506cfa2d588bb449..3a3a4e2abf7ac55dcc438ad95e7c11f9566b825f:/Projects/XPLAINBridge/XPLAINBridge.c?ds=inline

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index ce23862dd..f08dfc5c7 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -76,19 +76,14 @@ RingBuff_t UARTtoUSB_Buffer;
 int main(void)
 {
 	SetupHardware();
-	
-	USBtoUART_Buffer.In  = USBtoUART_Buffer.Buffer;
-	USBtoUART_Buffer.Out = USBtoUART_Buffer.Buffer;
-	UARTtoUSB_Buffer.In  = UARTtoUSB_Buffer.Buffer;
-	UARTtoUSB_Buffer.Out = UARTtoUSB_Buffer.Buffer;
-	
+
 	LEDs_SetAllLEDs(LEDMASK_USB_NOTREADY);
 	sei();
 
 	for (;;)
 	{
 		if (CurrentFirmwareMode == MODE_USART_BRIDGE)
-		  USARTBridge_Task();
+		  UARTBridge_Task();
 		else
 		  AVRISP_Task();
 
@@ -102,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 */
@@ -116,43 +113,24 @@ 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--)
-	{
-		*USBtoUART_Buffer.In = CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
-
-		if (++USBtoUART_Buffer.In == &USBtoUART_Buffer.Buffer[128])
-		  USBtoUART_Buffer.In = USBtoUART_Buffer.Buffer;
-	}
-	
-	/* Read bytes from the UART receive buffer into the USB IN endpoint */
-	if (UARTtoUSB_Buffer.In != UARTtoUSB_Buffer.Out)
-	{
-		CDC_Device_SendByte(&VirtualSerial_CDC_Interface, *UARTtoUSB_Buffer.Out);
-		if (++UARTtoUSB_Buffer.Out == &UARTtoUSB_Buffer.Buffer[128])
-		  UARTtoUSB_Buffer.Out = UARTtoUSB_Buffer.Buffer;
-	}
+	if (CDC_Device_BytesReceived(&VirtualSerial_CDC_Interface))
+	  RingBuffer_AtomicInsert(&USBtoUART_Buffer, CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface));
 	
-	/* Load bytes from the UART transmit buffer into the UART */
-	if ((USBtoUART_Buffer.In != USBtoUART_Buffer.Out) && SoftUART_IsReady())
+	/* Check if the software UART flush timer has expired */
+	if (TIFR0 & (1 << TOV0))
 	{
-		SoftUART_TxByte(*USBtoUART_Buffer.Out);
-		if (++USBtoUART_Buffer.Out == &USBtoUART_Buffer.Buffer[128])
-		  USBtoUART_Buffer.Out = USBtoUART_Buffer.Buffer;
-	}
-	
-	/* Load bytes from the UART into the UART receive buffer */
-	if (SoftUART_IsReceived())
-	{
-		*UARTtoUSB_Buffer.In = SoftUART_RxByte();
-		if (++UARTtoUSB_Buffer.In == &UARTtoUSB_Buffer.Buffer[128])
-		  UARTtoUSB_Buffer.In = UARTtoUSB_Buffer.Buffer;		
+		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));
 	}
 
 	CDC_Device_USBTask(&VirtualSerial_CDC_Interface);
@@ -172,18 +150,17 @@ 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);
 
 	/* Select the firmware mode based on the JTD pin's value */
-	CurrentFirmwareMode = MODE_USART_BRIDGE; // TEMP (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER;
+	CurrentFirmwareMode = (PINF & (1 << 7)) ? MODE_USART_BRIDGE : MODE_PDI_PROGRAMMER;
 
 	/* Re-enable JTAG debugging */
 	MCUCR &= ~(1 << JTD);
@@ -199,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
 	{
@@ -211,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)