CHG: some minor changes from @marshmellow42

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index f59ab8068e1fe04c83f8d1d867bbd1953631b925..c07bc579e446cd08b362f4caf3c92884234b7256 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -12,16 +12,16 @@
 #ifndef __MIFAREUTIL_H\r
 #define __MIFAREUTIL_H\r
 \r
-\r
 #include "proxmark3.h"\r
 #include "apps.h"\r
+#include "parity.h"\r
 #include "util.h"\r
 #include "string.h"\r
 #include "iso14443crc.h"\r
 #include "iso14443a.h"\r
 #include "crapto1.h"\r
-#include "parity.h"\r
-//#include "des.h"\r
+#include "des.h"\r
+#include "random.h"                    // fast_prand, prand\r
 \r
 // mifare authentication\r
 #define CRYPT_NONE    0\r
@@ -30,18 +30,6 @@
 #define AUTH_FIRST    0        \r
 #define AUTH_NESTED   2\r
 \r
-// reader voltage field detector\r
-#define MF_MINFIELDV      4000\r
-\r
-// debug\r
-// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode\r
-#define MF_DBG_NONE          0\r
-#define MF_DBG_ERROR         1\r
-#define MF_DBG_ALL           2\r
-#define MF_DBG_EXTENDED      4\r
-\r
-extern int MF_DBGLEVEL;\r
-\r
 //mifare emulator states\r
 #define MFEMUL_NOFIELD      0\r
 #define MFEMUL_IDLE         1\r