X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/e11fddfe66fcd6fa5b783bb5f1c39dfb5687538d..fc31973daffea3506051ce51a5f79383ce0867d6:/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
index b657758e9..1c5376579 100644
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
@@ -124,18 +124,11 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
 		case PROG_MODE_PAGED_VALUE_MASK:
 			do
 			{
-				/* Manage software timeout */
-				if (TIFR0 & (1 << OCF0A))
-				{
-					TIFR0 |= (1 << OCF0A);
-					TimeoutMSRemaining--;
-				}
-
-				SPI_Send(ReadMemCommand);
-				SPI_Send(PollAddress >> 8);
-				SPI_Send(PollAddress & 0xFF);
+				SPI_SendByte(ReadMemCommand);
+				SPI_SendByte(PollAddress >> 8);
+				SPI_SendByte(PollAddress & 0xFF);
 			}
-			while ((SPI_Transfer(0x00) == PollValue) && TimeoutMSRemaining);
+			while ((SPI_TransferByte(0x00) == PollValue) && TimeoutMSRemaining);
 
 			if (!(TimeoutMSRemaining))
 			 ProgrammingStatus = STATUS_CMD_TOUT;
@@ -162,18 +155,11 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
 {
 	do
 	{
-		/* Manage software timeout */
-		if (TIFR0 & (1 << OCF0A))
-		{
-			TIFR0 |= (1 << OCF0A);
-			TimeoutMSRemaining--;
-		}	
-
-		SPI_Send(0xF0);
-		SPI_Send(0x00);
-		SPI_Send(0x00);
+		SPI_SendByte(0xF0);
+		SPI_SendByte(0x00);
+		SPI_SendByte(0x00);
 	}
-	while ((SPI_Receive() & 0x01) && TimeoutMSRemaining);
+	while ((SPI_ReceiveByte() & 0x01) && TimeoutMSRemaining);
 
 	if (TimeoutMSRemaining)
 	{
@@ -192,10 +178,10 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
  */
 void ISPTarget_LoadExtendedAddress(void)
 {
-	SPI_Send(LOAD_EXTENDED_ADDRESS_CMD);
-	SPI_Send(0x00);
-	SPI_Send((CurrentAddress & 0x00FF0000) >> 16);
-	SPI_Send(0x00);	
+	SPI_SendByte(LOAD_EXTENDED_ADDRESS_CMD);
+	SPI_SendByte(0x00);
+	SPI_SendByte((CurrentAddress & 0x00FF0000) >> 16);
+	SPI_SendByte(0x00);	
 }
 
 #endif