X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ceb16ee24f1e6add5e2ad0398369c24d2d868cd8..a5e79333e5769f92558bf20458c165e2582a0cb6:/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c?ds=inline

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 6f0d87add..6adb24f16 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -165,6 +165,10 @@ void XPROGTarget_EnableTargetPDI(void)
 	BITBANG_PDIDATA_DDR  |= BITBANG_PDIDATA_MASK;
 	BITBANG_PDICLOCK_DDR |= BITBANG_PDICLOCK_MASK;
 	
+	/* Set DATA line low for at least 90ns to ensure that the device is ready for PDI mode to be entered */
+	BITBANG_PDIDATA_PORT &= ~BITBANG_PDIDATA_MASK;
+	_delay_us(1);
+
 	/* Set DATA line high for at least 90ns to disable /RESET functionality */
 	BITBANG_PDIDATA_PORT |= BITBANG_PDIDATA_MASK;
 	_delay_us(1);
@@ -314,6 +318,9 @@ void XPROGTarget_SendByte(const uint8_t Byte)
 	SoftUSART_Data     = NewUSARTData;
 	SoftUSART_BitCount = BITS_IN_USART_FRAME;
 #endif
+
+    if (TimeoutMSRemaining)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
 }
 
 /** Receives a byte via the software USART, blocking until data is received.
@@ -328,29 +335,16 @@ uint8_t XPROGTarget_ReceiveByte(void)
 
 #if defined(XPROG_VIA_HARDWARE_USART)
 	/* Wait until a byte has been received before reading */
-	while (!(UCSR1A & (1 << RXC1)) && TimeoutMSRemaining)
-	{
-		/* Manage software timeout */
-		if (TIFR0 & (1 << OCF0A))
-		{
-			TIFR0 |= (1 << OCF0A);
-			TimeoutMSRemaining--;
-		}	
-	}
+	while (!(UCSR1A & (1 << RXC1)) && TimeoutMSRemaining);
 	
+	if (TimeoutMSRemaining)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
+
 	return UDR1;
 #else
 	/* Wait until a byte has been received before reading */
 	SoftUSART_BitCount = BITS_IN_USART_FRAME;
-	while (SoftUSART_BitCount && TimeoutMSRemaining)
-	{
-		/* Manage software timeout */
-		if (TIFR0 & (1 << OCF0A))
-		{
-			TIFR0 |= (1 << OCF0A);
-			TimeoutMSRemaining--;
-		}
-	}
+	while (SoftUSART_BitCount && TimeoutMSRemaining);
 
 	if (TimeoutMSRemaining)
 	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
@@ -382,6 +376,9 @@ void XPROGTarget_SendBreak(void)
 	SoftUSART_Data     = 0x0FFF;
 	SoftUSART_BitCount = BITS_IN_USART_FRAME;
 #endif
+
+    if (TimeoutMSRemaining)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
 }
 
 static void XPROGTarget_SetTxMode(void)
@@ -399,14 +396,7 @@ static void XPROGTarget_SetTxMode(void)
 		
 	IsSending = true;
 #else
-	while (SoftUSART_BitCount && TimeoutMSRemaining)
-	{	
-		if (TIFR0 & (1 << OCF0A))
-		{
-			TIFR0 |= (1 << OCF0A);
-			TimeoutMSRemaining--;
-		}
-	}
+	while (SoftUSART_BitCount && TimeoutMSRemaining);
 	
 	/* Wait for a full cycle of the clock */
 	SoftUSART_Data     = 0x0001;
@@ -425,6 +415,9 @@ static void XPROGTarget_SetTxMode(void)
 	}
 #endif
 
+    if (TimeoutMSRemaining)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
+
 	IsSending = true;
 }
 
@@ -440,14 +433,7 @@ static void XPROGTarget_SetRxMode(void)
 	DDRD   &= ~(1 << 3);
 	PORTD  &= ~(1 << 3);
 #else
-	while (SoftUSART_BitCount && TimeoutMSRemaining)
-	{	
-		if (TIFR0 & (1 << OCF0A))
-		{
-			TIFR0 |= (1 << OCF0A);
-			TimeoutMSRemaining--;
-		}
-	}
+	while (SoftUSART_BitCount && TimeoutMSRemaining);
 
 	if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
 	{
@@ -455,15 +441,7 @@ static void XPROGTarget_SetRxMode(void)
 		BITBANG_PDIDATA_PORT &= ~BITBANG_PDIDATA_MASK;
 
 		/* Wait until DATA line has been pulled up to idle by the target */
-		while (!(BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK) && TimeoutMSRemaining)
-		{
-			/* Manage software timeout */
-			if (TIFR0 & (1 << OCF0A))
-			{
-				TIFR0 |= (1 << OCF0A);
-				TimeoutMSRemaining--;
-			}
-		}
+		while (!(BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK) && TimeoutMSRemaining);
 	}
 	else
 	{
@@ -471,15 +449,7 @@ static void XPROGTarget_SetRxMode(void)
 		BITBANG_TPIDATA_PORT &= ~BITBANG_TPIDATA_MASK;
 
 		/* Wait until DATA line has been pulled up to idle by the target */
-		while (!(BITBANG_TPIDATA_PIN & BITBANG_TPIDATA_MASK) && TimeoutMSRemaining)
-		{
-			/* Manage software timeout */
-			if (TIFR0 & (1 << OCF0A))
-			{
-				TIFR0 |= (1 << OCF0A);
-				TimeoutMSRemaining--;
-			}
-		}	
+		while (!(BITBANG_TPIDATA_PIN & BITBANG_TPIDATA_MASK) && TimeoutMSRemaining);
 	}	
 #endif