Merge remote-tracking branch 'upstream/master'

[proxmark3-svn] / client / cmdlfem4x.h

diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index a209e8f92d9b3791fab4e52a3db208804429a2b6..7faf6f49f4c7892cf9c5e0383e0bd625c72cafef 100644 (file)
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -11,16 +11,21 @@
 #ifndef CMDLFEM4X_H__
 #define CMDLFEM4X_H__
 
 #ifndef CMDLFEM4X_H__
 #define CMDLFEM4X_H__
 

-int CmdLFEM4X(const char *Cmd);
-
+int CmdEMdemodASK(const char *Cmd);

 int CmdEM410xRead(const char *Cmd);
 int CmdEM410xSim(const char *Cmd);
 int CmdEM410xWatch(const char *Cmd);
 int CmdEM410xRead(const char *Cmd);
 int CmdEM410xSim(const char *Cmd);
 int CmdEM410xWatch(const char *Cmd);

+int CmdEM410xWatchnSpoof(const char *Cmd);

 int CmdEM410xWrite(const char *Cmd);
 int CmdEM4x50Read(const char *Cmd);
 int CmdEM410xWrite(const char *Cmd);
 int CmdEM4x50Read(const char *Cmd);

-int CmdReadWord(const char *Cmd);
-int CmdReadWordPWD(const char *Cmd);
-int CmdWriteWord(const char *Cmd);
-int CmdWriteWordPWD(const char *Cmd);
+int EM4x50Read(const char *Cmd, bool verbose);
+int CmdLFEM4X(const char *Cmd);
+bool EM4x05Block0Test(uint32_t *wordData);
+int CmdEM4x05info(const char *Cmd);
+int CmdEM4x05WriteWord(const char *Cmd);
+int CmdEM4x05dump(const char *Cmd);
+int CmdEM4x05ReadWord(const char *Cmd);
+int EM4x05ReadWord_ext(uint8_t addr, uint32_t pwd, bool usePwd, uint32_t *wordData);
+

 
 #endif
 
 #endif