Fixed compile error in MinGW (#260)

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 10a70d7cee606523355af1ebf783a1e3084be924..005aa0e2a48158f0a48a03e4e67b7b367cd9aade 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -37,6 +37,12 @@
 #include "cmdlfvisa2000.h"  // for VISA2000 menu
 #include "cmdlfindala.h" // for indala menu
 #include "cmdlfgproxii.h"// for gproxii menu
 #include "cmdlfvisa2000.h"  // for VISA2000 menu
 #include "cmdlfindala.h" // for indala menu
 #include "cmdlfgproxii.h"// for gproxii menu

+#include "cmdlffdx.h"    // for fdx-b menu
+#include "cmdlfparadox.h"// for paradox menu
+#include "cmdlfnexwatch.h"//for nexwatch menu
+#include "cmdlfjablotron.h" //for jablotron menu
+#include "cmdlfnoralsy.h"// for noralsy menu
+#include "cmdlfsecurakey.h"//for securakey menu

 
 bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);
 
 bool g_lf_threshold_set = false;
 static int CmdHelp(const char *Cmd);


@@ -974,7 +980,7 @@ int CmdLFfind(const char *Cmd)
                return CheckChipType(cmdp);
        }
 
                return CheckChipType(cmdp);
        }
 

-       ans=CmdFDXBdemodBI("");
+       ans=CmdFdxDemod("");

        if (ans>0) {
                PrintAndLog("\nValid FDX-B ID Found!");
                return CheckChipType(cmdp);
        if (ans>0) {
                PrintAndLog("\nValid FDX-B ID Found!");
                return CheckChipType(cmdp);


@@ -984,13 +990,31 @@ int CmdLFfind(const char *Cmd)
        if (ans>0) {
                PrintAndLog("\nValid EM4x50 ID Found!");
                return 1;
        if (ans>0) {
                PrintAndLog("\nValid EM4x50 ID Found!");
                return 1;

-       }       
+       }
+
+       ans=CmdJablotronDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Jablotron ID Found!");
+               return CheckChipType(cmdp);
+       }
+
+       ans=CmdNoralsyDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Noralsy ID Found!");
+               return CheckChipType(cmdp);
+       }
+
+       ans=CmdSecurakeyDemod("");
+       if (ans>0) {
+               PrintAndLog("\nValid Securakey ID Found!");
+               return CheckChipType(cmdp);
+       }

 
        ans=CmdVikingDemod("");
        if (ans>0) {
                PrintAndLog("\nValid Viking ID Found!");
                return CheckChipType(cmdp);
 
        ans=CmdVikingDemod("");
        if (ans>0) {
                PrintAndLog("\nValid Viking ID Found!");
                return CheckChipType(cmdp);

-       }       
+       }

 
        ans=CmdIndalaDecode("");
        if (ans>0) {
 
        ans=CmdIndalaDecode("");
        if (ans>0) {


@@ -1041,21 +1065,27 @@ int CmdLFfind(const char *Cmd)
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,            1, "This help"},
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,            1, "This help"},

-       {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...    }"},
-       {"cotag",       CmdLFCOTAG,         1, "{ COTAG RFIDs...   }"},
-       {"em",          CmdLFEM4X,          1, "{ EM4X RFIDs...    }"},
-       {"gproxii",     CmdLF_G_Prox_II,    1, "{ G Prox II tags...    }"},
-       {"hid",         CmdLFHID,           1, "{ HID RFIDs...     }"},
-       {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
-       {"io",          CmdLFIO,            1, "{ ioProx tags...   }"},
-       {"indala",      CmdLFINDALA,        1, "{ Indala tags...   }"},
-       {"presco",      CmdLFPresco,        1, "{ Presco RFIDs...  }"},
-       {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
+       {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...              }"},
+       {"cotag",       CmdLFCOTAG,         1, "{ COTAG CHIPs...             }"},
+       {"em",          CmdLFEM4X,          1, "{ EM4X CHIPs & RFIDs...      }"},
+       {"fdx",         CmdLFFdx,           1, "{ FDX-B RFIDs...             }"},
+       {"gproxii",     CmdLF_G_Prox_II,    1, "{ G Prox II RFIDs...         }"},
+       {"hid",         CmdLFHID,           1, "{ HID RFIDs...               }"},
+       {"hitag",       CmdLFHitag,         1, "{ Hitag CHIPs...             }"},
+       {"io",          CmdLFIO,            1, "{ ioProx RFIDs...            }"},
+       {"indala",      CmdLFINDALA,        1, "{ Indala RFIDs...            }"},
+       {"jablotron",   CmdLFJablotron,     1, "{ Jablotron RFIDs...         }"},
+       {"nexwatch",    CmdLFNexWatch,      1, "{ NexWatch RFIDs...          }"},
+       {"noralsy",     CmdLFNoralsy,       1, "{ Noralsy RFIDs...           }"},
+       {"paradox",     CmdLFParadox,       1, "{ Paradox RFIDs...           }"},
+       {"presco",      CmdLFPresco,        1, "{ Presco RFIDs...            }"},
+       {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 CHIPs...           }"},

        {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
        {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},

-       {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs...   }"},
-       {"ti",          CmdLFTI,            1, "{ TI RFIDs...      }"},
-       {"viking",      CmdLFViking,        1, "{ Viking tags...   }"},
-       {"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...}"},
+       {"securakey",   CmdLFSecurakey,     1, "{ Securakey RFIDs...         }"},
+       {"t55xx",       CmdLFT55XX,         1, "{ T55xx CHIPs...             }"},
+       {"ti",          CmdLFTI,            1, "{ TI CHIPs...                }"},
+       {"viking",      CmdLFViking,        1, "{ Viking RFIDs...            }"},
+       {"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs...          }"},

        {"cmdread",     CmdLFCommandRead,   0, "<d period> <z period> <o period> <c command> ['H'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'H' for 134)"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
        {"cmdread",     CmdLFCommandRead,   0, "<d period> <z period> <o period> <c command> ['H'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'H' for 134)"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},