X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/29250969b0e2762fca3cbfa24e0648f29b21407d..e61530408c4b3605390748fc544b5afcfda996a3:/client/cmdhfmfu.h?ds=inline diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h index 53342219..83f28403 100644 --- a/client/cmdhfmfu.h +++ b/client/cmdhfmfu.h @@ -16,9 +16,9 @@ int CmdHF14AMfucAuth(const char *Cmd); //general stuff int CmdHF14AMfUDump(const char *Cmd); int CmdHF14AMfUInfo(const char *Cmd); -uint16_t GetHF14AMfU_Type(void); +uint32_t GetHF14AMfU_Type(void); -int ul_print_type(uint16_t tagtype, uint8_t spacer); +int ul_print_type(uint32_t tagtype, uint8_t spacer); void ul_switch_off_field(void); int usage_hf_mfu_dump(void); @@ -27,23 +27,28 @@ int usage_hf_mfu_info(void); int CmdHFMFUltra(const char *Cmd); typedef enum TAGTYPE_UL { - UNKNOWN = 0x0000, - UL = 0x0001, - UL_C = 0x0002, - 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, + UNKNOWN = 0x000000, + UL = 0x000001, + UL_C = 0x000002, + UL_EV1_48 = 0x000004, + UL_EV1_128 = 0x000008, + NTAG = 0x000010, + NTAG_203 = 0x000020, + NTAG_210 = 0x000040, + NTAG_212 = 0x000080, + NTAG_213 = 0x000100, + NTAG_215 = 0x000200, + NTAG_216 = 0x000400, + MY_D = 0x000800, + MY_D_NFC = 0x001000, + MY_D_MOVE = 0x002000, + MY_D_MOVE_NFC = 0x004000, + 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