CHG; still looking at 14b, this time started to look at the tracelog times not working.

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index 8f4c68d50bd08c54bece5324cab1a3e11d9ecf48..e1a203e7571513409f92a72df48ded780095ede3 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -275,12 +275,11 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize)
                                case 2: snprintf(exp, size,"4 slots ");break;
                                case 3: snprintf(exp, size,"8 slots ");break;
                                default: snprintf(exp, size,"16 slots ");break;
-                       }
-                       
-                       if ( (cmd[2] & 0x4) )
-                               snprintf(exp, size,"REQB");
-                       else
+                       }                       
+                       if ( (cmd[2] & 0x8) )
                                snprintf(exp, size,"WUPB");
+                       else
+                               snprintf(exp, size,"REQB");
                        break;
                }
                case ISO14443B_ATTRIB           : snprintf(exp,size,"ATTRIB");break;
@@ -790,7 +789,7 @@ static command_t CommandTable[] = {
        {"14b",         CmdHF14B,         1, "{ ISO14443B RFIDs... }"},
        {"15",          CmdHF15,          1, "{ ISO15693 RFIDs... }"},
        {"epa",         CmdHFEPA,         1, "{ German Identification Card... }"},
-       {"legic",       CmdHFLegic,       0, "{ LEGIC RFIDs... }"},
+       {"legic",       CmdHFLegic,       1, "{ LEGIC RFIDs... }"},
        {"iclass",      CmdHFiClass,      1, "{ ICLASS RFIDs... }"},
        {"mf",          CmdHFMF,                  1, "{ MIFARE RFIDs... }"},
        {"mfu",         CmdHFMFUltra,     1, "{ MIFARE Ultralight RFIDs... }"},