X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/63e1d35a07b1faa00e5c864024129a9faf8210c1..e1778858ddc53a6a82e8ee24f02e6b673687f69a:/armsrc/appmain.c?ds=inline

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 128f4063..ee6ab7fb 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -9,27 +9,27 @@
 // The main application code. This is the first thing called after start.c
 // executes.
 //-----------------------------------------------------------------------------
-
+#include <stdarg.h>
 #include "usb_cdc.h"
-#include "cmd.h"
-
 #include "proxmark3.h"
 #include "apps.h"
 #include "util.h"
 #include "printf.h"
 #include "string.h"
-
-#include <stdarg.h>
-
 #include "legicrf.h"
-#include <hitag2.h>
 #include "lfsampling.h"
 #include "BigBuf.h"
+#include "mifareutil.h"
+
 #ifdef WITH_LCD
  #include "LCD.h"
 #endif
 
-#define abs(x) ( ((x)<0) ? -(x) : (x) )
+// Craig Young - 14a stand-alone code
+#ifdef WITH_ISO14443a_StandAlone
+ #include "iso14443a.h"
+ #include "protocols.h"
+#endif
 
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
@@ -39,7 +39,7 @@
 
 #define TOSEND_BUFFER_SIZE (9*MAX_FRAME_SIZE + 1 + 1 + 2)  // 8 data bits and 1 parity bit per payload byte, 1 correction bit, 1 SOC bit, 2 EOC bits 
 uint8_t ToSend[TOSEND_BUFFER_SIZE];
-int ToSendMax;
+int ToSendMax = 0;
 static int ToSendBit;
 struct common_area common_area __attribute__((section(".commonarea")));
 
@@ -49,19 +49,17 @@ void ToSendReset(void)
 	ToSendBit = 8;
 }
 
-void ToSendStuffBit(int b)
-{
+void ToSendStuffBit(int b) {
 	if(ToSendBit >= 8) {
-		ToSendMax++;
+		++ToSendMax;
 		ToSend[ToSendMax] = 0;
 		ToSendBit = 0;
 	}
 
-	if(b) {
+	if(b)
 		ToSend[ToSendMax] |= (1 << (7 - ToSendBit));
-	}
 
-	ToSendBit++;
+	++ToSendBit;
 
 	if(ToSendMax >= sizeof(ToSend)) {
 		ToSendBit = 0;
@@ -69,26 +67,66 @@ void ToSendStuffBit(int b)
 	}
 }
 
+void PrintToSendBuffer(void){
+	DbpString("Printing ToSendBuffer:");
+	Dbhexdump(ToSendMax, ToSend, 0);
+}
+
+void print_result(char *name, uint8_t *buf, size_t len) {
+	uint8_t *p = buf;
+
+	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",
+				name,
+				p-buf,
+				len,
+				p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7],p[8], p[9], p[10], p[11], p[12], p[13], p[14], p[15]
+			);
+	}
+	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]);
+	}
+}
+
 //=============================================================================
 // Debug print functions, to go out over USB, to the usual PC-side client.
 //=============================================================================
 
-void DbpString(char *str)
-{
-  byte_t len = strlen(str);
-  cmd_send(CMD_DEBUG_PRINT_STRING,len,0,0,(byte_t*)str,len);
+void DbpStringEx(char *str, uint32_t cmd){
+	byte_t len = strlen(str);
+	cmd_send(CMD_DEBUG_PRINT_STRING,len, cmd,0,(byte_t*)str,len);
+}
+
+void DbpString(char *str) {
+	DbpStringEx(str, 0);
 }
 
 #if 0
-void DbpIntegers(int x1, int x2, int x3)
-{
-  cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
+void DbpIntegers(int x1, int x2, int x3) {
+	cmd_send(CMD_DEBUG_PRINT_INTEGERS,x1,x2,x3,0,0);
 }
 #endif
+void DbprintfEx(uint32_t cmd, const char *fmt, ...) {
+	// should probably limit size here; oh well, let's just use a big buffer
+	char output_string[128] = {0x00};
+	va_list ap;
+
+	va_start(ap, fmt);
+	kvsprintf(fmt, output_string, 10, ap);
+	va_end(ap);
+
+	DbpStringEx(output_string, cmd);
+}
 
 void Dbprintf(const char *fmt, ...) {
-// should probably limit size here; oh well, let's just use a big buffer
-	char output_string[128];
+	// should probably limit size here; oh well, let's just use a big buffer
+	char output_string[128] = {0x00};
 	va_list ap;
 
 	va_start(ap, fmt);
@@ -100,28 +138,27 @@ void Dbprintf(const char *fmt, ...) {
 
 // prints HEX & ASCII
 void Dbhexdump(int len, uint8_t *d, bool bAsci) {
-	int l=0,i;
+	int l=0, i;
 	char ascii[9];
     
 	while (len>0) {
-		if (len>8) l=8;
-		else l=len;
+
+		l = (len>8) ? 8 : len;
 		
 		memcpy(ascii,d,l);
 		ascii[l]=0;
 		
 		// filter safe ascii
-		for (i=0;i<l;i++)
+		for (i=0; i<l; ++i)
 			if (ascii[i]<32 || ascii[i]>126) ascii[i]='.';
         
-		if (bAsci) {
+		if (bAsci)
 			Dbprintf("%-8s %*D",ascii,l,d," ");
-		} else {
+		else
 			Dbprintf("%*D",l,d," ");
-		}
         
-		len-=8;
-		d+=8;		
+		len -= 8;
+		d += 8;		
 	}
 }
 
@@ -155,31 +192,29 @@ static int ReadAdc(int ch)
 
 	AT91C_BASE_ADC->ADC_CR = AT91C_ADC_START;
 
-	while(!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch)))
-		;
+	while (!(AT91C_BASE_ADC->ADC_SR & ADC_END_OF_CONVERSION(ch))) ;
+	
 	d = AT91C_BASE_ADC->ADC_CDR[ch];
-
 	return d;
 }
 
 int AvgAdc(int ch) // was static - merlok
 {
-	int i;
-	int a = 0;
-
-	for(i = 0; i < 32; i++) {
+	int i, a = 0;
+	for(i = 0; i < 32; ++i)
 		a += ReadAdc(ch);
-	}
 
 	return (a + 15) >> 5;
 }
 
-void MeasureAntennaTuning(void)
-{
+
+void MeasureAntennaTuning(void) {
+
 	uint8_t LF_Results[256];
-	int i, adcval = 0, peak = 0, peakv = 0, peakf = 0; //ptr = 0 
+	int i, adcval = 0, peak = 0, peakv = 0, peakf = 0;
 	int vLf125 = 0, vLf134 = 0, vHf = 0;	// in mV
 
+	memset(LF_Results, 0, sizeof(LF_Results));
 	LED_B_ON();
 
 /*
@@ -193,114 +228,53 @@ void MeasureAntennaTuning(void)
   
   	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-	for (i=255; i>=19; i--) {
-    WDT_HIT();
+		
+	for  (i = 255; i >= 19; i--) {
+		WDT_HIT();
 		FpgaSendCommand(FPGA_CMD_SET_DIVISOR, i);
 		SpinDelay(20);
 		adcval = ((MAX_ADC_LF_VOLTAGE * AvgAdc(ADC_CHAN_LF)) >> 10);
 		if (i==95) 	vLf125 = adcval; // voltage at 125Khz
 		if (i==89) 	vLf134 = adcval; // voltage at 134Khz
 
-		LF_Results[i] = adcval>>8; // scale int to fit in byte for graphing purposes
+		LF_Results[i] = adcval >> 8; // scale int to fit in byte for graphing purposes
 		if(LF_Results[i] > peak) {
 			peakv = adcval;
 			peak = LF_Results[i];
 			peakf = i;
-			//ptr = i;
 		}
 	}
 
-	for (i=18; i >= 0; i--) LF_Results[i] = 0;
-	
 	LED_A_ON();
 	// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
-  	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 	SpinDelay(20);
 	vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
 
-	cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134<<16), vHf, peakf | (peakv<<16), LF_Results, 256);
+	cmd_send(CMD_MEASURED_ANTENNA_TUNING, vLf125 | (vLf134 << 16), vHf, peakf | (peakv << 16), LF_Results, 256);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-	LED_A_OFF();
-	LED_B_OFF();
-	return;
+	LEDsoff();
 }
 
-void MeasureAntennaTuningHf(void)
-{
+void MeasureAntennaTuningHf(void) {
 	int vHf = 0;	// in mV
-
-	DbpString("Measuring HF antenna, press button to exit");
-
 	// Let the FPGA drive the high-frequency antenna around 13.56 MHz.
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR);
 
-	for (;;) {
+	while ( !BUTTON_PRESS() ){
 		SpinDelay(20);
 		vHf = (MAX_ADC_HF_VOLTAGE * AvgAdc(ADC_CHAN_HF)) >> 10;
-
-		Dbprintf("%d mV",vHf);
-		if (BUTTON_PRESS()) break;
+		//Dbprintf("%d mV",vHf);
+		DbprintfEx(CMD_MEASURE_ANTENNA_TUNING_HF, "%d mV",vHf);
 	}
-	DbpString("cancelled");
-
 	FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-
+	DbpString("cancelled");
 }
 
 
-void SimulateTagHfListen(void)
-{
-	// ToDo: historically this used the free buffer, which was 2744 Bytes long. 
-	// There might be a better size to be defined:
-	#define HF_14B_SNOOP_BUFFER_SIZE 2744
-	uint8_t *dest = BigBuf_malloc(HF_14B_SNOOP_BUFFER_SIZE);
-	uint8_t v = 0;
-	int i;
-	int p = 0;
-
-	// We're using this mode just so that I can test it out; the simulated
-	// tag mode would work just as well and be simpler.
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-	FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_RX_XCORR | FPGA_HF_READER_RX_XCORR_848_KHZ | FPGA_HF_READER_RX_XCORR_SNOOP);
-
-	// We need to listen to the high-frequency, peak-detected path.
-	SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-
-	FpgaSetupSsc();
-
-	i = 0;
-	for(;;) {
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-			AT91C_BASE_SSC->SSC_THR = 0xff;
-		}
-		if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
-			uint8_t r = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
-
-			v <<= 1;
-			if(r & 1) {
-				v |= 1;
-			}
-			p++;
-
-			if(p >= 8) {
-				dest[i] = v;
-				v = 0;
-				p = 0;
-				i++;
-
-				if(i >= HF_14B_SNOOP_BUFFER_SIZE) {
-					break;
-				}
-			}
-		}
-	}
-	DbpString("simulate tag (now type bitsamples)");
-}
-
-void ReadMem(int addr)
-{
+void ReadMem(int addr) {
 	const uint8_t *data = ((uint8_t *)addr);
 
 	Dbprintf("%x: %02x %02x %02x %02x %02x %02x %02x %02x",
@@ -310,45 +284,92 @@ void ReadMem(int addr)
 /* osimage version information is linked in */
 extern struct version_information version_information;
 /* bootrom version information is pointed to from _bootphase1_version_pointer */
-extern char *_bootphase1_version_pointer, _flash_start, _flash_end;
+extern char *_bootphase1_version_pointer, _flash_start, _flash_end, _bootrom_start, _bootrom_end, __data_src_start__;
 void SendVersion(void)
 {
-	char temp[512]; /* Limited data payload in USB packets */
-	DbpString("Prox/RFID mark3 RFID instrument");
+	char temp[USB_CMD_DATA_SIZE]; /* Limited data payload in USB packets */
+	char VersionString[USB_CMD_DATA_SIZE] = { '\0' };
 
 	/* Try to find the bootrom version information. Expect to find a pointer at
 	 * symbol _bootphase1_version_pointer, perform slight sanity checks on the
 	 * pointer, then use it.
 	 */
 	char *bootrom_version = *(char**)&_bootphase1_version_pointer;
+	
 	if( bootrom_version < &_flash_start || bootrom_version >= &_flash_end ) {
-		DbpString("bootrom version information appears invalid");
+		strcat(VersionString, "bootrom version information appears invalid\n");
 	} else {
 		FormatVersionInformation(temp, sizeof(temp), "bootrom: ", bootrom_version);
-		DbpString(temp);
+		strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
 	}
 
 	FormatVersionInformation(temp, sizeof(temp), "os: ", &version_information);
-	DbpString(temp);
+	strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
 
-	FpgaGatherVersion(temp, sizeof(temp));
-	DbpString(temp);
-	// Send Chip ID
-	cmd_send(CMD_ACK,*(AT91C_DBGU_CIDR),0,0,NULL,0);
+	FpgaGatherVersion(FPGA_BITSTREAM_LF, temp, sizeof(temp));
+	strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
+	
+	FpgaGatherVersion(FPGA_BITSTREAM_HF, temp, sizeof(temp));
+	strncat(VersionString, temp, sizeof(VersionString) - strlen(VersionString) - 1);
+
+	// Send Chip ID and used flash memory
+	uint32_t text_and_rodata_section_size = (uint32_t)&__data_src_start__ - (uint32_t)&_flash_start;
+	uint32_t compressed_data_section_size = common_area.arg1;
+	cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
 
-#ifdef WITH_LF
-// samy's sniff and repeat routine
-void SamyRun()
+// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
+// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
+void printUSBSpeed(void) 
 {
-	DbpString("Stand-alone mode! No PC necessary.");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+	Dbprintf("USB Speed:");
+	Dbprintf("  Sending USB packets to client...");
 
-	// 3 possible options? no just 2 for now
-#define OPTS 2
+	#define USB_SPEED_TEST_MIN_TIME	1500	// in milliseconds
+	uint8_t *test_data = BigBuf_get_addr();
+	uint32_t end_time;
 
-	int high[OPTS], low[OPTS];
+	uint32_t start_time = end_time = GetTickCount();
+	uint32_t bytes_transferred = 0;
+
+	LED_B_ON();
+	while(end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
+		cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+		end_time = GetTickCount();
+		bytes_transferred += USB_CMD_DATA_SIZE;
+	}
+	LED_B_OFF();
 
+	Dbprintf("  Time elapsed:      %dms", end_time - start_time);
+	Dbprintf("  Bytes transferred: %d", bytes_transferred);
+	Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 
+		1000 * bytes_transferred / (end_time - start_time));
+
+}
+	
+/**
+  * Prints runtime information about the PM3.
+**/
+void SendStatus(void) {
+	BigBuf_print_status();
+	Fpga_print_status();
+	printConfig(); //LF Sampling config
+	printUSBSpeed();
+	Dbprintf("Various");
+	Dbprintf("  MF_DBGLEVEL........%d", MF_DBGLEVEL);
+	Dbprintf("  ToSendMax..........%d", ToSendMax);
+	Dbprintf("  ToSendBit..........%d", ToSendBit);
+	Dbprintf("  ToSend BUFFERSIZE..%d", TOSEND_BUFFER_SIZE);
+
+	cmd_send(CMD_ACK,1,0,0,0,0);
+}
+
+#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
+
+#define OPTS 2
+void StandAloneMode()
+{
+	DbpString("Stand-alone mode! No PC necessary.");
 	// Oooh pretty -- notify user we're in elite samy mode now
 	LED(LED_RED,	200);
 	LED(LED_ORANGE, 200);
@@ -359,7 +380,277 @@ void SamyRun()
 	LED(LED_GREEN,	200);
 	LED(LED_ORANGE, 200);
 	LED(LED_RED,	200);
+}
+#endif
 
+#ifdef WITH_ISO14443a_StandAlone
+
+typedef struct {
+	uint8_t uid[10];
+	uint8_t uidlen;
+	uint8_t atqa[2];
+	uint8_t sak;
+} __attribute__((__packed__)) card_clone_t;
+
+void StandAloneMode14a()
+{
+	StandAloneMode();
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+
+	int selected = 0, playing = 0, iGotoRecord = 0, iGotoClone = 0;
+	int cardRead[OPTS] = {0};
+
+	card_clone_t uids[OPTS];
+	iso14a_card_select_t card_info[OPTS];
+	uint8_t params = (MAGIC_SINGLE | MAGIC_DATAIN);
+					
+	LED(selected + 1, 0);
+
+	for (;;)
+	{
+		usb_poll();
+		WDT_HIT();
+		SpinDelay(300);
+
+		if (iGotoRecord == 1 || cardRead[selected] == 0)
+		{
+			iGotoRecord = 0;
+			LEDsoff();
+			LED(selected + 1, 0);
+			LED(LED_RED2, 0);
+
+			// record
+			Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
+			/* need this delay to prevent catching some weird data */
+			SpinDelay(500);
+			iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
+
+			for ( ; ; )
+			{
+				WDT_HIT();
+				if (BUTTON_PRESS()) {
+					if (cardRead[selected]) {
+						Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
+						break;
+					}
+					else if (cardRead[(selected+1) % OPTS]) {
+						Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
+						selected = (selected+1) % OPTS;
+						break; // playing = 1;
+					}
+					else {
+						Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
+						SpinDelay(300);
+					}
+				}
+				if (!iso14443a_select_card(NULL, &card_info[selected], NULL, true, 0))
+					continue;
+				else
+				{
+					Dbprintf("Read UID:"); 
+					Dbhexdump(card_info[selected].uidlen, card_info[selected].uid, 0);
+					
+					if (memcmp(uids[(selected+1)%OPTS].uid, card_info[selected].uid, card_info[selected].uidlen ) == 0 ) {
+						Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
+					}
+					else {
+						
+						uids[selected].sak = card_info[selected].sak;
+						uids[selected].uidlen = card_info[selected].uidlen;						
+						memcpy(uids[selected].uid , card_info[selected].uid, uids[selected].uidlen);						
+						memcpy(uids[selected].atqa, card_info[selected].atqa, 2);
+												
+						if (uids[selected].uidlen > 4)
+							Dbprintf("Bank[%d] received a 7-byte UID", selected);
+						else
+							Dbprintf("Bank[%d] received a 4-byte UID", selected);
+					break;
+				}
+			}
+			}
+			Dbprintf("ATQA = %02X%02X", uids[selected].atqa[0], uids[selected].atqa[1]);
+			Dbprintf("SAK = %02X", uids[selected].sak);
+			LEDsoff();
+			LED(LED_GREEN,  200);
+			LED(LED_ORANGE, 200);
+			LED(LED_GREEN,  200);
+			LED(LED_ORANGE, 200);
+
+			LEDsoff();
+			LED(selected + 1, 0);
+
+			// Next state is replay:
+			playing = 1;
+
+			cardRead[selected] = 1;
+		}
+		/* MF Classic UID clone */
+		else if (iGotoClone==1)
+		{
+			iGotoClone=0;
+			LEDsoff();
+			LED(selected + 1, 0);
+			LED(LED_ORANGE, 250);
+
+			// magiccards holds 4bytes uid.
+			uint64_t tmpuid = bytes_to_num(uids[selected].uid, 4);
+			
+			// record
+			Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, tmpuid & 0xFFFFFFFF);
+
+			// wait for button to be released
+			// Delay cloning until card is in place
+			while(BUTTON_PRESS())
+				WDT_HIT();
+
+			Dbprintf("Starting clone. [Bank: %u]", selected);
+			// need this delay to prevent catching some weird data
+			SpinDelay(500);
+			// Begin clone function here:
+			/* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
+					UsbCommand c = {CMD_MIFARE_CSETBLOCK, {params & (0xFE | (uid == NULL ? 0:1)), blockNo, 0}};
+					memcpy(c.d.asBytes, data, 16);
+					SendCommand(&c);
+
+				Block read is similar:
+					UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, blockNo, 0}};
+				We need to imitate that call with blockNo 0 to set a uid.
+
+				The get and set commands are handled in this file:
+					// Work with "magic Chinese" card
+					case CMD_MIFARE_CSETBLOCK:
+							MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+							break;
+					case CMD_MIFARE_CGETBLOCK:
+							MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
+							break;
+
+				mfCSetUID provides example logic for UID set workflow:
+					-Read block0 from card in field with MifareCGetBlock()
+					-Configure new values without replacing reserved bytes
+							memcpy(block0, uid, 4); // Copy UID bytes from byte array
+							// Mifare UID BCC
+							block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
+							Bytes 5-7 are reserved SAK and ATQA for mifare classic
+					-Use mfCSetBlock(0, block0, oldUID, wantWipe, MAGIC_SINGLE) to write it
+			*/
+			uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
+			// arg0 = Flags, arg1=blockNo
+			MifareCGetBlock(params, 0, oldBlock0);
+			if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
+				Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
+				playing = 1;
+			}
+			else {
+				Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0], oldBlock0[1], oldBlock0[2], oldBlock0[3]);
+				memcpy(newBlock0, oldBlock0, 16);
+
+				// Copy uid for bank (2nd is for longer UIDs not supported if classic)
+				memcpy(newBlock0, uids[selected].uid, 4);
+				newBlock0[4] = newBlock0[0] ^ newBlock0[1] ^ newBlock0[2] ^ newBlock0[3];
+
+				// arg0 = workFlags, arg1 = blockNo, datain
+				MifareCSetBlock(params, 0, newBlock0);
+				MifareCGetBlock(params, 0, testBlock0);
+				
+				if (memcmp(testBlock0, newBlock0, 16)==0) {
+					DbpString("Cloned successfull!");
+					cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
+					playing = 0;
+					iGotoRecord = 1;
+					selected = (selected + 1) % OPTS;
+				} else {
+					Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
+					playing = 1;
+				}
+			}
+			LEDsoff();
+			LED(selected + 1, 0);
+		}
+		// Change where to record (or begin playing)
+		else if (playing==1) // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
+		{
+			LEDsoff();
+			LED(selected + 1, 0);
+
+			// Begin transmitting
+			if (playing)
+			{
+				LED(LED_GREEN, 0);
+				DbpString("Playing");
+				for ( ; ; ) {
+					WDT_HIT();
+					int button_action = BUTTON_HELD(1000);
+					if (button_action == 0) { // No button action, proceed with sim
+
+						uint8_t flags = FLAG_4B_UID_IN_DATA;
+						uint8_t data[USB_CMD_DATA_SIZE] = {0}; // in case there is a read command received we shouldn't break
+
+						memcpy(data, uids[selected].uid, uids[selected].uidlen);
+						
+						uint64_t tmpuid = bytes_to_num(uids[selected].uid, uids[selected].uidlen);
+									
+						if (  uids[selected].uidlen == 7 ) {
+							flags = FLAG_7B_UID_IN_DATA;
+							Dbprintf("Simulating ISO14443a tag with uid: %02x%08x [Bank: %u]", tmpuid >> 32, tmpuid & 0xFFFFFFFF , selected);
+						} else {
+							Dbprintf("Simulating ISO14443a tag with uid: %08x [Bank: %u]", tmpuid & 0xFFFFFFFF , selected);
+						}
+						
+						if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0) {
+							DbpString("Mifare Classic 1k");
+							SimulateIso14443aTag(1, flags, data);
+						} else if (uids[selected].sak == 0x18 && uids[selected].atqa[0] == 0x02 && uids[selected].atqa[1] == 0) {
+							DbpString("Mifare Classic 4k (4b uid)");
+							SimulateIso14443aTag(8, flags, data);
+						} else if (uids[selected].sak == 0x08 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+							DbpString("Mifare Classic 4k (7b uid)");
+							SimulateIso14443aTag(8, flags, data);
+						} else if (uids[selected].sak == 0x00 && uids[selected].atqa[0] == 0x44 && uids[selected].atqa[1] == 0) {
+							DbpString("Mifare Ultralight");
+							SimulateIso14443aTag(2, flags, data);
+						} else if (uids[selected].sak == 0x20 && uids[selected].atqa[0] == 0x04 && uids[selected].atqa[1] == 0x03) {
+							DbpString("Mifare DESFire");
+							SimulateIso14443aTag(3, flags, data);
+						}
+						else {
+							Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
+							SimulateIso14443aTag(1, flags, data);
+						}
+					}
+					else if (button_action == BUTTON_SINGLE_CLICK) {
+						selected = (selected + 1) % OPTS;
+						Dbprintf("Done playing. Switching to record mode on bank %d",selected);
+						iGotoRecord = 1;
+						break;
+					}
+					else if (button_action == BUTTON_HOLD) {
+						Dbprintf("Playtime over. Begin cloning...");
+						iGotoClone = 1;
+						break;
+					}
+					WDT_HIT();
+				}
+
+				/* We pressed a button so ignore it here with a delay */
+				SpinDelay(300);
+				LEDsoff();
+				LED(selected + 1, 0);
+			}
+			else
+				while(BUTTON_PRESS())
+					WDT_HIT();
+		}
+	}
+}
+#elif WITH_LF
+// samy's sniff and repeat routine
+void SamyRun()
+{
+	StandAloneMode();
+	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+
+	int high[OPTS], low[OPTS];
 	int selected = 0;
 	int playing = 0;
 	int cardRead = 0;
@@ -367,10 +658,9 @@ void SamyRun()
 	// Turn on selected LED
 	LED(selected + 1, 0);
 
-	for (;;)
-	{
+	for (;;) {
 		usb_poll();
-    WDT_HIT();
+		WDT_HIT();
 
 		// Was our button held down or pressed?
 		int button_pressed = BUTTON_HELD(1000);
@@ -394,54 +684,46 @@ void SamyRun()
 			SpinDelay(500);
 
 			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-			Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);
+			Dbprintf("Recorded %x %x %08x", selected, high[selected], low[selected]);
 
 			LEDsoff();
 			LED(selected + 1, 0);
 			// Finished recording
-
 			// If we were previously playing, set playing off
 			// so next button push begins playing what we recorded
-			playing = 0;
-			
-			cardRead = 1;
-	
+			playing = 0;			
+			cardRead = 1;	
 		}
+		else if (button_pressed > 0 && cardRead == 1) {
+			LEDsoff();
+			LED(selected + 1, 0);
+			LED(LED_ORANGE, 0);
 
-		else if (button_pressed > 0 && cardRead == 1)
-		{
-					LEDsoff();
-					LED(selected + 1, 0);
-					LED(LED_ORANGE, 0);
-
-					// record
-					Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
+			// record
+			Dbprintf("Cloning %x %x %08x", selected, high[selected], low[selected]);
 
-					// wait for button to be released
-					while(BUTTON_PRESS())
-						WDT_HIT();
+			// wait for button to be released
+			while(BUTTON_PRESS())
+				WDT_HIT();
 
-					/* need this delay to prevent catching some weird data */
-					SpinDelay(500);
+			/* need this delay to prevent catching some weird data */
+			SpinDelay(500);
 
-					CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
-					Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
+			CopyHIDtoT55x7(0, high[selected], low[selected], 0);
+			Dbprintf("Cloned %x %x %08x", selected, high[selected], low[selected]);
 
-					LEDsoff();
-					LED(selected + 1, 0);
-					// Finished recording
+			LEDsoff();
+			LED(selected + 1, 0);
+			// Finished recording
 
-					// If we were previously playing, set playing off
-					// so next button push begins playing what we recorded
-					playing = 0;
-					
-					cardRead = 0;
-			
+			// If we were previously playing, set playing off
+			// so next button push begins playing what we recorded
+			playing = 0;			
+			cardRead = 0;			
 		}
 
 		// Change where to record (or begin playing)
-		else if (button_pressed)
-		{
+		else if (button_pressed) {
 			// Next option if we were previously playing
 			if (playing)
 				selected = (selected + 1) % OPTS;
@@ -458,15 +740,16 @@ void SamyRun()
 				// wait for button to be released
 				while(BUTTON_PRESS())
 					WDT_HIT();
-				Dbprintf("%x %x %x", selected, high[selected], low[selected]);
-				CmdHIDsimTAG(high[selected], low[selected], 0);
+				
+				Dbprintf("%x %x %08x", selected, high[selected], low[selected]);
+				CmdHIDsimTAG(high[selected], low[selected], 0);		
 				DbpString("Done playing");
-				if (BUTTON_HELD(1000) > 0)
-					{
+				
+				if (BUTTON_HELD(1000) > 0) {
 					DbpString("Exiting");
 					LEDsoff();
 					return;
-					}
+				}
 
 				/* We pressed a button so ignore it here with a delay */
 				SpinDelay(300);
@@ -483,8 +766,8 @@ void SamyRun()
 		}
 	}
 }
-#endif
 
+#endif
 /*
 OBJECTIVE
 Listen and detect an external reader. Determine the best location
@@ -522,16 +805,14 @@ static const char LIGHT_SCHEME[] = {
 };
 static const int LIGHT_LEN = sizeof(LIGHT_SCHEME)/sizeof(LIGHT_SCHEME[0]);
 
-void ListenReaderField(int limit)
-{
-	int lf_av, lf_av_new, lf_baseline= 0, lf_max;
-	int hf_av, hf_av_new,  hf_baseline= 0, hf_max;
-	int mode=1, display_val, display_max, i;
-
+void ListenReaderField(int limit) {
 #define LF_ONLY						1
 #define HF_ONLY						2
 #define REPORT_CHANGE			 	10    // report new values only if they have changed at least by REPORT_CHANGE
 
+	int lf_av, lf_av_new, lf_baseline= 0, lf_max;
+	int hf_av, hf_av_new,  hf_baseline= 0, hf_max;
+	int mode=1, display_val, display_max, i;
 
 	// switch off FPGA - we don't want to measure our own signal
 	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
@@ -573,7 +854,7 @@ void ListenReaderField(int limit)
 
 		if (limit != HF_ONLY) {
 			if(mode == 1) {
-				if (abs(lf_av - lf_baseline) > REPORT_CHANGE) 
+				if (ABS(lf_av - lf_baseline) > REPORT_CHANGE) 
 					LED_D_ON();
 				else
 					LED_D_OFF();
@@ -581,7 +862,7 @@ void ListenReaderField(int limit)
 
 			lf_av_new = AvgAdc(ADC_CHAN_LF);
 			// see if there's a significant change
-			if(abs(lf_av - lf_av_new) > REPORT_CHANGE) {
+			if(ABS(lf_av - lf_av_new) > REPORT_CHANGE) {
 				Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
 				lf_av = lf_av_new;
 				if (lf_av > lf_max)
@@ -591,7 +872,7 @@ void ListenReaderField(int limit)
 
 		if (limit != LF_ONLY) {
 			if (mode == 1){
-				if (abs(hf_av - hf_baseline) > REPORT_CHANGE) 	
+				if (ABS(hf_av - hf_baseline) > REPORT_CHANGE) 	
 					LED_B_ON();
 				else
 					LED_B_OFF();
@@ -599,7 +880,7 @@ void ListenReaderField(int limit)
 
 			hf_av_new = AvgAdc(ADC_CHAN_HF);
 			// see if there's a significant change
-			if(abs(hf_av - hf_av_new) > REPORT_CHANGE) {
+			if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
 				Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
 				hf_av = hf_av_new;
 				if (hf_av > hf_max)
@@ -640,7 +921,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 {
 	UsbCommand *c = (UsbCommand *)packet;
 
-//  Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
+	//Dbprintf("received %d bytes, with command: 0x%04x and args: %d %d %d",len,c->cmd,c->arg[0],c->arg[1],c->arg[2]);
   
 	switch(c->cmd) {
 #ifdef WITH_LF
@@ -648,10 +929,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			setSamplingConfig((sample_config *) c->d.asBytes);
 			break;
 		case CMD_ACQUIRE_RAW_ADC_SAMPLES_125K:
-			cmd_send(CMD_ACK,SampleLF(c->arg[0]),0,0,0,0);
+			cmd_send(CMD_ACK, SampleLF(c->arg[0]),0,0,0,0);
 			break;
 		case CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K:
-			ModThenAcquireRawAdcSamples125k(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+			ModThenAcquireRawAdcSamples125k(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
 		case CMD_LF_SNOOP_RAW_ADC_SAMPLES:
 			cmd_send(CMD_ACK,SnoopLF(),0,0,0,0);
@@ -678,7 +959,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			CmdIOdemodFSK(c->arg[0], 0, 0, 1);
 			break;
 		case CMD_IO_CLONE_TAG:
-			CopyIOtoT55x7(c->arg[0], c->arg[1], c->d.asBytes[0]);
+			CopyIOtoT55x7(c->arg[0], c->arg[1]);
 			break;
 		case CMD_EM410X_DEMOD:
 			CmdEM410xdemod(c->arg[0], 0, 0, 1);
@@ -693,7 +974,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			WriteTItag(c->arg[0],c->arg[1],c->arg[2]);
 			break;
 		case CMD_SIMULATE_TAG_125K:
-			LED_A_ON();
+			LED_A_ON();		
 			SimulateTagLowFrequency(c->arg[0], c->arg[1], 1);
 			LED_A_OFF();
 			break;
@@ -707,23 +988,37 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			CopyIndala224toT55x7(c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3], c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]);
 			break;
 		case CMD_T55XX_READ_BLOCK:
-			T55xxReadBlock(c->arg[1], c->arg[2],c->d.asBytes[0]);
+			T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		case CMD_T55XX_WRITE_BLOCK:
 			T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
 			break;
-		case CMD_T55XX_READ_TRACE:
-			T55xxReadTrace();
+		case CMD_T55XX_WAKEUP:
+			T55xxWakeUp(c->arg[0]);
+			break;
+		case CMD_T55XX_RESET_READ:
+			T55xxResetRead();
 			break;
 		case CMD_PCF7931_READ:
 			ReadPCF7931();
-			cmd_send(CMD_ACK,0,0,0,0,0);
+			break;
+		case CMD_PCF7931_WRITE:
+			WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		case CMD_EM4X_READ_WORD:
-			EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
+			EM4xReadWord(c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		case CMD_EM4X_WRITE_WORD:
-			EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
+			EM4xWriteWord(c->arg[0], c->arg[1], c->arg[2]);
+			break;
+		case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
+			CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
+			break;
+        case CMD_VIKING_CLONE_TAG:
+			CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
+            break;
+		case CMD_COTAG:
+			Cotag(c->arg[0]);
 			break;
 #endif
 
@@ -737,6 +1032,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
 			ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
 			break;
+		case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
+			SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+			break;
+		case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
+			check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
+			break;
+		case CMD_READ_HITAG_S: //Reader for only Hitag S tags, args = key or challenge
+			ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+			break;
+		case CMD_WR_HITAG_S: //writer for Hitag tags args=data to write,page and key or challenge
+			WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
+			break;
 #endif
 
 #ifdef WITH_ISO15693
@@ -746,19 +1053,15 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_RECORD_RAW_ADC_SAMPLES_ISO_15693:
 			RecordRawAdcSamplesIso15693();
 			break;
-			
 		case CMD_ISO_15693_COMMAND:
 			DirectTag15693Command(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
 			break;
-					
 		case CMD_ISO_15693_FIND_AFI:
 			BruteforceIso15693Afi(c->arg[0]);
 			break;	
-			
 		case CMD_ISO_15693_DEBUG:
 			SetDebugIso15693(c->arg[0]);
 			break;
-
 		case CMD_READER_ISO_15693:
 			ReaderIso15693(c->arg[0]);
 			break;
@@ -771,54 +1074,54 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_SIMULATE_TAG_LEGIC_RF:
 			LegicRfSimulate(c->arg[0], c->arg[1], c->arg[2]);
 			break;
-
 		case CMD_WRITER_LEGIC_RF:
-			LegicRfWriter(c->arg[1], c->arg[0]);
+			LegicRfWriter( c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-
 		case CMD_READER_LEGIC_RF:
-			LegicRfReader(c->arg[0], c->arg[1]);
+			LegicRfReader(c->arg[0], c->arg[1], c->arg[2]);
+			break;			
+		case CMD_LEGIC_INFO:
+			LegicRfInfo();
+			break;
+		case CMD_LEGIC_ESET:
+			LegicEMemSet(c->arg[0], c->arg[1], c->d.asBytes);
 			break;
 #endif
 
 #ifdef WITH_ISO14443b
-		case CMD_ACQUIRE_RAW_ADC_SAMPLES_ISO_14443:
-			AcquireRawAdcSamplesIso14443(c->arg[0]);
-			break;
-		case CMD_READ_SRI512_TAG:
-			ReadSTMemoryIso14443(0x0F);
+		case CMD_READ_SRI_TAG:
+			ReadSTMemoryIso14443b(c->arg[0]);
 			break;
-		case CMD_READ_SRIX4K_TAG:
-			ReadSTMemoryIso14443(0x7F);
+		case CMD_SNOOP_ISO_14443B:
+			SnoopIso14443b();
 			break;
-		case CMD_SNOOP_ISO_14443:
-			SnoopIso14443();
-			break;
-		case CMD_SIMULATE_TAG_ISO_14443:
-			SimulateIso14443Tag();
+		case CMD_SIMULATE_TAG_ISO_14443B:
+			SimulateIso14443bTag(c->arg[0]);
 			break;
 		case CMD_ISO_14443B_COMMAND:
-			SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+			//SendRawCommand14443B(c->arg[0],c->arg[1],c->arg[2],c->d.asBytes);
+			SendRawCommand14443B_Ex(c);
 			break;
 #endif
 
 #ifdef WITH_ISO14443a
 		case CMD_SNOOP_ISO_14443a:
-			SnoopIso14443a(c->arg[0]);
+			SniffIso14443a(c->arg[0]);
 			break;
 		case CMD_READER_ISO_14443a:
 			ReaderIso14443a(c);
 			break;
 		case CMD_SIMULATE_TAG_ISO_14443a:
-			SimulateIso14443aTag(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
+			SimulateIso14443aTag(c->arg[0], c->arg[1], c->d.asBytes);  // ## Simulate iso14443a tag - pass tag type & UID
 			break;
-			
 		case CMD_EPA_PACE_COLLECT_NONCE:
 			EPA_PACE_Collect_Nonce(c);
 			break;
-			
+		case CMD_EPA_PACE_REPLAY:
+			EPA_PACE_Replay(c);
+			break;
 		case CMD_READER_MIFARE:
-			ReaderMifare(c->arg[0]);
+            ReaderMifare(c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		case CMD_MIFARE_READBL:
 			MifareReadBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -826,17 +1129,11 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_MIFAREU_READBL:
 			MifareUReadBlock(c->arg[0],c->arg[1], c->d.asBytes);
 			break;
-		case CMD_MIFAREUC_AUTH1:
-			MifareUC_Auth1(c->arg[0],c->d.asBytes);
-			break;
-		case CMD_MIFAREUC_AUTH2:
-			MifareUC_Auth2(c->arg[0],c->d.asBytes);
+		case CMD_MIFAREUC_AUTH:
+			MifareUC_Auth(c->arg[0],c->d.asBytes);
 			break;
 		case CMD_MIFAREU_READCARD:
-			MifareUReadCard(c->arg[0], c->arg[1], c->d.asBytes);
-			break;
-		case CMD_MIFAREUC_READCARD:
-			MifareUReadCard(c->arg[0], c->arg[1], c->d.asBytes);
+			MifareUReadCard(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
 		case CMD_MIFAREUC_SETPWD: 
 			MifareUSetPwd(c->arg[0], c->d.asBytes);
@@ -847,11 +1144,14 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_MIFARE_WRITEBL:
 			MifareWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
-		case CMD_MIFAREU_WRITEBL_COMPAT:
-			MifareUWriteBlock(c->arg[0], c->d.asBytes);
-			break;
+		//case CMD_MIFAREU_WRITEBL_COMPAT:
+			//MifareUWriteBlockCompat(c->arg[0], c->d.asBytes);
+			//break;
 		case CMD_MIFAREU_WRITEBL:
-			MifareUWriteBlock_Special(c->arg[0], c->d.asBytes);
+			MifareUWriteBlock(c->arg[0], c->arg[1], c->d.asBytes);
+			break;
+		case CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES:
+			MifareAcquireEncryptedNonces(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
 			break;
 		case CMD_MIFARE_NESTED:
 			MifareNested(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
@@ -882,10 +1182,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			
 		// Work with "magic Chinese" card
 		case CMD_MIFARE_CSETBLOCK:
-			MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			MifareCSetBlock(c->arg[0], c->arg[1], c->d.asBytes);
 			break;
 		case CMD_MIFARE_CGETBLOCK:
-			MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			MifareCGetBlock(c->arg[0], c->arg[1], c->d.asBytes);
 			break;
 		case CMD_MIFARE_CIDENT:
 			MifareCIdent();
@@ -896,8 +1196,62 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			SniffMifare(c->arg[0]);
 			break;
 
-#endif
+		case CMD_MIFARE_SETMOD:
+			MifareSetMod(c->arg[0], c->d.asBytes);
+			break;
 
+		//mifare desfire
+		case CMD_MIFARE_DESFIRE_READBL:	break;
+		case CMD_MIFARE_DESFIRE_WRITEBL: break;
+		case CMD_MIFARE_DESFIRE_AUTH1:
+			MifareDES_Auth1(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+			break;
+		case CMD_MIFARE_DESFIRE_AUTH2:
+			//MifareDES_Auth2(c->arg[0],c->d.asBytes);
+			break;
+		case CMD_MIFARE_DES_READER:
+			//readermifaredes(c->arg[0], c->arg[1], c->d.asBytes);
+			break;
+		case CMD_MIFARE_DESFIRE_INFO:
+			MifareDesfireGetInformation();
+			break;
+		case CMD_MIFARE_DESFIRE:
+			MifareSendCommand(c->arg[0], c->arg[1], c->d.asBytes);
+			break;
+		case CMD_MIFARE_COLLECT_NONCES:
+			break;
+#endif
+#ifdef WITH_EMV
+		case CMD_EMV_TRANSACTION:
+			EMVTransaction();
+			break;
+        case CMD_EMV_GET_RANDOM_NUM:
+            //EMVgetUDOL();
+            break;
+        case CMD_EMV_LOAD_VALUE:
+            EMVloadvalue(c->arg[0], c->d.asBytes);  
+            break;
+        case CMD_EMV_DUMP_CARD:
+            EMVdumpcard();
+			break;
+/*			
+       case CMD_EMV_READ_RECORD:
+            EMVReadRecord(c->arg[0], c->arg[1], NULL);
+            break; 
+        case CMD_EMV_CLONE:
+            EMVClone(c->arg[0], c->arg[1]);
+            break;
+       case CMD_EMV_SIM:
+            EMVSim();
+            break;
+        case CMD_EMV_TEST:
+            EMVTest();
+            break;
+        case CMD_EMV_FUZZ_RATS:
+            EMVFuzz_RATS(c->arg[0],c->d.asBytes);
+            break;
+			*/
+#endif
 #ifdef WITH_ICLASS
 		// Makes use of ISO14443a FPGA Firmware
 		case CMD_SNOOP_ICLASS:
@@ -912,14 +1266,33 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_READER_ICLASS_REPLAY:
 		    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
 			break;
-	case CMD_ICLASS_EML_MEMSET:
+		case CMD_ICLASS_EML_MEMSET:
 			emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
 			break;
+		case CMD_ICLASS_WRITEBLOCK:
+			iClass_WriteBlock(c->arg[0], c->d.asBytes);
+			break;
+		case CMD_ICLASS_READCHECK:  // auth step 1
+			iClass_ReadCheck(c->arg[0], c->arg[1]);
+			break;
+		case CMD_ICLASS_READBLOCK:
+			iClass_ReadBlk(c->arg[0]);
+			break;
+		case CMD_ICLASS_AUTHENTICATION: //check
+			iClass_Authentication(c->d.asBytes);
+			break;
+		case CMD_ICLASS_DUMP:
+			iClass_Dump(c->arg[0], c->arg[1]);
+			break;
+		case CMD_ICLASS_CLONE:
+			iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
+			break;
 #endif
-
-		case CMD_SIMULATE_TAG_HF_LISTEN:
-			SimulateTagHfListen();
+#ifdef WITH_HFSNOOP
+		case CMD_HF_SNIFFER:
+			HfSnoop(c->arg[0], c->arg[1]);
 			break;
+#endif
 
 		case CMD_BUFF_CLEAR:
 			BigBuf_Clear();
@@ -943,25 +1316,55 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			LED_D_OFF(); // LED D indicates field ON or OFF
 			break;
 
-		case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K:
-
+		case CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K: {
 			LED_B_ON();
 			uint8_t *BigBuf = BigBuf_get_addr();
-			for(size_t i=0; i<c->arg[1]; i += USB_CMD_DATA_SIZE) {
-				size_t len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE);
-				cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,i,len,BigBuf_get_traceLen(),BigBuf+c->arg[0]+i,len);
+			size_t len = 0;
+			size_t startidx = c->arg[0];
+			uint8_t isok = FALSE;
+			// arg0 = startindex
+			// arg1 = length bytes to transfer
+			// arg2 = RFU
+			//Dbprintf("transfer to client parameters: %" PRIu64 " | %" PRIu64 " | %" PRIu64, c->arg[0], c->arg[1], c->arg[2]);
+			
+			for(size_t i = 0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) {
+				len = MIN( (c->arg[1] - i), USB_CMD_DATA_SIZE);
+				isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), BigBuf + startidx + i, len);
+				if (!isok) 
+					Dbprintf("transfer to client failed ::  | bytes %d", len);
 			}
 			// Trigger a finish downloading signal with an ACK frame
