From c41dd5f9f690777eefd08eaeb43db52f599ce38c Mon Sep 17 00:00:00 2001
From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 16 Oct 2019 09:36:37 +0200
Subject: [PATCH 1/4] fix 'hf iclass reader' * code deduplication. Use
 functions from iso15693.c * speedup CodeIso15693AsReader() * invert reader
 command coding. 0 now means 'unmodulated' ( = field on) * decode SOF only as
 a valid tag response in Handle15693SamplesFromTag() * complete decoding of
 EOF in Handle15693SamplesFromTag() * determine and write correct times to
 trace * FPGA-change: generate shorter frame signal to allow proper sync in
 StartCountSspClk() * modify StartCountSspClk() for 16bit SSC transfers *
 whitespace in util.c * add specific LogTrace_ISO15693() with scaled down
 duration. Modify cmdhflist.c accordingly. * allow 'hf 15 raw' with single
 byte commands * check for buffer overflow, card timeout and single SOF in 'hf
 15 raw'

---
 armsrc/iclass.c    | 324 ++++++++------------------------
 armsrc/iso15693.c  | 446 +++++++++++++++++++++++++--------------------
 armsrc/iso15693.h  |  15 +-
 armsrc/util.c      | 153 ++++++++--------
 armsrc/util.h      |   2 +-
 client/cmdhf15.c   |  31 ++--
 client/cmdhflist.c |   6 -
 fpga/fpga_hf.bit   | Bin 42175 -> 42175 bytes
 fpga/hi_reader.v   |   4 +-
 9 files changed, 446 insertions(+), 535 deletions(-)

diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 2533d1f9..392271bd 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -57,14 +57,17 @@
 #include "usb_cdc.h" // for usb_poll_validate_length
 #include "fpgaloader.h"
 
-static int timeout = 4096;
-
 // iCLASS has a slightly different timing compared to ISO15693. According to the picopass data sheet the tag response is expected 330us after
 // the reader command. This is measured from end of reader EOF to first modulation of the tag's SOF which starts with a 56,64us unmodulated period.
 // 330us = 140 ssp_clk cycles @ 423,75kHz when simulating.
 // 56,64us = 24 ssp_clk_cycles
-#define DELAY_ICLASS_VCD_TO_VICC_SIM 140
-#define TAG_SOF_UNMODULATED          24
+#define DELAY_ICLASS_VCD_TO_VICC_SIM     (140 - 24)
+// times in ssp_clk_cycles @ 3,3625MHz when acting as reader
+#define DELAY_ICLASS_VICC_TO_VCD_READER	 DELAY_ISO15693_VICC_TO_VCD_READER
+// times in samples @ 212kHz when acting as reader
+#define ICLASS_READER_TIMEOUT_ACTALL     330 // 1558us, nominal 330us + 7slots*160us = 1450us         
+#define ICLASS_READER_TIMEOUT_OTHERS      80 // 380us, nominal 330us
+
 
 //-----------------------------------------------------------------------------
 // The software UART that receives commands from the reader, and its state
@@ -698,7 +701,7 @@ void RAMFUNC SnoopIClass(void) {
 				//if (!LogTrace(NULL, 0, Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER, 0, true)) break;
 				uint8_t parity[MAX_PARITY_SIZE];
 				GetParity(Uart.output, Uart.byteCnt, parity);
-				LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, parity, true);
+				LogTrace_ISO15693(Uart.output, Uart.byteCnt, time_start*32, time_stop*32, parity, true);
 
 				/* And ready to receive another command. */
 				Uart.state = STATE_UNSYNCD;
@@ -723,7 +726,7 @@ void RAMFUNC SnoopIClass(void) {
 
 				uint8_t parity[MAX_PARITY_SIZE];
 				GetParity(Demod.output, Demod.len, parity);
-				LogTrace(Demod.output, Demod.len, time_start, time_stop, parity, false);
+				LogTrace_ISO15693(Demod.output, Demod.len, time_start*32, time_stop*32, parity, false);
 
 				// And ready to receive another response.
 				memset(&Demod, 0, sizeof(Demod));
@@ -1230,9 +1233,9 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf) {
 		A legit tag has about 273,4us delay between reader EOT and tag SOF.
 		**/
 		if (modulated_response_size > 0) {
-			uint32_t response_time = reader_eof_time + DELAY_ICLASS_VCD_TO_VICC_SIM - TAG_SOF_UNMODULATED - DELAY_ARM_TO_READER_SIM;
+			uint32_t response_time = reader_eof_time + DELAY_ICLASS_VCD_TO_VICC_SIM;
 			TransmitTo15693Reader(modulated_response, modulated_response_size, &response_time, 0, false);
-			LogTrace(trace_data, trace_data_size, response_time + DELAY_ARM_TO_READER_SIM, response_time + (modulated_response_size << 6) + DELAY_ARM_TO_READER_SIM, NULL, false);
+			LogTrace_ISO15693(trace_data, trace_data_size, response_time*32, response_time*32 + modulated_response_size/2, NULL, false);
 		}
 
 	}
@@ -1327,214 +1330,22 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain
 
 /// THE READER CODE
 
-//-----------------------------------------------------------------------------
-// Transmit the command (to the tag) that was placed in ToSend[].
-//-----------------------------------------------------------------------------
-static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) {
-	int c;
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-	AT91C_BASE_SSC->SSC_THR = 0x00;
-	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_ISO14443A);
+static void ReaderTransmitIClass(uint8_t *frame, int len, uint32_t *start_time) {
 
-	if (wait) {
-		if (*wait < 10) *wait = 10;
+	CodeIso15693AsReader(frame, len);
 
-		for (c = 0; c < *wait;) {
-			if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-				AT91C_BASE_SSC->SSC_THR = 0x00;     // For exact timing!
-				c++;
-			}
-			if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-				volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
-				(void)r;
-			}
-			WDT_HIT();
-		}
-	}
+	TransmitTo15693Tag(ToSend, ToSendMax, start_time);
 
-	uint8_t sendbyte;
-	bool firstpart = true;
-	c = 0;
-	for (;;) {
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-
-			// DOUBLE THE SAMPLES!
-			if (firstpart) {
-				sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4);
-			} else {
-				sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4);
-				c++;
-			}
-			if (sendbyte == 0xff) {
-				sendbyte = 0xfe;
-			}
-			AT91C_BASE_SSC->SSC_THR = sendbyte;
-			firstpart = !firstpart;
-
-			if (c >= len) {
-				break;
-			}
-		}
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
-			(void)r;
-		}
-		WDT_HIT();
-	}
-	if (samples && wait) *samples = (c + *wait) << 3;
+	uint32_t end_time = *start_time + 32*(8*ToSendMax-4); // substract the 4 padding bits after EOF
+	LogTrace_ISO15693(frame, len, *start_time*4, end_time*4, NULL, true);
 }
 
 
-//-----------------------------------------------------------------------------
-// Prepare iClass reader command to send to FPGA
-//-----------------------------------------------------------------------------
-void CodeIClassCommand(const uint8_t *cmd, int len) {
-	int i, j, k;
-
-	ToSendReset();
-
-	// Start of Communication: 1 out of 4
-	ToSend[++ToSendMax] = 0xf0;
-	ToSend[++ToSendMax] = 0x00;
-	ToSend[++ToSendMax] = 0x0f;
-	ToSend[++ToSendMax] = 0x00;
-
-	// Modulate the bytes
-	for (i = 0; i < len; i++) {
-		uint8_t b = cmd[i];
-		for (j = 0; j < 4; j++) {
-			for (k = 0; k < 4; k++) {
-				if (k == (b & 3)) {
-					ToSend[++ToSendMax] = 0x0f;
-				} else {
-					ToSend[++ToSendMax] = 0x00;
-				}
-			}
-			b >>= 2;
-		}
-	}
-
-	// End of Communication
-	ToSend[++ToSendMax] = 0x00;
-	ToSend[++ToSendMax] = 0x00;
-	ToSend[++ToSendMax] = 0xf0;
-	ToSend[++ToSendMax] = 0x00;
-
-	// Convert from last character reference to length
-	ToSendMax++;
-}
-
-static void ReaderTransmitIClass(uint8_t *frame, int len) {
-	int wait = 0;
-	int samples = 0;
-
-	// This is tied to other size changes
-	CodeIClassCommand(frame, len);
-
-	// Select the card
-	TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
-	if (trigger)
-		LED_A_ON();
-
-	// Store reader command in buffer
-	uint8_t par[MAX_PARITY_SIZE];
-	GetParity(frame, len, par);
-	LogTrace(frame, len, rsamples, rsamples, par, true);
-}
-
-//-----------------------------------------------------------------------------
-// Wait a certain time for tag response
-//  If a response is captured return true
-//  If it takes too long return false
-//-----------------------------------------------------------------------------
-static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed) {
-	//uint8_t *buffer
-	// buffer needs to be 512 bytes
-	int c;
-
-	// Set FPGA mode to "reader listen mode", no modulation (listen
-	// only, since we are receiving, not transmitting).
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
-
-	// Now get the answer from the card
-	Demod.output = receivedResponse;
-	Demod.len = 0;
-	Demod.state = DEMOD_UNSYNCD;
-
-	uint8_t b;
-	if (elapsed) *elapsed = 0;
-
-	bool skip = false;
-
-	c = 0;
-	for (;;) {
-		WDT_HIT();
-
-		if (BUTTON_PRESS()) return false;
-
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0x00;  // To make use of exact timing of next command from reader!!
-			if (elapsed) (*elapsed)++;
-		}
-		if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			if (c < timeout) {
-				c++;
-			} else {
-				return false;
-			}
-			b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-			skip = !skip;
-			if (skip) continue;
-
-			if (ManchesterDecoding(b & 0x0f)) {
-				*samples = c << 3;
-				return  true;
-			}
-		}
-	}
-}
-
-static int ReaderReceiveIClass(uint8_t *receivedAnswer) {
-	int samples = 0;
-	if (!GetIClassAnswer(receivedAnswer, 160, &samples, 0)) {
-		return false;
-	}
-	rsamples += samples;
-	uint8_t parity[MAX_PARITY_SIZE];
-	GetParity(receivedAnswer, Demod.len, parity);
-	LogTrace(receivedAnswer, Demod.len, rsamples, rsamples, parity, false);
-	if (samples == 0) return false;
-	return Demod.len;
-}
-
-static void setupIclassReader() {
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	// Reset trace buffer
-	set_tracing(true);
-	clear_trace();
-
-	// Setup SSC
-	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_ISO14443A);
-	// Start from off (no field generated)
-	// Signal field is off with the appropriate LED
-	LED_D_OFF();
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	SpinDelay(200);
-
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-
-	// Now give it time to spin up.
-	// Signal field is on with the appropriate LED
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
-	SpinDelay(200);
-	LED_A_ON();
-
-}
-
-static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) {
+static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, size_t max_resp_size, 
+										  uint8_t expected_size, uint8_t retries, uint32_t start_time, uint32_t *eof_time) {
 	while (retries-- > 0) {
-		ReaderTransmitIClass(command, cmdsize);
-		if (expected_size == ReaderReceiveIClass(resp)) {
+		ReaderTransmitIClass(command, cmdsize, &start_time);
+		if (expected_size == GetIso15693AnswerFromTag(resp, max_resp_size, ICLASS_READER_TIMEOUT_OTHERS, eof_time)) {
 			return true;
 		}
 	}
@@ -1548,12 +1359,11 @@ static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint
  *         1 = Got CSN
  *         2 = Got CSN and CC
  */
-static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
-	static uint8_t act_all[]     = { 0x0a };
-	//static uint8_t identify[]    = { 0x0c };
-	static uint8_t identify[]    = { 0x0c, 0x00, 0x73, 0x33 };
-	static uint8_t select[]      = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	static uint8_t readcheck_cc[]= { 0x88, 0x02 };
+static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key, uint32_t *eof_time) {
+	uint8_t act_all[]      = { 0x0a };
+	uint8_t identify[]     = { 0x0c };
+	uint8_t select[]       = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+	uint8_t readcheck_cc[] = { 0x88, 0x02 };
 	if (use_credit_key)
 		readcheck_cc[0] = 0x18;
 	else
@@ -1562,24 +1372,28 @@ static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 	uint8_t resp[ICLASS_BUFFER_SIZE];
 
 	uint8_t read_status = 0;
+	uint32_t start_time = GetCountSspClk();
 
 	// Send act_all
-	ReaderTransmitIClass(act_all, 1);
+	ReaderTransmitIClass(act_all, 1, &start_time);
 	// Card present?
-	if (!ReaderReceiveIClass(resp)) return read_status;//Fail
-
+	if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_ACTALL, eof_time) < 0) return read_status;//Fail
+	
 	//Send Identify
-	ReaderTransmitIClass(identify, 1);
+	start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+	ReaderTransmitIClass(identify, 1, &start_time);
+	// FpgaDisableTracing(); // DEBUGGING
 	//We expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC
-	uint8_t len = ReaderReceiveIClass(resp);
+	uint8_t len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
 	if (len != 10) return read_status;//Fail
 
 	//Copy the Anti-collision CSN to our select-packet
 	memcpy(&select[1], resp, 8);
 	//Select the card
-	ReaderTransmitIClass(select, sizeof(select));
+	start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+	ReaderTransmitIClass(select, sizeof(select), &start_time);
 	//We expect a 10-byte response here, 8 byte CSN and 2 byte CRC
-	len = ReaderReceiveIClass(resp);
+	len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
 	if (len != 10) return read_status;//Fail
 
 	//Success - level 1, we got CSN
@@ -1590,8 +1404,9 @@ static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 	read_status = 1;
 
 	// Card selected, now read e-purse (cc) (only 8 bytes no CRC)
-	ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
-	if (ReaderReceiveIClass(resp) == 8) {
+	start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+	ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc), &start_time);
+	if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time) == 8) {
 		//Save CC (e-purse) in response data
 		memcpy(card_data+8, resp, 8);
 		read_status++;
@@ -1600,8 +1415,8 @@ static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
 	return read_status;
 }
 
-static uint8_t handshakeIclassTag(uint8_t *card_data) {
-	return handshakeIclassTag_ext(card_data, false);
+static uint8_t handshakeIclassTag(uint8_t *card_data, uint32_t *eof_time) {
+	return handshakeIclassTag_ext(card_data, false, eof_time);
 }
 
 
@@ -1633,8 +1448,13 @@ void ReaderIClass(uint8_t arg0) {
 	uint8_t flagReadAA = arg0 & FLAG_ICLASS_READER_AA;
 
 	set_tracing(true);
-	setupIclassReader();
+	clear_trace();
+	Iso15693InitReader();
 
+	StartCountSspClk();
+	uint32_t start_time = 0;
+	uint32_t eof_time = 0;
+	
 	uint16_t tryCnt = 0;
 	bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
 	while (!userCancelled) {
@@ -1649,29 +1469,31 @@ void ReaderIClass(uint8_t arg0) {
 		}
 		WDT_HIT();
 
-		read_status = handshakeIclassTag_ext(card_data, use_credit_key);
+		read_status = handshakeIclassTag_ext(card_data, use_credit_key, &eof_time);
 
 		if (read_status == 0) continue;
 		if (read_status == 1) result_status = FLAG_ICLASS_READER_CSN;
 		if (read_status == 2) result_status = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC;
 
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		// handshakeIclass returns CSN|CC, but the actual block
 		// layout is CSN|CONFIG|CC, so here we reorder the data,
 		// moving CC forward 8 bytes
 		memcpy(card_data+16, card_data+8, 8);
 		//Read block 1, config
 		if (flagReadConfig) {
-			if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 10)) {
+			if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
 				result_status |= FLAG_ICLASS_READER_CONF;
 				memcpy(card_data+8, resp, 8);
 			} else {
 				Dbprintf("Failed to dump config block");
 			}
+			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		}
 
 		//Read block 5, AA
 		if (flagReadAA) {
-			if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 10)) {
+			if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
 				result_status |= FLAG_ICLASS_READER_AA;
 				memcpy(card_data + (8*5), resp, 8);
 			} else {
@@ -1746,9 +1568,14 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 
 	uint8_t resp[ICLASS_BUFFER_SIZE];
 
-	setupIclassReader();
 	set_tracing(true);
+	clear_trace();
+	Iso15693InitReader();
 
+	StartCountSspClk();
+	uint32_t start_time = 0;
+	uint32_t eof_time = 0;
+	
 	while (!BUTTON_PRESS()) {
 
 		WDT_HIT();
@@ -1758,28 +1585,34 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			break;
 		}
 
-		uint8_t read_status = handshakeIclassTag(card_data);
+		uint8_t read_status = handshakeIclassTag(card_data, &eof_time);
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+
 		if (read_status < 2) continue;
 
 		//for now replay captured auth (as cc not updated)
 		memcpy(check+5, MAC, 4);
 
-		if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 5)) {
+		if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 5, start_time, &eof_time)) {
+			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 			Dbprintf("Error: Authentication Fail!");
 			continue;
 		}
 
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		//first get configuration block (block 1)
 		crc = block_crc_LUT[1];
 		read[1] = 1;
 		read[2] = crc >> 8;
 		read[3] = crc & 0xff;
 
-		if (!sendCmdGetResponseWithRetries(read, sizeof(read),resp, 10, 10)) {
+		if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 			Dbprintf("Dump config (block 1) failed");
 			continue;
 		}
 
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		mem = resp[5];
 		memory.k16 = (mem & 0x80);
 		memory.book = (mem & 0x20);
@@ -1800,7 +1633,8 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			read[2] = crc >> 8;
 			read[3] = crc & 0xff;
 
-			if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10)) {
+			if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+				start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 				Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
 						block, resp[0], resp[1], resp[2],
 						resp[3], resp[4], resp[5],
@@ -1857,7 +1691,8 @@ void iClass_Authentication(uint8_t *MAC) {
 	uint8_t resp[ICLASS_BUFFER_SIZE];
 	memcpy(check+5, MAC, 4);
 	bool isOK;
-	isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
+	uint32_t eof_time;
+	isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 6, 0, &eof_time);
 	cmd_send(CMD_ACK,isOK, 0, 0, 0, 0);
 }
 
@@ -1867,11 +1702,12 @@ static bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) {
 	uint16_t rdCrc = iclass_crc16(&bl, 1);
 	readcmd[2] = rdCrc >> 8;
 	readcmd[3] = rdCrc & 0xff;
-	uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
+	uint8_t resp[10];
 	bool isOK = false;
-
+	uint32_t eof_time;
+	
 	//readcmd[1] = blockNo;
-	isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, 10, 10);
+	isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, sizeof(resp), 10, 10, 0, &eof_time);
 	memcpy(readdata, resp, sizeof(resp));
 
 	return isOK;
@@ -1929,16 +1765,18 @@ static bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 	uint16_t wrCrc = iclass_crc16(wrCmd, 13);
 	write[14] = wrCrc >> 8;
 	write[15] = wrCrc & 0xff;
-	uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
+	uint8_t resp[10];
 	bool isOK = false;
-
-	isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10);
+	uint32_t eof_time = 0;
+	
+	isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10, 10, 0, &eof_time);
+	uint32_t start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 	if (isOK) { //if reader responded correctly
 		//Dbprintf("WriteResp: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",resp[0],resp[1],resp[2],resp[3],resp[4],resp[5],resp[6],resp[7],resp[8],resp[9]);
 		if (memcmp(write+2, resp, 8)) {  //if response is not equal to write values
 			if (blockNo != 3 && blockNo != 4) { //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
 				//error try again
-				isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10);
+				isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10, 10, start_time, &eof_time);
 			}
 		}
 	}
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index 85af0859..fff8b370 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -64,8 +64,26 @@
 
 #define arraylen(x) (sizeof(x)/sizeof((x)[0]))
 
+// Delays in SSP_CLK ticks.
+// SSP_CLK runs at 13,56MHz / 32 = 423.75kHz when simulating a tag
+#define DELAY_READER_TO_ARM               8
+#define DELAY_ARM_TO_READER               0
+//SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when acting as reader. All values should be multiples of 16
+#define DELAY_TAG_TO_ARM                 32
+#define DELAY_ARM_TO_TAG                 16
+
 static int DEBUG = 0;
 
+
+// specific LogTrace function for ISO15693: the duration needs to be scaled because otherwise it won't fit into a uint16_t
+bool LogTrace_ISO15693(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag) {
+	uint32_t duration = timestamp_end - timestamp_start;
+	duration /= 32;
+	timestamp_end = timestamp_start + duration;
+	return LogTrace(btBytes, iLen, timestamp_start, timestamp_end, parity, readerToTag);
+}
+
+
 ///////////////////////////////////////////////////////////////////////
 // ISO 15693 Part 2 - Air Interface
 // This section basically contains transmission and receiving of bits
@@ -84,84 +102,37 @@ static int DEBUG = 0;
 // resulting data rate is 26.48 kbit/s (fc/512)
 // cmd ... data
 // n ... length of data
