fix windows compile error and remove linux compile warnings

[proxmark3-svn] / winsrc / command.cpp

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index 913631efa8b88d1ac29ff07a0195aa00d42c5b81..b5d3e3d7d69f2abc0fd652d92c8610594ce6c07c 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -639,7 +639,6 @@ static void ChkBitstream(char *str)
 static void CmdLosim(char *str)\r
 {\r
        int i;\r
 static void CmdLosim(char *str)\r
 {\r
        int i;\r

-       char *zero = "0";\r

 \r
        /* convert to bitstream if necessary */\r
        ChkBitstream(str);\r
 \r
        /* convert to bitstream if necessary */\r
        ChkBitstream(str);\r


@@ -677,6 +676,22 @@ static void CmdLoread(char *str)
        SendCommand(&c, FALSE);\r
 }\r
 \r
        SendCommand(&c, FALSE);\r
 }\r
 \r

+static void CmdDetectReader(char *str)\r
+{\r
+       UsbCommand c;\r
+       // 'l' means LF - 125/134 kHz\r
+       if(*str == 'l') {\r
+               c.ext1 = 1;\r
+       } else if (*str == 'h') {\r
+               c.ext1 = 2;\r
+       } else if (*str != '\0') {\r
+               PrintToScrollback("use 'detectreader' or 'detectreader l' or 'detectreader h'");\r
+               return;\r
+       }\r
+       c.cmd = CMD_LISTEN_READER_FIELD;\r
+        SendCommand(&c, FALSE);\r
+}\r
+\r

 /* send a command before reading */\r
 static void CmdLoCommandRead(char *str)\r
 {\r
 /* send a command before reading */\r
 static void CmdLoCommandRead(char *str)\r
 {\r


@@ -688,7 +703,7 @@ static void CmdLoCommandRead(char *str)
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, &c.d.asBytes,&dummy+1);\r
        // in case they specified 'h'\r
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, &c.d.asBytes,&dummy+1);\r
        // in case they specified 'h'\r

-       strcpy(&c.d.asBytes + strlen(c.d.asBytes),dummy);\r
+       strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);\r

        SendCommand(&c, FALSE);\r
 }\r
 \r
        SendCommand(&c, FALSE);\r
 }\r
 \r


@@ -2011,8 +2026,7 @@ static void CmdFlexdemod(char *str)
 \r
 static void Cmdaskdemod(char *str) {\r
        int i;\r
 \r
 static void Cmdaskdemod(char *str) {\r
        int i;\r

-       int n = 0;\r
-       int c,high,low = 0;\r
+       int c, high = 0, low = 0;\r

 \r
        // TODO: complain if we do not give 2 arguments here !\r
        sscanf(str, "%i", &c);\r
 \r
        // TODO: complain if we do not give 2 arguments here !\r
        sscanf(str, "%i", &c);\r


@@ -2573,6 +2587,7 @@ static struct {
        "buffclear",            CmdBuffClear,0,         "    Clear sample buffer and graph window",\r
        "dec",                          CmdDec,1,               "    Decimate samples",\r
        "detectclock",          Cmddetectclockrate,1, "    Detect clock rate",\r
        "buffclear",            CmdBuffClear,0,         "    Clear sample buffer and graph window",\r
        "dec",                          CmdDec,1,               "    Decimate samples",\r
        "detectclock",          Cmddetectclockrate,1, "    Detect clock rate",\r

+       "detectreader",         CmdDetectReader,0, "['l'|'h'] -- Detect external reader field (option 'l' or 'h' to limit to LF or HF)",\r

        "em410xsim",            CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag",\r
        "em410xread",           CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag",\r
        "em410xwatch",          CmdEM410xwatch,0,       "    Watches for EM410x tags",\r
        "em410xsim",            CmdEM410xsim,1,         "<UID> -- Simulate EM410x tag",\r
        "em410xread",           CmdEM410xread,1,        "[clock rate] -- Extract ID from EM410x tag",\r
        "em410xwatch",          CmdEM410xwatch,0,       "    Watches for EM410x tags",\r