Add ntag 210, 212, 203 and bug fix

[proxmark3-svn] / client / cmdhfmfu.h

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 23f97cac37a22db5c34d94464d0d9072fed793ac..4087b3114548c0527a942926bd4eb53cabe172d0 100644 (file)
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -15,17 +15,16 @@ int CmdHF14AMfucAuth(const char *Cmd);
 
 //general stuff
 int CmdHF14AMfUDump(const char *Cmd);
-void rol (uint8_t *data, const size_t len);
-
-uint8_t requestAuthentication( uint8_t *nonce);
-int try3DesAuthentication( uint8_t *key);
+int CmdHF14AMfUInfo(const char *Cmd);
 uint16_t GetHF14AMfU_Type(void);
+
 int ul_print_type(uint16_t tagtype, uint8_t spacer);
+void ul_switch_off_field(void);
 
 int usage_hf_mfu_dump(void);
+int usage_hf_mfu_info(void);
 
 int CmdHFMFUltra(const char *Cmd);
-int CmdHF14AMfUInfo(const char *Cmd);
 
 typedef enum TAGTYPE_UL {
        UNKNOWN       = 0x0000,
@@ -34,14 +33,17 @@ typedef enum TAGTYPE_UL {
        UL_EV1_48     = 0x0004,
        UL_EV1_128    = 0x0008,
        NTAG          = 0x0010,
-       NTAG_213      = 0x0020,
-       NTAG_215      = 0x0040,
-       NTAG_216      = 0x0080,
-       MY_D          = 0x0100,
-       MY_D_NFC      = 0x0200,
-       MY_D_MOVE     = 0x0400,
-       MY_D_MOVE_NFC = 0x0800,
-       MAGIC         = 0x1000,
+       NTAG_203      = 0x0020,
+       NTAG_210      = 0x0040,
+       NTAG_212      = 0x0080,
+       NTAG_213      = 0x0100,
+       NTAG_215      = 0x0200,
+       NTAG_216      = 0x0400,
+       MY_D          = 0x0800,
+       MY_D_NFC      = 0x1000,
+       MY_D_MOVE     = 0x2000,
+       MY_D_MOVE_NFC = 0x4000,
+       MAGIC         = 0x8000,
        UL_MAGIC      = UL | MAGIC,
        UL_C_MAGIC    = UL_C | MAGIC,
        UL_ERROR      = 0xFFFF,