-			cmd_send(CMD_ACK,1,0,BigBuf_get_traceLen(),getSamplingConfig(),sizeof(sample_config));
+			cmd_send(CMD_ACK, 1, 0, BigBuf_get_traceLen(), getSamplingConfig(), sizeof(sample_config));
 			LED_B_OFF();
 			break;
-
+		}
 		case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
+			// iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
+			// to be able to use this one for uploading data to device 
+			// arg1 = 0 upload for LF usage 
+			//        1 upload for HF usage
+			if ( c->arg[1] == 0 )
+				FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+			else 
+				FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 			uint8_t *b = BigBuf_get_addr();
-			memcpy(b+c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
-			cmd_send(CMD_ACK,0,0,0,0,0);
+			memcpy( b + c->arg[0], c->d.asBytes, USB_CMD_DATA_SIZE);
+			cmd_send(CMD_ACK,1,0,0,0,0);
 			break;
-		}	
+		}
+		case CMD_DOWNLOAD_EML_BIGBUF: {
+			LED_B_ON();
+			uint8_t *cardmem = BigBuf_get_EM_addr();
+			size_t len = 0;
+			for(size_t i=0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) {
+				len = MIN((c->arg[1] - i), USB_CMD_DATA_SIZE);
+				cmd_send(CMD_DOWNLOADED_EML_BIGBUF, i, len, CARD_MEMORY_SIZE, cardmem + c->arg[0] + i, len);
+			}
+			// Trigger a finish downloading signal with an ACK frame
+			cmd_send(CMD_ACK, 1, 0, CARD_MEMORY_SIZE, 0, 0);
+			LED_B_OFF();
+			break;
+		}
 		case CMD_READ_MEM:
 			ReadMem(c->arg[0]);
 			break;
