Merge branch 'master' into fix_iso15693_fpga

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 73b0bc76f4a4bead86536ec3eb389e170698d567..5aeb7ce4bcc4fdf40658d43925791e9d5e88735c 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -50,7 +50,7 @@ int CmdHFSearch(const char *Cmd){
                PrintAndLog("\nValid ISO14443A Tag Found - Quiting Search\n");
                return ans;
        }
-       ans = HFiClassReader("", false, false);
+       ans = HFiClassReader(false, false);
        if (ans) {
                PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
                return ans;
@@ -61,11 +61,16 @@ int CmdHFSearch(const char *Cmd){
                return ans;
        }
        //14b is longest test currently (and rarest chip type) ... put last
-       ans = HF14BInfo(false);
+       ans = infoHF14B(false);
        if (ans) {
                PrintAndLog("\nValid ISO14443B Tag Found - Quiting Search\n");
                return ans;
        }
+       ans = CmdLegicRFRead("");
+       if (ans == 0) {
+               PrintAndLog("\nValid Legic Tag Found - Quiting Search\n");
+               return ans;
+       }
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");
        return 0;
 }