X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1e1de234ac2b8d337d36ba67367d8a2b447db038..f53020e729d583f7975095ca7b4b467741d99edb:/armsrc/iso14443b.c

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 416c31f9..67e4ccdd 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -240,7 +240,7 @@ static RAMFUNC int Handle14443bUartBit(uint8_t bit)
 					LED_A_OFF(); // Finished receiving
 					Uart.state = STATE_UNSYNCD;
 					if (Uart.byteCnt != 0) {
-						return TRUE;
+					return TRUE;
 					}
 				} else {
 					// this is an error
@@ -365,8 +365,8 @@ void SimulateIso14443bTag(void)
 	for(;;) {
 
 		if(!GetIso14443bCommandFromReader(receivedCmd, &len)) {
-			Dbprintf("button pressed, received %d commands", cmdsRecvd);
-			break;
+		Dbprintf("button pressed, received %d commands", cmdsRecvd);
+		break;
 		}
 
 		if (tracing) {
@@ -556,7 +556,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 				Demod.sumI = ci;
 				Demod.sumQ = cq;
 				Demod.posCount = 1;
-				}
+			}
 			break;
 
 		case DEMOD_PHASE_REF_TRAINING:
@@ -565,14 +565,14 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 				if (v > SUBCARRIER_DETECT_THRESHOLD) {
 					// set the reference phase (will code a logic '1') by averaging over 32 1/fs.
 					// note: synchronization time > 80 1/fs
-					Demod.sumI += ci;
-					Demod.sumQ += cq;
+				Demod.sumI += ci;
+				Demod.sumQ += cq;
 					Demod.posCount++;
 				} else {		// subcarrier lost
-					Demod.state = DEMOD_UNSYNCD;
+				Demod.state = DEMOD_UNSYNCD;
 				}
 			} else {
-				Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF;
+					Demod.state = DEMOD_AWAITING_FALLING_EDGE_OF_SOF;
 			}
 			break;
 
@@ -665,7 +665,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 						LED_C_OFF();
 						if(s == 0x000) {
 							// This is EOF (start, stop and all data bits == '0'
-							return TRUE;
+						return TRUE;
 						}
 					}
 				}
@@ -757,8 +757,8 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
 			if(Handle14443bSamplesDemod(ci, cq)) {
 				gotFrame = TRUE;
 				break;
-			}
 		}
