From: merlokk <olegmsn@gmail.com>
Date: Tue, 16 Jan 2018 12:34:04 +0000 (+0200)
Subject: `hf mf sniff` small fix
X-Git-Tag: v3.1.0~84^2~8
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/feb328c90ab6287c691b578d6a41fe5cf50a987d

`hf mf sniff` small fix
---

diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c
index 7d589f0e..bd37fe9a 100644
--- a/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@ -2539,7 +2539,9 @@ void RAMFUNC SniffMifare(uint8_t param) {
 			if(!TagIsActive) {		// no need to try decoding tag data if the reader is sending
 				uint8_t readerdata = (previous_data & 0xF0) | (*data >> 4);
 				if(MillerDecoding(readerdata, (sniffCounter-1)*4)) {
-					LED_C_INV();
+					LED_B_ON();
+					LED_C_OFF();
+
 					if (MfSniffLogic(receivedCmd, Uart.len, Uart.parity, Uart.bitCount, true)) break;
 
 					/* And ready to receive another command. */
@@ -2549,12 +2551,14 @@ void RAMFUNC SniffMifare(uint8_t param) {
 					DemodReset();
 				}
 				ReaderIsActive = (Uart.state != STATE_UNSYNCD);
+				TagIsActive = !ReaderIsActive;
 			}
 			
 			if(!ReaderIsActive) {		// no need to try decoding tag data if the reader is sending
 				uint8_t tagdata = (previous_data << 4) | (*data & 0x0F);
 				if(ManchesterDecoding(tagdata, 0, (sniffCounter-1)*4)) {
-					LED_C_INV();
+					LED_B_OFF();
+					LED_C_ON();
 
 					if (MfSniffLogic(receivedResponse, Demod.len, Demod.parity, Demod.bitCount, false)) break;
 
@@ -2564,6 +2568,7 @@ void RAMFUNC SniffMifare(uint8_t param) {
 					UartInit(receivedCmd, receivedCmdPar);
 				}
 				TagIsActive = (Demod.state != DEMOD_UNSYNCD);
+				ReaderIsActive = !TagIsActive;
 			}
 		}
 
diff --git a/armsrc/mifaresniff.c b/armsrc/mifaresniff.c
index 7f94b0fe..b9ab3df4 100644
--- a/armsrc/mifaresniff.c
+++ b/armsrc/mifaresniff.c
@@ -124,16 +124,10 @@ bool RAMFUNC MfSniffLogic(const uint8_t *data, uint16_t len, uint8_t *parity, ui
 			sniffBuf[12] = 0xFF;
 			sniffBuf[13] = 0xFF;
 			LogTrace(sniffBuf, 14, 0, 0, NULL, TRUE);
-		}	// intentionally no break;
-		case SNF_CARD_CMD:{		
-			LogTrace(data, len, 0, 0, NULL, TRUE);
-			sniffState = SNF_CARD_RESP;
-			timerData = GetTickCount();
-			break;
-		}
-		case SNF_CARD_RESP:{
-			LogTrace(data, len, 0, 0, NULL, FALSE);
 			sniffState = SNF_CARD_CMD;
+		}	// intentionally no break;
+		case SNF_CARD_CMD:{	
+			LogTrace(data, len, 0, 0, NULL, reader);
 			timerData = GetTickCount();
 			break;
 		}