Merge branch 'master' of https://github.com/Proxmark/proxmark3

[proxmark3-svn] / client / cmdhfmfu.h

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 27f9f9ca076da49a0bc0c5744ec8f73769ae10b0..4ec48ff9dfbcb07c9d7768c3a589c20f2a8b7163 100644 (file)
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -4,25 +4,24 @@
 #ifndef CMDHFMFU_H__
 #define CMDHFMFU_H__
 
-//standard ultralight
 int CmdHF14AMfUWrBl(const char *Cmd);
 int CmdHF14AMfURdBl(const char *Cmd);
 
 //Crypto Cards
-int CmdHF14AMfUCRdBl(const char *Cmd);
-int CmdHF14AMfUCRdCard(const char *Cmd);
 int CmdHF14AMfucAuth(const char *Cmd);
 
 //general stuff
 int CmdHF14AMfUDump(const char *Cmd);
 int CmdHF14AMfUInfo(const char *Cmd);
-uint32_t GetHF14AMfU_Type(void);
 
-int ul_print_type(uint16_t tagtype, uint8_t spacer);
+uint32_t GetHF14AMfU_Type(void);
+int ul_print_type(uint32_t tagtype, uint8_t spacer);
 void ul_switch_off_field(void);
 
 int usage_hf_mfu_dump(void);
 int usage_hf_mfu_info(void);
+int usage_hf_mfu_rdbl(void);
+int usage_hf_mfu_wrbl(void);
 
 int CmdHFMFUltra(const char *Cmd);
 
@@ -33,9 +32,9 @@ typedef enum TAGTYPE_UL {
        UL_EV1_48     = 0x000004,
        UL_EV1_128    = 0x000008,
        NTAG          = 0x000010,
-       NTAG_203          = 0x000020,
-       NTAG_210          = 0x000040,
-       NTAG_212          = 0x000080,
+       NTAG_203      = 0x000020,
+       NTAG_210      = 0x000040,
+       NTAG_212      = 0x000080,
        NTAG_213      = 0x000100,
        NTAG_215      = 0x000200,
        NTAG_216      = 0x000400,
@@ -43,12 +42,12 @@ typedef enum TAGTYPE_UL {
        MY_D_NFC      = 0x001000,
        MY_D_MOVE     = 0x002000,
        MY_D_MOVE_NFC = 0x004000,
-       NTAG_I2C_1K       = 0x008000,
-       NTAG_I2C_2K       = 0x010000,
+       NTAG_I2C_1K   = 0x008000,
+       NTAG_I2C_2K   = 0x010000,
        MAGIC         = 0x020000,
        UL_MAGIC      = UL | MAGIC,
        UL_C_MAGIC    = UL_C | MAGIC,
-       UL_ERROR      = 0xFFFF,
+       UL_ERROR      = 0xFFFFFF,
 } TagTypeUL_t;
 
 #endif