Resolved Conflicts

[proxmark3-svn] / armsrc / apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index d1c885ab0af17bc24a686a4b3098a0c8d6bad3de..4d9a1482c02aa920d2a5c2ad654447abf49ec9ec 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -89,6 +89,7 @@ void TurnReadLFOn();
 //void T55xxReadTrace(void);
 void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode);
 void EM4xWriteWord(uint32_t flag, uint32_t Data, uint32_t Pwd);
+void EM4xProtect(uint32_t flag, uint32_t Data, uint32_t Pwd);
 void Cotag(uint32_t arg0);
 
 /// iso14443.h