-static void CodeIso15693AsReader(uint8_t *cmd, int n)
-{
-	int i, j;
+void CodeIso15693AsReader(uint8_t *cmd, int n) {
 
 	ToSendReset();
 
-	// Give it a bit of slack at the beginning
-	for(i = 0; i < 24; i++) {
-		ToSendStuffBit(1);
-	}
-
 	// SOF for 1of4
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	for(i = 0; i < n; i++) {
-		for(j = 0; j < 8; j += 2) {
-			int these = (cmd[i] >> j) & 3;
+	ToSend[++ToSendMax] = 0x84; //10000100
+
+	// data
+	for (int i = 0; i < n; i++) {
+		for (int j = 0; j < 8; j += 2) {
+			int these = (cmd[i] >> j) & 0x03;
 			switch(these) {
 				case 0:
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
+					ToSend[++ToSendMax] = 0x40; //01000000
 					break;
 				case 1:
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
+					ToSend[++ToSendMax] = 0x10; //00010000
 					break;
 				case 2:
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
+					ToSend[++ToSendMax] = 0x04; //00000100
 					break;
 				case 3:
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(1);
-					ToSendStuffBit(0);
+					ToSend[++ToSendMax] = 0x01; //00000001
 					break;
 			}
 		}
 	}
+
 	// EOF
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-
-	// Fill remainder of last byte with 1
-	for(i = 0; i < 4; i++) {
-		ToSendStuffBit(1);
-	}
-
+	ToSend[++ToSendMax] = 0x20; //0010 + 0000 padding
+	
 	ToSendMax++;
 }
 
@@ -170,46 +141,26 @@ static void CodeIso15693AsReader(uint8_t *cmd, int n)
 // is designed for more robust communication over longer distances
 static void CodeIso15693AsReader256(uint8_t *cmd, int n)
 {
-	int i, j;
-
 	ToSendReset();
 
-	// Give it a bit of slack at the beginning
-	for(i = 0; i < 24; i++) {
-		ToSendStuffBit(1);
-	}
-
 	// SOF for 1of256
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
+	ToSend[++ToSendMax] = 0x81; //10000001
 
-	for(i = 0; i < n; i++) {
-		for (j = 0; j<=255; j++) {
-			if (cmd[i]==j) {
-				ToSendStuffBit(1);
+	// data
+	for(int i = 0; i < n; i++) {
+		for (int j = 0; j <= 255; j++) {
+			if (cmd[i] == j) {
 				ToSendStuffBit(0);
+				ToSendStuffBit(1);
 			} else {
-				ToSendStuffBit(1);
-				ToSendStuffBit(1);
+				ToSendStuffBit(0);
+				ToSendStuffBit(0);
 			}
 		}
 	}
-	// EOF
-	ToSendStuffBit(1);
-	ToSendStuffBit(1);
-	ToSendStuffBit(0);
-	ToSendStuffBit(1);
 
-	// Fill remainder of last byte with 1
-	for(i = 0; i < 4; i++) {
-		ToSendStuffBit(1);
-	}
+	// EOF
+	ToSend[++ToSendMax] = 0x20; //0010 + 0000 padding
 
 	ToSendMax++;
 }
@@ -295,27 +246,38 @@ void CodeIso15693AsTag(uint8_t *cmd, size_t len) {
 
 
 // Transmit the command (to the tag) that was placed in cmd[].
-static void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t start_time)
-{
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_FULL_MOD);
-	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
+void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time) {
 
-	while (GetCountSspClk() < start_time) ;
+	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_FULL_MOD);
+	
+	*start_time = (*start_time - DELAY_ARM_TO_TAG) & 0xfffffff0;
+
+	while (GetCountSspClk() > *start_time) { // we may miss the intended time
+		*start_time += 16; // next possible time
+	}
+
+	
+	while (GetCountSspClk() < *start_time)
+		/* wait */ ;
 
 	LED_B_ON();
-	for(int c = 0; c < len; c++) {
+	for (int c = 0; c < len; c++) {
 		uint8_t data = cmd[c];
 		for (int i = 0; i < 8; i++) {
-			uint16_t send_word = (data & 0x80) ? 0x0000 : 0xffff;
+			uint16_t send_word = (data & 0x80) ? 0xffff : 0x0000;
 			while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) ;
 			AT91C_BASE_SSC->SSC_THR = send_word;
 			while (!(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY))) ;
 			AT91C_BASE_SSC->SSC_THR = send_word;
+
 			data <<= 1;
 		}
 		WDT_HIT();
 	}
 	LED_B_OFF();
+	
+	*start_time = *start_time + DELAY_ARM_TO_TAG;
+
 }
 
 
@@ -326,7 +288,7 @@ void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time,
 	// don't use the FPGA_HF_SIMULATOR_MODULATE_424K_8BIT minor mode. It would spoil GetCountSspClk()
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
 
-	uint32_t modulation_start_time = *start_time + 3 * 8;  // no need to transfer the unmodulated start of SOF
+	uint32_t modulation_start_time = *start_time - DELAY_ARM_TO_READER + 3 * 8;  // no need to transfer the unmodulated start of SOF
 	
 	while (GetCountSspClk() > (modulation_start_time & 0xfffffff8) + 3) { // we will miss the intended time
 		if (slot_time) {
@@ -341,7 +303,7 @@ void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time,
 
 	uint8_t shift_delay = modulation_start_time & 0x00000007;
 
-	*start_time = modulation_start_time - 3 * 8;
+	*start_time = modulation_start_time + DELAY_ARM_TO_READER - 3 * 8;
 
 	LED_C_ON();
 	uint8_t bits_to_shift = 0x00;
@@ -386,15 +348,18 @@ void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time,
 //          false if we are still waiting for some more
 //=============================================================================
 
-#define NOISE_THRESHOLD    160      // don't try to correlate noise
+#define NOISE_THRESHOLD          160                   // don't try to correlate noise
+#define MAX_PREVIOUS_AMPLITUDE   (-1 - NOISE_THRESHOLD)
 
 typedef struct DecodeTag {
 	enum {
 		STATE_TAG_SOF_LOW,
+		STATE_TAG_SOF_RISING_EDGE,
 		STATE_TAG_SOF_HIGH,
 		STATE_TAG_SOF_HIGH_END,
 		STATE_TAG_RECEIVING_DATA,
-		STATE_TAG_EOF
+		STATE_TAG_EOF,
+		STATE_TAG_EOF_TAIL
 	}         state;
 	int       bitCount;
 	int       posCount;
@@ -409,6 +374,9 @@ typedef struct DecodeTag {
 	uint8_t   *output;
 	int       len;
 	int       sum1, sum2;
+	int       threshold_sof;
+	int       threshold_half;
+	uint16_t  previous_amplitude;
 } DecodeTag_t;
 
 
@@ -416,40 +384,58 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 {
 	switch(DecodeTag->state) {
 		case STATE_TAG_SOF_LOW:
-			// waiting for 12 times low (11 times low is accepted as well)
-			if (amplitude < NOISE_THRESHOLD) {
-				DecodeTag->posCount++;
-			} else {
+			// waiting for a rising edge
+			if (amplitude > NOISE_THRESHOLD + DecodeTag->previous_amplitude) {
 				if (DecodeTag->posCount > 10) {
-					DecodeTag->posCount = 1;
-					DecodeTag->sum1 = 0;
-					DecodeTag->state = STATE_TAG_SOF_HIGH;
+					DecodeTag->threshold_sof = amplitude - DecodeTag->previous_amplitude;
+					DecodeTag->threshold_half = 0;
+					DecodeTag->state = STATE_TAG_SOF_RISING_EDGE;
 				} else {
 					DecodeTag->posCount = 0;
 				}
+			} else {
+				DecodeTag->posCount++;
+				DecodeTag->previous_amplitude = amplitude;
 			}
 			break;
 
+		case STATE_TAG_SOF_RISING_EDGE:
+			if (amplitude - DecodeTag->previous_amplitude > DecodeTag->threshold_sof) { // edge still rising
+				if (amplitude - DecodeTag->threshold_sof > DecodeTag->threshold_sof) { // steeper edge, take this as time reference
+					DecodeTag->posCount = 1;
+				} else {
+					DecodeTag->posCount = 2;
+				}
+				DecodeTag->threshold_sof = (amplitude - DecodeTag->previous_amplitude) / 2;
+			} else {
+				DecodeTag->posCount = 2;
+				DecodeTag->threshold_sof = DecodeTag->threshold_sof/2;
+			}
+			// DecodeTag->posCount = 2;
+			DecodeTag->state = STATE_TAG_SOF_HIGH;
+			break;
+				
 		case STATE_TAG_SOF_HIGH:
 			// waiting for 10 times high. Take average over the last 8
-			if (amplitude > NOISE_THRESHOLD) {
+			if (amplitude > DecodeTag->threshold_sof) {
 				DecodeTag->posCount++;
 				if (DecodeTag->posCount > 2) {
-					DecodeTag->sum1 += amplitude; // keep track of average high value
+					DecodeTag->threshold_half += amplitude; // keep track of average high value
 				}
 				if (DecodeTag->posCount == 10) {
-					DecodeTag->sum1 >>= 4;        // calculate half of average high value (8 samples)
+					DecodeTag->threshold_half >>= 2; // (4 times 1/2 average)
 					DecodeTag->state = STATE_TAG_SOF_HIGH_END;
 				}
 			} else { // high phase was too short
 				DecodeTag->posCount = 1;
+				DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 				DecodeTag->state = STATE_TAG_SOF_LOW;
 			}
 			break;
 
 		case STATE_TAG_SOF_HIGH_END:
-			// waiting for a falling edge
-			if (amplitude < DecodeTag->sum1) {   // signal drops below 50% average high: a falling edge
+			// check for falling edge
+			if (DecodeTag->posCount == 13 && amplitude < DecodeTag->threshold_sof) {
 				DecodeTag->lastBit = SOF_PART1;  // detected 1st part of SOF (12 samples low and 12 samples high)
 				DecodeTag->shiftReg = 0;
 				DecodeTag->bitCount = 0;
@@ -458,11 +444,18 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 				DecodeTag->sum2 = 0;
 				DecodeTag->posCount = 2;
 				DecodeTag->state = STATE_TAG_RECEIVING_DATA;
+				// FpgaDisableTracing(); // DEBUGGING
+				// Dbprintf("amplitude = %d, threshold_sof = %d, threshold_half/4 = %d, previous_amplitude = %d", 
+					// amplitude, 
+					// DecodeTag->threshold_sof, 
+					// DecodeTag->threshold_half/4,
+					// DecodeTag->previous_amplitude); // DEBUGGING
 				LED_C_ON();
 			} else {
 				DecodeTag->posCount++;
 				if (DecodeTag->posCount > 13) { // high phase too long
 					DecodeTag->posCount = 0;
+					DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 					DecodeTag->state = STATE_TAG_SOF_LOW;
 					LED_C_OFF();
 				}
@@ -480,18 +473,16 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 				DecodeTag->sum2 += amplitude;
 			}
 			if (DecodeTag->posCount == 8) {
-				int32_t corr_1 = DecodeTag->sum2 - DecodeTag->sum1;
-				int32_t corr_0 = -corr_1;
-				int32_t corr_EOF = (DecodeTag->sum1 + DecodeTag->sum2) / 2;
-				if (corr_EOF > corr_0 && corr_EOF > corr_1) {
+				if (DecodeTag->sum1 > DecodeTag->threshold_half && DecodeTag->sum2 > DecodeTag->threshold_half) { // modulation in both halves
 					if (DecodeTag->lastBit == LOGIC0) {  // this was already part of EOF
 						DecodeTag->state = STATE_TAG_EOF;
 					} else {
 						DecodeTag->posCount = 0;
+						DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 						DecodeTag->state = STATE_TAG_SOF_LOW;
 						LED_C_OFF();
 					}
-				} else if (corr_1 > corr_0) {
+				} else if (DecodeTag->sum1 < DecodeTag->threshold_half && DecodeTag->sum2 > DecodeTag->threshold_half) { // modulation in second half
 					// logic 1
 					if (DecodeTag->lastBit == SOF_PART1) { // still part of SOF
 						DecodeTag->lastBit = SOF_PART2;    // SOF completed
@@ -503,20 +494,21 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 						if (DecodeTag->bitCount == 8) {
 							DecodeTag->output[DecodeTag->len] = DecodeTag->shiftReg;
 							DecodeTag->len++;
+							// if (DecodeTag->shiftReg == 0x12 && DecodeTag->len == 1) FpgaDisableTracing(); // DEBUGGING
 							if (DecodeTag->len > DecodeTag->max_len) {
 								// buffer overflow, give up
-								DecodeTag->posCount = 0;
-								DecodeTag->state = STATE_TAG_SOF_LOW;
 								LED_C_OFF();
+								return true;
 							}
 							DecodeTag->bitCount = 0;
 							DecodeTag->shiftReg = 0;
 						}
 					}
-				} else {
+				} else if (DecodeTag->sum1 > DecodeTag->threshold_half && DecodeTag->sum2 < DecodeTag->threshold_half) { // modulation in first half
 					// logic 0
 					if (DecodeTag->lastBit == SOF_PART1) { // incomplete SOF
 						DecodeTag->posCount = 0;
+						DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 						DecodeTag->state = STATE_TAG_SOF_LOW;
 						LED_C_OFF();
 					} else {
@@ -526,9 +518,11 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 						if (DecodeTag->bitCount == 8) {
 							DecodeTag->output[DecodeTag->len] = DecodeTag->shiftReg;
 							DecodeTag->len++;
+							// if (DecodeTag->shiftReg == 0x12 && DecodeTag->len == 1) FpgaDisableTracing(); // DEBUGGING
 							if (DecodeTag->len > DecodeTag->max_len) {
 								// buffer overflow, give up
 								DecodeTag->posCount = 0;
+								DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 								DecodeTag->state = STATE_TAG_SOF_LOW;
 								LED_C_OFF();
 							}
@@ -536,6 +530,15 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 							DecodeTag->shiftReg = 0;
 						}
 					}
+				} else { // no modulation
+					if (DecodeTag->lastBit == SOF_PART2) { // only SOF (this is OK for iClass)
+						LED_C_OFF();
+						return true;
+					} else {
+						DecodeTag->posCount = 0;
+						DecodeTag->state = STATE_TAG_SOF_LOW;
+						LED_C_OFF();
+					}
 				}
 				DecodeTag->posCount = 0;
 			}
@@ -553,21 +556,42 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 				DecodeTag->sum2 += amplitude;
 			}
 			if (DecodeTag->posCount == 8) {
-				int32_t corr_1 = DecodeTag->sum2 - DecodeTag->sum1;
-				int32_t corr_0 = -corr_1;
-				int32_t corr_EOF = (DecodeTag->sum1 + DecodeTag->sum2) / 2;
-				if (corr_EOF > corr_0 || corr_1 > corr_0) {
+				if (DecodeTag->sum1 > DecodeTag->threshold_half && DecodeTag->sum2 < DecodeTag->threshold_half) { // modulation in first half
 					DecodeTag->posCount = 0;
+					DecodeTag->state = STATE_TAG_EOF_TAIL;
+				} else {
+					DecodeTag->posCount = 0;
+					DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 					DecodeTag->state = STATE_TAG_SOF_LOW;
 					LED_C_OFF();
-				} else {
-					LED_C_OFF();
-					return true;
 				}
 			}
 			DecodeTag->posCount++;
 			break;
 
+		case STATE_TAG_EOF_TAIL:
+			if (DecodeTag->posCount == 1) {
+				DecodeTag->sum1 = 0;
+				DecodeTag->sum2 = 0;
+			}
+			if (DecodeTag->posCount <= 4) {
+				DecodeTag->sum1 += amplitude;
+			} else {
+				DecodeTag->sum2 += amplitude;
+			}
+			if (DecodeTag->posCount == 8) {
+				if (DecodeTag->sum1 < DecodeTag->threshold_half && DecodeTag->sum2 < DecodeTag->threshold_half) { // no modulation in both halves
+					LED_C_OFF();
+					return true;
+				} else {
+					DecodeTag->posCount = 0;
+					DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+					DecodeTag->state = STATE_TAG_SOF_LOW;
+					LED_C_OFF();
+				}
+			}
+			DecodeTag->posCount++;
+			break;
 	}
 
 	return false;
@@ -576,6 +600,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 
 static void DecodeTagInit(DecodeTag_t *DecodeTag, uint8_t *data, uint16_t max_len)
 {
+	DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 	DecodeTag->posCount = 0;
 	DecodeTag->state = STATE_TAG_SOF_LOW;
 	DecodeTag->output = data;
@@ -587,18 +612,19 @@ static void DecodeTagReset(DecodeTag_t *DecodeTag)
 {
 	DecodeTag->posCount = 0;
 	DecodeTag->state = STATE_TAG_SOF_LOW;
+	DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 }
 
 
 /*
  *  Receive and decode the tag response, also log to tracebuffer
  */
-static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int timeout)
-{
-	int samples = 0;
-	bool gotFrame = false;
+int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time) {
 
-	uint16_t *dmaBuf = (uint16_t*)BigBuf_malloc(ISO15693_DMA_BUFFER_SIZE*sizeof(uint16_t));
+	int samples = 0;
+	int ret = 0;
+
+	uint16_t dmaBuf[ISO15693_DMA_BUFFER_SIZE];
 
 	// the Decoder data structure
 	DecodeTag_t DecodeTag = { 0 };
@@ -613,6 +639,7 @@ static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int tim
 	// Setup and start DMA.
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
 	FpgaSetupSscDma((uint8_t*) dmaBuf, ISO15693_DMA_BUFFER_SIZE);
+	uint32_t dma_start_time = 0;
 	uint16_t *upTo = dmaBuf;
 
 	for(;;) {
@@ -620,12 +647,19 @@ static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int tim
 
 		if (behindBy == 0) continue;
 
+		samples++;
+		if (samples == 1) {
+		    // DMA has transferred the very first data
+			dma_start_time = GetCountSspClk() & 0xfffffff0;
+		}
+		
 		uint16_t tagdata = *upTo++;
 
 		if(upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                // we have read all of the DMA buffer content.
 			upTo = dmaBuf;                                             // start reading the circular buffer from the beginning
 			if(behindBy > (9*ISO15693_DMA_BUFFER_SIZE/10)) {
 				Dbprintf("About to blow circular buffer - aborted! behindBy=%d", behindBy);
+				ret = -1;
 				break;
 			}
 		}
@@ -634,30 +668,42 @@ static int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, int tim
 			AT91C_BASE_PDC_SSC->PDC_RNCR = ISO15693_DMA_BUFFER_SIZE;   // DMA Next Counter registers
 		}
 
-		samples++;
-
 		if (Handle15693SamplesFromTag(tagdata, &DecodeTag)) {
-			gotFrame = true;
+			*eof_time = dma_start_time + samples*16 - DELAY_TAG_TO_ARM; // end of EOF
+			if (DecodeTag.lastBit == SOF_PART2) {
+				*eof_time -= 8*16; // needed 8 additional samples to confirm single SOF (iCLASS)
+			}
+			if (DecodeTag.len > DecodeTag.max_len) {
+				ret = -2; // buffer overflow
+			}
 			break;
 		}
 
 		if (samples > timeout && DecodeTag.state < STATE_TAG_RECEIVING_DATA) {
-			DecodeTag.len = 0;
+			ret = -1;	// timeout
 			break;
 		}
 
 	}
 
 	FpgaDisableSscDma();
-	BigBuf_free();
 
-	if (DEBUG) Dbprintf("samples = %d, gotFrame = %d, Decoder: state = %d, len = %d, bitCount = %d, posCount = %d",
-						samples, gotFrame, DecodeTag.state, DecodeTag.len, DecodeTag.bitCount, DecodeTag.posCount);
+	if (DEBUG) Dbprintf("samples = %d, ret = %d, Decoder: state = %d, lastBit = %d, len = %d, bitCount = %d, posCount = %d",
+						samples, ret, DecodeTag.state, DecodeTag.lastBit, DecodeTag.len, DecodeTag.bitCount, DecodeTag.posCount);
 
-	if (DecodeTag.len > 0) {
-		LogTrace(DecodeTag.output, DecodeTag.len, 0, 0, NULL, false);
+	if (ret < 0) {
+		return ret;
 	}
 
+	uint32_t sof_time = *eof_time
+						- DecodeTag.len * 8 * 8 * 16 // time for byte transfers
+						- 32 * 16  // time for SOF transfer
+						- (DecodeTag.lastBit != SOF_PART2?32*16:0); // time for EOF transfer
+						
+	if (DEBUG) Dbprintf("timing: sof_time = %d, eof_time = %d", sof_time, *eof_time);
+	
+	LogTrace_ISO15693(DecodeTag.output, DecodeTag.len, sof_time*4, *eof_time*4, NULL, false);
+
 	return DecodeTag.len;
 }
 
@@ -977,7 +1023,7 @@ int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eo
 
 		for (int i = 7; i >= 0; i--) {
 			if (Handle15693SampleFromReader((b >> i) & 0x01, &DecodeReader)) {
-				*eof_time = dma_start_time + samples - DELAY_READER_TO_ARM_SIM; // end of EOF
+				*eof_time = dma_start_time + samples - DELAY_READER_TO_ARM; // end of EOF
 				gotFrame = true;
 				break;
 			}
@@ -1006,7 +1052,7 @@ int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eo
 						- DecodeReader.byteCount * (DecodeReader.Coding==CODING_1_OUT_OF_4?128:2048) // time for byte transfers
 						- 32  // time for SOF transfer
 						- 16; // time for EOF transfer
-		LogTrace(DecodeReader.output, DecodeReader.byteCount, sof_time, *eof_time, NULL, true);
+		LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, sof_time*32, *eof_time*32, NULL, true);
 	}
 
 	return DecodeReader.byteCount;
@@ -1060,7 +1106,8 @@ void AcquireRawAdcSamplesIso15693(void)
 	SpinDelay(100);
 
 	// Now send the command
-	TransmitTo15693Tag(ToSend, ToSendMax, 0);
+	uint32_t start_time = 0;
+	TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
 
 	// wait for last transfer to complete
 	while (!(AT91C_BASE_SSC->SSC_SR & AT91C_SSC_TXEMPTY)) ;
@@ -1156,7 +1203,7 @@ void SnoopIso15693(void)
 			if (Handle15693SampleFromReader(snoopdata & 0x02, &DecodeReader)) {
 				FpgaDisableSscDma();
 				ExpectTagAnswer = true;
-				LogTrace(DecodeReader.output, DecodeReader.byteCount, samples, samples, NULL, true);
+				LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, samples*64, samples*64, NULL, true);
 				/* And ready to receive another command. */
 				DecodeReaderReset(&DecodeReader);
 				/* And also reset the demod code, which might have been */
@@ -1168,7 +1215,7 @@ void SnoopIso15693(void)
 			if (Handle15693SampleFromReader(snoopdata & 0x01, &DecodeReader)) {
 				FpgaDisableSscDma();
 				ExpectTagAnswer = true;
-				LogTrace(DecodeReader.output, DecodeReader.byteCount, samples, samples, NULL, true);
+				LogTrace_ISO15693(DecodeReader.output, DecodeReader.byteCount, samples*64, samples*64, NULL, true);
 				/* And ready to receive another command. */
 				DecodeReaderReset(&DecodeReader);
 				/* And also reset the demod code, which might have been */
@@ -1184,7 +1231,7 @@ void SnoopIso15693(void)
 			if (Handle15693SamplesFromTag(snoopdata >> 2, &DecodeTag)) {
 				FpgaDisableSscDma();
 				//Use samples as a time measurement
-				LogTrace(DecodeTag.output, DecodeTag.len, samples, samples, NULL, false);
+				LogTrace_ISO15693(DecodeTag.output, DecodeTag.len, samples*64, samples*64, NULL, false);
 				// And ready to receive another response.
 				DecodeTagReset(&DecodeTag);
 				DecodeReaderReset(&DecodeReader);
@@ -1213,10 +1260,8 @@ void SnoopIso15693(void)
 
 
 // Initialize the proxmark as iso15k reader
-static void Iso15693InitReader() {
+void Iso15693InitReader() {
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	// Setup SSC
-	// FpgaSetupSsc();
 
 	// Start from off (no field generated)
 	LED_D_OFF();
@@ -1300,17 +1345,20 @@ static void BuildInventoryResponse(uint8_t *uid)
 //  init ... should we initialize the reader?
 //  speed ... 0 low speed, 1 hi speed
 //  *recv will contain the tag's answer
-//  return: lenght of received data
-int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time) {
+//  return: length of received data, or -1 for timeout
+int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint32_t *eof_time) {
 
 	LED_A_ON();
 	LED_B_OFF();
 	LED_C_OFF();
 
-	if (init) Iso15693InitReader();
-
-	int answerLen=0;
-
+	if (init) {
+		Iso15693InitReader();
+		StartCountSspClk();
+	}
+	
+	int answerLen = 0;
+	
 	if (!speed) {
 		// low speed (1 out of 256)
 		CodeIso15693AsReader256(send, sendlen);
@@ -1319,11 +1367,14 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv,
 		CodeIso15693AsReader(send, sendlen);
 	}
 
-	TransmitTo15693Tag(ToSend, ToSendMax, start_time);
+	if (start_time == 0) {
+		start_time = GetCountSspClk();
+	}
+	TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
 
 	// Now wait for a response
 	if (recv != NULL) {
-		answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, DELAY_ISO15693_VCD_TO_VICC_READER * 2);
+		answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, DELAY_ISO15693_VCD_TO_VICC_READER * 2, eof_time);
 	}
 
 	LED_A_OFF();
@@ -1445,11 +1496,13 @@ void ReaderIso15693(uint32_t parameter)
 
 	// Now send the IDENTIFY command
 	BuildIdentifyRequest();
-	TransmitTo15693Tag(ToSend, ToSendMax, 0);
+	uint32_t start_time = 0;
+	TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
 
 	// Now wait for a response
-	answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2) ;
-	uint32_t start_time = GetCountSspClk() + DELAY_ISO15693_VICC_TO_VCD_READER;
+	uint32_t eof_time;
+	answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2, &eof_time) ;
+	start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 
 	if (answerLen >=12) // we should do a better check than this
 	{
@@ -1487,9 +1540,9 @@ void ReaderIso15693(uint32_t parameter)
 	if (answerLen >= 12 && DEBUG) {
 		for (int i = 0; i < 32; i++) {  // sanity check, assume max 32 pages
 			BuildReadBlockRequest(TagUID, i);
-			TransmitTo15693Tag(ToSend, ToSendMax, start_time);
-			int answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2);
-			start_time = GetCountSspClk() + DELAY_ISO15693_VICC_TO_VCD_READER;
+			TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
+			int answerLen = GetIso15693AnswerFromTag(answer, sizeof(answer), DELAY_ISO15693_VCD_TO_VICC_READER * 2, &eof_time);
+			start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 			if (answerLen > 0) {
 				Dbprintf("READ SINGLE BLOCK %d returned %d octets:", i, answerLen);
 				DbdecodeIso15693Answer(answerLen, answer);
@@ -1535,7 +1588,7 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 
 		if ((cmd_len >= 5) && (cmd[0] & ISO15693_REQ_INVENTORY) && (cmd[1] == ISO15693_INVENTORY)) { // TODO: check more flags
 			bool slow = !(cmd[0] & ISO15693_REQ_DATARATE_HIGH);
-			start_time = eof_time + DELAY_ISO15693_VCD_TO_VICC_SIM - DELAY_ARM_TO_READER_SIM;
+			start_time = eof_time + DELAY_ISO15693_VCD_TO_VICC_SIM;
 			TransmitTo15693Reader(ToSend, ToSendMax, &start_time, 0, slow);
 		}
 
@@ -1557,11 +1610,8 @@ void BruteforceIso15693Afi(uint32_t speed)
 
 	uint8_t data[6];
 	uint8_t recv[ISO15693_MAX_RESPONSE_LENGTH];
-
-	int datalen=0, recvlen=0;
-
-	Iso15693InitReader();
-	StartCountSspClk();
+	int datalen = 0, recvlen = 0;
+	uint32_t eof_time;
 
 	// first without AFI
 	// Tags should respond without AFI and with AFI=0 even when AFI is active
@@ -1570,8 +1620,9 @@ void BruteforceIso15693Afi(uint32_t speed)
 	data[1] = ISO15693_INVENTORY;
 	data[2] = 0; // mask length
 	datalen = Iso15693AddCrc(data,3);
-	recvlen = SendDataTag(data, datalen, false, speed, recv, sizeof(recv), 0);
-	uint32_t start_time = GetCountSspClk() + DELAY_ISO15693_VICC_TO_VCD_READER;
+	uint32_t start_time = GetCountSspClk();
+	recvlen = SendDataTag(data, datalen, true, speed, recv, sizeof(recv), 0, &eof_time);
+	start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 	WDT_HIT();
 	if (recvlen>=12) {
 		Dbprintf("NoAFI UID=%s", Iso15693sprintUID(NULL, &recv[2]));
@@ -1587,8 +1638,8 @@ void BruteforceIso15693Afi(uint32_t speed)
 	for (int i = 0; i < 256; i++) {
 		data[2] = i & 0xFF;
 		datalen = Iso15693AddCrc(data,4);
-		recvlen = SendDataTag(data, datalen, false, speed, recv, sizeof(recv), start_time);
-		start_time = GetCountSspClk() + DELAY_ISO15693_VICC_TO_VCD_READER;
+		recvlen = SendDataTag(data, datalen, false, speed, recv, sizeof(recv), start_time, &eof_time);
+		start_time = eof_time + DELAY_ISO15693_VICC_TO_VCD_READER;
 		WDT_HIT();
 		if (recvlen >= 12) {
 			Dbprintf("AFI=%i UID=%s", i, Iso15693sprintUID(NULL, &recv[2]));
@@ -1605,7 +1656,8 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
 
 	int recvlen = 0;
 	uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
-
+	uint32_t eof_time;
+	
 	LED_A_ON();
 
 	if (DEBUG) {
@@ -1613,24 +1665,27 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
 		Dbhexdump(datalen, data, false);
 	}
 
-	recvlen = SendDataTag(data, datalen, true, speed, (recv?recvbuf:NULL), sizeof(recvbuf), 0);
-
-	if (recv) {
-		if (DEBUG) {
-			Dbprintf("RECV:");
-			Dbhexdump(recvlen, recvbuf, false);
-			DbdecodeIso15693Answer(recvlen, recvbuf);
-		}
-
-		cmd_send(CMD_ACK, recvlen>ISO15693_MAX_RESPONSE_LENGTH?ISO15693_MAX_RESPONSE_LENGTH:recvlen, 0, 0, recvbuf, ISO15693_MAX_RESPONSE_LENGTH);
-
-	}
+	recvlen = SendDataTag(data, datalen, true, speed, (recv?recvbuf:NULL), sizeof(recvbuf), 0, &eof_time);
 
 	// for the time being, switch field off to protect rdv4.0
 	// note: this prevents using hf 15 cmd with s option - which isn't implemented yet anyway
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 	LED_D_OFF();
 
+	if (recv) {
+		if (DEBUG) {
+			Dbprintf("RECV:");
+			if (recvlen > 0) {
+				Dbhexdump(recvlen, recvbuf, false);
+				DbdecodeIso15693Answer(recvlen, recvbuf);
+			}
+		}
+		if (recvlen > ISO15693_MAX_RESPONSE_LENGTH) {
+			recvlen = ISO15693_MAX_RESPONSE_LENGTH;
+		}
+		cmd_send(CMD_ACK, recvlen, 0, 0, recvbuf, ISO15693_MAX_RESPONSE_LENGTH);
+	}
+
 	LED_A_OFF();
 }
 
@@ -1648,7 +1703,8 @@ void SetTag15693Uid(uint8_t *uid)
 
 	int recvlen = 0;
 	uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
-
+	uint32_t eof_time;
+	
 	LED_A_ON();
 
 	// Command 1 : 02213E00000000
@@ -1687,7 +1743,7 @@ void SetTag15693Uid(uint8_t *uid)
 	cmd[3][5] = uid[1];
 	cmd[3][6] = uid[0];
 
-	for (int i=0; i<4; i++) {
+	for (int i = 0; i < 4; i++) {
 		// Add the CRC
 		crc = Iso15693Crc(cmd[i], 7);
 		cmd[i][7] = crc & 0xff;
@@ -1698,12 +1754,14 @@ void SetTag15693Uid(uint8_t *uid)
 			Dbhexdump(sizeof(cmd[i]), cmd[i], false);
 		}
 
-		recvlen = SendDataTag(cmd[i], sizeof(cmd[i]), true, 1, recvbuf, sizeof(recvbuf), 0);
+		recvlen = SendDataTag(cmd[i], sizeof(cmd[i]), true, 1, recvbuf, sizeof(recvbuf), 0, &eof_time);
 
 		if (DEBUG) {
 			Dbprintf("RECV:");
-			Dbhexdump(recvlen, recvbuf, false);
-			DbdecodeIso15693Answer(recvlen, recvbuf);
+			if (recvlen > 0) {
+				Dbhexdump(recvlen, recvbuf, false);
+				DbdecodeIso15693Answer(recvlen, recvbuf);
+			}
 		}
 
 		cmd_send(CMD_ACK, recvlen>ISO15693_MAX_RESPONSE_LENGTH?ISO15693_MAX_RESPONSE_LENGTH:recvlen, 0, 0, recvbuf, ISO15693_MAX_RESPONSE_LENGTH);
diff --git a/armsrc/iso15693.h b/armsrc/iso15693.h
index 7d2e7598..96a2b39b 100644
--- a/armsrc/iso15693.h
+++ b/armsrc/iso15693.h
@@ -17,16 +17,18 @@
 
 // Delays in SSP_CLK ticks.
 // SSP_CLK runs at 13,56MHz / 32 = 423.75kHz when simulating a tag
-#define DELAY_READER_TO_ARM_SIM           8
-#define DELAY_ARM_TO_READER_SIM           0
-#define DELAY_ISO15693_VCD_TO_VICC_SIM    132  // 132/423.75kHz = 311.5us from end of command EOF to start of tag response
-//SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when acting as reader
+#define DELAY_ISO15693_VCD_TO_VICC_SIM     132  // 132/423.75kHz = 311.5us from end of command EOF to start of tag response
+//SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when acting as reader. All values should be multiples of 16
 #define DELAY_ISO15693_VCD_TO_VICC_READER 1056 // 1056/3,39MHz = 311.5us from end of command EOF to start of tag response
-#define DELAY_ISO15693_VICC_TO_VCD_READER 1017 // 1017/3.39MHz = 300us between end of tag response and next reader command
+#define DELAY_ISO15693_VICC_TO_VCD_READER 1024 // 1024/3.39MHz = 302.1us between end of tag response and next reader command
 
+void Iso15693InitReader();
+void CodeIso15693AsReader(uint8_t *cmd, int n);
 void CodeIso15693AsTag(uint8_t *cmd, size_t len);
-int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eof_time);
 void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time, uint32_t slot_time, bool slow);
+int GetIso15693CommandFromReader(uint8_t *received, size_t max_len, uint32_t *eof_time);
+void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time);
+int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeout, uint32_t *eof_time);
 void SnoopIso15693(void);
 void AcquireRawAdcSamplesIso15693(void);
 void ReaderIso15693(uint32_t parameter);
@@ -35,5 +37,6 @@ void BruteforceIso15693Afi(uint32_t speed);
 void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t data[]);
 void SetTag15693Uid(uint8_t *uid);
 void SetDebugIso15693(uint32_t flag);
+bool LogTrace_ISO15693(const uint8_t *btBytes, uint16_t iLen, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);
 
 #endif
diff --git a/armsrc/util.c b/armsrc/util.c
index aac68a34..4bff3a26 100644
--- a/armsrc/util.c
+++ b/armsrc/util.c
@@ -21,7 +21,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
 
    if ( len % 16 == 0 ) {
 	   for(; p-buf < len; p += 16)
-       Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
+	   Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
 				name,
 				p-buf,
 				len,
@@ -30,7 +30,7 @@ void print_result(char *name, uint8_t *buf, size_t len) {
    }
    else {
    for(; p-buf < len; p += 8)
-       Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x", name, p-buf, len, p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+	   Dbprintf("[%s:%d/%d] %02x %02x %02x %02x %02x %02x %02x %02x", name, p-buf, len, p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
    }
 }
 
@@ -68,17 +68,17 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
 
 // RotateLeft - Ultralight, Desfire
 void rol(uint8_t *data, const size_t len){
-    uint8_t first = data[0];
-    for (size_t i = 0; i < len-1; i++) {
-        data[i] = data[i+1];
-    }
-    data[len-1] = first;
+	uint8_t first = data[0];
+	for (size_t i = 0; i < len-1; i++) {
+		data[i] = data[i+1];
+	}
+	data[len-1] = first;
 }
 void lsl (uint8_t *data, size_t len) {
-    for (size_t n = 0; n < len - 1; n++) {
-        data[n] = (data[n] << 1) | (data[n+1] >> 7);
-    }
-    data[len - 1] <<= 1;
+	for (size_t n = 0; n < len - 1; n++) {
+		data[n] = (data[n] << 1) | (data[n+1] >> 7);
+	}
+	data[len - 1] <<= 1;
 }
 
 void LEDsoff()
@@ -309,16 +309,16 @@ void FormatVersionInformation(char *dst, int len, const char *prefix, void *vers
 //  -------------------------------------------------------------------------
 //  test procedure:
 //
-//	ti = GetTickCount();
-//	SpinDelay(1000);
-//	ti = GetTickCount() - ti;
-//	Dbprintf("timer(1s): %d t=%d", ti, GetTickCount());
+//  ti = GetTickCount();
+//  SpinDelay(1000);
+//  ti = GetTickCount() - ti;
+//  Dbprintf("timer(1s): %d t=%d", ti, GetTickCount());
 
 void StartTickCount()
 {
 	// This timer is based on the slow clock. The slow clock frequency is between 22kHz and 40kHz.
 	// We can determine the actual slow clock frequency by looking at the Main Clock Frequency Register.
-    uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff;		// = 16 * main clock frequency (16MHz) / slow clock frequency
+	uint16_t mainf = AT91C_BASE_PMC->PMC_MCFR & 0xffff;     // = 16 * main clock frequency (16MHz) / slow clock frequency
 	// set RealTimeCounter divider to count at 1kHz:
 	AT91C_BASE_RTTC->RTTC_RTMR = AT91C_RTTC_RTTRST | ((256000 + (mainf/2)) / mainf);
 	// note: worst case precision is approx 2.5%
@@ -334,12 +334,12 @@ uint32_t RAMFUNC GetTickCount(){
 
 
 //  -------------------------------------------------------------------------
-//  microseconds timer 
+//  microseconds timer
 //  -------------------------------------------------------------------------
 void StartCountUS()
 {
 	AT91C_BASE_PMC->PMC_PCER |= (0x1 << 12) | (0x1 << 13) | (0x1 << 14);
-//	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC1XC1S_TIOA0;
+//  AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC1XC1S_TIOA0;
 	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_NONE | AT91C_TCB_TC1XC1S_TIOA0 | AT91C_TCB_TC2XC2S_NONE;
 
 	// fast clock
@@ -349,10 +349,10 @@ void StartCountUS()
 														AT91C_TC_ACPC_SET | AT91C_TC_ASWTRG_SET;
 	AT91C_BASE_TC0->TC_RA = 1;
 	AT91C_BASE_TC0->TC_RC = 0xBFFF + 1; // 0xC000
-	
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; // timer disable  
+
+	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; // timer disable
 	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_XC1; // from timer 0
-	
+
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN;
 	AT91C_BASE_TCB->TCB_BCR = 1;
@@ -375,61 +375,72 @@ uint32_t RAMFUNC GetDeltaCountUS(){
 
 
 //  -------------------------------------------------------------------------
-//  Timer for iso14443 commands. Uses ssp_clk from FPGA 
+//  Timer for iso14443 commands. Uses ssp_clk from FPGA
 //  -------------------------------------------------------------------------
 void StartCountSspClk()
 {
 	AT91C_BASE_PMC->PMC_PCER = (1 << AT91C_ID_TC0) | (1 << AT91C_ID_TC1) | (1 << AT91C_ID_TC2);  // Enable Clock to all timers
-	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_TIOA1 		// XC0 Clock = TIOA1
-							| AT91C_TCB_TC1XC1S_NONE 		// XC1 Clock = none
-							| AT91C_TCB_TC2XC2S_TIOA0;		// XC2 Clock = TIOA0
+	AT91C_BASE_TCB->TCB_BMR = AT91C_TCB_TC0XC0S_TIOA1       // XC0 Clock = TIOA1
+							| AT91C_TCB_TC1XC1S_NONE        // XC1 Clock = none
+							| AT91C_TCB_TC2XC2S_TIOA0;      // XC2 Clock = TIOA0
 
 	// configure TC1 to create a short pulse on TIOA1 when a rising edge on TIOB1 (= ssp_clk from FPGA) occurs:
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS; 				// disable TC1
+	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;               // disable TC1
 	AT91C_BASE_TC1->TC_CMR = AT91C_TC_CLKS_TIMER_DIV1_CLOCK // TC1 Clock = MCK(48MHz)/2 = 24MHz
-							| AT91C_TC_CPCSTOP				// Stop clock on RC compare
-							| AT91C_TC_EEVTEDG_RISING		// Trigger on rising edge of Event
-							| AT91C_TC_EEVT_TIOB			// Event-Source: TIOB1 (= ssp_clk from FPGA = 13,56MHz/16 ... 13,56MHz/4)
-							| AT91C_TC_ENETRG				// Enable external trigger event
-							| AT91C_TC_WAVESEL_UP	 		// Upmode without automatic trigger on RC compare
-							| AT91C_TC_WAVE 				// Waveform Mode
-							| AT91C_TC_AEEVT_SET 			// Set TIOA1 on external event
-							| AT91C_TC_ACPC_CLEAR; 			// Clear TIOA1 on RC Compare
-	AT91C_BASE_TC1->TC_RC = 0x02; 							// RC Compare value = 0x02
+							| AT91C_TC_CPCSTOP              // Stop clock on RC compare
+							| AT91C_TC_EEVTEDG_RISING       // Trigger on rising edge of Event
+							| AT91C_TC_EEVT_TIOB            // Event-Source: TIOB1 (= ssp_clk from FPGA = 13,56MHz/16 ... 13,56MHz/4)
+							| AT91C_TC_ENETRG               // Enable external trigger event
+							| AT91C_TC_WAVESEL_UP           // Upmode without automatic trigger on RC compare
+							| AT91C_TC_WAVE                 // Waveform Mode
+							| AT91C_TC_AEEVT_SET            // Set TIOA1 on external event
+							| AT91C_TC_ACPC_CLEAR;          // Clear TIOA1 on RC Compare
+	AT91C_BASE_TC1->TC_RC = 0x02;                           // RC Compare value = 0x02
 
 	// use TC0 to count TIOA1 pulses
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;				// disable TC0
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_XC0	 			// TC0 clock = XC0 clock = TIOA1
-							| AT91C_TC_WAVE 				// Waveform Mode
-							| AT91C_TC_WAVESEL_UP	 		// just count
-							| AT91C_TC_ACPA_CLEAR 			// Clear TIOA0 on RA Compare
-							| AT91C_TC_ACPC_SET; 			// Set TIOA0 on RC Compare
-	AT91C_BASE_TC0->TC_RA = 1;								// RA Compare value = 1; pulse width to TC2
-	AT91C_BASE_TC0->TC_RC = 0; 								// RC Compare value = 0; increment TC2 on overflow
+	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;               // disable TC0
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_XC0              // TC0 clock = XC0 clock = TIOA1
+							| AT91C_TC_WAVE                 // Waveform Mode
+							| AT91C_TC_WAVESEL_UP           // just count
+							| AT91C_TC_ACPA_CLEAR           // Clear TIOA0 on RA Compare
+							| AT91C_TC_ACPC_SET;            // Set TIOA0 on RC Compare
+	AT91C_BASE_TC0->TC_RA = 1;                              // RA Compare value = 1; pulse width to TC2
+	AT91C_BASE_TC0->TC_RC = 0;                              // RC Compare value = 0; increment TC2 on overflow
 
 	// use TC2 to count TIOA0 pulses (giving us a 32bit counter (TC0/TC2) clocked by ssp_clk)
-	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS; 				// disable TC2  
-	AT91C_BASE_TC2->TC_CMR = AT91C_TC_CLKS_XC2	 			// TC2 clock = XC2 clock = TIOA0
-							| AT91C_TC_WAVE 				// Waveform Mode
-							| AT91C_TC_WAVESEL_UP;	 		// just count
-	
-	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;				// enable TC0
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN;				// enable TC1
-	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN;				// enable TC2
+	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKDIS;               // disable TC2
+	AT91C_BASE_TC2->TC_CMR = AT91C_TC_CLKS_XC2              // TC2 clock = XC2 clock = TIOA0
+							| AT91C_TC_WAVE                 // Waveform Mode
+							| AT91C_TC_WAVESEL_UP;          // just count
+
+	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN;                // enable TC0
+	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN;                // enable TC1
+	AT91C_BASE_TC2->TC_CCR = AT91C_TC_CLKEN;                // enable TC2
 
 	//
-	// synchronize the counter with the ssp_frame signal. Note: FPGA must be in a FPGA mode with SSC transfer, otherwise SSC_FRAME and SSC_CLK signals would not be present 
+	// synchronize the counter with the ssp_frame signal. Note: FPGA must be in a FPGA mode with SSC transfer, otherwise SSC_FRAME and SSC_CLK signals would not be present
 	//
-	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME)); 	// wait for ssp_frame to go high (start of frame)
-	while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME); 		// wait for ssp_frame to be low
-	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); 	// wait for ssp_clk to go high
-	// note: up to now two ssp_clk rising edges have passed since the rising edge of ssp_frame
+	while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME);      // wait for ssp_frame to be low
+	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_FRAME));   // wait for ssp_frame to go high (start of frame)
+	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK));     // wait for ssp_clk to go high; 1st ssp_clk after start of frame
+	while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK);        // wait for ssp_clk to go low;
+	while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK));     // wait for ssp_clk to go high; 2nd ssp_clk after start of frame
+	if ((AT91C_BASE_SSC->SSC_RFMR & SSC_FRAME_MODE_BITS_IN_WORD(32)) == SSC_FRAME_MODE_BITS_IN_WORD(16)) {
+		while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK);    // wait for ssp_clk to go low;
+		while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); // wait for ssp_clk to go high; 3rd ssp_clk after start of frame
+		while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK);    // wait for ssp_clk to go low;
+		while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); // wait for ssp_clk to go high; 4th ssp_clk after start of frame
+		while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK);    // wait for ssp_clk to go low;
+		while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); // wait for ssp_clk to go high; 5th ssp_clk after start of frame
+		while(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK);    // wait for ssp_clk to go low;
+		while(!(AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_CLK)); // wait for ssp_clk to go high; 6th ssp_clk after start of frame
+	}
 	// it is now safe to assert a sync signal. This sets all timers to 0 on next active clock edge
