Applied Holiman's fixes for iclass.c and CSNs

[proxmark3-svn] / client / cmdlfio.c

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index d7d36bc1bf10bfe7aeb8e7af6df18567650c973a..78d8fa213a9d63d12c6a7542fe4ca6af5a13db62 100644 (file)
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -16,25 +16,23 @@ static int CmdHelp(const char *Cmd);
 
 int CmdIODemodFSK(const char *Cmd)
 {
-  UsbCommand c={CMD_IO_DEMOD_FSK};
-  SendCommand(&c);
-  return 0;
+       int findone = 0;
+       if (Cmd[0] =='1') findone = 1;
+       
+       UsbCommand c={CMD_IO_DEMOD_FSK};
+       c.arg[0] = findone;
+       SendCommand(&c);
+       return 0;
 }
 
-
 int CmdIOProxDemod(const char *Cmd){
   if (GraphTraceLen < 4800) {
     PrintAndLog("too short; need at least 4800 samples");
     return 0;
   }
-
   GraphTraceLen = 4800;
   for (int i = 0; i < GraphTraceLen; ++i) {
-    if (GraphBuffer[i] < 0) {
-      GraphBuffer[i] = 0;
-    } else {
-      GraphBuffer[i] = 1;
-    }
+    GraphBuffer[i] = (GraphBuffer[i] < 0) ? 0 : 1;
   }
   RepaintGraphWindow();
   return 0;
@@ -68,10 +66,10 @@ int CmdIOClone(const char *Cmd)
 
 static command_t CommandTable[] = 
 {
-  {"help",        CmdHelp,            1, "This help"},
-  {"demod",      CmdIOProxDemod,     1, "Demodulate Stream"},
-  {"fskdemod",    CmdIODemodFSK,      1, "Demodulate ioProx Tag"},
-  {"clone",      CmdIOClone,         1, "Clone ioProx Tag"},
+  {"help",      CmdHelp,         1, "This help"},
+  {"demod",        CmdIOProxDemod,  1, "Demodulate Stream"},
+  {"fskdemod",  CmdIODemodFSK,   0, "['1'] Realtime IO FSK demodulator (option '1' for one tag only)"},
+  {"clone",        CmdIOClone,      0, "Clone ioProx Tag"},
   {NULL, NULL, 0, NULL}
 };