X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/2059fd8b1a4c79f37811bb27fa568a97c56936a4..9a1560dc050f79fd189838a87ce623e79ff48677:/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 05d5ec9a4..e75adbe10 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -53,7 +53,7 @@ volatile uint16_t           SoftUSART_Data;
 ISR(TIMER1_COMPA_vect, ISR_BLOCK)
 {
 	/* Toggle CLOCK pin in a single cycle (see AVR datasheet) */
-	BITBANG_PDICLOCK_PIN |= BITBANG_PDICLOCK_MASK;
+	BITBANG_PDICLOCK_PIN = BITBANG_PDICLOCK_MASK;
 
 	/* If not sending or receiving, just exit */
 	if (!(SoftUSART_BitCount))
@@ -69,9 +69,9 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
 		/* Wait for the start bit when receiving */
 		if ((SoftUSART_BitCount == BITS_IN_USART_FRAME) && (BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK))
 		  return;
-	
+
 		/* Shift in the bit one less than the frame size in position, so that the start bit will eventually
-		 * be discarded leaving the data to be byte-aligned for quick access */
+		 * be discarded leaving the data to be byte-aligned for quick access (subtract 9 as we are ORing to the MSB) */
 		if (BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK)
 		  ((uint8_t*)&SoftUSART_Data)[1] |= (1 << (BITS_IN_USART_FRAME - 9));
 
@@ -91,15 +91,15 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
 		  BITBANG_PDIDATA_PORT &= ~BITBANG_PDIDATA_MASK;		  
 
 		SoftUSART_Data >>= 1;
-		SoftUSART_BitCount--;
+		SoftUSART_BitCount--;	
 	}
 }
 
 /** ISR to manage the TPI software USART when bit-banged TPI USART mode is selected. */
