X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/75465377b93c9a27450a186342e9cfd2a84b4173..c81a80dc9631071f854e03129de389df788ac7d1:/client/cmdhfmfu.h?ds=sidebyside

diff --git a/client/cmdhfmfu.h b/client/cmdhfmfu.h
index 20f25d1d..9da0bb53 100644
--- a/client/cmdhfmfu.h
+++ b/client/cmdhfmfu.h
@@ -1,16 +1,54 @@
 #include "cmdhfmf.h"
+#include "cmdhf14a.h"
+
+#ifndef CMDHFMFU_H__
+#define CMDHFMFU_H__
 
 //standard ultralight
 int CmdHF14AMfUWrBl(const char *Cmd);
 int CmdHF14AMfURdBl(const char *Cmd);
-int CmdHF14AMfURdCard(const char *Cmd);
-int CmdHF14AMfUDump(const char *Cmd);
+
 //Crypto Cards
 int CmdHF14AMfUCRdBl(const char *Cmd);
 int CmdHF14AMfUCRdCard(const char *Cmd);
-int CmdHF14AMfUCDump(const char *Cmd);
 int CmdHF14AMfucAuth(const char *Cmd);
-void rol (uint8_t *data, const size_t len);
 
 //general stuff
+int CmdHF14AMfUDump(const char *Cmd);
+int CmdHF14AMfUInfo(const char *Cmd);
+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 CmdHFMFUltra(const char *Cmd);
+
+typedef enum TAGTYPE_UL {
+	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      = 0xFFFFFF,
+} TagTypeUL_t;
+
+#endif