@@ -983,7 +1386,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_VERSION:
 			SendVersion();
 			break;
-
+		case CMD_STATUS:
+			SendStatus();
+			break;
+		case CMD_PING:
+			cmd_send(CMD_ACK,0,0,0,0,0);
+			break;
 #ifdef WITH_LCD
 		case CMD_LCD_RESET:
 			LCDReset();
@@ -996,8 +1404,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_FINISH_WRITE:
 		case CMD_HARDWARE_RESET:
 			usb_disable();
-			SpinDelay(1000);
-			SpinDelay(1000);
+			SpinDelay(2000);
 			AT91C_BASE_RSTC->RSTC_RCR = RST_CONTROL_KEY | AT91C_RSTC_PROCRST;
 			for(;;) {
 				// We're going to reset, and the bootrom will take control.
@@ -1037,21 +1444,17 @@ void  __attribute__((noreturn)) AppMain(void)
 	}
 	common_area.flags.osimage_present = 1;
 
-	LED_D_OFF();
-	LED_C_OFF();
-	LED_B_OFF();
-	LED_A_OFF();
+	LEDsoff();
 
 	// Init USB device
-  usb_enable();
+	usb_enable();
 
 	// The FPGA gets its clock from us from PCK0 output, so set that up.
 	AT91C_BASE_PIOA->PIO_BSR = GPIO_PCK0;
 	AT91C_BASE_PIOA->PIO_PDR = GPIO_PCK0;
 	AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK0;
 	// PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz
