Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts: armsrc/iclass.c
2015-02-16 18:59:44 +01:00
parent 6af88242eb e80aeb9695
commit d716ca2fc1
8 changed files with 329 additions and 239 deletions
--- a/include/usb_cmd.h
+++ b/include/usb_cmd.h
@@ -132,6 +132,7 @@ typedef struct{
 #define CMD_READER_ICLASS                                                 0x0394
 #define CMD_READER_ICLASS_REPLAY										  0x0395
 #define CMD_ICLASS_ISO14443A_WRITE										  0x0397
+#define CMD_ICLASS_EML_MEMSET                                             0x0398

 // For measurements of the antenna tuning
 #define CMD_MEASURE_ANTENNA_TUNING                                        0x0400