-	AT91C_BASE_TCB->TCB_BCR = 1;							// assert Sync (set all timers to 0 on next active clock edge)
-	// at the next (3rd) ssp_clk rising edge, TC1 will be reset (and not generate a clock signal to TC0)
-	// at the next (4th) ssp_clk rising edge, TC0 (the low word of our counter) will be reset. From now on,
+	AT91C_BASE_TCB->TCB_BCR = 1;                            // assert Sync (set all timers to 0 on next active clock edge)
+	// at the next (3rd/7th) ssp_clk rising edge, TC1 will be reset (and not generate a clock signal to TC0)
+	// at the next (4th/8th) ssp_clk rising edge, TC0 (the low word of our counter) will be reset. From now on,
 	// whenever the last three bits of our counter go 0, we can be sure to be in the middle of a frame transfer.
-	// (just started with the transfer of the 4th Bit).
+	// (just started with the transfer of the 3rd Bit).
 	// The high word of the counter (TC2) will not reset until the low word (TC0) overflows. Therefore need to wait quite some time before
 	// we can use the counter.
 	while (AT91C_BASE_TC0->TC_CV < 0xFFFF);
@@ -445,19 +456,17 @@ void ResetSspClk(void) {
 	while (AT91C_BASE_TC2->TC_CV > 0);
 }
 
-
 uint32_t GetCountSspClk(){
 	uint32_t hi, lo;
 
-	do {
+	do { 
 		hi = AT91C_BASE_TC2->TC_CV;
 		lo = AT91C_BASE_TC0->TC_CV;
-	} while(hi != AT91C_BASE_TC2->TC_CV);
-
+	} while (hi != AT91C_BASE_TC2->TC_CV);
+	
 	return (hi << 16) | lo;
 }
 
-
 //  -------------------------------------------------------------------------
 //  Timer for bitbanging, or LF stuff when you need a very precis timer
 //  1us = 1.5ticks
