From: Martin Holst Swende <martin@swende.se>
Date: Tue, 10 Feb 2015 20:25:14 +0000 (+0100)
Subject: Merge branch 'master' into GenericTracing
X-Git-Tag: v2.0.0-rc1~23^2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/61972abbdd0a03832cae7d5ae58548fed11e619e?ds=inline;hp=--cc

Merge branch 'master' into GenericTracing

Conflicts:
	armsrc/iso14443a.c
---

61972abbdd0a03832cae7d5ae58548fed11e619e
diff --cc armsrc/iso14443a.c
index 05ffb941,103f25e6..a7102168
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@@ -2197,9 -2266,10 +2199,10 @@@ void Mifare1ksim(uint8_t flags, uint8_
  
  	// free eventually allocated BigBuf memory but keep Emulator Memory
  	BigBuf_free_keep_EM();
+ 
  	// clear trace
 -    iso14a_clear_trace();
 -	iso14a_set_tracing(TRUE);
 +	clear_trace();
 +	set_tracing(TRUE);
  
  	// Authenticate response - nonce
  	uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
@@@ -2644,7 -2714,8 +2647,8 @@@
  			}
  		}
  	}
 -	if (MF_DBGLEVEL >= 1)	Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",	tracing, traceLen);
 +	if (MF_DBGLEVEL >= 1)	Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",	tracing, BigBuf_get_traceLen());
+ 	
  }