From a5d1ec0b22477feb6e8ab8c7ceae3c9d706fe3cc Mon Sep 17 00:00:00 2001
From: Chris <herrmann1001@gmail.com>
Date: Fri, 6 Jul 2018 16:01:23 +0200
Subject: [PATCH] chg:'i2c' timeouts..

---
 common/i2c.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/i2c.c b/common/i2c.c
index 466c89b79..82689d51e 100644
--- a/common/i2c.c
+++ b/common/i2c.c
@@ -111,12 +111,8 @@ void I2C_Reset_EnterBootloader(void) {
 
 //	µÈ´ýʱÖÓ±ä¸ß	
 // Wait for the clock to go High.	
-bool WaitSCL_H(void) {
-
-	volatile uint16_t delay = 5000;
-
+bool WaitSCL_H_delay(uint32_t delay) {
 	while (delay--)	{
-		
 		if (SCL_read) {
 			return true;
 		}
@@ -125,6 +121,9 @@ bool WaitSCL_H(void) {
 	return false;
 }
 
+bool WaitSCL_H(void) {
+	return WaitSCL_H_delay(5000);
+}
 // Wait max 300ms or until SCL goes LOW.
 // Which ever comes first
 bool WaitSCL_300ms(void){
@@ -514,7 +513,6 @@ void I2C_print_status(void) {
 		DbpString("  FW version................FAILED");
 }
 
-#define WAIT_UNTIL_SCL_GOES_HIGH	{ while (!SCL_read) { SpinDelay(1); } }
 bool GetATR(smart_card_atr_t *card_ptr) {
 	
 	if ( card_ptr ) {
@@ -530,12 +528,16 @@ bool GetATR(smart_card_atr_t *card_ptr) {
 
 	// variable delay here.
 	if (!WaitSCL_300ms()) {
-		if ( MF_DBGLEVEL > 3 ) DbpString(" 300ms SCL delay failed");
+		if ( MF_DBGLEVEL > 3 ) DbpString(" 300ms SCL delay - timed out");
 		return false;
 	}
 
 	// 8051 speaks with smart card.
-	WAIT_UNTIL_SCL_GOES_HIGH;
+	// 50ms timeout?
+	if (!WaitSCL_H_delay(1500*50) ) {
+		if ( MF_DBGLEVEL > 3 ) DbpString("wait for SCL HIGH - timed out");
+		return false;
+	}
 
 	if ( MF_DBGLEVEL > 3 ) DbpString("before reading");