Amontec JTAGKey config

[proxmark3-svn] / winsrc / command.cpp

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index 5892a8e551b50b91c089448d5aa83c8385400d1e..0214a0ab94af36d895f3c72f145155ffb7b718ea 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -107,6 +107,20 @@ static void CmdSri512read(char *str)
        c.ext1 = atoi(str);\r
        SendCommand(&c, FALSE);\r
 }\r
+
+/* 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/
+ */
+static void CmdSrix4kread(char *str)
+{
+        UsbCommand c;
+        c.cmd = CMD_READ_SRIX4K_TAG;
+        c.ext1 = atoi(str);
+        SendCommand(&c, FALSE);
+}
+
+
 \r
 // ## New command\r
 static void CmdHi14areader(char *str)\r
@@ -895,9 +909,12 @@ static void CmdHexsamples(char *str)
 {\r
        int i;\r
        int n;\r
+       int requested = atoi(str);\r
+       int delivered = 0;\r
 \r
        if(atoi(str) == 0) {\r
                n = 12;\r
+               requested = 12;\r
        } else {\r
                n = atoi(str)/4;\r
        }\r
@@ -925,7 +942,12 @@ static void CmdHexsamples(char *str)
                                c.d.asBytes[j+7],\r
                                c.d.asBytes[j+8]\r
                        );\r
+                       delivered += 8;\r
+                       if(delivered >= requested)\r
+                               break;\r
                }\r
+               if(delivered >= requested)\r
+                       break;\r
        }\r
 }\r
 \r
@@ -2935,6 +2957,7 @@ static struct {
        {"setlfdivisor",        CmdSetDivisor,                  0, "<19 - 255> -- Drive LF antenna at 12Mhz/(divisor+1)"},\r
        {"setmux",              CmdSetMux,                      0, "<loraw|hiraw|lopkd|hipkd> -- Set the ADC mux to a specific value"},\r
        {"sri512read",          CmdSri512read,                  0, "<int> -- Read contents of a SRI512 tag"},\r
+       {"srix4kread",          CmdSrix4kread,                  0, "<int> -- Read contents of a SRIX4K tag"},
        {"tidemod",                             CmdTIDemod,                                     1, "Demodulate raw bits for TI-type LF tag"},\r
        {"tiread",                              CmdTIRead,                                      0, "Read and decode a TI 134 kHz tag"},\r
        {"tiwrite",                             CmdTIWrite,                                     0, "Write new data to a r/w TI 134 kHz tag"},\r