X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6c0f60ca7bcd7737b5d3867004f1cbdc9532720c..66707a3b3c59b7ac53231dda726b27389a9bfb70:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 2061f6b3..8347bed9 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -203,7 +203,7 @@ void MeasureAntennaTuning(void)
 
   LED_B_ON();
 	DbpString("Measuring antenna characteristics, please wait...");
-	memset(dest,0,sizeof(FREE_BUFFER_SIZE));
+	memset(dest,0,FREE_BUFFER_SIZE);
 
 /*
  * Sweeps the useful LF range of the proxmark from
@@ -643,7 +643,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			cmd_send(CMD_ACK,0,0,0,0,0);
 			break;
 		case CMD_HID_DEMOD_FSK:
-			CmdHIDdemodFSK(0, 0, 0, 1);					// Demodulate HID tag
+			CmdHIDdemodFSK(c->arg[0], 0, 0, 1);					// Demodulate HID tag
 			break;
 		case CMD_HID_SIM_TAG:
 			CmdHIDsimTAG(c->arg[0], c->arg[1], 1);					// Simulate HID tag by ID
@@ -652,11 +652,14 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			CopyHIDtoT55x7(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
 			break;
 		case CMD_IO_DEMOD_FSK:
-			CmdIOdemodFSK(1, 0, 0, 1);					// Demodulate IO tag
+			CmdIOdemodFSK(c->arg[0], 0, 0, 1);					// Demodulate IO tag
 			break;
 		case CMD_IO_CLONE_TAG: // Clone IO tag by ID to T55x7
 			CopyIOtoT55x7(c->arg[0], c->arg[1], c->d.asBytes[0]);
 			break;
+		case CMD_EM410X_DEMOD:
+			CmdEM410xdemod(c->arg[0], 0, 0, 1);
+			break;
 		case CMD_EM410X_WRITE_TAG:
 			WriteEM410x(c->arg[0], c->arg[1], c->arg[2]);
 			break;
@@ -867,6 +870,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_READER_ICLASS:
 			ReaderIClass(c->arg[0]);
 			break;
+		case CMD_READER_ICLASS_REPLAY:
+		    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
+			break;
 #endif
 
 		case CMD_SIMULATE_TAG_HF_LISTEN: