X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c981c53ff3509b2f3a46d980fd8297006fbb2461..3f84d473698a65e37504ec873905d248edef0f5d:/armsrc/mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 775a2036..c07bc579 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -8,11 +8,21 @@
 //-----------------------------------------------------------------------------
 // code for work with mifare cards.
 //-----------------------------------------------------------------------------
-#include "crapto1.h"
 
 #ifndef __MIFAREUTIL_H
 #define __MIFAREUTIL_H
 
+#include "proxmark3.h"
+#include "apps.h"
+#include "parity.h"
+#include "util.h"
+#include "string.h"
+#include "iso14443crc.h"
+#include "iso14443a.h"
+#include "crapto1.h"
+#include "des.h"
+#include "random.h"			// fast_prand, prand
+
 // mifare authentication
 #define CRYPT_NONE    0
 #define CRYPT_ALL     1
@@ -20,18 +30,6 @@
 #define AUTH_FIRST    0	
 #define AUTH_NESTED   2
 
-// reader voltage field detector
-#define MF_MINFIELDV      4000
-
-// debug
-// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode
-#define MF_DBG_NONE          0
-#define MF_DBG_ERROR         1
-#define MF_DBG_ALL           2
-#define MF_DBG_EXTENDED      4
-
-extern int MF_DBGLEVEL;
-
 //mifare emulator states
 #define MFEMUL_NOFIELD      0
 #define MFEMUL_IDLE         1