From e322f14620a1064efc4b3a98cf701efc48da81cc Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 21 Feb 2010 06:26:33 +0000
Subject: More fixes to the AVRISP command timeout system so that it should no
 longer lock up while processing command no matter what the conditions.

---
 Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c | 17 ++++++++++++++++-
 Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h | 13 +------------
 Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c   | 16 ++++++++++++----
 3 files changed, 29 insertions(+), 17 deletions(-)

(limited to 'Projects/AVRISP-MKII/Lib/ISP')

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
index e0eb44107..85b31fbdb 100644
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.c
@@ -75,7 +75,7 @@ void ISPProtocol_EnterISPMode(void)
 
 	/* Continuously attempt to synchronize with the target until either the number of attempts specified
 	 * by the host has exceeded, or the the device sends back the expected response values */
-	while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))
+	while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED) && TimeoutMSRemaining)
 	{
 		uint8_t ResponseBytes[4];
 
@@ -518,4 +518,19 @@ void ISPProtocol_SPIMulti(void)
 	}
 }
 
+/** Blocking delay for a given number of milliseconds.
+ *
+ *  \param[in] DelayMS  Number of milliseconds to delay for
+ */
+void ISPProtocol_DelayMS(uint8_t DelayMS)
+{
+	while (DelayMS-- && TimeoutMSRemaining)
+	{
+		if (TimeoutMSRemaining)
+		  TimeoutMSRemaining--;
+		  
+		_delay_ms(1);
+	}
+}
+
 #endif
\ No newline at end of file
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
index 88e35348d..a9114e1e8 100644
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPProtocol.h
@@ -66,17 +66,6 @@
 		#define PROG_MODE_PAGED_READYBUSY_MASK  (1 << 6)
 		#define PROG_MODE_COMMIT_PAGE_MASK      (1 << 7)
 
-	/* Inline Functions: */
-		/** Blocking delay for a given number of milliseconds.
-		 *
-		 *  \param[in] DelayMS  Number of milliseconds to delay for
-		 */
-		static inline void ISPProtocol_DelayMS(uint8_t DelayMS)
-		{
-			while (DelayMS--)
-			  _delay_ms(1);
-		}
-
 	/* Function Prototypes: */
 		void ISPProtocol_EnterISPMode(void);
 		void ISPProtocol_LeaveISPMode(void);
@@ -86,5 +75,5 @@
 		void ISPProtocol_ReadFuseLockSigOSCCAL(const uint8_t V2Command);
 		void ISPProtocol_WriteFuseLock(const uint8_t V2Command);
 		void ISPProtocol_SPIMulti(void);
-
+		void ISPProtocol_DelayMS(uint8_t DelayMS);
 #endif
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
index 51ba1ec97..94f1c3d74 100644
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c
@@ -112,7 +112,6 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
                                       const uint8_t DelayMS, const uint8_t ReadMemCommand)
 {
 	uint8_t ProgrammingStatus  = STATUS_CMD_OK;
-	uint8_t TimeoutMSRemaining = 100;
 
 	/* Determine method of Programming Complete check */
 	switch (ProgrammingMode & ~(PROG_MODE_PAGED_WRITES_MASK | PROG_MODE_COMMIT_PAGE_MASK))
@@ -148,6 +147,9 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
 			break;
 	}
 
+	if (ProgrammingStatus == STATUS_CMD_OK)
+	  TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
+
 	return ProgrammingStatus;
 }
 
@@ -158,8 +160,6 @@ uint8_t ISPTarget_WaitForProgComplete(const uint8_t ProgrammingMode, const uint1
  */
 uint8_t ISPTarget_WaitWhileTargetBusy(void)
 {
-	uint8_t TimeoutMSRemaining = 100;
-
 	do
 	{
 		/* Manage software timeout */
@@ -175,7 +175,15 @@ uint8_t ISPTarget_WaitWhileTargetBusy(void)
 	}
 	while ((SPI_ReceiveByte() & 0x01) && TimeoutMSRemaining);
 
-	return ((TimeoutMSRemaining) ? STATUS_CMD_OK : STATUS_RDY_BSY_TOUT);
+	if (TimeoutMSRemaining)
+	{
+		TimeoutMSRemaining = COMMAND_TIMEOUT_MS;
+		return STATUS_CMD_OK;
+	}
+	else
+	{
+		return STATUS_RDY_BSY_TOUT;
+	}
 }
 
 /** Sends a low-level LOAD EXTENDED ADDRESS command to the target, for addressing of memory beyond the
-- 
cgit v1.2.3