X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/d57e7369a24dae0125942bfa8f861b1f606a58fb..c37fd0ef91c58003eab6f3a5461d970ea1a22602:/Projects/XPLAINBridge/XPLAINBridge.c

diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c
index 35a3951f4..4ba9fd991 100644
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -76,7 +76,8 @@ RingBuff_t UARTtoUSB_Buffer;
 int main(void)
 {
 	SetupHardware();
-	
+	V2Protocol_Init();
+
 	RingBuffer_InitBuffer(&USBtoUART_Buffer);
 	RingBuffer_InitBuffer(&UARTtoUSB_Buffer);
 	
@@ -86,14 +87,9 @@ int main(void)
 	for (;;)
 	{
 		if (CurrentFirmwareMode == MODE_USART_BRIDGE)
-		{
-			USARTBridge_Task();
-		}
+		  UARTBridge_Task();
 		else
-		{
-			AVRISP_Task();
-			V2Params_UpdateParamValues();
-		}
+		  AVRISP_Task();
 
 		USB_USBTask();
 	}
@@ -105,6 +101,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 */
@@ -119,7 +117,7 @@ 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)
@@ -150,13 +148,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);