Merge some PM3 master commits. Had to re-make the StandAloneMode to work with flags...

[proxmark3-svn] / armsrc / apps.h

diff --git a/armsrc/apps.h b/armsrc/apps.h
index bb777eab552c292fd1b384e7d3fc354736bedf56..5eff451159ff924bdc03d29eed0e14d12ad67ebc 100644 (file)
--- a/armsrc/apps.h
+++ b/armsrc/apps.h
@@ -21,6 +21,7 @@
 #include "lfdemod.h"
 #include "BigBuf.h"
 #include "fpgaloader.h"
+#include "usb_cdc.h"
 #include "hitag2.h"
 #include "mifare.h"
 //#include "des.h"
@@ -105,7 +106,7 @@ void SendRawCommand14443B(uint32_t, uint32_t, uint8_t, uint8_t[]);
 
 /// iso14443a.h
 void RAMFUNC SniffIso14443a(uint8_t param);
-void SimulateIso14443aTag(int tagType, int uid_1st, int uid_2nd, byte_t* data);
+void SimulateIso14443aTag(int tagType, int flags, byte_t* data);
 void ReaderIso14443a(UsbCommand * c);
 // Also used in iclass.c
 bool RAMFUNC LogTrace(const uint8_t *btBytes, uint16_t len, uint32_t timestamp_start, uint32_t timestamp_end, uint8_t *parity, bool readerToTag);