X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ab195ab1da1da75a3a23d47b56c66d14803a9de3..12a01ed72d0d6dbf243160302314870e7b29cc07:/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c?ds=inline

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
index 0ab297538..428469df7 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.c
@@ -77,14 +77,19 @@ static void TINYNVM_SendWriteNVMRegister(const uint8_t Address)
 bool TINYNVM_WaitWhileNVMBusBusy(void)
 {
 	/* Poll the STATUS register to check to see if NVM access has been enabled */
+	uint8_t TimeoutMSRemaining = 100;
 	while (TimeoutMSRemaining)
 	{
 		/* Send the SLDCS command to read the TPI STATUS register to see the NVM bus is active */
 		XPROGTarget_SendByte(TPI_CMD_SLDCS | TPI_STATUS_REG);
 		if (XPROGTarget_ReceiveByte() & TPI_STATUS_NVM)
+		  return true;
+
+		/* Manage software timeout */
+		if (TIFR0 & (1 << OCF0A))
 		{
-			TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
-			return true;
+			TIFR0 |= (1 << OCF0A);
+			TimeoutMSRemaining--;
 		}
 	}
 
@@ -99,6 +104,7 @@ bool TINYNVM_WaitWhileNVMBusBusy(void)
 bool TINYNVM_WaitWhileNVMControllerBusy(void)
 {
 	/* Poll the STATUS register to check to see if NVM access has been enabled */
+	uint8_t TimeoutMSRemaining = 100;
 	while (TimeoutMSRemaining)
 	{
 		/* Send the SIN command to read the TPI STATUS register to see the NVM bus is busy */
@@ -106,9 +112,13 @@ bool TINYNVM_WaitWhileNVMControllerBusy(void)
 
 		/* Check to see if the BUSY flag is still set */
 		if (!(XPROGTarget_ReceiveByte() & (1 << 7)))
+		  return true;
+
+		/* Manage software timeout */
+		if (TIFR0 & (1 << OCF0A))
 		{
-			TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
-			return true;
+			TIFR0 |= (1 << OCF0A);
+			TimeoutMSRemaining--;
 		}
 	}