@@ -476,11 +485,11 @@ void StartTicks(void){
 	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // re-enable timer and wait for TC0
 
 	// second configure TC0 (lower, 0x0000FFFF) 16 bit counter
-	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32 
-	                         AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO |
-	                         AT91C_TC_ACPA_CLEAR | // RA comperator clears TIOA (carry bit)
-	                         AT91C_TC_ACPC_SET |   // RC comperator sets TIOA (carry bit)
-	                         AT91C_TC_ASWTRG_SET;  // SWTriger sets TIOA (carry bit)
+	AT91C_BASE_TC0->TC_CMR = AT91C_TC_CLKS_TIMER_DIV3_CLOCK | // MCK(48MHz) / 32
+							 AT91C_TC_WAVE | AT91C_TC_WAVESEL_UP_AUTO |
+							 AT91C_TC_ACPA_CLEAR | // RA comperator clears TIOA (carry bit)
+							 AT91C_TC_ACPC_SET |   // RC comperator sets TIOA (carry bit)
+							 AT91C_TC_ASWTRG_SET;  // SWTriger sets TIOA (carry bit)
 	AT91C_BASE_TC0->TC_RC  = 0; // set TIOA (carry bit) on overflow, return to zero
 	AT91C_BASE_TC0->TC_RA  = 1; // clear carry bit on next clock cycle
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKEN | AT91C_TC_SWTRG; // reset and re-enable timer
@@ -517,7 +526,7 @@ void WaitTicks(uint32_t ticks){
 }
 
 
-// Wait / Spindelay in us (microseconds) 
+// Wait / Spindelay in us (microseconds)
 // 1us = 1.5ticks.
 void WaitUS(uint16_t us){
 	WaitTicks( (uint32_t)us * 3 / 2 ) ;
@@ -546,7 +555,7 @@ void ResetTimer(AT91PS_TC timer){
 // stop clock
 void StopTicks(void){
 	AT91C_BASE_TC0->TC_CCR = AT91C_TC_CLKDIS;
-	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;	
+	AT91C_BASE_TC1->TC_CCR = AT91C_TC_CLKDIS;
 }
 
 
diff --git a/armsrc/util.h b/armsrc/util.h
index 7b3d0849..14ac5e10 100644
--- a/armsrc/util.h
+++ b/armsrc/util.h
@@ -66,7 +66,7 @@ uint32_t RAMFUNC GetDeltaCountUS();
 
 void StartCountSspClk();
 void ResetSspClk(void);
-uint32_t RAMFUNC GetCountSspClk();
+uint32_t GetCountSspClk();
 
 extern void StartTicks(void);
 extern uint32_t GetTicks(void);
diff --git a/client/cmdhf15.c b/client/cmdhf15.c
index c2a13354..6bcad201 100644
--- a/client/cmdhf15.c
+++ b/client/cmdhf15.c
@@ -464,7 +464,7 @@ int CmdHF15CmdRaw (const char *cmd) {
 	char *hexout;
 
 	
-	if (strlen(cmd)<3) {
+	if (strlen(cmd)<2) {
 		PrintAndLog("Usage: hf 15 cmd raw  [-r] [-2] [-c] <0A 0B 0C ... hex>");
 		PrintAndLog("       -r    do not read response");
 		PrintAndLog("       -2    use slower '1 out of 256' mode");
@@ -526,22 +526,31 @@ int CmdHF15CmdRaw (const char *cmd) {
 	SendCommand(&c);
 	
 	if (reply) {
-		if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+		if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
 			recv = resp.d.asBytes;
-			PrintAndLog("received %i octets",resp.arg[0]);
-			hexout = (char *)malloc(resp.arg[0] * 3 + 1);
-			if (hexout != NULL) {
-				for (int i = 0; i < resp.arg[0]; i++) { // data in hex
-					sprintf(&hexout[i * 3], "%02X ", recv[i]);
+			int recv_len = resp.arg[0];
+			if (recv_len == 0) {
+				PrintAndLog("received SOF only. Maybe Picopass/iCLASS?");
+			} else if (recv_len > 0) {
+				PrintAndLog("received %i octets", recv_len);
+				hexout = (char *)malloc(resp.arg[0] * 3 + 1);
+				if (hexout != NULL) {
+					for (int i = 0; i < resp.arg[0]; i++) { // data in hex
+						sprintf(&hexout[i * 3], "%02X ", recv[i]);
+					}
+					PrintAndLog("%s", hexout);
+					free(hexout);
 				}
-				PrintAndLog("%s", hexout);
-				free(hexout);
+			} else if (recv_len == -1) {
+				PrintAndLog("card didn't respond");
+			} else if (recv_len == -2) {
+				PrintAndLog("receive buffer overflow");
 			}
 		} else {
 			PrintAndLog("timeout while waiting for reply.");
 		}
-		
-	} // if reply
+	}
+
 	return 0;
 }
 
diff --git a/client/cmdhflist.c b/client/cmdhflist.c
index 07a286cc..29d10d92 100644
--- a/client/cmdhflist.c
+++ b/client/cmdhflist.c
@@ -903,8 +903,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 	// adjust for different time scales
 	if (protocol == ICLASS || protocol == ISO_15693) {
-		first_timestamp *= 32;
-		timestamp *= 32;
 		duration *= 32;
 	}
 
@@ -1037,10 +1035,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
 
 	if (showWaitCycles && !isResponse && next_record_is_response(tracepos, trace)) {
 		uint32_t next_timestamp = *((uint32_t *)(trace + tracepos));
-		// adjust for different time scales
-		if (protocol == ICLASS || protocol == ISO_15693) {
-			next_timestamp *= 32;
-		}
 
 		PrintAndLog(" %10d | %10d | %s | fdt (Frame Delay Time): %d",
 			(EndOfTransmissionTimestamp - first_timestamp),
diff --git a/fpga/fpga_hf.bit b/fpga/fpga_hf.bit
index 44b2428040ab74e66878d78bf7cc7a79ee3c7266..3899059714dcdd9904577d9aaa21d64cf3efdbd5 100644
GIT binary patch
literal 42175
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

literal 42175
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
PryyD0%V+fa^MCt)Rw!d4

diff --git a/fpga/hi_reader.v b/fpga/hi_reader.v
index b0b21e30..aca9132f 100644
--- a/fpga/hi_reader.v
+++ b/fpga/hi_reader.v
@@ -247,9 +247,9 @@ begin
 
 	// set ssp_frame signal for corr_i_cnt = 1..3
 	// (send one frame with 16 Bits)
-    if (corr_i_cnt == 6'd2)
+    if (corr_i_cnt == 6'd1)
         ssp_frame <= 1'b1;
-    if (corr_i_cnt == 6'd14)
+    if (corr_i_cnt == 6'd5)
         ssp_frame <= 1'b0;
 end
 

From a334de73d264b10fd9d9da5b752231cf521a6ce7 Mon Sep 17 00:00:00 2001
From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Tue, 22 Oct 2019 21:02:02 +0200
Subject: [PATCH 2/4] 'hf 14b' formatting * renaming a few functions *
 whitespace * moving a bit towards RRG repo

---
 client/cmdhf.c    |   2 +-
 client/cmdhf14b.c | 401 ++++++++++++++++++++++++++--------------------
 client/cmdhf14b.h |   2 +-
 3 files changed, 226 insertions(+), 179 deletions(-)

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 6d25cac0..83170cae 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -61,7 +61,7 @@ int CmdHFSearch(const char *Cmd){
 		return ans;
 	}
 	//14b is longest test currently (and rarest chip type) ... put last
-	ans = HF14BInfo(false);
+	ans = infoHF14B(false);
 	if (ans) {
 		PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
 		return ans;
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 7cd55476..8a83df8f 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
+#include <ctype.h>
 #include "iso14443crc.h"
 #include "comms.h"
 #include "graph.h"
@@ -25,101 +26,98 @@
 #include "taginfo.h"
 
 
-static int CmdHelp(const char *Cmd);
-
-int CmdHF14BList(const char *Cmd)
-{
+int CmdHF14BList(const char *Cmd) {
 	PrintAndLog("Deprecated command, use 'hf list 14b' instead");
-
 	return 0;
 }
 
-int CmdHF14BSim(const char *Cmd)
-{
+
+int CmdHF14BSim(const char *Cmd) {
   UsbCommand c={CMD_SIMULATE_TAG_ISO_14443B};
   clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
-int CmdHF14BSnoop(const char *Cmd)
-{
+
+int CmdHF14BSnoop(const char *Cmd) {
   UsbCommand c = {CMD_SNOOP_ISO_14443B};
   clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
+
 /* New command to read the contents of a SRI512 tag
  * SRI512 tags are ISO14443-B modulated memory tags,
  * this command just dumps the contents of the memory
  */
-int CmdSri512Read(const char *Cmd)
-{
+int CmdSri512Read(const char *Cmd) {
   UsbCommand c = {CMD_READ_SRI512_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
   clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
+
 /* New command to read the contents of a SRIX4K tag
  * SRIX4K tags are ISO14443-B modulated memory tags,
  * this command just dumps the contents of the memory/
  */
-int CmdSrix4kRead(const char *Cmd)
-{
+int CmdSrix4kRead(const char *Cmd) {
   UsbCommand c = {CMD_READ_SRIX4K_TAG, {strtol(Cmd, NULL, 0), 0, 0}};
   clearCommandBuffer();
   SendCommand(&c);
   return 0;
 }
 
-int rawClose(void){
+
+static bool switch_off_field_14b(void) {
 	UsbCommand resp;
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
-		return 0;
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+		return false;
 	}
-	return 0;
+	return false;
 }
 
-int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose){
+
+int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datalen, bool verbose) {
 	UsbCommand resp;
 	UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv,power
-	if(*crc)
-	{
+	if (*crc) {
 		uint8_t first, second;
 		ComputeCrc14443(CRC_14443_B, data, *datalen, &first, &second);
 		data[*datalen] = first;
 		data[*datalen + 1] = second;
 		*datalen += 2;
 	}
-	
+
 	c.arg[0] = *datalen;
 	c.arg[1] = reply;
 	c.arg[2] = power;
-	memcpy(c.d.asBytes,data,*datalen);
+	memcpy(c.d.asBytes,data, *datalen);
 	clearCommandBuffer();
 	SendCommand(&c);
-	
-	if (!reply) return 1; 
 
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
+	if (!reply) return 1;
+
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
 		if (verbose) PrintAndLog("timeout while waiting for reply.");
 		return 0;
 	}
 	*datalen = resp.arg[0];
 	if (verbose) PrintAndLog("received %u octets", *datalen);
-	if(*datalen<2) return 0;
+	if (*datalen < 2) return 0;
 
 	memcpy(data, resp.d.asBytes, *datalen);
 	if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen));
 
 	uint8_t first, second;
 	ComputeCrc14443(CRC_14443_B, data, *datalen-2, &first, &second);
-	if(data[*datalen-2] == first && data[*datalen-1] == second) {
+	if (data[*datalen-2] == first && data[*datalen-1] == second) {
 		if (verbose) PrintAndLog("CRC OK");
 		*crc = true;
 	} else {
@@ -129,7 +127,8 @@ int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datal
 	return 1;
 }
 
-int CmdHF14BCmdRaw (const char *Cmd) {
+
+static int CmdHF14BCmdRaw (const char *Cmd) {
 	bool reply = true;
 	bool crc = false;
 	bool power = false;
@@ -140,7 +139,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 	uint8_t datalen = 0;
 	unsigned int temp;
 	int i = 0;
-	if (strlen(Cmd)<3) {
+	if (strlen(Cmd) < 3) {
 			PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
 			PrintAndLog("       -r    do not read response");
 			PrintAndLog("       -c    calculate and append CRC");
@@ -151,28 +150,28 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 	}
 
 	// strip
-	while (*Cmd==' ' || *Cmd=='\t') Cmd++;
-	
-	while (Cmd[i]!='\0') {
-		if (Cmd[i]==' ' || Cmd[i]=='\t') { i++; continue; }
-		if (Cmd[i]=='-') {
+	while (*Cmd == ' ' || *Cmd == '\t') Cmd++;
+
+	while (Cmd[i] != '\0') {
+		if (Cmd[i] == ' ' || Cmd[i] == '\t') { i++; continue; }
+		if (Cmd[i] == '-') {
 			switch (Cmd[i+1]) {
-				case 'r': 
-				case 'R': 
+				case 'r':
+				case 'R':
 					reply = false;
 					break;
 				case 'c':
-				case 'C':                
+				case 'C':
 					crc = true;
 					break;
-				case 'p': 
-				case 'P': 
+				case 'p':
+				case 'P':
 					power = true;
 					break;
 				case 's':
 				case 'S':
 					select = true;
-					if (Cmd[i+2]=='s' || Cmd[i+2]=='S') {
+					if (Cmd[i+2] == 's' || Cmd[i+2] == 'S') {
 						SRx = true;
 						i++;
 					}
@@ -181,34 +180,33 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 					PrintAndLog("Invalid option");
 					return 0;
 			}
-			i+=2;
+			i += 2;
 			continue;
 		}
-		if ((Cmd[i]>='0' && Cmd[i]<='9') ||
-		    (Cmd[i]>='a' && Cmd[i]<='f') ||
-		    (Cmd[i]>='A' && Cmd[i]<='F') ) {
-			buf[strlen(buf)+1]=0;
-			buf[strlen(buf)]=Cmd[i];
+		if ((Cmd[i] >= '0' && Cmd[i] <= '9') ||
+			(Cmd[i] >= 'a' && Cmd[i] <= 'f') ||
+			(Cmd[i] >= 'A' && Cmd[i] <= 'F') ) {
+			buf[strlen(buf)+1] = 0;
+			buf[strlen(buf)] = Cmd[i];
 			i++;
-			
-			if (strlen(buf)>=2) {
-				sscanf(buf,"%x",&temp);
-				data[datalen++]=(uint8_t)(temp & 0xff);
-				*buf=0;
+
+			if (strlen(buf) >= 2) {
+				sscanf(buf, "%x", &temp);
+				data[datalen++] = (uint8_t)(temp & 0xff);
+				*buf = 0;
 			}
 			continue;
 		}
 		PrintAndLog("Invalid char on input");
 		return 0;
 	}
-	if (datalen == 0)
-	{
+	if (datalen == 0) {
 		PrintAndLog("Missing data input");
 		return 0;
 	}
 
-	if (select){ //auto select 14b tag
-		uint8_t	cmd2[16];
+	if (select) { //auto select 14b tag
+		uint8_t cmd2[16];
 		bool crc2 = true;
 		uint8_t cmdLen;
 
@@ -225,11 +223,11 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 			cmd2[2] = 0x08;
 		}
 
-		if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+		if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false) == 0) return switch_off_field_14b();
+
+		if (SRx && (cmdLen != 3 || !crc2) ) return switch_off_field_14b();
+		else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return switch_off_field_14b();
 
-		if ( SRx && (cmdLen != 3 || !crc2) ) return rawClose();
-		else if (cmd2[0] != 0x50 || cmdLen != 14 || !crc2) return rawClose();
-		
 		uint8_t chipID = 0;
 		if (SRx) {
 			// select
@@ -239,7 +237,7 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 			cmdLen = 2;
 		} else {
 			// attrib
-			cmd2[0] = 0x1D; 
+			cmd2[0] = 0x1D;
 			// UID from cmd2[1 - 4]
 			cmd2[5] = 0x00;
 			cmd2[6] = 0x08;
@@ -248,39 +246,40 @@ int CmdHF14BCmdRaw (const char *Cmd) {
 			cmdLen = 9;
 		}
 
-		if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+		if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false) == 0) return switch_off_field_14b();
 
-		if (cmdLen != 3 || !crc2) return rawClose();
-		if (SRx && cmd2[0] != chipID) return rawClose();
+		if (cmdLen != 3 || !crc2) return switch_off_field_14b();
+		if (SRx && cmd2[0] != chipID) return switch_off_field_14b();
 	}
 	return HF14BCmdRaw(reply, &crc, power, data, &datalen, true);
 }
 
+
 // print full atqb info
-static void print_atqb_resp(uint8_t *data){
+static void print_atqb_resp(uint8_t *data) {
 	//PrintAndLog ("           UID: %s", sprint_hex(data+1,4));
-	PrintAndLog ("      App Data: %s", sprint_hex(data+5,4));
-	PrintAndLog ("      Protocol: %s", sprint_hex(data+9,3));
+	PrintAndLog("      App Data: %s", sprint_hex(data+5,4));
+	PrintAndLog("      Protocol: %s", sprint_hex(data+9,3));
 	uint8_t BitRate = data[9];
-	if (!BitRate) 
+	if (!BitRate)
 		PrintAndLog ("      Bit Rate: 106 kbit/s only PICC <-> PCD");
 	if (BitRate & 0x10)
 		PrintAndLog ("      Bit Rate: 212 kbit/s PICC -> PCD supported");
 	if (BitRate & 0x20)
-		PrintAndLog ("      Bit Rate: 424 kbit/s PICC -> PCD supported"); 
+		PrintAndLog ("      Bit Rate: 424 kbit/s PICC -> PCD supported");
 	if (BitRate & 0x40)
-		PrintAndLog ("      Bit Rate: 847 kbit/s PICC -> PCD supported"); 
+		PrintAndLog ("      Bit Rate: 847 kbit/s PICC -> PCD supported");
 	if (BitRate & 0x01)
 		PrintAndLog ("      Bit Rate: 212 kbit/s PICC <- PCD supported");
 	if (BitRate & 0x02)
-		PrintAndLog ("      Bit Rate: 424 kbit/s PICC <- PCD supported"); 
+		PrintAndLog ("      Bit Rate: 424 kbit/s PICC <- PCD supported");
 	if (BitRate & 0x04)
-		PrintAndLog ("      Bit Rate: 847 kbit/s PICC <- PCD supported"); 
-	if (BitRate & 0x80) 
+		PrintAndLog ("      Bit Rate: 847 kbit/s PICC <- PCD supported");
+	if (BitRate & 0x80)
 		PrintAndLog ("                Same bit rate <-> required");
 
-	uint16_t maxFrame = data[10]>>4;
-	if (maxFrame < 5) 
+	uint16_t maxFrame = data[10] >> 4;
+	if (maxFrame < 5)
 		maxFrame = 8*maxFrame + 16;
 	else if (maxFrame == 5)
 		maxFrame = 64;
@@ -293,7 +292,7 @@ static void print_atqb_resp(uint8_t *data){
 	else
 		maxFrame = 257;
 
-	PrintAndLog ("Max Frame Size: %u%s",maxFrame, (maxFrame == 257) ? "+ RFU" : "");
+	PrintAndLog ("Max Frame Size: %u%s", maxFrame, (maxFrame == 257) ? "+ RFU" : "");
 
 	uint8_t protocolT = data[10] & 0xF;
 	PrintAndLog (" Protocol Type: Protocol is %scompliant with ISO/IEC 14443-4",(protocolT) ? "" : "not " );
@@ -302,32 +301,32 @@ static void print_atqb_resp(uint8_t *data){
 	PrintAndLog (" Frame Options: NAD is %ssupported",(data[11]&2) ? "" : "not ");
 	PrintAndLog (" Frame Options: CID is %ssupported",(data[11]&1) ? "" : "not ");
 	PrintAndLog ("Max Buf Length: %u (MBLI) %s",data[14]>>4, (data[14] & 0xF0) ? "" : "not supported");
-	
+
 	return;
 }
 
 
-int print_ST_Lock_info(uint8_t model){
+int print_ST_Lock_info(uint8_t model) {
 	//assume connection open and tag selected...
 	uint8_t data[16] = {0x00};
 	uint8_t datalen = 2;
 	bool crc = true;
 	uint8_t resplen;
-	uint8_t	blk1;
+	uint8_t blk1;
 	data[0] = 0x08;
 
-	if (model == 0x2) { //SR176 has special command:
-		data[1] = 0xf;
-		resplen = 4;			
+	if (model == 0x02) { //SR176 has special command:
+		data[1] = 0x0f;
+		resplen = 4;
 	} else {
 		data[1] = 0xff;
 		resplen = 6;
 	}
 
 	//std read cmd
-	if (HF14BCmdRaw(true, &crc, true, data, &datalen, false)==0) return rawClose();
+	if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) == 0) return switch_off_field_14b();
 
-	if (datalen != resplen || !crc) return rawClose();
+	if (datalen != resplen || !crc) return switch_off_field_14b();
 
 	PrintAndLog("Chip Write Protection Bits:");
 	// now interpret the data
@@ -339,7 +338,7 @@ int print_ST_Lock_info(uint8_t model){
 			blk1 = 9;
 			PrintAndLog("   raw: %s",printBits(1,data+3));
 			PrintAndLog(" 07/08:%slocked", (data[3] & 1) ? " not " : " " );
-			for (uint8_t i = 1; i<8; i++){
+			for (uint8_t i = 1; i < 8; i++){
 				PrintAndLog("    %02u:%slocked", blk1, (data[3] & (1 << i)) ? " not " : " " );
 				blk1++;
 			}
@@ -349,9 +348,9 @@ int print_ST_Lock_info(uint8_t model){
 		case 0xC: //             (SRT512)
 			//need data[2] and data[3]
 			blk1 = 0;
-			PrintAndLog("   raw: %s",printBits(2,data+2));
-			for (uint8_t b=2; b<4; b++){
-				for (uint8_t i=0; i<8; i++){
+			PrintAndLog("   raw: %s", printBits(2,data+2));
+			for (uint8_t b = 2; b < 4; b++) {
+				for (uint8_t i = 0; i < 8; i++) {
 					PrintAndLog("    %02u:%slocked", blk1, (data[b] & (1 << i)) ? " not " : " " );
 					blk1++;
 				}
@@ -360,29 +359,31 @@ int print_ST_Lock_info(uint8_t model){
 		case 0x2: //             (SR176)
 			//need data[2]
 			blk1 = 0;
-			PrintAndLog("   raw: %s",printBits(1,data+2));
-			for (uint8_t i = 0; i<8; i++){
+			PrintAndLog("   raw: %s",printBits(1, data+2));
+			for (uint8_t i = 0; i < 8; i++){
 				PrintAndLog(" %02u/%02u:%slocked", blk1, blk1+1, (data[2] & (1 << i)) ? " " : " not " );
-				blk1+=2;
+				blk1 += 2;
 			}
 			break;
 		default:
-			return rawClose();
+			return switch_off_field_14b();
 	}
 	return 1;
 }
 
+
 // print UID info from SRx chips (ST Microelectronics)
-static void print_st_general_info(uint8_t *data){
+static void print_st_general_info(uint8_t *data) {
 	//uid = first 8 bytes in data
-	PrintAndLog("   UID: %s", sprint_hex(SwapEndian64(data,8,8),8));
+	PrintAndLog("   UID: %s", sprint_hex(SwapEndian64(data, 8, 8), 8));
 	PrintAndLog("   MFG: %02X, %s", data[6], getManufacturerName(data[6]));
 	PrintAndLog("  Chip: %02X, %s", data[5], getChipInfo(data[6], data[5]));
 	return;
 }
 
+
 // 14b get and print UID only (general info)
-int HF14BStdReader(uint8_t *data, uint8_t *datalen){
+int HF14BStdReader(uint8_t *data, uint8_t *datalen) {
 	//05 00 00 = find one tag in field
 	//1d xx xx xx xx 00 08 01 00 = attrib xx=UID (resp 10 [f9 e0])
 	//a3 = ?  (resp 03 [e2 c2])
@@ -407,18 +408,18 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
 	data[1] = 0x00;
 	data[2] = 0x08;
 
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+	if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
 
-	if (data[0] != 0x50 || *datalen != 14 || !crc) return rawClose();
+	if (data[0] != 0x50 || *datalen != 14 || !crc) return switch_off_field_14b();
 
 	PrintAndLog ("\n14443-3b tag found:");
-	PrintAndLog ("           UID: %s", sprint_hex(data+1,4));
+	PrintAndLog ("           UID: %s", sprint_hex(data+1, 4));
 
-	uint8_t	cmd2[16];
+	uint8_t cmd2[16];
 	uint8_t cmdLen = 3;
 	bool crc2 = true;
 
-	cmd2[0] = 0x1D; 
+	cmd2[0] = 0x1D;
 	// UID from data[1 - 4]
 	cmd2[1] = data[1];
 	cmd2[2] = data[2];
@@ -431,28 +432,29 @@ int HF14BStdReader(uint8_t *data, uint8_t *datalen){
 	cmdLen = 9;
 
 	// attrib
-	if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false)==0) return rawClose();
+	if (HF14BCmdRaw(true, &crc2, true, cmd2, &cmdLen, false) == 0) return switch_off_field_14b();
 
-	if (cmdLen != 3 || !crc2) return rawClose();
+	if (cmdLen != 3 || !crc2) return switch_off_field_14b();
 	// add attrib responce to data
 	data[14] = cmd2[0];
-	rawClose();
+	switch_off_field_14b();
 	return 1;
 }
 
+
 // 14b get and print Full Info (as much as we know)
-int HF14BStdInfo(uint8_t *data, uint8_t *datalen){
-	if (!HF14BStdReader(data,datalen)) return 0;
+static bool HF14B_Std_Info(uint8_t *data, uint8_t *datalen) {
+	if (!HF14BStdReader(data, datalen)) return false;
 
 	//add more info here
 	print_atqb_resp(data);
 
-
-	return 1;
+	return true;
 }
 
+
 // SRx get and print general info about SRx chip from UID
-int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
+static bool HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
 	bool crc = true;
 	*datalen = 2;
 	//wake cmd
@@ -461,9 +463,9 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
 
 	//leave power on
 	// verbose on for now for testing - turn off when functional
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+	if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
 
-	if (*datalen != 3 || !crc) return rawClose();
+	if (*datalen != 3 || !crc) return switch_off_field_14b();
 
 	uint8_t chipID = data[0];
 	// select
@@ -472,118 +474,143 @@ int HF14B_ST_Reader(uint8_t *data, uint8_t *datalen, bool closeCon){
 	*datalen = 2;
 
 	//leave power on
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+	if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
 
-	if (*datalen != 3 || !crc || data[0] != chipID) return rawClose();
+	if (*datalen != 3 || !crc || data[0] != chipID) return switch_off_field_14b();
 
 	// get uid
 	data[0] = 0x0B;
 	*datalen = 1;
 
 	//leave power on
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)==0) return rawClose();
+	if (HF14BCmdRaw(true, &crc, true, data, datalen, false) == 0) return switch_off_field_14b();
 
-	if (*datalen != 10 || !crc) return rawClose();
+	if (*datalen != 10 || !crc) return switch_off_field_14b();
 
 	//power off ?
-	if (closeCon) rawClose();
+	if (closeCon) switch_off_field_14b();
 
 	PrintAndLog("\n14443-3b ST tag found:");
 	print_st_general_info(data);
 	return 1;
 }
 
-// SRx get and print full info (needs more info...)
-int HF14B_ST_Info(uint8_t *data, uint8_t *datalen){
-	if (!HF14B_ST_Reader(data, datalen, false)) return 0;
-	
-	//add locking bit information here.
-	if (print_ST_Lock_info(data[5]>>2)) 
-		rawClose();
 
-	return 1;
+// SRx get and print full info (needs more info...)
+static bool HF14B_ST_Info(bool verbose) {
+	uint8_t data[100];
+	uint8_t datalen;
+
+	if (!HF14B_ST_Reader(data, &datalen, false)) return false;
+
+	//add locking bit information here.
+	if (print_ST_Lock_info(data[5] >> 2))
+		switch_off_field_14b();
+
+	return true;
 }
 
+
 // test for other 14b type tags (mimic another reader - don't have tags to identify)
-int HF14B_Other_Reader(uint8_t *data, uint8_t *datalen){
+static bool HF14B_Other_Reader(bool verbose) {
+	uint8_t data[4];
+	uint8_t datalen;
+
 	bool crc = true;
-	*datalen = 4;
+	datalen = 4;
 	//std read cmd
 	data[0] = 0x00;
 	data[1] = 0x0b;
 	data[2] = 0x3f;
 	data[3] = 0x80;
 
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
-		if (*datalen > 2 || !crc) {
+	if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) != 0) {
+		if (datalen > 2 || !crc) {
 			PrintAndLog ("\n14443-3b tag found:");
 			PrintAndLog ("Unknown tag type answered to a 0x000b3f80 command ans:");
-			PrintAndLog ("%s",sprint_hex(data,*datalen));
-			rawClose();
-			return 1;
+			PrintAndLog ("%s", sprint_hex(data, datalen));
+			switch_off_field_14b();
+			return true;
 		}
 	}
 
 	crc = false;
-	*datalen = 1;
+	datalen = 1;
 	data[0] = 0x0a;
 
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
-		if (*datalen > 0) {
+	if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) != 0) {
+		if (datalen > 0) {
 			PrintAndLog ("\n14443-3b tag found:");
 			PrintAndLog ("Unknown tag type answered to a 0x0A command ans:");
-			PrintAndLog ("%s",sprint_hex(data,*datalen));
-			rawClose();
-			return 1;
+			PrintAndLog ("%s", sprint_hex(data, datalen));
+			switch_off_field_14b();
+			return true;
 		}
 	}
-	
+
 	crc = false;
-	*datalen = 1;
+	datalen = 1;
 	data[0] = 0x0c;
 
-	if (HF14BCmdRaw(true, &crc, true, data, datalen, false)!=0) {
-		if (*datalen > 0) {
+	if (HF14BCmdRaw(true, &crc, true, data, &datalen, false) != 0) {
+		if (datalen > 0) {
 			PrintAndLog ("\n14443-3b tag found:");
 			PrintAndLog ("Unknown tag type answered to a 0x0C command ans:");
-			PrintAndLog ("%s",sprint_hex(data,*datalen));
-			rawClose();
-			return 1;
+			PrintAndLog ("%s", sprint_hex(data, datalen));
+			switch_off_field_14b();
+			return true;
 		}
 	}
-	rawClose();
+	switch_off_field_14b();
+	return false;
+}
+
+
+// get and print all info known about any known 14b tag
+static int usage_hf_14b_info(void) {
+	PrintAndLogEx(NORMAL, "Usage: hf 14b info [h] [s]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h    this help");
+	PrintAndLogEx(NORMAL, "       s    silently");
+	PrintAndLogEx(NORMAL, "Example:");
+	PrintAndLogEx(NORMAL, "       hf 14b info");
 	return 0;
 }
 
-// get and print all info known about any known 14b tag
-int HF14BInfo(bool verbose){
+int infoHF14B(bool verbose) {
 	uint8_t data[100];
-	uint8_t datalen = 5;
-	
+	uint8_t datalen;
+
 	// try std 14b (atqb)
-	if (HF14BStdInfo(data, &datalen)) return 1;
+	if (HF14B_Std_Info(data, &datalen)) return 1;
 
 	// try st 14b
-	if (HF14B_ST_Info(data, &datalen)) return 1;
+	if (HF14B_ST_Info(verbose)) return 1;
 
 	// try unknown 14b read commands (to be identified later)
 	//   could be read of calypso, CEPAS, moneo, or pico pass.
-	if (HF14B_Other_Reader(data, &datalen)) return 1;
+	if (HF14B_Other_Reader(verbose)) return 1;
 
 	if (verbose) PrintAndLog("no 14443B tag found");
 	return 0;
 }
 
+
 // menu command to get and print all info known about any known 14b tag
-int CmdHF14Binfo(const char *Cmd){
-	return HF14BInfo(true);
+static int CmdHF14Binfo(const char *Cmd){
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_hf_14b_info();
+
+	bool verbose = !(cmdp == 's');
+	return infoHF14B(verbose);
 }
 
+
 // get and print general info about all known 14b chips
-int HF14BReader(bool verbose){
+int readHF14B(bool verbose){
 	uint8_t data[100];
 	uint8_t datalen = 5;
-	
+
 	// try std 14b (atqb)
 	if (HF14BStdReader(data, &datalen)) return 1;
 
@@ -592,33 +619,50 @@ int HF14BReader(bool verbose){
 
 	// try unknown 14b read commands (to be identified later)
 	//   could be read of calypso, CEPAS, moneo, or pico pass.
-	if (HF14B_Other_Reader(data, &datalen)) return 1;
+	if (HF14B_Other_Reader(verbose)) return 1;
 
 	if (verbose) PrintAndLog("no 14443B tag found");
 	return 0;
 }
 
+
 // menu command to get and print general info about all known 14b chips
-int CmdHF14BReader(const char *Cmd){
-	return HF14BReader(true);
+static int usage_hf_14b_reader(void) {
+	PrintAndLogEx(NORMAL, "Usage: hf 14b reader [h] [s]");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "       h    this help");
+	PrintAndLogEx(NORMAL, "       s    silently");
+	PrintAndLogEx(NORMAL, "Example:");
+	PrintAndLogEx(NORMAL, "       hf 14b reader");
+	return 0;
 }
 
-int CmdSriWrite( const char *Cmd){
+
+static int CmdHF14BReader(const char *Cmd) {
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (cmdp == 'h') return usage_hf_14b_reader();
+
+	bool verbose = !(cmdp == 's');
+	return readHF14B(verbose);
+}
+
+
+int CmdSriWrite(const char *Cmd) {
 /*
  * For SRIX4K  blocks 00 - 7F
  * hf 14b raw -c -p 09 $srix4kwblock $srix4kwdata
  *
  * For SR512  blocks 00 - 0F
  * hf 14b raw -c -p 09 $sr512wblock $sr512wdata
- * 
+ *
  * Special block FF =  otp_lock_reg block.
  * Data len 4 bytes-
  */
- 	char cmdp = param_getchar(Cmd, 0);
+	char cmdp = param_getchar(Cmd, 0);
 	uint8_t blockno = -1;
 	uint8_t data[4] = {0x00};
 	bool isSrix4k = true;
-	char str[20];	
+	char str[20];
 
 	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
 		PrintAndLog("Usage:  hf 14b write <1|2> <BLOCK> <DATA>");
@@ -634,43 +678,46 @@ int CmdSriWrite( const char *Cmd){
 
 	if ( cmdp == '2' )
 		isSrix4k = false;
-	
+
 	//blockno = param_get8(Cmd, 1);
-	
-	if ( param_gethex(Cmd,1, &blockno, 2) ) {
+
+	if (param_gethex(Cmd,1, &blockno, 2) ) {
 		PrintAndLog("Block number must include 2 HEX symbols");
 		return 0;
 	}
-	
-	if ( isSrix4k ){
-		if ( blockno > 0x7f && blockno != 0xff ){
+
+	if (isSrix4k) {
+		if (blockno > 0x7f && blockno != 0xff){
 			PrintAndLog("Block number out of range");
 			return 0;
-		}		
+		}
 	} else {
-		if ( blockno > 0x0f && blockno != 0xff ){
+		if (blockno > 0x0f && blockno != 0xff){
 			PrintAndLog("Block number out of range");
 			return 0;
-		}		
+		}
 	}
-	
+
 	if (param_gethex(Cmd, 2, data, 8)) {
 		PrintAndLog("Data must include 8 HEX symbols");
 		return 0;
 	}
- 
-	if ( blockno == 0xff)
-		PrintAndLog("[%s] Write special block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512" , blockno,  sprint_hex(data,4) );
+
+	if (blockno == 0xff)
+		PrintAndLog("[%s] Write special block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno, sprint_hex(data, 4));
 	else
-		PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno,  sprint_hex(data,4) );
- 
+		PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno, sprint_hex(data, 4));
+
 	sprintf(str, "-c 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
 
 	CmdHF14BCmdRaw(str);
 	return 0;
 }
 
-static command_t CommandTable[] = 
+
+static int CmdHelp(const char *Cmd);
+
+static command_t CommandTable[] =
 {
   {"help",        CmdHelp,        1, "This help"},
   {"info",        CmdHF14Binfo,   0, "Find and print details about a 14443B tag"},
diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 4fcae927..4897d879 100644
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -21,6 +21,6 @@ int CmdHF14BSnoop(const char *Cmd);
 int CmdSri512Read(const char *Cmd);
 int CmdSrix4kRead(const char *Cmd);
 int CmdHF14BWrite( const char *cmd);
-int HF14BInfo(bool verbose);
+int infoHF14B(bool verbose);
 
 #endif

From a3bef9863b9e06a820c7559b9caffeaaa1bb575b Mon Sep 17 00:00:00 2001
From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 23 Oct 2019 09:09:13 +0200
Subject: [PATCH 3/4] iso14443b: trying to approach iClass * decode and handle
 SOF only responses in Handle14443bSamplesDemod() * allow 1 byte commands with
 'hf 14b raw'

---
 armsrc/iso14443b.c | 94 ++++++++++++++++++++++++----------------------
 client/cmdhf14b.c  | 20 ++++++++--
 2 files changed, 66 insertions(+), 48 deletions(-)

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index f276158f..6434409d 100644
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -586,9 +586,10 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 					Demod.state = DEMOD_UNSYNCD;
 				} else {
 					LED_C_ON(); // Got SOF
-					Demod.state = DEMOD_AWAITING_START_BIT;
 					Demod.posCount = 0;
+					Demod.bitCount = 0;
 					Demod.len = 0;
+					Demod.state = DEMOD_AWAITING_START_BIT;
 /* this had been used to add RSSI (Received Signal Strength Indication) to traces. Currently not implemented.
 					Demod.metricN = 0;
 					Demod.metric = 0;
@@ -605,13 +606,16 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 		case DEMOD_AWAITING_START_BIT:
 			Demod.posCount++;
 			MAKE_SOFT_DECISION();
-			if(v > 0) {
-				if(Demod.posCount > 3*2) { 		// max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
-					Demod.state = DEMOD_UNSYNCD;
+			if (v > 0) {
+				if (Demod.posCount > 3*2) { 		// max 19us between characters = 16 1/fs, max 3 etu after low phase of SOF = 24 1/fs
 					LED_C_OFF();
+					if (Demod.bitCount == 0 && Demod.len == 0) { // received SOF only, this is valid for iClass/Picopass
+						return true;
+					} else {
+						Demod.state = DEMOD_UNSYNCD;
+					}
 				}
 			} else {							// start bit detected
-				Demod.bitCount = 0;
 				Demod.posCount = 1;				// this was the first half
 				Demod.thisBit = v;
 				Demod.shiftReg = 0;
@@ -621,7 +625,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 
 		case DEMOD_RECEIVING_DATA:
 			MAKE_SOFT_DECISION();
-			if(Demod.posCount == 0) { 			// first half of bit
+			if (Demod.posCount == 0) { 			// first half of bit
 				Demod.thisBit = v;
 				Demod.posCount = 1;
 			} else {							// second half of bit
@@ -637,22 +641,23 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 */
 
 				Demod.shiftReg >>= 1;
-				if(Demod.thisBit > 0) {	// logic '1'
+				if (Demod.thisBit > 0) {	// logic '1'
 					Demod.shiftReg |= 0x200;
 				}
 
 				Demod.bitCount++;
-				if(Demod.bitCount == 10) {
+				if (Demod.bitCount == 10) {
 					uint16_t s = Demod.shiftReg;
-					if((s & 0x200) && !(s & 0x001)) { // stop bit == '1', start bit == '0'
+					if ((s & 0x200) && !(s & 0x001)) { // stop bit == '1', start bit == '0'
 						uint8_t b = (s >> 1);
 						Demod.output[Demod.len] = b;
 						Demod.len++;
+						Demod.bitCount = 0;
 						Demod.state = DEMOD_AWAITING_START_BIT;
 					} else {
 						Demod.state = DEMOD_UNSYNCD;
 						LED_C_OFF();
-						if(s == 0x000) {
+						if (s == 0x000) {
 							// This is EOF (start, stop and all data bits == '0'
 							return true;
 						}
@@ -693,8 +698,8 @@ static void DemodInit(uint8_t *data)
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'true' to disable debug output
  */
-static void GetSamplesFor14443bDemod(int timeout, bool quiet)
-{
+static int GetSamplesFor14443bDemod(int timeout, bool quiet) {
+	int ret = 0;
 	int maxBehindBy = 0;
 	bool gotFrame = false;
 	int lastRxCounter, samples = 0;
@@ -750,12 +755,14 @@ static void GetSamplesFor14443bDemod(int timeout, bool quiet)
 		}
 		samples++;
 
-		if(Handle14443bSamplesDemod(ci, cq)) {
+		if (Handle14443bSamplesDemod(ci, cq)) {
+			ret = Demod.len;
 			gotFrame = true;
 			break;
 		}
 
 		if(samples > timeout && Demod.state < DEMOD_PHASE_REF_TRAINING) {
+			ret = -1;
 			LED_C_OFF();
 			break;
 		}
@@ -764,10 +771,14 @@ static void GetSamplesFor14443bDemod(int timeout, bool quiet)
 	FpgaDisableSscDma();
 
 	if (!quiet) Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d", maxBehindBy, samples, gotFrame, Demod.len, Demod.sumI, Demod.sumQ);
-	//Tracing
-	if (Demod.len > 0) {
-		LogTrace(Demod.output, Demod.len, 0, 0, NULL, false);
+
+	if (ret < 0) {
+		return ret;
 	}
+ 	//Tracing
+	LogTrace(Demod.output, Demod.len, 0, 0, NULL, false);
+
+	return ret;
 }
 
 
@@ -858,8 +869,7 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
 /* Sends an APDU to the tag
  * TODO: check CRC and preamble
  */
-int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response)
-{
+int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response) {
 	LED_A_ON();
 	uint8_t message_frame[message_length + 4];
 	// PCB
@@ -874,21 +884,19 @@ int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *respo
 	// send
 	CodeAndTransmit14443bAsReader(message_frame, message_length + 4);
 	// get response
-	GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+	int ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
 	FpgaDisableTracing();
-	if(Demod.len < 3)
-	{
+	if (ret < 3) {
 		LED_A_OFF();
 		return 0;
 	}
 	// TODO: Check CRC
 	// copy response contents
-	if(response != NULL)
-	{
+	if (response != NULL) {
 		memcpy(response, Demod.output, Demod.len);
 	}
 	LED_A_OFF();
-	return Demod.len;
+	return ret;
 }
 
 /* Perform the ISO 14443 B Card Selection procedure
@@ -907,10 +915,9 @@ int iso14443b_select_card()
 
 	// first, wake up the tag
 	CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));
-	GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+	int ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
 	// ATQB too short?
-	if (Demod.len < 14)
-	{
+	if (ret < 14) {
 		return 2;
 	}
 
@@ -922,10 +929,9 @@ int iso14443b_select_card()
     attrib[7] = Demod.output[10] & 0x0F;
     ComputeCrc14443(CRC_14443_B, attrib, 9, attrib + 9, attrib + 10);
     CodeAndTransmit14443bAsReader(attrib, sizeof(attrib));
-    GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+    ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
     // Answer to ATTRIB too short?
-    if(Demod.len < 3)
-	{
+    if (ret < 3) {
 		return 2;
 	}
 	// reset PCB block number
@@ -985,9 +991,9 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 	// First command: wake up the tag using the INITIATE command
 	uint8_t cmd1[] = {0x06, 0x00, 0x97, 0x5b};
 	CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
-	GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+	int ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
 
-	if (Demod.len == 0) {
+	if (ret < 0) {
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		DbpString("No response from tag");
 		LEDsoff();
@@ -1003,7 +1009,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 	cmd1[1] = Demod.output[0];
 	ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
 	CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
-	GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+	ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
 	if (Demod.len != 3) {
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);
@@ -1031,8 +1037,8 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 	cmd1[0] = 0x0B;
 	ComputeCrc14443(CRC_14443_B, cmd1, 1 , &cmd1[1], &cmd1[2]);
 	CodeAndTransmit14443bAsReader(cmd1, 3); // Only first three bytes for this one
-	GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
-	if (Demod.len != 10) {
+	ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+	if (ret != 10) {
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);
 		LEDsoff();
@@ -1062,8 +1068,8 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 		cmd1[1] = i;
 		ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
 		CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
-		GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
-		if (Demod.len != 6) { // Check if we got an answer from the tag
+		ret = GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+		if (ret != 6) { // Check if we got an answer from the tag
 			FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 			DbpString("Expected 6 bytes from tag, got less...");
 			LEDsoff();
@@ -1071,7 +1077,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 		}
 		// 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 ?)
@@ -1213,8 +1219,8 @@ void RAMFUNC SnoopIso14443b(void)
 			ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
 		}
 
-		if(!ReaderIsActive && triggered) {						// no need to try decoding tag data if the reader is sending or not yet triggered
-			if(Handle14443bSamplesDemod(ci/2, cq/2)) {
+		if (!ReaderIsActive && triggered) {						// no need to try decoding tag data if the reader is sending or not yet triggered
+			if (Handle14443bSamplesDemod(ci/2, cq/2) >= 0) {
 				//Use samples as a time measurement
 				LogTrace(Demod.output, Demod.len, samples, samples, NULL, false);
 				// And ready to receive another response.
@@ -1265,17 +1271,17 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
 		
 		CodeAndTransmit14443bAsReader(data, datalen);
 
-		if(recv) {
-			GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+		if (recv) {
+			int ret = GetSamplesFor14443bDemod(5*RECEIVE_SAMPLES_TIMEOUT, true);
 			FpgaDisableTracing();
 			uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);
-			cmd_send(CMD_ACK, iLen, 0, 0, Demod.output, iLen);
+			cmd_send(CMD_ACK, ret, 0, 0, Demod.output, iLen);
 		}
 
 		FpgaDisableTracing();
 	}
 
-	if(!powerfield) {
+	if (!powerfield) {
 		FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
 		LED_D_OFF();
 	}
diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 8a83df8f..4685f3f5 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -108,9 +108,21 @@ int HF14BCmdRaw(bool reply, bool *crc, bool power, uint8_t *data, uint8_t *datal
 		if (verbose) PrintAndLog("timeout while waiting for reply.");
 		return 0;
 	}
-	*datalen = resp.arg[0];
-	if (verbose) PrintAndLog("received %u octets", *datalen);
-	if (*datalen < 2) return 0;
+
+	int ret = resp.arg[0];
+	if (verbose) {
+		if (ret < 0) {
+			PrintAndLog("tag didn't respond");
+		} else if (ret == 0) {
+			PrintAndLog("received SOF only (maybe iCLASS/Picopass)");
+		} else {
+			PrintAndLog("received %u octets", ret);
+		}
+	}
+
+	*datalen = ret;
+	
+	if (ret < 2) return 0;
 
 	memcpy(data, resp.d.asBytes, *datalen);
 	if (verbose) PrintAndLog("%s", sprint_hex(data, *datalen));
@@ -139,7 +151,7 @@ static int CmdHF14BCmdRaw (const char *Cmd) {
 	uint8_t datalen = 0;
 	unsigned int temp;
 	int i = 0;
-	if (strlen(Cmd) < 3) {
+	if (strlen(Cmd) < 2) {
 			PrintAndLog("Usage: hf 14b raw [-r] [-c] [-p] [-s || -ss] <0A 0B 0C ... hex>");
 			PrintAndLog("       -r    do not read response");
 			PrintAndLog("       -c    calculate and append CRC");

From ece38ef311b28eefb1d716937139aad9ee00985c Mon Sep 17 00:00:00 2001
From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Sun, 27 Oct 2019 16:51:27 +0100
Subject: [PATCH 4/4] fix 'hf iclass reader' and 'hf iclass readblk' * don't do
 READCHECK when not trying to authenticate * standard LED handling * remove
 unused FLAG_ICLASS_READER_ONLY_ONCE and FLAG_ICLASS_READER_ONE_TRY * sanity
 check for negative times in TransmitTo15693Tag() * increase reader timeout
 for 'hf 15' functions to be enough for slot 7 answers to ACTALL * add 'hf
 iclass permute' inspired by RRG repository * whitespace fixes

---
 armsrc/appmain.c             |   7 +-
 armsrc/iclass.c              | 277 ++++++------
 armsrc/iclass.h              |   4 +-
 armsrc/iso15693.c            | 112 +++--
 armsrc/iso15693.h            |   2 +
 client/cmdhficlass.c         | 821 ++++++++++++++++++++---------------
 client/cmdhficlass.h         |  24 +-
 client/loclass/elite_crack.h |   2 +-
 include/usb_cmd.h            |   7 +-
 9 files changed, 674 insertions(+), 582 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index e3bd1fe0..56da5434 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1327,8 +1327,11 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_ICLASS_READBLOCK:
 			iClass_ReadBlk(c->arg[0]);
 			break;
-		case CMD_ICLASS_AUTHENTICATION: //check
-			iClass_Authentication(c->d.asBytes);
+		case CMD_ICLASS_CHECK:
+			iClass_Check(c->d.asBytes);
+			break;
+		case CMD_ICLASS_READCHECK:
+			iClass_Readcheck(c->arg[0], c->arg[1]);
 			break;
 		case CMD_ICLASS_DUMP:
 			iClass_Dump(c->arg[0], c->arg[1]);
diff --git a/armsrc/iclass.c b/armsrc/iclass.c
index 392271bd..1a729f3f 100644
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@ -63,9 +63,9 @@
 // 56,64us = 24 ssp_clk_cycles
 #define DELAY_ICLASS_VCD_TO_VICC_SIM     (140 - 24)
 // times in ssp_clk_cycles @ 3,3625MHz when acting as reader
-#define DELAY_ICLASS_VICC_TO_VCD_READER	 DELAY_ISO15693_VICC_TO_VCD_READER
+#define DELAY_ICLASS_VICC_TO_VCD_READER  DELAY_ISO15693_VICC_TO_VCD_READER
 // times in samples @ 212kHz when acting as reader
-#define ICLASS_READER_TIMEOUT_ACTALL     330 // 1558us, nominal 330us + 7slots*160us = 1450us         
+#define ICLASS_READER_TIMEOUT_ACTALL     330 // 1558us, nominal 330us + 7slots*160us = 1450us
 #define ICLASS_READER_TIMEOUT_OTHERS      80 // 380us, nominal 330us
 
 
@@ -695,7 +695,6 @@ void RAMFUNC SnoopIClass(void) {
 			if (OutOfNDecoding((smpl & 0xF0) >> 4)) {
 				rsamples = samples - Uart.samples;
 				time_stop = (GetCountSspClk()-time_0) << 4;
-				LED_C_ON();
 
 				//if (!LogTrace(Uart.output, Uart.byteCnt, rsamples, Uart.parityBits,true)) break;
 				//if (!LogTrace(NULL, 0, Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER, 0, true)) break;
@@ -708,7 +707,6 @@ void RAMFUNC SnoopIClass(void) {
 				/* And also reset the demod code, which might have been */
 				/* false-triggered by the commands from the reader. */
 				Demod.state = DEMOD_UNSYNCD;
-				LED_B_OFF();
 				Uart.byteCnt = 0;
 			} else {
 				time_start = (GetCountSspClk()-time_0) << 4;
@@ -722,7 +720,6 @@ void RAMFUNC SnoopIClass(void) {
 				time_stop = (GetCountSspClk()-time_0) << 4;
 
 				rsamples = samples - Demod.samples;
-				LED_B_ON();
 
 				uint8_t parity[MAX_PARITY_SIZE];
 				GetParity(Demod.output, Demod.len, parity);
@@ -732,7 +729,6 @@ void RAMFUNC SnoopIClass(void) {
 				memset(&Demod, 0, sizeof(Demod));
 				Demod.output = tagToReaderResponse;
 				Demod.state = DEMOD_UNSYNCD;
-				LED_C_OFF();
 			} else {
 				time_start = (GetCountSspClk()-time_0) << 4;
 			}
@@ -1341,7 +1337,7 @@ static void ReaderTransmitIClass(uint8_t *frame, int len, uint32_t *start_time)
 }
 
 
-static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, size_t max_resp_size, 
+static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, size_t max_resp_size,
 										  uint8_t expected_size, uint8_t retries, uint32_t start_time, uint32_t *eof_time) {
 	while (retries-- > 0) {
 		ReaderTransmitIClass(command, cmdsize, &start_time);
@@ -1353,39 +1349,31 @@ static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint
 }
 
 /**
- * @brief Talks to an iclass tag, sends the commands to get CSN and CC.
- * @param card_data where the CSN and CC are stored for return
- * @return 0 = fail
- *         1 = Got CSN
- *         2 = Got CSN and CC
+ * @brief Selects an iclass tag
+ * @param card_data where the CSN is stored for return
+ * @return false = fail
+ *         true = success
  */
-static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key, uint32_t *eof_time) {
+static bool selectIclassTag(uint8_t *card_data, uint32_t *eof_time) {
 	uint8_t act_all[]      = { 0x0a };
 	uint8_t identify[]     = { 0x0c };
 	uint8_t select[]       = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t readcheck_cc[] = { 0x88, 0x02 };
-	if (use_credit_key)
-		readcheck_cc[0] = 0x18;
-	else
-		readcheck_cc[0] = 0x88;
 
 	uint8_t resp[ICLASS_BUFFER_SIZE];
 
-	uint8_t read_status = 0;
 	uint32_t start_time = GetCountSspClk();
 
 	// Send act_all
 	ReaderTransmitIClass(act_all, 1, &start_time);
 	// Card present?
-	if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_ACTALL, eof_time) < 0) return read_status;//Fail
-	
+	if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_ACTALL, eof_time) < 0) return false;//Fail
+
 	//Send Identify
 	start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 	ReaderTransmitIClass(identify, 1, &start_time);
-	// FpgaDisableTracing(); // DEBUGGING
 	//We expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC
 	uint8_t len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
-	if (len != 10) return read_status;//Fail
+	if (len != 10) return false;//Fail
 
 	//Copy the Anti-collision CSN to our select-packet
 	memcpy(&select[1], resp, 8);
@@ -1394,54 +1382,33 @@ static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key, u
 	ReaderTransmitIClass(select, sizeof(select), &start_time);
 	//We expect a 10-byte response here, 8 byte CSN and 2 byte CRC
 	len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
-	if (len != 10) return read_status;//Fail
+	if (len != 10) return false;//Fail
 
-	//Success - level 1, we got CSN
+	//Success - we got CSN
 	//Save CSN in response data
 	memcpy(card_data, resp, 8);
 
-	//Flag that we got to at least stage 1, read CSN
-	read_status = 1;
-
-	// Card selected, now read e-purse (cc) (only 8 bytes no CRC)
-	start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
-	ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc), &start_time);
-	if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time) == 8) {
-		//Save CC (e-purse) in response data
-		memcpy(card_data+8, resp, 8);
-		read_status++;
-	}
-
-	return read_status;
-}
-
-static uint8_t handshakeIclassTag(uint8_t *card_data, uint32_t *eof_time) {
-	return handshakeIclassTag_ext(card_data, false, eof_time);
+	return true;
 }
 
 
-// Reader iClass Anticollission
+// Select an iClass tag and read all blocks which are always readable without authentication
 void ReaderIClass(uint8_t arg0) {
 
+	LED_A_ON();
+
 	uint8_t card_data[6 * 8] = {0};
 	memset(card_data, 0xFF, sizeof(card_data));
-	uint8_t last_csn[8] = {0,0,0,0,0,0,0,0};
 	uint8_t resp[ICLASS_BUFFER_SIZE];
-	memset(resp, 0xFF, sizeof(resp));
 	//Read conf block CRC(0x01) => 0xfa 0x22
-	uint8_t readConf[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x01, 0xfa, 0x22};
+	uint8_t readConf[] = {ICLASS_CMD_READ_OR_IDENTIFY, 0x01, 0xfa, 0x22};
+	//Read e-purse block CRC(0x02) => 0x61 0x10
+	uint8_t readEpurse[] = {ICLASS_CMD_READ_OR_IDENTIFY, 0x02, 0x61, 0x10};
 	//Read App Issuer Area block CRC(0x05) => 0xde  0x64
-	uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
+	uint8_t readAA[] = {ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
 
-	int read_status= 0;
 	uint8_t result_status = 0;
-	// flag to read until one tag is found successfully
-	bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;
-	// flag to only try 5 times to find one tag then return
-	bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;
-	// if neither abort_after_read nor try_once then continue reading until button pressed.
 
-	bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY;
 	// test flags for what blocks to be sure to read
 	uint8_t flagReadConfig = arg0 & FLAG_ICLASS_READER_CONF;
 	uint8_t flagReadCC = arg0 & FLAG_ICLASS_READER_CC;
@@ -1454,93 +1421,57 @@ void ReaderIClass(uint8_t arg0) {
 	StartCountSspClk();
 	uint32_t start_time = 0;
 	uint32_t eof_time = 0;
+
+	if (selectIclassTag(resp, &eof_time)) {
+		result_status = FLAG_ICLASS_READER_CSN;
+		memcpy(card_data, resp, 8);
+	}
 	
-	uint16_t tryCnt = 0;
-	bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
-	while (!userCancelled) {
-		// if only looking for one card try 2 times if we missed it the first time
-		if (try_once && tryCnt > 2) {
-			break;
+	start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+	
+	//Read block 1, config
+	if (flagReadConfig) {
+		if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+			result_status |= FLAG_ICLASS_READER_CONF;
+			memcpy(card_data+8, resp, 8);
+		} else {
+			Dbprintf("Failed to read config block");
 		}
-		tryCnt++;
-		if (!get_tracing()) {
-			DbpString("Trace full");
-			break;
-		}
-		WDT_HIT();
-
-		read_status = handshakeIclassTag_ext(card_data, use_credit_key, &eof_time);
-
-		if (read_status == 0) continue;
-		if (read_status == 1) result_status = FLAG_ICLASS_READER_CSN;
-		if (read_status == 2) result_status = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC;
-
 		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
-		// handshakeIclass returns CSN|CC, but the actual block
-		// layout is CSN|CONFIG|CC, so here we reorder the data,
-		// moving CC forward 8 bytes
-		memcpy(card_data+16, card_data+8, 8);
-		//Read block 1, config
-		if (flagReadConfig) {
-			if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
-				result_status |= FLAG_ICLASS_READER_CONF;
-				memcpy(card_data+8, resp, 8);
-			} else {
-				Dbprintf("Failed to dump config block");
-			}
-			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
-		}
-
-		//Read block 5, AA
-		if (flagReadAA) {
-			if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
-				result_status |= FLAG_ICLASS_READER_AA;
-				memcpy(card_data + (8*5), resp, 8);
-			} else {
-				//Dbprintf("Failed to dump AA block");
-			}
-		}
-
-		// 0 : CSN
-		// 1 : Configuration
-		// 2 : e-purse
-		// 3 : kd / debit / aa2 (write-only)
-		// 4 : kc / credit / aa1 (write-only)
-		// 5 : AIA, Application issuer area
-		//Then we can 'ship' back the 6 * 8 bytes of data,
-		// with 0xFF:s in block 3 and 4.
-
-		LED_B_ON();
-		//Send back to client, but don't bother if we already sent this -
-		//  only useful if looping in arm (not try_once && not abort_after_read)
-		if (memcmp(last_csn, card_data, 8) != 0) {
-			// If caller requires that we get Conf, CC, AA, continue until we got it
-			if ( (result_status ^ FLAG_ICLASS_READER_CSN ^ flagReadConfig ^ flagReadCC ^ flagReadAA) == 0) {
-				cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
-				if (abort_after_read) {
-					FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-					LED_A_OFF();
-					LED_B_OFF();
-					return;
-				}
-				//Save that we already sent this....
-				memcpy(last_csn, card_data, 8);
-			}
-
-		}
-		LED_B_OFF();
-		userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
 	}
-	if (userCancelled) {
-		cmd_send(CMD_ACK, 0xFF, 0, 0, card_data, 0);
-	} else {
-		cmd_send(CMD_ACK, 0, 0, 0, card_data, 0);
+
+	//Read block 2, e-purse
+	if (flagReadCC) {
+		if (sendCmdGetResponseWithRetries(readEpurse, sizeof(readEpurse), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+			result_status |= FLAG_ICLASS_READER_CC;
+			memcpy(card_data + (8*2), resp, 8);
+		} else {
+			Dbprintf("Failed to read e-purse");
+		}
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 	}
+
+	//Read block 5, AA
+	if (flagReadAA) {
+		if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+			result_status |= FLAG_ICLASS_READER_AA;
+			memcpy(card_data + (8*5), resp, 8);
+		} else {
+			Dbprintf("Failed to read AA block");
+		}
+	}
+
+	cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
+
 	LED_A_OFF();
 }
 
+
 void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 
+	LED_A_ON();
+
+	bool use_credit_key = false;
 	uint8_t card_data[USB_CMD_DATA_SIZE]={0};
 	uint16_t block_crc_LUT[255] = {0};
 
@@ -1551,6 +1482,9 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 	}
 	//Dbprintf("Lookup table: %02x %02x %02x" ,block_crc_LUT[0],block_crc_LUT[1],block_crc_LUT[2]);
 
+	uint8_t readcheck_cc[] = { ICLASS_CMD_READCHECK_KD, 0x02 };
+	if (use_credit_key)
+		readcheck_cc[0] = ICLASS_CMD_READCHECK_KC;
 	uint8_t check[]       = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 	uint8_t read[]        = { 0x0c, 0x00, 0x00, 0x00 };
 
@@ -1575,7 +1509,7 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 	StartCountSspClk();
 	uint32_t start_time = 0;
 	uint32_t eof_time = 0;
-	
+
 	while (!BUTTON_PRESS()) {
 
 		WDT_HIT();
@@ -1585,34 +1519,33 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			break;
 		}
 
-		uint8_t read_status = handshakeIclassTag(card_data, &eof_time);
+		if (!selectIclassTag(card_data, &eof_time)) continue;
+
 		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+		if (!sendCmdGetResponseWithRetries(readcheck_cc, sizeof(readcheck_cc), resp, sizeof(resp), 8, 3, start_time, &eof_time)) continue;
 
-		if (read_status < 2) continue;
-
-		//for now replay captured auth (as cc not updated)
+		// replay captured auth (cc must not have been updated)
 		memcpy(check+5, MAC, 4);
 
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 5, start_time, &eof_time)) {
-			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 			Dbprintf("Error: Authentication Fail!");
 			continue;
 		}
 
-		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		//first get configuration block (block 1)
 		crc = block_crc_LUT[1];
 		read[1] = 1;
 		read[2] = crc >> 8;
 		read[3] = crc & 0xff;
 
+		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
 			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 			Dbprintf("Dump config (block 1) failed");
 			continue;
 		}
 
-		start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 		mem = resp[5];
 		memory.k16 = (mem & 0x80);
 		memory.book = (mem & 0x20);
@@ -1633,8 +1566,8 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			read[2] = crc >> 8;
 			read[3] = crc & 0xff;
 
+			start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 			if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
-				start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 				Dbprintf("     %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
 						block, resp[0], resp[1], resp[2],
 						resp[3], resp[4], resp[5],
@@ -1683,19 +1616,33 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) {
 			 0);
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LED_D_OFF();
 	LED_A_OFF();
 }
 
-void iClass_Authentication(uint8_t *MAC) {
-	uint8_t check[] = { ICLASS_CMD_CHECK_KD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-	uint8_t resp[ICLASS_BUFFER_SIZE];
+
+void iClass_Check(uint8_t *MAC) {
+	uint8_t check[9] = {ICLASS_CMD_CHECK_KD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+	uint8_t resp[4];
 	memcpy(check+5, MAC, 4);
-	bool isOK;
 	uint32_t eof_time;
-	isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 6, 0, &eof_time);
-	cmd_send(CMD_ACK,isOK, 0, 0, 0, 0);
+	bool isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 6, 0, &eof_time);
+	cmd_send(CMD_ACK, isOK, 0, 0, resp, sizeof(resp));
 }
 
+
+void iClass_Readcheck(uint8_t block, bool use_credit_key) {
+	uint8_t readcheck[2] = {ICLASS_CMD_READCHECK_KD, block};
+	if (use_credit_key) {
+		readcheck[0] = ICLASS_CMD_READCHECK_KC;
+	}
+	uint8_t resp[8];
+	uint32_t eof_time;
+	bool isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 8, 6, 0, &eof_time);
+	cmd_send(CMD_ACK, isOK, 0, 0, resp, sizeof(resp));
+}
+
+
 static bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) {
 	uint8_t readcmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00}; //0x88, 0x00 // can i use 0C?
 	char bl = blockNo;
@@ -1705,23 +1652,32 @@ static bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) {
 	uint8_t resp[10];
 	bool isOK = false;
 	uint32_t eof_time;
-	
-	//readcmd[1] = blockNo;
+
 	isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, sizeof(resp), 10, 10, 0, &eof_time);
 	memcpy(readdata, resp, sizeof(resp));
 
 	return isOK;
 }
 
+
 void iClass_ReadBlk(uint8_t blockno) {
+
+	LED_A_ON();
+
 	uint8_t readblockdata[] = {0,0,0,0,0,0,0,0,0,0};
 	bool isOK = false;
 	isOK = iClass_ReadBlock(blockno, readblockdata);
 	cmd_send(CMD_ACK, isOK, 0, 0, readblockdata, 8);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LED_D_OFF();
+
+	LED_A_OFF();
 }
 
 void iClass_Dump(uint8_t blockno, uint8_t numblks) {
+
+	LED_A_ON();
+
 	uint8_t readblockdata[] = {0,0,0,0,0,0,0,0,0,0};
 	bool isOK = false;
 	uint8_t blkCnt = 0;
@@ -1751,12 +1707,19 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) {
 	}
 	//return pointer to dump memory in arg3
 	cmd_send(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0);
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+	LED_D_OFF();
 	BigBuf_free();
+
+	LED_A_OFF();
 }
 
+
 static bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
+
+	LED_A_ON();
+
 	uint8_t write[] = { ICLASS_CMD_UPDATE, blockNo, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 	//uint8_t readblockdata[10];
 	//write[1] = blockNo;
@@ -1768,7 +1731,7 @@ static bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 	uint8_t resp[10];
 	bool isOK = false;
 	uint32_t eof_time = 0;
-	
+
 	isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10, 10, 0, &eof_time);
 	uint32_t start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
 	if (isOK) { //if reader responded correctly
@@ -1780,10 +1743,17 @@ static bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) {
 			}
 		}
 	}
+
+	LED_A_OFF();
+
 	return isOK;
 }
 
+
 void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
+
+	LED_A_ON();
+
 	bool isOK = iClass_WriteBlock_ext(blockNo, data);
 	if (isOK){
 		Dbprintf("Write block [%02x] successful", blockNo);
@@ -1791,7 +1761,11 @@ void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) {
 		Dbprintf("Write block [%02x] failed", blockNo);
 	}
 	cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+	LED_D_OFF();
+
+	LED_A_OFF();
 }
 
 void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
@@ -1819,5 +1793,6 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
 
 	cmd_send(CMD_ACK, 1, 0, 0, 0, 0);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+	LED_D_OFF();
+	LED_A_OFF();
 }
diff --git a/armsrc/iclass.h b/armsrc/iclass.h
index 3cbe79fb..9666e888 100644
--- a/armsrc/iclass.h
+++ b/armsrc/iclass.h
@@ -15,6 +15,7 @@
 #define ICLASS_H__
 
 #include <stdint.h>
+#include <stdbool.h>
 #include "common.h" // for RAMFUNC
 
 extern void RAMFUNC SnoopIClass(void);
@@ -22,7 +23,8 @@ extern void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t
 extern void ReaderIClass(uint8_t arg0);
 extern void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC);
 extern void IClass_iso14443A_GetPublic(uint8_t arg0);
-extern void iClass_Authentication(uint8_t *MAC);
+extern void iClass_Readcheck(uint8_t block, bool use_credit_key);
+extern void iClass_Check(uint8_t *MAC);
 extern void iClass_WriteBlock(uint8_t blockNo, uint8_t *data);
 extern void iClass_ReadBlk(uint8_t blockNo);
 extern void iClass_Dump(uint8_t blockno, uint8_t numblks);
diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c
index fff8b370..3b39d576 100644
--- a/armsrc/iso15693.c
+++ b/armsrc/iso15693.c
@@ -132,7 +132,7 @@ void CodeIso15693AsReader(uint8_t *cmd, int n) {
 
 	// EOF
 	ToSend[++ToSendMax] = 0x20; //0010 + 0000 padding
-	
+
 	ToSendMax++;
 }
 
@@ -249,14 +249,18 @@ void CodeIso15693AsTag(uint8_t *cmd, size_t len) {
 void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time) {
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER | FPGA_HF_READER_MODE_SEND_FULL_MOD);
-	
+
+	if (*start_time < DELAY_ARM_TO_TAG) {
+		*start_time = DELAY_ARM_TO_TAG;
+	}
+
 	*start_time = (*start_time - DELAY_ARM_TO_TAG) & 0xfffffff0;
 
 	while (GetCountSspClk() > *start_time) { // we may miss the intended time
 		*start_time += 16; // next possible time
 	}
 
-	
+
 	while (GetCountSspClk() < *start_time)
 		/* wait */ ;
 
@@ -275,7 +279,7 @@ void TransmitTo15693Tag(const uint8_t *cmd, int len, uint32_t *start_time) {
 		WDT_HIT();
 	}
 	LED_B_OFF();
-	
+
 	*start_time = *start_time + DELAY_ARM_TO_TAG;
 
 }
@@ -289,7 +293,7 @@ void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time,
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_MODULATE_424K);
 
 	uint32_t modulation_start_time = *start_time - DELAY_ARM_TO_READER + 3 * 8;  // no need to transfer the unmodulated start of SOF
-	
+
 	while (GetCountSspClk() > (modulation_start_time & 0xfffffff8) + 3) { // we will miss the intended time
 		if (slot_time) {
 			modulation_start_time += slot_time; // use next available slot
@@ -298,7 +302,7 @@ void TransmitTo15693Reader(const uint8_t *cmd, size_t len, uint32_t *start_time,
 		}
 	}
 
-	while (GetCountSspClk() < (modulation_start_time & 0xfffffff8)) 
+	while (GetCountSspClk() < (modulation_start_time & 0xfffffff8))
 		/* wait */ ;
 
 	uint8_t shift_delay = modulation_start_time & 0x00000007;
@@ -414,7 +418,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 			// DecodeTag->posCount = 2;
 			DecodeTag->state = STATE_TAG_SOF_HIGH;
 			break;
-				
+
 		case STATE_TAG_SOF_HIGH:
 			// waiting for 10 times high. Take average over the last 8
 			if (amplitude > DecodeTag->threshold_sof) {
@@ -428,7 +432,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 				}
 			} else { // high phase was too short
 				DecodeTag->posCount = 1;
-				DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+				DecodeTag->previous_amplitude = amplitude;
 				DecodeTag->state = STATE_TAG_SOF_LOW;
 			}
 			break;
@@ -444,18 +448,18 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 				DecodeTag->sum2 = 0;
 				DecodeTag->posCount = 2;
 				DecodeTag->state = STATE_TAG_RECEIVING_DATA;
-				// FpgaDisableTracing(); // DEBUGGING
-				// Dbprintf("amplitude = %d, threshold_sof = %d, threshold_half/4 = %d, previous_amplitude = %d", 
-					// amplitude, 
-					// DecodeTag->threshold_sof, 
-					// DecodeTag->threshold_half/4,
-					// DecodeTag->previous_amplitude); // DEBUGGING
+				FpgaDisableTracing(); // DEBUGGING
+				Dbprintf("amplitude = %d, threshold_sof = %d, threshold_half/4 = %d, previous_amplitude = %d",
+					amplitude,
+					DecodeTag->threshold_sof,
+					DecodeTag->threshold_half/4,
+					DecodeTag->previous_amplitude); // DEBUGGING
 				LED_C_ON();
 			} else {
 				DecodeTag->posCount++;
 				if (DecodeTag->posCount > 13) { // high phase too long
 					DecodeTag->posCount = 0;
-					DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+					DecodeTag->previous_amplitude = amplitude;
 					DecodeTag->state = STATE_TAG_SOF_LOW;
 					LED_C_OFF();
 				}
@@ -478,7 +482,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 						DecodeTag->state = STATE_TAG_EOF;
 					} else {
 						DecodeTag->posCount = 0;
-						DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+						DecodeTag->previous_amplitude = amplitude;
 						DecodeTag->state = STATE_TAG_SOF_LOW;
 						LED_C_OFF();
 					}
@@ -508,7 +512,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 					// logic 0
 					if (DecodeTag->lastBit == SOF_PART1) { // incomplete SOF
 						DecodeTag->posCount = 0;
-						DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+						DecodeTag->previous_amplitude = amplitude;
 						DecodeTag->state = STATE_TAG_SOF_LOW;
 						LED_C_OFF();
 					} else {
@@ -522,7 +526,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 							if (DecodeTag->len > DecodeTag->max_len) {
 								// buffer overflow, give up
 								DecodeTag->posCount = 0;
-								DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+								DecodeTag->previous_amplitude = amplitude;
 								DecodeTag->state = STATE_TAG_SOF_LOW;
 								LED_C_OFF();
 							}
@@ -561,7 +565,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 					DecodeTag->state = STATE_TAG_EOF_TAIL;
 				} else {
 					DecodeTag->posCount = 0;
-					DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+					DecodeTag->previous_amplitude = amplitude;
 					DecodeTag->state = STATE_TAG_SOF_LOW;
 					LED_C_OFF();
 				}
@@ -585,7 +589,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 					return true;
 				} else {
 					DecodeTag->posCount = 0;
-					DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
+					DecodeTag->previous_amplitude = amplitude;
 					DecodeTag->state = STATE_TAG_SOF_LOW;
 					LED_C_OFF();
 				}
@@ -598,8 +602,7 @@ static int inline __attribute__((always_inline)) Handle15693SamplesFromTag(uint1
 }
 
 
-static void DecodeTagInit(DecodeTag_t *DecodeTag, uint8_t *data, uint16_t max_len)
-{
+static void DecodeTagInit(DecodeTag_t *DecodeTag, uint8_t *data, uint16_t max_len) {
 	DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
 	DecodeTag->posCount = 0;
 	DecodeTag->state = STATE_TAG_SOF_LOW;
@@ -608,8 +611,7 @@ static void DecodeTagInit(DecodeTag_t *DecodeTag, uint8_t *data, uint16_t max_le
 }
 
 
-static void DecodeTagReset(DecodeTag_t *DecodeTag)
-{
+static void DecodeTagReset(DecodeTag_t *DecodeTag) {
 	DecodeTag->posCount = 0;
 	DecodeTag->state = STATE_TAG_SOF_LOW;
 	DecodeTag->previous_amplitude = MAX_PREVIOUS_AMPLITUDE;
@@ -649,10 +651,10 @@ int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeo
 
 		samples++;
 		if (samples == 1) {
-		    // DMA has transferred the very first data
+			// DMA has transferred the very first data
 			dma_start_time = GetCountSspClk() & 0xfffffff0;
 		}
-		
+
 		uint16_t tagdata = *upTo++;
 
 		if(upTo >= dmaBuf + ISO15693_DMA_BUFFER_SIZE) {                // we have read all of the DMA buffer content.
@@ -680,7 +682,7 @@ int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeo
 		}
 
 		if (samples > timeout && DecodeTag.state < STATE_TAG_RECEIVING_DATA) {
-			ret = -1;	// timeout
+			ret = -1;   // timeout
 			break;
 		}
 
@@ -699,9 +701,9 @@ int GetIso15693AnswerFromTag(uint8_t* response, uint16_t max_len, uint16_t timeo
 						- DecodeTag.len * 8 * 8 * 16 // time for byte transfers
 						- 32 * 16  // time for SOF transfer
 						- (DecodeTag.lastBit != SOF_PART2?32*16:0); // time for EOF transfer
-						
+
 	if (DEBUG) Dbprintf("timing: sof_time = %d, eof_time = %d", sof_time, *eof_time);
-	
+
 	LogTrace_ISO15693(DecodeTag.output, DecodeTag.len, sof_time*4, *eof_time*4, NULL, false);
 
 	return DecodeTag.len;
@@ -1089,20 +1091,19 @@ static void BuildIdentifyRequest(void)
 //-----------------------------------------------------------------------------
 void AcquireRawAdcSamplesIso15693(void)
 {
-	LEDsoff();
 	LED_A_ON();
 
 	uint8_t *dest = BigBuf_get_addr();
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER);
+	LED_D_ON();
 	FpgaSetupSsc(FPGA_MAJOR_MODE_HF_READER);
 	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
 
 	BuildIdentifyRequest();
 
 	// Give the tags time to energize
-	LED_D_ON();
 	SpinDelay(100);
 
 	// Now send the command
@@ -1129,6 +1130,7 @@ void AcquireRawAdcSamplesIso15693(void)
 void SnoopIso15693(void)
 {
 	LED_A_ON();
+	
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	BigBuf_free();
 
@@ -1348,17 +1350,13 @@ static void BuildInventoryResponse(uint8_t *uid)
 //  return: length of received data, or -1 for timeout
 int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv, uint16_t max_recv_len, uint32_t start_time, uint32_t *eof_time) {
 
-	LED_A_ON();
-	LED_B_OFF();
-	LED_C_OFF();
-
 	if (init) {
 		Iso15693InitReader();
 		StartCountSspClk();
 	}
-	
+
 	int answerLen = 0;
-	
+
 	if (!speed) {
 		// low speed (1 out of 256)
 		CodeIso15693AsReader256(send, sendlen);
@@ -1367,18 +1365,13 @@ int SendDataTag(uint8_t *send, int sendlen, bool init, int speed, uint8_t *recv,
 		CodeIso15693AsReader(send, sendlen);
 	}
 
-	if (start_time == 0) {
-		start_time = GetCountSspClk();
-	}
 	TransmitTo15693Tag(ToSend, ToSendMax, &start_time);
 
 	// Now wait for a response
 	if (recv != NULL) {
-		answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, DELAY_ISO15693_VCD_TO_VICC_READER * 2, eof_time);
+		answerLen = GetIso15693AnswerFromTag(recv, max_recv_len, ISO15693_READER_TIMEOUT, eof_time);
 	}
 
-	LED_A_OFF();
-
 	return answerLen;
 }
 
@@ -1462,9 +1455,8 @@ void SetDebugIso15693(uint32_t debug) {
 // Simulate an ISO15693 reader, perform anti-collision and then attempt to read a sector.
 // all demodulation performed in arm rather than host. - greg
 //---------------------------------------------------------------------------------------
-void ReaderIso15693(uint32_t parameter)
-{
-	LEDsoff();
+void ReaderIso15693(uint32_t parameter) {
+
 	LED_A_ON();
 
 	set_tracing(true);
@@ -1564,9 +1556,8 @@ void ReaderIso15693(uint32_t parameter)
 // Simulate an ISO15693 TAG.
 // For Inventory command: print command and send Inventory Response with given UID
 // TODO: interpret other reader commands and send appropriate response
-void SimTagIso15693(uint32_t parameter, uint8_t *uid)
-{
-	LEDsoff();
+void SimTagIso15693(uint32_t parameter, uint8_t *uid) {
+
 	LED_A_ON();
 
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -1597,7 +1588,8 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 	}
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+	LED_D_OFF();
+	LED_A_OFF();
 }
 
 
@@ -1605,7 +1597,6 @@ void SimTagIso15693(uint32_t parameter, uint8_t *uid)
 // (some manufactures offer a way to read the AFI, though)
 void BruteforceIso15693Afi(uint32_t speed)
 {
-	LEDsoff();
 	LED_A_ON();
 
 	uint8_t data[6];
@@ -1648,17 +1639,19 @@ void BruteforceIso15693Afi(uint32_t speed)
 	Dbprintf("AFI Bruteforcing done.");
 
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LEDsoff();
+	LED_D_OFF();
+	LED_A_OFF();
+
 }
 
 // Allows to directly send commands to the tag via the client
 void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint8_t data[]) {
 
+	LED_A_ON();
+
 	int recvlen = 0;
 	uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
 	uint32_t eof_time;
-	
-	LED_A_ON();
 
 	if (DEBUG) {
 		Dbprintf("SEND:");
@@ -1695,17 +1688,16 @@ void DirectTag15693Command(uint32_t datalen, uint32_t speed, uint32_t recv, uint
 //-----------------------------------------------------------------------------
 
 // Set the UID to the tag (based on Iceman work).
-void SetTag15693Uid(uint8_t *uid)
-{
-	uint8_t cmd[4][9] = {0x00};
+void SetTag15693Uid(uint8_t *uid) {
 
+	LED_A_ON();
+
+	uint8_t cmd[4][9] = {0x00};
 	uint16_t crc;
 
 	int recvlen = 0;
 	uint8_t recvbuf[ISO15693_MAX_RESPONSE_LENGTH];
 	uint32_t eof_time;
-	
-	LED_A_ON();
 
 	// Command 1 : 02213E00000000
 	cmd[0][0] = 0x02;
@@ -1767,8 +1759,6 @@ void SetTag15693Uid(uint8_t *uid)
 		cmd_send(CMD_ACK, recvlen>ISO15693_MAX_RESPONSE_LENGTH?ISO15693_MAX_RESPONSE_LENGTH:recvlen, 0, 0, recvbuf, ISO15693_MAX_RESPONSE_LENGTH);
 	}
 
-	LED_D_OFF();
-
 	LED_A_OFF();
 }
 
diff --git a/armsrc/iso15693.h b/armsrc/iso15693.h
index 96a2b39b..5cbe5ecc 100644
--- a/armsrc/iso15693.h
+++ b/armsrc/iso15693.h
@@ -21,6 +21,8 @@
 //SSP_CLK runs at 13.56MHz / 4 = 3,39MHz when acting as reader. All values should be multiples of 16
 #define DELAY_ISO15693_VCD_TO_VICC_READER 1056 // 1056/3,39MHz = 311.5us from end of command EOF to start of tag response
 #define DELAY_ISO15693_VICC_TO_VCD_READER 1024 // 1024/3.39MHz = 302.1us between end of tag response and next reader command
+// times in samples @ 212kHz when acting as reader
+#define ISO15693_READER_TIMEOUT            330 // 330/212kHz = 1558us, should be even enough for iClass tags responding to ACTALL
 
 void Iso15693InitReader();
 void CodeIso15693AsReader(uint8_t *cmd, int n);
diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index 81738686..195a282d 100644
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -35,7 +35,6 @@
 #include "util_posix.h"
 #include "cmdhf14a.h" // DropField()
 
-static int CmdHelp(const char *Cmd);
 
 #define ICLASS_KEYS_MAX 8
 static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
@@ -49,12 +48,14 @@ static uint8_t iClass_Key_Table[ICLASS_KEYS_MAX][8] = {
 		{ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }
 };
 
+
 typedef struct iclass_block {
-    uint8_t d[8];
+	uint8_t d[8];
 } iclass_block_t;
 
-int usage_hf_iclass_chk(void) {
-	PrintAndLog("Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");	
+
+static void usage_hf_iclass_chk(void) {
+	PrintAndLog("Checkkeys loads a dictionary text file with 8byte hex keys to test authenticating against a iClass tag");
 	PrintAndLog("Usage: hf iclass chk [h|e|r] <f  (*.dic)>");
 	PrintAndLog("Options:");
 	PrintAndLog("h             Show this help");
@@ -62,31 +63,25 @@ int usage_hf_iclass_chk(void) {
 	PrintAndLog("      e             target Elite / High security key scheme");
 	PrintAndLog("      r             interpret dictionary file as raw (diversified keys)");
 	PrintAndLog("Samples:");
-	PrintAndLog("		 hf iclass chk f default_iclass_keys.dic");	
-	PrintAndLog("		 hf iclass chk f default_iclass_keys.dic e");	
-	return 0;
+	PrintAndLog("        hf iclass chk f default_iclass_keys.dic");
+	PrintAndLog("        hf iclass chk f default_iclass_keys.dic e");
 }
 
-int xorbits_8(uint8_t val) {
-	uint8_t res = val ^ (val >> 1); //1st pass
-	res = res ^ (res >> 1); 		// 2nd pass
-	res = res ^ (res >> 2); 		// 3rd pass
-	res = res ^ (res >> 4); 			// 4th pass
-	return res & 1;
-}
 
-int CmdHFiClassList(const char *Cmd) {
+static int CmdHFiClassList(const char *Cmd) {
 	PrintAndLog("Deprecated command, use 'hf list iclass' instead");
 	return 0;
 }
 
-int CmdHFiClassSnoop(const char *Cmd) {
+
+static int CmdHFiClassSnoop(const char *Cmd) {
 	UsbCommand c = {CMD_SNOOP_ICLASS};
 	SendCommand(&c);
 	return 0;
 }
 
-int usage_hf_iclass_sim(void) {
+
+static void usage_hf_iclass_sim(void) {
 	PrintAndLog("Usage:  hf iclass sim <option> [CSN]");
 	PrintAndLog("        options");
 	PrintAndLog("                0 <CSN> simulate the given CSN");
@@ -97,9 +92,9 @@ int usage_hf_iclass_sim(void) {
 	PrintAndLog("        example: hf iclass sim 2");
 	PrintAndLog("        example: hf iclass eload 'tagdump.bin'");
 	PrintAndLog("                 hf iclass sim 3");
-	return 0;
 }
 
+
 // the original malicious IDs from Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult,
 // and Milosch Meriac. Dismantling iClass and iClass Elite.
 #define NUM_CSNS 15
@@ -127,32 +122,34 @@ static uint8_t csns[8 * NUM_CSNS] = {
 
 // #define NUM_CSNS 9
 // static uint8_t csns[8 * NUM_CSNS] = {
-    // 0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
-    // 0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
-    // //0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
+	// 0x01, 0x0A, 0x0F, 0xFF, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0x0C, 0x06, 0x0C, 0xFE, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0x10, 0x97, 0x83, 0x7B, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0x13, 0x97, 0x82, 0x7A, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0x07, 0x0E, 0x0D, 0xF9, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0x14, 0x96, 0x84, 0x76, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0x17, 0x96, 0x85, 0x71, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0xCE, 0xC5, 0x0F, 0x77, 0xF7, 0xFF, 0x12, 0xE0,
+	// 0xD2, 0x5A, 0x82, 0xF8, 0xF7, 0xFF, 0x12, 0xE0
+	// //0x04, 0x08, 0x9F, 0x78, 0x6E, 0xFF, 0x12, 0xE0
 // };
 
 
-int CmdHFiClassSim(const char *Cmd) {
+static int CmdHFiClassSim(const char *Cmd) {
 	uint8_t simType = 0;
 	uint8_t CSN[8] = {0, 0, 0, 0, 0, 0, 0, 0};
 
 	if (strlen(Cmd) < 1) {
-		return usage_hf_iclass_sim();
+		usage_hf_iclass_sim();
+		return 0;
 	}
 	simType = param_get8ex(Cmd, 0, 0, 10);
 
 	if (simType == ICLASS_SIM_MODE_CSN) {
 		if (param_gethex(Cmd, 1, CSN, 16)) {
 			PrintAndLog("A CSN should consist of 16 HEX symbols");
-			return usage_hf_iclass_sim();
+			usage_hf_iclass_sim();
+			return 0;
 		}
 		PrintAndLog("--simtype:%02x csn:%s", simType, sprint_hex(CSN, 8));
 	}
@@ -186,8 +183,8 @@ int CmdHFiClassSim(const char *Cmd) {
 		void* dump = malloc(datalen);
 		for(int i = 0; i < NUM_CSNS; i++) {
 			memcpy(dump + i*24, csns+i*8, 8); //CSN
-            //copy CC from response
-            memcpy(dump + i*24 + 8, resp.d.asBytes + i*16, 8);
+			//copy CC from response
+			memcpy(dump + i*24 + 8, resp.d.asBytes + i*16, 8);
 			//Then comes NR_MAC (eight bytes from the response)
 			memcpy(dump + i*24 + 16, resp.d.asBytes + i*16 + 8, 8);
 		}
@@ -202,17 +199,18 @@ int CmdHFiClassSim(const char *Cmd) {
 
 	} else {
 		PrintAndLog("Undefined simtype %d", simType);
-		return usage_hf_iclass_sim();
+		usage_hf_iclass_sim();
+		return 0;
 	}
 
 	return 0;
 }
 
+
 int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 	bool tagFound = false;
 	UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN |
-		    FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_AA |
-		    FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY } };
+			FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_AA} };
 	// loop in client not device - else on windows have a communication error
 	UsbCommand resp;
 	while(!ukbhit()){
@@ -232,7 +230,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 				PrintAndLog("   CSN: %s",sprint_hex(data,8));
 				tagFound = true;
 			}
-			if( readStatus & FLAG_ICLASS_READER_CC) { 
+			if( readStatus & FLAG_ICLASS_READER_CC) {
 				PrintAndLog("    CC: %s",sprint_hex(data+16,8));
 			}
 			if( readStatus & FLAG_ICLASS_READER_CONF) {
@@ -244,7 +242,7 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 				for (int i = 0; i<8; i++) {
 					if (data[8*5+i] != 0xFF) {
 						legacy = false;
-					} 
+					}
 				}
 				PrintAndLog("      : Possible iClass %s",(legacy) ? "(legacy tag)" : "(NOT legacy tag)");
 			}
@@ -258,11 +256,13 @@ int HFiClassReader(const char *Cmd, bool loop, bool verbose) {
 	return 0;
 }
 
-int CmdHFiClassReader(const char *Cmd) {
+
+static int CmdHFiClassReader(const char *Cmd) {
 	return HFiClassReader(Cmd, true, true);
 }
 
-int CmdHFiClassReader_Replay(const char *Cmd) {
+
+static int CmdHFiClassReader_Replay(const char *Cmd) {
 	uint8_t readerType = 0;
 	uint8_t MAC[4]={0x00, 0x00, 0x00, 0x00};
 
@@ -284,26 +284,22 @@ int CmdHFiClassReader_Replay(const char *Cmd) {
 	return 0;
 }
 
-int iclassEmlSetMem(uint8_t *data, int blockNum, int blocksCount) {
-	UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNum, blocksCount, 0}};
-	memcpy(c.d.asBytes, data, blocksCount * 16);
-	SendCommand(&c);
-	return 0;
-}
 
-int hf_iclass_eload_usage(void) {
+static void usage_hf_iclass_eload(void) {
 	PrintAndLog("Loads iclass tag-dump into emulator memory on device");
 	PrintAndLog("Usage:  hf iclass eload f <filename>");
 	PrintAndLog("");
 	PrintAndLog("Example: hf iclass eload f iclass_tagdump-aa162d30f8ff12f1.bin");
-	return 0;
 }
 
-int CmdHFiClassELoad(const char *Cmd) {
+
+static int CmdHFiClassELoad(const char *Cmd) {
 
 	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h')
-		return hf_iclass_eload_usage();
+	if (strlen(Cmd)<1 || opt == 'h') {
+		usage_hf_iclass_eload();
+		return 0;
+	}
 
 	//File handling and reading
 	FILE *f;
@@ -311,7 +307,8 @@ int CmdHFiClassELoad(const char *Cmd) {
 	if (opt == 'f' && param_getstr(Cmd, 1, filename, sizeof(filename)) > 0) {
 		f = fopen(filename, "rb");
 	} else {
-		return hf_iclass_eload_usage();
+		usage_hf_iclass_eload();
+		return 0;
 	}
 
 	if (!f) {
@@ -337,7 +334,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 	printIclassDumpInfo(dump);
 	//Validate
 
-	if (bytes_read < fsize)	{
+	if (bytes_read < fsize) {
 		prnlog("Error, could only read %d bytes (should be %d)",bytes_read, fsize );
 		free(dump);
 		return 1;
@@ -359,6 +356,7 @@ int CmdHFiClassELoad(const char *Cmd) {
 	return 0;
 }
 
+
 static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
 	FILE *f = fopen(filename, "rb");
 	if(!f) {
@@ -383,7 +381,8 @@ static int readKeyfile(const char *filename, size_t len, uint8_t* buffer) {
 	return 0;
 }
 
-int usage_hf_iclass_decrypt(void) {
+
+static void usage_hf_iclass_decrypt(void) {
 	PrintAndLog("Usage: hf iclass decrypt f <tagdump>");
 	PrintAndLog("");
 	PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
@@ -394,10 +393,10 @@ int usage_hf_iclass_decrypt(void) {
 	PrintAndLog("OBS! This is pretty stupid implementation, it tries to decrypt every block after block 6. ");
 	PrintAndLog("Correct behaviour would be to decrypt only the application areas where the key is valid,");
 	PrintAndLog("which is defined by the configuration block.");
-	return 1;
 }
 
-int CmdHFiClassDecrypt(const char *Cmd) {
+
+static int CmdHFiClassDecrypt(const char *Cmd) {
 	uint8_t key[16] = { 0 };
 	if(readKeyfile("iclass_decryptionkey.bin", 16, key))
 	{
@@ -406,8 +405,10 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 	}
 	PrintAndLog("Decryption file found... ");
 	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h')
-		return usage_hf_iclass_decrypt();
+	if (strlen(Cmd)<1 || opt == 'h') {
+		usage_hf_iclass_decrypt();
+		return 0;
+	}
 
 	//Open the tagdump-file
 	FILE *f;
@@ -419,7 +420,8 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 			return 1;
 		}
 	} else {
-		return usage_hf_iclass_decrypt();
+		usage_hf_iclass_decrypt();
+		return 0;
 	}
 
 	fseek(f, 0, SEEK_END);
@@ -457,7 +459,8 @@ int CmdHFiClassDecrypt(const char *Cmd) {
 	return 0;
 }
 
-int usage_hf_iclass_encrypt(void) {
+
+static void usage_hf_iclass_encrypt(void) {
 	PrintAndLog("Usage: hf iclass encrypt <BlockData>");
 	PrintAndLog("");
 	PrintAndLog("OBS! In order to use this function, the file 'iclass_decryptionkey.bin' must reside");
@@ -465,9 +468,9 @@ int usage_hf_iclass_encrypt(void) {
 	PrintAndLog("");
 	PrintAndLog("example: hf iclass encrypt 0102030405060708");
 	PrintAndLog("");
-	return 0;
 }
 
+
 static int iClassEncryptBlkData(uint8_t *blkData) {
 	uint8_t key[16] = { 0 };
 	if(readKeyfile("iclass_decryptionkey.bin", 16, key))
@@ -481,7 +484,7 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 	uint8_t *encrypted = encryptedData;
 	mbedtls_des3_context ctx = { {0} };
 	mbedtls_des3_set2key_enc( &ctx, key);
-	
+
 	mbedtls_des3_crypt_ecb(&ctx, blkData,encrypted);
 	//printvar("decrypted block", decrypted, 8);
 	memcpy(blkData,encrypted,8);
@@ -489,25 +492,26 @@ static int iClassEncryptBlkData(uint8_t *blkData) {
 	return 1;
 }
 
-int CmdHFiClassEncryptBlk(const char *Cmd) {
+
+static int CmdHFiClassEncryptBlk(const char *Cmd) {
 	uint8_t blkData[8] = {0};
 	char opt = param_getchar(Cmd, 0);
-	if (strlen(Cmd)<1 || opt == 'h')
-		return usage_hf_iclass_encrypt();
-
+	if (strlen(Cmd)<1 || opt == 'h') {
+		usage_hf_iclass_encrypt();
+		return 0;
+	}
 	//get the bytes to encrypt
-	if (param_gethex(Cmd, 0, blkData, 16))
-	{
+	if (param_gethex(Cmd, 0, blkData, 16)) {
 		PrintAndLog("BlockData must include 16 HEX symbols");
 		return 0;
 	}
 	if (!iClassEncryptBlkData(blkData)) return 0;
-
 	printvar("encrypted block", blkData, 8);
 	return 1;
 }
 
-void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
+
+static void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4]) {
 	uint8_t WB[9];
 	WB[0] = blockno;
 	memcpy(WB + 1,data,8);
@@ -515,18 +519,15 @@ void Calc_wb_mac(uint8_t blockno, uint8_t *data, uint8_t *div_key, uint8_t MAC[4
 	//printf("Cal wb mac block [%02x][%02x%02x%02x%02x%02x%02x%02x%02x] : MAC [%02x%02x%02x%02x]",WB[0],WB[1],WB[2],WB[3],WB[4],WB[5],WB[6],WB[7],WB[8],MAC[0],MAC[1],MAC[2],MAC[3]);
 }
 
-static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool verbose) {
+
+static bool select_only(uint8_t *CSN, bool verbose) {
 	UsbCommand resp;
 
 	UsbCommand c = {CMD_READER_ICLASS, {0}};
-	c.arg[0] = FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_CC | FLAG_ICLASS_READER_ONE_TRY;
-	if (use_credit_key)
-		c.arg[0] |= FLAG_ICLASS_READER_CEDITKEY;
 
 	clearCommandBuffer();
 	SendCommand(&c);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
 		PrintAndLog("Command execute timeout");
 		return false;
 	}
@@ -534,45 +535,81 @@ static bool select_only(uint8_t *CSN, uint8_t *CCNR, bool use_credit_key, bool v
 	uint8_t isOK = resp.arg[0] & 0xff;
 	uint8_t *data = resp.d.asBytes;
 
-	memcpy(CSN,data,8);
-	if (CCNR!=NULL)memcpy(CCNR,data+16,8);
-	if(isOK > 0)
-	{
-		if (verbose) PrintAndLog("CSN: %s",sprint_hex(CSN,8));
-	}
-	if(isOK <= 1){
-		PrintAndLog("Failed to obtain CC! Aborting");
+	memcpy(CSN, data, 8);
+
+	if (isOK > 0) {
+		if (verbose) PrintAndLog("CSN: %s", sprint_hex(CSN, 8));
+	} else {
+		PrintAndLog("Failed to select card! Aborting");
 		return false;
 	}
-	return true;	
+	return true;
 }
 
-static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
-	uint8_t CSN[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CCNR[12]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
-	if (!select_only(CSN, CCNR, use_credit_key, verbose))
+static void HFiClassCalcDivKey(uint8_t *CSN, uint8_t *KEY, uint8_t *div_key, bool elite){
+	uint8_t keytable[128] = {0};
+	uint8_t key_index[8] = {0};
+	if (elite) {
+		uint8_t key_sel[8] = { 0 };
+		uint8_t key_sel_p[8] = { 0 };
+		hash2(KEY, keytable);
+		hash1(CSN, key_index);
+		for(uint8_t i = 0; i < 8 ; i++)
+			key_sel[i] = keytable[key_index[i]] & 0xFF;
+
+		//Permute from iclass format to standard format
+		permutekey_rev(key_sel, key_sel_p);
+		diversifyKey(CSN, key_sel_p, div_key);
+	} else {
+		diversifyKey(CSN, KEY, div_key);
+	}
+}
+
+
+static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
+	uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+	uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+
+	if (!select_only(CSN, verbose))
 		return false;
 
 	//get div_key
-	if(rawkey)
+	if (rawkey)
 		memcpy(div_key, KEY, 8);
 	else
 		HFiClassCalcDivKey(CSN, KEY, div_key, elite);
-	 if (verbose) PrintAndLog("Authing with %s: %02x%02x%02x%02x%02x%02x%02x%02x", rawkey ? "raw key" : "diversified key", div_key[0],div_key[1],div_key[2],div_key[3],div_key[4],div_key[5],div_key[6],div_key[7]);
+
+	if (verbose) PrintAndLog("Authenticating with %s: %s", rawkey ? "raw key" : "diversified key", sprint_hex(div_key, 8));
+
+	UsbCommand resp;
+	UsbCommand d = {CMD_ICLASS_READCHECK, {2, use_credit_key, 0}};
+
+	clearCommandBuffer();
+	SendCommand(&d);
+
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+		if (verbose) PrintAndLog("Auth Command (READCHECK[2]) execute timeout");
+		return false;
+	}
+	bool isOK = resp.arg[0];
+	if (!isOK) {
+		if (verbose) PrintAndLog("Couldn't get Card Challenge");
+		return false;
+	}
+	memcpy(CCNR, resp.d.asBytes, 8);
 
 	doMAC(CCNR, div_key, MAC);
-	UsbCommand resp;
-	UsbCommand d = {CMD_ICLASS_AUTHENTICATION, {0}};
+
+	d.cmd = CMD_ICLASS_CHECK;
 	memcpy(d.d.asBytes, MAC, 4);
 	clearCommandBuffer();
 	SendCommand(&d);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
-		if (verbose) PrintAndLog("Auth Command execute timeout");
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
+		if (verbose) PrintAndLog("Auth Command (CHECK) execute timeout");
 		return false;
 	}
-	uint8_t isOK = resp.arg[0] & 0xff;
+	isOK = resp.arg[0];
 	if (!isOK) {
 		if (verbose) PrintAndLog("Authentication error");
 		return false;
@@ -580,7 +617,8 @@ static bool select_and_auth(uint8_t *KEY, uint8_t *MAC, uint8_t *div_key, bool u
 	return true;
 }
 
-int usage_hf_iclass_dump(void) {
+
+static void usage_hf_iclass_dump(void) {
 	PrintAndLog("Usage:  hf iclass dump f <fileName> k <Key> c <CreditKey> e|r\n");
 	PrintAndLog("Options:");
 	PrintAndLog("  f <filename> : specify a filename to save dump to");
@@ -591,14 +629,45 @@ int usage_hf_iclass_dump(void) {
 	PrintAndLog("                 See 'hf iclass sim 2'. This key should be on iclass-format");
 	PrintAndLog("  r            : If 'r' is specified, the key is interpreted as raw block 3/4");
 	PrintAndLog("  NOTE: * = required");
-  PrintAndLog("Samples:");
+	PrintAndLog("Samples:");
 	PrintAndLog("  hf iclass dump k 001122334455667B");
 	PrintAndLog("  hf iclass dump k AAAAAAAAAAAAAAAA c 001122334455667B");
 	PrintAndLog("  hf iclass dump k AAAAAAAAAAAAAAAA e");
-	return 0;
 }
 
-int CmdHFiClassReader_Dump(const char *Cmd) {
+
+static void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
+	uint8_t mem_config;
+	memcpy(&mem_config, iclass_dump + 13,1);
+	uint8_t maxmemcount;
+	uint8_t filemaxblock = filesize / 8;
+	if (mem_config & 0x80)
+		maxmemcount = 255;
+	else
+		maxmemcount = 31;
+	//PrintAndLog   ("endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d", endblock,filesize, maxmemcount, filemaxblock);
+
+	if (startblock == 0)
+		startblock = 6;
+	if ((endblock > maxmemcount) || (endblock == 0))
+		endblock = maxmemcount;
+
+	// remember endblock need to relate to zero-index arrays.
+	if (endblock > filemaxblock-1)
+		endblock = filemaxblock;
+
+	int i = startblock;
+	printf("------+--+-------------------------+\n");
+	while (i <= endblock) {
+		uint8_t *blk = iclass_dump + (i * 8);
+		printf("Block |%02X| %s|\n", i, sprint_hex(blk, 8) );
+		i++;
+	}
+	printf("------+--+-------------------------+\n");
+}
+
+
+static int CmdHFiClassReader_Dump(const char *Cmd) {
 
 	uint8_t MAC[4] = {0x00,0x00,0x00,0x00};
 	uint8_t div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -629,7 +698,8 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		{
 		case 'h':
 		case 'H':
-			return usage_hf_iclass_dump();
+			usage_hf_iclass_dump();
+			return 0;
 		case 'c':
 		case 'C':
 			have_credit_key = true;
@@ -657,7 +727,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			break;
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLog("No filename found after f");
 				errors = true;
@@ -668,7 +738,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 		case 'K':
 			have_debit_key = true;
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -694,16 +764,21 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			errors = true;
 			break;
 		}
-		if(errors) return usage_hf_iclass_dump();
+		if (errors) {
+			usage_hf_iclass_dump();
+			return 0;
+		}
 	}
 
-	if (cmdp < 2) return usage_hf_iclass_dump();
+	if (cmdp < 2) {
+		usage_hf_iclass_dump();
+		return 0;
+	}
 	// if no debit key given try credit key on AA1 (not for iclass but for some picopass this will work)
 	if (!have_debit_key && have_credit_key) use_credit_key = true;
 
 	//get config and first 3 blocks
-	UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN |
-					FLAG_ICLASS_READER_CONF | FLAG_ICLASS_READER_ONLY_ONCE | FLAG_ICLASS_READER_ONE_TRY}};
+	UsbCommand c = {CMD_READER_ICLASS, {FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CONF}};
 	UsbCommand resp;
 	uint8_t tag_data[255*8];
 
@@ -739,7 +814,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			return 0;
 		}
 	}
-	
+
 	// begin dump
 	UsbCommand w = {CMD_ICLASS_DUMP, {blockno, numblks-blockno+1}};
 	clearCommandBuffer();
@@ -796,7 +871,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 				PrintAndLog("Read Block Failed 2");
 				DropField();
 				return 0;
-			}		
+			}
 
 			startindex = resp.arg[2];
 			if (blocksRead*8 > sizeof(tag_data)-gotBytes) {
@@ -806,7 +881,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 			// get dumped data from bigbuf
 			GetFromBigBuf(tag_data+gotBytes, blocksRead*8, startindex, NULL, -1, false);
 
-			gotBytes += blocksRead*8;			
+			gotBytes += blocksRead*8;
 		} else { //field is still on - turn it off...
 			DropField();
 		}
@@ -819,11 +894,11 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 	printf("------+--+-------------------------+\n");
 	printf("CSN   |00| %s|\n",sprint_hex(tag_data, 8));
 	printIclassDumpContents(tag_data, 1, (gotBytes/8), gotBytes);
-	
+
 	if (filename[0] == 0){
 		snprintf(filename, FILE_PATH_SIZE,"iclass_tagdump-%02x%02x%02x%02x%02x%02x%02x%02x",
-		    tag_data[0],tag_data[1],tag_data[2],tag_data[3],
-		    tag_data[4],tag_data[5],tag_data[6],tag_data[7]);
+			tag_data[0],tag_data[1],tag_data[2],tag_data[3],
+			tag_data[4],tag_data[5],tag_data[6],tag_data[7]);
 	}
 
 	// save the dump to .bin file
@@ -832,6 +907,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
 	return 1;
 }
 
+
 static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool verbose) {
 	uint8_t MAC[4]={0x00,0x00,0x00,0x00};
 	uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -844,7 +920,7 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
 	UsbCommand w = {CMD_ICLASS_WRITEBLOCK, {blockno}};
 	memcpy(w.d.asBytes, bldata, 8);
 	memcpy(w.d.asBytes + 8, MAC, 4);
-	
+
 	clearCommandBuffer();
 	SendCommand(&w);
 	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
@@ -861,22 +937,23 @@ static int WriteBlock(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_c
 	return 1;
 }
 
-int usage_hf_iclass_writeblock(void) {
+
+static void usage_hf_iclass_writeblock(void) {
 	PrintAndLog("Options:");
-  PrintAndLog("  b <Block> : The block number as 2 hex symbols");
-  PrintAndLog("  d <data>  : Set the Data to write as 16 hex symbols");
+	PrintAndLog("  b <Block> : The block number as 2 hex symbols");
+	PrintAndLog("  d <data>  : Set the Data to write as 16 hex symbols");
 	PrintAndLog("  k <Key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
-  PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
-  PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
-  PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
-  PrintAndLog("Samples:");
+	PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
+	PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
+	PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
+	PrintAndLog("Samples:");
 	PrintAndLog("  hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA k 001122334455667B");
 	PrintAndLog("  hf iclass writeblk b 1B d AAAAAAAAAAAAAAAA k 001122334455667B c");
 	PrintAndLog("  hf iclass writeblk b 0A d AAAAAAAAAAAAAAAA n 0");
-	return 0;
 }
 
-int CmdHFiClass_WriteBlock(const char *Cmd) {
+
+static int CmdHFiClass_WriteBlock(const char *Cmd) {
 	uint8_t blockno=0;
 	uint8_t bldata[8]={0,0,0,0,0,0,0,0};
 	uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -894,7 +971,8 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 		{
 		case 'h':
 		case 'H':
-			return usage_hf_iclass_writeblock();
+			usage_hf_iclass_writeblock();
+			return 0;
 		case 'b':
 		case 'B':
 			if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
@@ -925,7 +1003,7 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 		case 'k':
 		case 'K':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -951,16 +1029,23 @@ int CmdHFiClass_WriteBlock(const char *Cmd) {
 			errors = true;
 			break;
 		}
-		if(errors) return usage_hf_iclass_writeblock();
+		if(errors) {
+			usage_hf_iclass_writeblock();
+			return 0;
+		}
 	}
 
-	if (cmdp < 6) return usage_hf_iclass_writeblock();
+	if (cmdp < 6) {
+		usage_hf_iclass_writeblock();
+		return 0;
+	}
 	int ans = WriteBlock(blockno, bldata, KEY, use_credit_key, elite, rawkey, true);
 	DropField();
 	return ans;
 }
 
-int usage_hf_iclass_clone(void) {
+
+static void usage_hf_iclass_clone(void) {
 	PrintAndLog("Usage:  hf iclass clone f <tagfile.bin> b <first block> l <last block> k <KEY> c e|r");
 	PrintAndLog("Options:");
 	PrintAndLog("  f <filename>: specify a filename to clone from");
@@ -974,10 +1059,10 @@ int usage_hf_iclass_clone(void) {
 	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 06 l 1A k 1122334455667788 e");
 	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 05 l 19 k 0");
 	PrintAndLog("  hf iclass clone f iclass_tagdump-121345.bin b 06 l 19 k 0 e");
-	return -1;
 }
 
-int CmdHFiClassCloneTag(const char *Cmd) {
+
+static int CmdHFiClassCloneTag(const char *Cmd) {
 	char filename[FILE_PATH_SIZE] = {0};
 	char tempStr[50]={0};
 	uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -997,7 +1082,8 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 		{
 		case 'h':
 		case 'H':
-			return usage_hf_iclass_clone();
+			usage_hf_iclass_clone();
+			return 0;
 		case 'b':
 		case 'B':
 			if (param_gethex(Cmd, cmdp+1, &startblock, 2)) {
@@ -1018,7 +1104,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			break;
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLog("No filename found after f");
 				errors = true;
@@ -1028,7 +1114,7 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 		case 'k':
 		case 'K':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1062,10 +1148,16 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 			errors = true;
 			break;
 		}
-		if(errors) return usage_hf_iclass_clone();
+		if (errors) {
+			usage_hf_iclass_clone();
+			return 0;
+		}
 	}
 
-	if (cmdp < 8) return usage_hf_iclass_clone();
+	if (cmdp < 8) {
+		usage_hf_iclass_clone();
+		return 0;
+	}
 
 	FILE *f;
 
@@ -1108,21 +1200,21 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 	uint8_t *ptr;
 	// calculate all mac for every the block we will write
 	for (i = startblock; i <= endblock; i++){
-	    Calc_wb_mac(i,tag_data[i - startblock].d,div_key,MAC);
-	    // usb command d start pointer = d + (i - 6) * 12
-	    // memcpy(pointer,tag_data[i - 6],8) 8 bytes
-	    // memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
-	    // next one
-	    ptr = w.d.asBytes + (i - startblock) * 12;
-	    memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
-	    memcpy(ptr + 8,MAC, 4);
+		Calc_wb_mac(i,tag_data[i - startblock].d,div_key,MAC);
+		// usb command d start pointer = d + (i - 6) * 12
+		// memcpy(pointer,tag_data[i - 6],8) 8 bytes
+		// memcpy(pointer + 8,mac,sizoof(mac) 4 bytes;
+		// next one
+		ptr = w.d.asBytes + (i - startblock) * 12;
+		memcpy(ptr, &(tag_data[i - startblock].d[0]), 8);
+		memcpy(ptr + 8,MAC, 4);
 	}
 	uint8_t p[12];
 	for (i = 0; i <= endblock - startblock;i++){
-	    memcpy(p,w.d.asBytes + (i * 12),12);
-	    printf("Block |%02x|",i + startblock);
-	    printf(" %02x%02x%02x%02x%02x%02x%02x%02x |",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
-	    printf(" MAC |%02x%02x%02x%02x|\n",p[8],p[9],p[10],p[11]);
+		memcpy(p,w.d.asBytes + (i * 12),12);
+		printf("Block |%02x|",i + startblock);
+		printf(" %02x%02x%02x%02x%02x%02x%02x%02x |",p[0],p[1],p[2],p[3],p[4],p[5],p[6],p[7]);
+		printf(" MAC |%02x%02x%02x%02x|\n",p[8],p[9],p[10],p[11]);
 	}
 	UsbCommand resp;
 	SendCommand(&w);
@@ -1134,7 +1226,9 @@ int CmdHFiClassCloneTag(const char *Cmd) {
 	return 1;
 }
 
+
 static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite, bool rawkey, bool verbose, bool auth) {
+
 	uint8_t MAC[4]={0x00,0x00,0x00,0x00};
 	uint8_t div_key[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 
@@ -1142,9 +1236,8 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 		if (!select_and_auth(KEY, MAC, div_key, (keyType==0x18), elite, rawkey, verbose))
 			return 0;
 	} else {
-		uint8_t CSN[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-		uint8_t CCNR[12]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-		if (!select_only(CSN, CCNR, (keyType==0x18), verbose))
+		uint8_t CSN[8];
+		if (!select_only(CSN, verbose))
 			return 0;
 	}
 
@@ -1152,8 +1245,7 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 	UsbCommand w = {CMD_ICLASS_READBLOCK, {blockno}};
 	clearCommandBuffer();
 	SendCommand(&w);
-	if (!WaitForResponseTimeout(CMD_ACK,&resp,4500))
-	{
+	if (!WaitForResponseTimeout(CMD_ACK, &resp, 4500)) {
 		PrintAndLog("Command execute timeout");
 		return 0;
 	}
@@ -1167,22 +1259,23 @@ static int ReadBlock(uint8_t *KEY, uint8_t blockno, uint8_t keyType, bool elite,
 	return 1;
 }
 
-int usage_hf_iclass_readblock(void) {
-	PrintAndLog("Usage:  hf iclass readblk b <Block> k <Key> c e|r\n");
+
+static void usage_hf_iclass_readblock(void) {
+	PrintAndLog("Usage:  hf iclass readblk b <Block> k <Key> [c] [e|r]\n");
 	PrintAndLog("Options:");
-  PrintAndLog("  b <Block> : The block number as 2 hex symbols");
+	PrintAndLog("  b <Block> : The block number as 2 hex symbols");
 	PrintAndLog("  k <Key>   : Access Key as 16 hex symbols or 1 hex to select key from memory");
-  PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
-  PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
-  PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
-  PrintAndLog("Samples:");
+	PrintAndLog("  c         : If 'c' is specified, the key set is assumed to be the credit key\n");
+	PrintAndLog("  e         : If 'e' is specified, elite computations applied to key");
+	PrintAndLog("  r         : If 'r' is specified, no computations applied to key");
+	PrintAndLog("Samples:");
 	PrintAndLog("  hf iclass readblk b 06 k 0011223344556677");
 	PrintAndLog("  hf iclass readblk b 1B k 0011223344556677 c");
 	PrintAndLog("  hf iclass readblk b 0A k 0");
-	return 0;
 }
 
-int CmdHFiClass_ReadBlock(const char *Cmd) {
+
+static int CmdHFiClass_ReadBlock(const char *Cmd) {
 	uint8_t blockno=0;
 	uint8_t keyType = 0x88; //debit key
 	uint8_t KEY[8]={0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -1194,71 +1287,78 @@ int CmdHFiClass_ReadBlock(const char *Cmd) {
 	bool errors = false;
 	bool auth = false;
 	uint8_t cmdp = 0;
-	while(param_getchar(Cmd, cmdp) != 0x00)
-	{
-		switch(param_getchar(Cmd, cmdp))
-		{
-		case 'h':
-		case 'H':
-			return usage_hf_iclass_readblock();
-		case 'b':
-		case 'B':
-			if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
-				PrintAndLog("Block No must include 2 HEX symbols\n");
-				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'c':
-		case 'C':
-			keyType = 0x18;
-			cmdp++;
-			break;
-		case 'e':
-		case 'E':
-			elite = true;
-			cmdp++;
-			break;
-		case 'k':
-		case 'K':
-			auth = true;
-			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
-				errors = param_gethex(tempStr, 0, KEY, dataLen);
-			} else if (dataLen == 1) {
-				keyNbr = param_get8(Cmd, cmdp+1);
-				if (keyNbr < ICLASS_KEYS_MAX) {
-					memcpy(KEY, iClass_Key_Table[keyNbr], 8);
-				} else {
-					PrintAndLog("\nERROR: Credit KeyNbr is invalid\n");
+	while (param_getchar(Cmd, cmdp) != 0x00) {
+		switch (param_getchar(Cmd, cmdp)) {
+			case 'h':
+			case 'H':
+				usage_hf_iclass_readblock();
+				return 0;
+			case 'b':
+			case 'B':
+				if (param_gethex(Cmd, cmdp+1, &blockno, 2)) {
+					PrintAndLog("Block No must include 2 HEX symbols\n");
 					errors = true;
 				}
-			} else {
-				PrintAndLog("\nERROR: Credit Key is incorrect length\n");
+				cmdp += 2;
+				break;
+			case 'c':
+			case 'C':
+				keyType = 0x18;
+				cmdp++;
+				break;
+			case 'e':
+			case 'E':
+				elite = true;
+				cmdp++;
+				break;
+			case 'k':
+			case 'K':
+				auth = true;
+				dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
+				if (dataLen == 16) {
+					errors = param_gethex(tempStr, 0, KEY, dataLen);
+				} else if (dataLen == 1) {
+					keyNbr = param_get8(Cmd, cmdp+1);
+					if (keyNbr < ICLASS_KEYS_MAX) {
+						memcpy(KEY, iClass_Key_Table[keyNbr], 8);
+					} else {
+						PrintAndLog("\nERROR: KeyNbr is invalid\n");
+						errors = true;
+					}
+				} else {
+					PrintAndLog("\nERROR: Key is incorrect length\n");
+					errors = true;
+				}
+				cmdp += 2;
+				break;
+			case 'r':
+			case 'R':
+				rawkey = true;
+				cmdp++;
+				break;
+			default:
+				PrintAndLog("Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
 				errors = true;
-			}
-			cmdp += 2;
-			break;
-		case 'r':
-		case 'R':
-			rawkey = true;
-			cmdp++;
-			break;
-		default:
-			PrintAndLog("Unknown parameter '%c'\n", param_getchar(Cmd, cmdp));
-			errors = true;
-			break;
+				break;
+		}
+		if (errors) {
+			usage_hf_iclass_readblock();
+			return 0;
 		}
-		if(errors) return usage_hf_iclass_readblock();
 	}
 
-	if (cmdp < 2) return usage_hf_iclass_readblock();
+	if (cmdp < 2) {
+		usage_hf_iclass_readblock();
+		return 0;
+	}
 	if (!auth)
 		PrintAndLog("warning: no authentication used with read, only a few specific blocks can be read accurately without authentication.");
+
 	return ReadBlock(KEY, blockno, keyType, elite, rawkey, true, auth);
 }
 
-int CmdHFiClass_loclass(const char *Cmd) {
+
+static int CmdHFiClass_loclass(const char *Cmd) {
 	char opt = param_getchar(Cmd, 0);
 
 	if (strlen(Cmd)<1 || opt == 'h') {
@@ -1297,49 +1397,22 @@ int CmdHFiClass_loclass(const char *Cmd) {
 	return 0;
 }
 
-void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize) {
-	uint8_t mem_config;
-	memcpy(&mem_config, iclass_dump + 13,1);
-	uint8_t maxmemcount;
-	uint8_t filemaxblock = filesize / 8;
-	if (mem_config & 0x80)
-		maxmemcount = 255;
-	else
-		maxmemcount = 31;
-	//PrintAndLog	("endblock: %d, filesize: %d, maxmemcount: %d, filemaxblock: %d", endblock,filesize, maxmemcount, filemaxblock);
 
-	if (startblock == 0)
-		startblock = 6;
-	if ((endblock > maxmemcount) || (endblock == 0))
-		endblock = maxmemcount;
-
-	// remember endblock need to relate to zero-index arrays.
-	if (endblock > filemaxblock-1)
-		endblock = filemaxblock;
-	
-	int i = startblock;
-	printf("------+--+-------------------------+\n");
-	while (i <= endblock) {
-		uint8_t *blk = iclass_dump + (i * 8);
-		printf("Block |%02X| %s|\n", i, sprint_hex(blk, 8) );	
-		i++;
-	}
-	printf("------+--+-------------------------+\n");
-}
-
-int usage_hf_iclass_readtagfile() {
+static void usage_hf_iclass_readtagfile() {
 	PrintAndLog("Usage: hf iclass readtagfile <filename> [startblock] [endblock]");
-	return 1;
 }
 
-int CmdHFiClassReadTagFile(const char *Cmd) {
+
+static int CmdHFiClassReadTagFile(const char *Cmd) {
 	int startblock = 0;
 	int endblock = 0;
 	char tempnum[5];
 	FILE *f;
 	char filename[FILE_PATH_SIZE];
-	if (param_getstr(Cmd, 0, filename, sizeof(filename)) < 1)
-		return usage_hf_iclass_readtagfile();
+	if (param_getstr(Cmd, 0, filename, sizeof(filename)) < 1) {
+		usage_hf_iclass_readtagfile();
+		return 0;
+	}
 	if (param_getstr(Cmd, 1, tempnum, sizeof(tempnum)) < 1)
 		startblock = 0;
 	else
@@ -1397,24 +1470,7 @@ uint64_t hexarray_to_uint64(uint8_t *key) {
 	return uint_key;
 }
 */
-void HFiClassCalcDivKey(uint8_t	*CSN, uint8_t	*KEY, uint8_t *div_key, bool elite){
-	uint8_t keytable[128] = {0};
-	uint8_t key_index[8] = {0};
-	if (elite) {
-		uint8_t key_sel[8] = { 0 };
-		uint8_t key_sel_p[8] = { 0 };
-		hash2(KEY, keytable);
-		hash1(CSN, key_index);
-		for(uint8_t i = 0; i < 8 ; i++)
-			key_sel[i] = keytable[key_index[i]] & 0xFF;
 
-		//Permute from iclass format to standard format
-		permutekey_rev(key_sel, key_sel_p);
-		diversifyKey(CSN, key_sel_p, div_key);	
-	} else {
-		diversifyKey(CSN, KEY, div_key);
-	}		
-}
 
 //when told CSN, oldkey, newkey, if new key is elite (elite), and if old key was elite (oldElite)
 //calculate and return xor_div_key (ready for a key write command)
@@ -1426,18 +1482,19 @@ static void HFiClassCalcNewKey(uint8_t *CSN, uint8_t *OLDKEY, uint8_t *NEWKEY, u
 	HFiClassCalcDivKey(CSN, OLDKEY, old_div_key, oldElite);
 	//get new div key
 	HFiClassCalcDivKey(CSN, NEWKEY, new_div_key, elite);
-	
+
 	for (uint8_t i = 0; i < sizeof(old_div_key); i++){
 		xor_div_key[i] = old_div_key[i] ^ new_div_key[i];
 	}
 	if (verbose) {
 		printf("Old Div Key : %s\n",sprint_hex(old_div_key,8));
 		printf("New Div Key : %s\n",sprint_hex(new_div_key,8));
-		printf("Xor Div Key : %s\n",sprint_hex(xor_div_key,8));		
+		printf("Xor Div Key : %s\n",sprint_hex(xor_div_key,8));
 	}
 }
 
-int usage_hf_iclass_calc_newkey(void) {
+
+static void usage_hf_iclass_calc_newkey(void) {
 	PrintAndLog("HELP :  Manage iClass Keys in client memory:\n");
 	PrintAndLog("Usage:  hf iclass calc_newkey o <Old key> n <New key> s [csn] e");
 	PrintAndLog("  Options:");
@@ -1451,16 +1508,14 @@ int usage_hf_iclass_calc_newkey(void) {
 	PrintAndLog(" std key to e key read csn: hf iclass calcnewkey o 1122334455667788 n 2233445566778899 e");
 	PrintAndLog(" std to std read csn      : hf iclass calcnewkey o 1122334455667788 n 2233445566778899");
 	PrintAndLog("NOTE: * = required\n");
-
-	return 1;
 }
 
-int CmdHFiClassCalcNewKey(const char *Cmd) {
+
+static int CmdHFiClassCalcNewKey(const char *Cmd) {
 	uint8_t OLDKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t NEWKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t xor_div_key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t CSN[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-	uint8_t CCNR[12] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
 	uint8_t keyNbr = 0;
 	uint8_t dataLen = 0;
 	char tempStr[50] = {0};
@@ -1475,7 +1530,8 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		{
 		case 'h':
 		case 'H':
-			return usage_hf_iclass_calc_newkey();
+			usage_hf_iclass_calc_newkey();
+			return 0;
 		case 'e':
 		case 'E':
 			dataLen = param_getstr(Cmd, cmdp, tempStr, sizeof(tempStr));
@@ -1487,7 +1543,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		case 'n':
 		case 'N':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, NEWKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1506,7 +1562,7 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		case 'o':
 		case 'O':
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
-			if (dataLen == 16) { 
+			if (dataLen == 16) {
 				errors = param_gethex(tempStr, 0, OLDKEY, dataLen);
 			} else if (dataLen == 1) {
 				keyNbr = param_get8(Cmd, cmdp+1);
@@ -1525,8 +1581,10 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 		case 's':
 		case 'S':
 			givenCSN = true;
-			if (param_gethex(Cmd, cmdp+1, CSN, 16))
-				return usage_hf_iclass_calc_newkey();
+			if (param_gethex(Cmd, cmdp+1, CSN, 16)) {
+				usage_hf_iclass_calc_newkey();
+				return 0;
+			}
 			cmdp += 2;
 			break;
 		default:
@@ -1534,19 +1592,26 @@ int CmdHFiClassCalcNewKey(const char *Cmd) {
 			errors = true;
 			break;
 		}
-		if(errors) return usage_hf_iclass_calc_newkey();
+		if (errors) {
+			usage_hf_iclass_calc_newkey();
+			return 0;
+		}
 	}
 
-	if (cmdp < 4) return usage_hf_iclass_calc_newkey();
+	if (cmdp < 4) {
+		usage_hf_iclass_calc_newkey();
+		return 0;
+	}
 
 	if (!givenCSN)
-		if (!select_only(CSN, CCNR, false, true))
+		if (!select_only(CSN, true))
 			return 0;
-	
+
 	HFiClassCalcNewKey(CSN, OLDKEY, NEWKEY, xor_div_key, elite, oldElite, true);
 	return 0;
 }
 
+
 static int loadKeys(char *filename) {
 	FILE *f;
 	f = fopen(filename,"rb");
@@ -1582,6 +1647,7 @@ static int loadKeys(char *filename) {
 	return 1;
 }
 
+
 static int saveKeys(char *filename) {
 	FILE *f;
 	f = fopen(filename,"wb");
@@ -1599,16 +1665,18 @@ static int saveKeys(char *filename) {
 	return 0;
 }
 
+
 static int printKeys(void) {
 	PrintAndLog("");
 	for (uint8_t i = 0; i < ICLASS_KEYS_MAX; i++){
 		PrintAndLog("%u: %s",i,sprint_hex(iClass_Key_Table[i],8));
 	}
-	PrintAndLog("");	
+	PrintAndLog("");
 	return 0;
 }
 
-int usage_hf_iclass_managekeys(void) {
+
+static void usage_hf_iclass_managekeys(void) {
 	PrintAndLog("HELP :  Manage iClass Keys in client memory:\n");
 	PrintAndLog("Usage:  hf iclass managekeys n [keynbr] k [key] f [filename] s l p\n");
 	PrintAndLog("  Options:");
@@ -1623,10 +1691,10 @@ int usage_hf_iclass_managekeys(void) {
 	PrintAndLog(" save key file: hf iclass managekeys f mykeys.bin s");
 	PrintAndLog(" load key file: hf iclass managekeys f mykeys.bin l");
 	PrintAndLog(" print keys   : hf iclass managekeys p\n");
-	return 0;
 }
 
-int CmdHFiClassManageKeys(const char *Cmd) {
+
+static int CmdHFiClassManageKeys(const char *Cmd) {
 	uint8_t keyNbr = 0;
 	uint8_t dataLen = 0;
 	uint8_t KEY[8] = {0};
@@ -1643,10 +1711,11 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 		{
 		case 'h':
 		case 'H':
-			return usage_hf_iclass_managekeys();
+			usage_hf_iclass_managekeys();
+			return 0;
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLog("No filename found after f");
 				errors = true;
@@ -1664,7 +1733,7 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			break;
 		case 'k':
 		case 'K':
-			operation += 3; //set key 
+			operation += 3; //set key
 			dataLen = param_getstr(Cmd, cmdp+1, tempStr, sizeof(tempStr));
 			if (dataLen == 16) { //ul-c or ev1/ntag key length
 				errors = param_gethex(tempStr, 0, KEY, dataLen);
@@ -1694,19 +1763,25 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 			errors = true;
 			break;
 		}
-		if(errors) return usage_hf_iclass_managekeys();
+		if (errors) {
+			usage_hf_iclass_managekeys();
+			return 0;
+		}
 	}
 	if (operation == 0){
 		PrintAndLog("no operation specified (load, save, or print)\n");
-		return usage_hf_iclass_managekeys();
+		usage_hf_iclass_managekeys();
+		return 0;
 	}
 	if (operation > 6){
 		PrintAndLog("Too many operations specified\n");
-		return usage_hf_iclass_managekeys();
+		usage_hf_iclass_managekeys();
+		return 0;
 	}
 	if (operation > 4 && fileNameLen == 0){
 		PrintAndLog("You must enter a filename when loading or saving\n");
-		return usage_hf_iclass_managekeys();
+		usage_hf_iclass_managekeys();
+		return 0;
 	}
 
 	switch (operation){
@@ -1719,7 +1794,8 @@ int CmdHFiClassManageKeys(const char *Cmd) {
 	return 0;
 }
 
-int CmdHFiClassCheckKeys(const char *Cmd) {
+
+static int CmdHFiClassCheckKeys(const char *Cmd) {
 
 	uint8_t mac[4] = {0x00,0x00,0x00,0x00};
 	uint8_t key[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@@ -1727,9 +1803,9 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 
 	// elite key,  raw key, standard key
 	bool use_elite = false;
-	bool use_raw = false;	
+	bool use_raw = false;
 	bool found_debit = false;
-	bool found_credit = false;	
+	bool found_credit = false;
 	bool errors = false;
 	uint8_t cmdp = 0x00;
 	FILE * f;
@@ -1743,10 +1819,11 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 		switch (param_getchar(Cmd, cmdp)) {
 		case 'h':
 		case 'H':
-			return usage_hf_iclass_chk();
+			usage_hf_iclass_chk();
+			return 0;
 		case 'f':
 		case 'F':
-			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename)); 
+			fileNameLen = param_getstr(Cmd, cmdp+1, filename, sizeof(filename));
 			if (fileNameLen < 1) {
 				PrintAndLog("No filename found after f");
 				errors = true;
@@ -1769,8 +1846,11 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			break;
 		}
 	}
-	if (errors) return usage_hf_iclass_chk();	
-			
+	if (errors) {
+		usage_hf_iclass_chk();
+		return 0;
+	}
+
 	if ( !(f = fopen( filename , "r")) ) {
 		PrintAndLog("File: %s: not found or locked.", filename);
 		return 1;
@@ -1779,16 +1859,16 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 	while( fgets(buf, sizeof(buf), f) ){
 		if (strlen(buf) < 16 || buf[15] == '\n')
 			continue;
-	
+
 		while (fgetc(f) != '\n' && !feof(f)) ;  //goto next line
-		
-		if( buf[0]=='#' ) continue;	//The line start with # is comment, skip
+
+		if( buf[0]=='#' ) continue; //The line start with # is comment, skip
 
 		if (!isxdigit(buf[0])){
 			PrintAndLog("File content error. '%s' must include 16 HEX symbols",buf);
 			continue;
 		}
-		
+
 		buf[16] = 0;
 
 		p = realloc(keyBlock, 8 * (keyitems += 64));
@@ -1809,19 +1889,19 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 	}
 	fclose(f);
 	PrintAndLog("Loaded %2d keys from %s", keycnt, filename);
-	
+
 	// time
 	uint64_t t1 = msclock();
-				
+
 	for (uint32_t c = 0; c < keycnt; c += 1) {
-			printf("."); fflush(stdout);			
+			printf("."); fflush(stdout);
 			if (ukbhit()) {
 				int gc = getchar(); (void)gc;
 				printf("\naborted via keyboard!\n");
 				break;
 			}
-			
-			memcpy(key, keyBlock + 8 * c , 8); 
+
+			memcpy(key, keyBlock + 8 * c , 8);
 
 			// debit key. try twice
 			for (int foo = 0; foo < 2 && !found_debit; foo++) {
@@ -1833,18 +1913,18 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 			PrintAndLog("   Found AA1 debit key\t\t[%s]", sprint_hex(key, 8));
 				found_debit = true;
 			}
-			
+
 			// credit key. try twice
 			for (int foo = 0; foo < 2 && !found_credit; foo++) {
 				if (!select_and_auth(key, mac, div_key, true, use_elite, use_raw, false))
 					continue;
-				
+
 				// key found
 				PrintAndLog("\n--------------------------------------------------------");
 				PrintAndLog("   Found AA2 credit key\t\t[%s]", sprint_hex(key, 8));
 				found_credit = true;
 			}
-			
+
 			// both keys found.
 			if ( found_debit && found_credit )
 				break;
@@ -1853,45 +1933,108 @@ int CmdHFiClassCheckKeys(const char *Cmd) {
 	t1 = msclock() - t1;
 
 	PrintAndLog("\nTime in iclass checkkeys: %.0f seconds\n", (float)t1/1000.0);
-	
+
 	DropField();
 	free(keyBlock);
 	PrintAndLog("");
 	return 0;
 }
 
-static command_t CommandTable[] = 
-{
-	{"help",        CmdHelp,                    	1,	"This help"},
-	{"calcnewkey",  CmdHFiClassCalcNewKey,      	1,	"[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
-	{"chk",         CmdHFiClassCheckKeys,        	0,	"            Check keys"},	
-	{"clone",       CmdHFiClassCloneTag,        	0,	"[options..] Authenticate and Clone from iClass bin file"},
-	{"decrypt",     CmdHFiClassDecrypt,         	1,	"[f <fname>] Decrypt tagdump" },
-	{"dump",        CmdHFiClassReader_Dump,     	0,	"[options..] Authenticate and Dump iClass tag's AA1"},
-	{"eload",       CmdHFiClassELoad,           	0,	"[f <fname>] (experimental) Load data into iClass emulator memory"},
-	{"encryptblk",  CmdHFiClassEncryptBlk,      	1,	"<BlockData> Encrypt given block data"},
-	{"list",        CmdHFiClassList,            	0,	"            (Deprecated) List iClass history"},
-	{"loclass",     CmdHFiClass_loclass,        	1,	"[options..] Use loclass to perform bruteforce of reader attack dump"},
-	{"managekeys",  CmdHFiClassManageKeys,      	1,	"[options..] Manage the keys to use with iClass"},
-	{"readblk",     CmdHFiClass_ReadBlock,      	0,	"[options..] Authenticate and Read iClass block"},
-	{"reader",      CmdHFiClassReader,          	0,	"            Look for iClass tags until a key or the pm3 button is pressed"},
-	{"readtagfile", CmdHFiClassReadTagFile,     	1,	"[options..] Display Content from tagfile"},
-	{"replay",      CmdHFiClassReader_Replay,   	0,	"<mac>       Read an iClass tag via Reply Attack"},
-	{"sim",         CmdHFiClassSim,             	0,	"[options..] Simulate iClass tag"},
-	{"snoop",       CmdHFiClassSnoop,           	0,	"            Eavesdrop iClass communication"},
-	{"writeblk",    CmdHFiClass_WriteBlock,     	0,	"[options..] Authenticate and Write iClass block"},
+
+static void usage_hf_iclass_permutekey(void) {
+	PrintAndLogEx(NORMAL, "Convert keys from standard NIST to iClass format (and vice versa)");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Usage:  hf iclass permute [h] [r] <key>");
+	PrintAndLogEx(NORMAL, "Options:");
+	PrintAndLogEx(NORMAL, "           h          This help");
+	PrintAndLogEx(NORMAL, "           r          reverse convert key from iClass to NIST format");
+	PrintAndLogEx(NORMAL, "");
+	PrintAndLogEx(NORMAL, "Examples:");
+	PrintAndLogEx(NORMAL, "      hf iclass permute r 0123456789abcdef");
+}
+
+
+static int CmdHFiClassPermuteKey(const char *Cmd) {
+
+	uint8_t key[8] = {0};
+	uint8_t data[16] = {0};
+	bool isReverse = false;
+	int len = sizeof(data);
+	char cmdp = tolower(param_getchar(Cmd, 0));
+	if (strlen(Cmd) == 0 || cmdp == 'h') {
+		usage_hf_iclass_permutekey();
+		return 0;
+	}
+
+	if (cmdp == 'r') {
+		isReverse = true;
+		param_gethex_ex(Cmd, 1, data, &len);
+	} else if (cmdp == 'f') {
+		param_gethex_ex(Cmd, 1, data, &len);
+	} else {
+		param_gethex_ex(Cmd, 0, data, &len);
+	}
+
+
+	if (len % 2) {
+		usage_hf_iclass_permutekey();
+		return 0;
+	}
+
+	len >>= 1;
+
+	memcpy(key, data, 8);
+
+	if (isReverse) {
+		// generate_rev(data, len);
+		uint8_t key_std_format[8] = {0};
+		permutekey_rev(key, key_std_format);
+		PrintAndLogEx(SUCCESS, "key in standard NIST format:     %s \n", sprint_hex(key_std_format, 8));
+		// if (mbedtls_des_key_check_key_parity(key_std_format
+	} else {
+		// generate(data, len);
+		uint8_t key_iclass_format[8] = {0};
+		permutekey(key, key_iclass_format);
+		PrintAndLogEx(SUCCESS, "key in iClass (permuted) format: %s \n", sprint_hex(key_iclass_format, 8));
+	}
+	return 0;
+}
+
+
+static int CmdHelp(const char *Cmd);
+
+static command_t CommandTable[] = {
+	{"help",        CmdHelp,                        1,  "This help"},
+	{"calcnewkey",  CmdHFiClassCalcNewKey,          1,  "[options..] Calc Diversified keys (blocks 3 & 4) to write new keys"},
+	{"chk",         CmdHFiClassCheckKeys,           0,  "            Check keys"},
+	{"clone",       CmdHFiClassCloneTag,            0,  "[options..] Authenticate and Clone from iClass bin file"},
+	{"decrypt",     CmdHFiClassDecrypt,             1,  "[f <fname>] Decrypt tagdump" },
+	{"dump",        CmdHFiClassReader_Dump,         0,  "[options..] Authenticate and Dump iClass tag's AA1"},
+	{"eload",       CmdHFiClassELoad,               0,  "[f <fname>] (experimental) Load data into iClass emulator memory"},
+	{"encryptblk",  CmdHFiClassEncryptBlk,          1,  "<BlockData> Encrypt given block data"},
+	{"list",        CmdHFiClassList,                0,  "            (Deprecated) List iClass history"},
+	{"loclass",     CmdHFiClass_loclass,            1,  "[options..] Use loclass to perform bruteforce of reader attack dump"},
+	{"managekeys",  CmdHFiClassManageKeys,          1,  "[options..] Manage the keys to use with iClass"},
+	{"permutekey",  CmdHFiClassPermuteKey,          1,  "            iClass key permutation"},
+	{"readblk",     CmdHFiClass_ReadBlock,          0,  "[options..] Authenticate and Read iClass block"},
+	{"reader",      CmdHFiClassReader,              0,  "            Look for iClass tags until a key or the pm3 button is pressed"},
+	{"readtagfile", CmdHFiClassReadTagFile,         1,  "[options..] Display Content from tagfile"},
+	{"replay",      CmdHFiClassReader_Replay,       0,  "<mac>       Read an iClass tag via Reply Attack"},
+	{"sim",         CmdHFiClassSim,                 0,  "[options..] Simulate iClass tag"},
+	{"snoop",       CmdHFiClassSnoop,               0,  "            Eavesdrop iClass communication"},
+	{"writeblk",    CmdHFiClass_WriteBlock,         0,  "[options..] Authenticate and Write iClass block"},
 	{NULL, NULL, 0, NULL}
 };
 
-int CmdHFiClass(const char *Cmd)
-{
-	clearCommandBuffer();	
+
+int CmdHFiClass(const char *Cmd) {
+	clearCommandBuffer();
 	CmdsParse(CommandTable, Cmd);
 	return 0;
 }
 
-int CmdHelp(const char *Cmd)
-{
+
+int CmdHelp(const char *Cmd) {
 	CmdsHelp(CommandTable);
 	return 0;
 }
diff --git a/client/cmdhficlass.h b/client/cmdhficlass.h
index 456bb1c3..09103b33 100644
--- a/client/cmdhficlass.h
+++ b/client/cmdhficlass.h
@@ -13,28 +13,6 @@
 #define CMDHFICLASS_H__
 
 int CmdHFiClass(const char *Cmd);
-
-int CmdHFiClassCalcNewKey(const char *Cmd);
-int CmdHFiClassCloneTag(const char *Cmd);
-int CmdHFiClassDecrypt(const char *Cmd);
-int CmdHFiClassEncryptBlk(const char *Cmd);
-int CmdHFiClassELoad(const char *Cmd);
-int CmdHFiClassList(const char *Cmd);
 int HFiClassReader(const char *Cmd, bool loop, bool verbose);
-int CmdHFiClassReader(const char *Cmd);
-int CmdHFiClassReader_Dump(const char *Cmd);
-int CmdHFiClassReader_Replay(const char *Cmd);
-int CmdHFiClassReadKeyFile(const char *filename);
-int CmdHFiClassReadTagFile(const char *Cmd);
-int CmdHFiClass_ReadBlock(const char *Cmd);
-int CmdHFiClass_TestMac(const char *Cmd);
-int CmdHFiClassManageKeys(const char *Cmd);
-int CmdHFiClass_loclass(const char *Cmd);
-int CmdHFiClassSnoop(const char *Cmd);
-int CmdHFiClassSim(const char *Cmd);
-int CmdHFiClassWriteKeyFile(const char *Cmd);
-int CmdHFiClass_WriteBlock(const char *Cmd);
-int CmdHFiClassCheckKeys(const char *Cmd);
-void printIclassDumpContents(uint8_t *iclass_dump, uint8_t startblock, uint8_t endblock, size_t filesize);
-void HFiClassCalcDivKey(uint8_t	*CSN, uint8_t	*KEY, uint8_t *div_key, bool elite);
+
 #endif
diff --git a/client/loclass/elite_crack.h b/client/loclass/elite_crack.h
index 46791fb5..c44f5105 100644
--- a/client/loclass/elite_crack.h
+++ b/client/loclass/elite_crack.h
@@ -85,7 +85,7 @@ typedef struct {
 	uint8_t cc_nr[12];
 	uint8_t mac[4];
 
-}dumpdata;
+} dumpdata;
 
 /**
  * @brief Performs brute force attack against a dump-data item, containing csn, cc_nr and mac.
diff --git a/include/usb_cmd.h b/include/usb_cmd.h
index 0802d2f1..75b7c210 100644
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -165,7 +165,8 @@ typedef struct{
 #define CMD_ICLASS_READBLOCK                                              0x0396
 #define CMD_ICLASS_WRITEBLOCK                                             0x0397
 #define CMD_ICLASS_EML_MEMSET                                             0x0398
-#define CMD_ICLASS_AUTHENTICATION                                         0x0399
+#define CMD_ICLASS_CHECK                                                  0x0399
+#define CMD_ICLASS_READCHECK                                              0x039A                                         
 
 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400
@@ -236,13 +237,11 @@ typedef struct{
 
 
 // iCLASS reader flags
-#define FLAG_ICLASS_READER_ONLY_ONCE    0x01
 #define FLAG_ICLASS_READER_CC           0x02
 #define FLAG_ICLASS_READER_CSN          0x04
 #define FLAG_ICLASS_READER_CONF         0x08
 #define FLAG_ICLASS_READER_AA           0x10
-#define FLAG_ICLASS_READER_ONE_TRY      0x20
-#define FLAG_ICLASS_READER_CEDITKEY     0x40
+#define FLAG_ICLASS_READER_CREDITKEY    0x40
 
 // iCLASS simulation modes
 #define ICLASS_SIM_MODE_CSN                   0