-	AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK |
-		AT91C_PMC_PRES_CLK_4;
+	AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK | AT91C_PMC_PRES_CLK_4; //  4 for 24Mhz pck0, 2 for 48 MHZ pck0
 	AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;
 
 	// Reset SPI
@@ -1069,21 +1472,29 @@ void  __attribute__((noreturn)) AppMain(void)
 	LCDInit();
 #endif
 
-  byte_t rx[sizeof(UsbCommand)];
+	byte_t rx[sizeof(UsbCommand)];
 	size_t rx_len;
   
 	for(;;) {
-    if (usb_poll()) {
-      rx_len = usb_read(rx,sizeof(UsbCommand));
-      if (rx_len) {
-        UsbPacketReceived(rx,rx_len);
-      }
-    }
+		if ( usb_poll_validate_length() ) {
+			rx_len = usb_read(rx, sizeof(UsbCommand));
+			
+			if (rx_len)
+				UsbPacketReceived(rx, rx_len);
+		}
 		WDT_HIT();
 
 #ifdef WITH_LF
+#ifndef WITH_ISO14443a_StandAlone
 		if (BUTTON_HELD(1000) > 0)
 			SamyRun();
+#endif
+#endif
+#ifdef WITH_ISO14443a
+#ifdef WITH_ISO14443a_StandAlone
+		if (BUTTON_HELD(1000) > 0)
+			StandAloneMode14a();
+#endif
 #endif
 	}
 }