+	}
 
 		if(samples > n || gotFrame) {
 			break;
@@ -980,7 +980,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 	if(cmd1[2] != Demod.output[8] || cmd1[3] != Demod.output[9]) {
 		Dbprintf("CRC Error reading block! Expected: %04x got: %04x",
 				(cmd1[2]<<8)+cmd1[3], (Demod.output[8]<<8)+Demod.output[9]);
-		// Do not return;, let's go on... (we should retry, maybe ?)
+	// Do not return;, let's go on... (we should retry, maybe ?)
 	}
 	Dbprintf("Tag UID (64 bits): %08x %08x",
 			(Demod.output[7]<<24) + (Demod.output[6]<<16) + (Demod.output[5]<<8) + Demod.output[4],
@@ -992,7 +992,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 	i = 0x00;
 	dwLast++;
 	for (;;) {
-		if (i == dwLast) {
+		   if (i == dwLast) {
 			DbpString("System area block (0xff):");
 			i = 0xff;
 		}
@@ -1001,23 +1001,22 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 		CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
 		GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
 		if (Demod.len != 6) { // Check if we got an answer from the tag
-			DbpString("Expected 6 bytes from tag, got less...");
-			return;
+		DbpString("Expected 6 bytes from tag, got less...");
+		return;
 		}
 		// The check the CRC of the answer (use cmd1 as temporary variable):
 		ComputeCrc14443(CRC_14443_B, Demod.output, 4, &cmd1[2], &cmd1[3]);
-		if(cmd1[2] != Demod.output[4] || cmd1[3] != Demod.output[5]) {
+			if(cmd1[2] != Demod.output[4] || cmd1[3] != Demod.output[5]) {
 			Dbprintf("CRC Error reading block! Expected: %04x got: %04x",
 					(cmd1[2]<<8)+cmd1[3], (Demod.output[4]<<8)+Demod.output[5]);
-			// Do not return;, let's go on... (we should retry, maybe ?)
+		// Do not return;, let's go on... (we should retry, maybe ?)
 		}
 		// Now print out the memory location:
 		Dbprintf("Address=%02x, Contents=%08x, CRC=%04x", i,
 				(Demod.output[3]<<24) + (Demod.output[2]<<16) + (Demod.output[1]<<8) + Demod.output[0],
-				(Demod.output[4]<<8)+Demod.output[5]);
-		if (i == 0xff) {
-			break;
-		}
+			(Demod.output[4]<<8)+Demod.output[5]
+		);
+		if (i == 0xff) break;
 		i++;
 	}
 }
@@ -1088,6 +1087,9 @@ void RAMFUNC SnoopIso14443b(void)
 	FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
 	uint8_t parity[MAX_PARITY_SIZE];
 
+	bool TagIsActive = FALSE;
+	bool ReaderIsActive = FALSE;
+		
 	bool TagIsActive = FALSE;
 	bool ReaderIsActive = FALSE;
 	
@@ -1114,6 +1116,10 @@ void RAMFUNC SnoopIso14443b(void)
 			if(behindBy > (9*ISO14443B_DMA_BUFFER_SIZE/10)) { // TODO: understand whether we can increase/decrease as we want or not?
 				Dbprintf("blew circular buffer! behindBy=%d", behindBy);
 				break;
+			WDT_HIT();
+			if(behindBy > (9*DMA_BUFFER_SIZE/10)) { // TODO: understand whether we can increase/decrease as we want or not?
+				Dbprintf("blew circular buffer! behindBy=%d", behindBy);
+				break;
 			}
 			if(!tracing) {
 				DbpString("Reached trace limit");
@@ -1129,42 +1135,42 @@ void RAMFUNC SnoopIso14443b(void)
 
 		if (!TagIsActive) {							// no need to try decoding reader data if the tag is sending
 			if(Handle14443bUartBit(ci & 0x01)) {
-				if(triggered && tracing) {
+			if(triggered && tracing) {
 					LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE);
-				}
-				/* And ready to receive another command. */
-				UartReset();
-				/* And also reset the demod code, which might have been */
-				/* false-triggered by the commands from the reader. */
-				DemodReset();
 			}
+			/* And ready to receive another command. */
+			UartReset();
+			/* And also reset the demod code, which might have been */
+			/* false-triggered by the commands from the reader. */
+			DemodReset();
+		}
 			if(Handle14443bUartBit(cq & 0x01)) {
-				if(triggered && tracing) {
+			if(triggered && tracing) {
 					LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE);
-				}
-				/* And ready to receive another command. */
-				UartReset();
-				/* And also reset the demod code, which might have been */
-				/* false-triggered by the commands from the reader. */
-				DemodReset();
 			}
+			/* And ready to receive another command. */
+			UartReset();
+			/* And also reset the demod code, which might have been */
+			/* false-triggered by the commands from the reader. */
+			DemodReset();
+		}
 			ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
 		}
 
 		if(!ReaderIsActive) {						// no need to try decoding tag data if the reader is sending - and we cannot afford the time
 			if(Handle14443bSamplesDemod(ci | 0x01, cq | 0x01)) {
 
-				//Use samples as a time measurement
-				if(tracing)
-				{
-					uint8_t parity[MAX_PARITY_SIZE];
+			//Use samples as a time measurement
+			if(tracing)
+			{
+				uint8_t parity[MAX_PARITY_SIZE];
 					LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE);
-				}
-				triggered = TRUE;
-
-				// And ready to receive another response.
-				DemodReset();
 			}
+			triggered = TRUE;
+
+			// And ready to receive another response.
+			DemodReset();
+		}
 			TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF);
 		}