-ISR(TIMER1_COMPB_vect, ISR_BLOCK)
+ISR(TIMER1_CAPT_vect, ISR_BLOCK)
 {
 	/* Toggle CLOCK pin in a single cycle (see AVR datasheet) */
-	BITBANG_TPICLOCK_PIN |= BITBANG_TPICLOCK_MASK;
+	BITBANG_TPICLOCK_PIN = BITBANG_TPICLOCK_MASK;
 
 	/* If not sending or receiving, just exit */
 	if (!(SoftUSART_BitCount))
@@ -117,7 +117,7 @@ ISR(TIMER1_COMPB_vect, ISR_BLOCK)
 		  return;
 	
 		/* Shift in the bit one less than the frame size in position, so that the start bit will eventually
-		 * be discarded leaving the data to be byte-aligned for quick access */
+		 * be discarded leaving the data to be byte-aligned for quick access (subtract 9 as we are ORing to the MSB) */
 		if (BITBANG_TPIDATA_PIN & BITBANG_TPIDATA_MASK)
 		 ((uint8_t*)&SoftUSART_Data)[1] |= (1 << (BITS_IN_USART_FRAME - 9));
 
@@ -154,12 +154,10 @@ void XPROGTarget_EnableTargetPDI(void)
 	
 	/* Set DATA line high for at least 90ns to disable /RESET functionality */
 	PORTD |= (1 << 3);
-	asm volatile ("NOP"::);
-	asm volatile ("NOP"::);
+	_delay_us(1);
 	
-	/* Set up the synchronous USART for XMEGA communications - 
-	   8 data bits, even parity, 2 stop bits */
-	UBRR1  = (F_CPU / 500000UL);
+	/* Set up the synchronous USART for XMEGA communications - 8 data bits, even parity, 2 stop bits */
+	UBRR1  = (F_CPU / XPROG_HARDWARE_SPEED);
 	UCSR1B = (1 << TXEN1);
 	UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
 #else
@@ -169,13 +167,12 @@ void XPROGTarget_EnableTargetPDI(void)
 	
 	/* Set DATA line high for at least 90ns to disable /RESET functionality */
 	BITBANG_PDIDATA_PORT |= BITBANG_PDIDATA_MASK;
-	asm volatile ("NOP"::);
-	asm volatile ("NOP"::);
+	_delay_us(1);
 
 	/* Fire timer compare channel A ISR to manage the software USART */
-	OCR1A   = BITS_BETWEEN_USART_CLOCKS;
-	TCCR1B  = (1 << WGM12) | (1 << CS10);
-	TIMSK1  = (1 << OCIE1A);
+	OCR1A  = BITS_BETWEEN_USART_CLOCKS;
+	TCCR1B = (1 << WGM12) | (1 << CS10);
+	TIMSK1 = (1 << OCIE1A);
 #endif
 
 	/* Send two BREAKs of 12 bits each to enable PDI interface (need at least 16 idle bits) */
@@ -188,20 +185,18 @@ void XPROGTarget_EnableTargetTPI(void)
 {
 	IsSending = false;
 
-	/* Set /RESET line low for at least 90ns to enable TPI functionality */
+	/* Set /RESET line low for at least 400ns to enable TPI functionality */
 	AUX_LINE_DDR  |=  AUX_LINE_MASK;
 	AUX_LINE_PORT &= ~AUX_LINE_MASK;
-	asm volatile ("NOP"::);
-	asm volatile ("NOP"::);
+	_delay_us(1);
 
 #if defined(XPROG_VIA_HARDWARE_USART)
 	/* Set Tx and XCK as outputs, Rx as input */
 	DDRD |=  (1 << 5) | (1 << 3);
 	DDRD &= ~(1 << 2);
 		
-	/* Set up the synchronous USART for TINY communications - 
-	   8 data bits, even parity, 2 stop bits */
-	UBRR1  = (F_CPU / 500000UL);
+	/* Set up the synchronous USART for TINY communications - 8 data bits, even parity, 2 stop bits */
+	UBRR1  = (F_CPU / XPROG_HARDWARE_SPEED);
 	UCSR1B = (1 << TXEN1);
 	UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
 #else
@@ -212,10 +207,10 @@ void XPROGTarget_EnableTargetTPI(void)
 	/* Set DATA line high for idle state */
 	BITBANG_TPIDATA_PORT |= BITBANG_TPIDATA_MASK;
 
-	/* Fire timer capture channel B ISR to manage the software USART */
-	OCR1B   = BITS_BETWEEN_USART_CLOCKS;
-	TCCR1B  = (1 << WGM12) | (1 << CS10);
-	TIMSK1  = (1 << OCIE1B);
+	/* Fire timer capture channel ISR to manage the software USART */
+	ICR1   = BITS_BETWEEN_USART_CLOCKS;
+	TCCR1B = (1 << WGM13) | (1 << WGM12) | (1 << CS10);
+	TIMSK1 = (1 << ICIE1);
 #endif
 
 	/* Send two BREAKs of 12 bits each to enable TPI interface (need at least 16 idle bits) */
@@ -230,22 +225,17 @@ void XPROGTarget_DisableTargetPDI(void)
 	XPROGTarget_SetRxMode();
 
 #if defined(XPROG_VIA_HARDWARE_USART)
-	/* Set /RESET high for a one millisecond to ensure target device is restarted */
-	PORTD |= (1 << 5);
-	_delay_ms(1);
-
 	/* Turn off receiver and transmitter of the USART, clear settings */
-	UCSR1A |= (1 << TXC1) | (1 << RXC1);
+	UCSR1A  = ((1 << TXC1) | (1 << RXC1));
 	UCSR1B  = 0;
 	UCSR1C  = 0;
 
-	/* Set all USART lines as input, tristate */
+	/* Tristate all pins */
 	DDRD  &= ~((1 << 5) | (1 << 3));
 	PORTD &= ~((1 << 5) | (1 << 3) | (1 << 2));
 #else
-	/* Set /RESET high for a one millisecond to ensure target device is restarted */
-	BITBANG_PDICLOCK_PORT |= BITBANG_PDICLOCK_MASK;
-	_delay_ms(1);
+	/* Turn off software USART management timer */
+	TCCR1B = 0;
 
 	/* Set DATA and CLOCK lines to inputs */
 	BITBANG_PDIDATA_DDR   &= ~BITBANG_PDIDATA_MASK;
@@ -253,7 +243,7 @@ void XPROGTarget_DisableTargetPDI(void)
 	
 	/* Tristate DATA and CLOCK lines */
 	BITBANG_PDIDATA_PORT  &= ~BITBANG_PDIDATA_MASK;
-	BITBANG_PDICLOCK_PORT &= ~BITBANG_PDICLOCK_MASK;
+	BITBANG_PDICLOCK_PORT &= ~BITBANG_PDICLOCK_MASK;	
 #endif
 }
 
@@ -273,6 +263,9 @@ void XPROGTarget_DisableTargetTPI(void)
 	DDRD  &= ~((1 << 5) | (1 << 3));
 	PORTD &= ~((1 << 5) | (1 << 3) | (1 << 2));
 #else
+	/* Turn off software USART management timer */
+	TCCR1B = 0;
+
 	/* Set DATA and CLOCK lines to inputs */
 	BITBANG_TPIDATA_DDR   &= ~BITBANG_TPIDATA_MASK;
 	BITBANG_TPICLOCK_DDR  &= ~BITBANG_TPICLOCK_MASK;
@@ -307,7 +300,7 @@ void XPROGTarget_SendByte(const uint8_t Byte)
 	uint16_t NewUSARTData = ((1 << 11) | (1 << 10) | (0 << 9) | ((uint16_t)Byte << 1) | (0 << 0));
 
 	/* Compute Even parity - while a bit is still set, chop off lowest bit and toggle parity bit */
-	uint8_t ParityData    = Byte;
+	uint8_t ParityData = Byte;
 	while (ParityData)
 	{
 		NewUSARTData ^= (1 << 9);
@@ -335,12 +328,35 @@ 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);
+	while (!(UCSR1A & (1 << RXC1)) && TimeoutMSRemaining)
+	{
+		/* Manage software timeout */
+		if (TIFR0 & (1 << OCF0A))
+		{
+			TIFR0 |= (1 << OCF0A);
+			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);
+	while (SoftUSART_BitCount && TimeoutMSRemaining)
+	{
+		/* Manage software timeout */
+		if (TIFR0 & (1 << OCF0A))
+		{
+			TIFR0 |= (1 << OCF0A);
+			TimeoutMSRemaining--;
+		}
+	}
+
+	if (TimeoutMSRemaining)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
 
 	/* Throw away the parity and stop bits to leave only the data (start bit is already discarded) */
 	return (uint8_t)SoftUSART_Data;
@@ -386,8 +402,15 @@ static void XPROGTarget_SetTxMode(void)
 		
 	IsSending = true;
 #else
-	while (SoftUSART_BitCount);
-
+	while (SoftUSART_BitCount && TimeoutMSRemaining)
+	{	
+		if (TIFR0 & (1 << OCF0A))
+		{
+			TIFR0 |= (1 << OCF0A);
+			TimeoutMSRemaining--;
+		}
+	}
+	
 	/* Wait for a full cycle of the clock */
 	SoftUSART_Data     = 0x0001;
 	SoftUSART_BitCount = 1;
@@ -420,23 +443,52 @@ static void XPROGTarget_SetRxMode(void)
 	DDRD   &= ~(1 << 3);
 	PORTD  &= ~(1 << 3);
 #else
-	while (SoftUSART_BitCount);
+	while (SoftUSART_BitCount && TimeoutMSRemaining)
+	{	
+		if (TIFR0 & (1 << OCF0A))
+		{
+			TIFR0 |= (1 << OCF0A);
+			TimeoutMSRemaining--;
+		}
+	}
 
 	if (XPROG_SelectedProtocol == XPRG_PROTOCOL_PDI)
 	{
 		BITBANG_PDIDATA_DDR  &= ~BITBANG_PDIDATA_MASK;
 		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--;
+			}
+		}
 	}
 	else
 	{
 		BITBANG_TPIDATA_DDR  &= ~BITBANG_TPIDATA_MASK;
-		BITBANG_TPIDATA_PORT &= ~BITBANG_TPIDATA_MASK;	
-	}
-	
-	/* Wait until DATA line has been pulled up to idle by the target */
-	while (!(BITBANG_PDIDATA_PIN & BITBANG_PDIDATA_MASK) && TimeoutMSRemaining);
+		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--;
+			}
+		}	
+	}	
 #endif
 
+    if (TimeoutMSRemaining)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
+
 	IsSending = false;
 }