CHG: Moved some includes, defines, structs from .c into header file.

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 1939b92bdca16ca1c8e76a0deca7cd6da57b8454..72c1e897899f9cbad95354bb035e0fdfd3da07f4 100644 (file)
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -8,17 +8,10 @@
 // mifare commands\r
 //-----------------------------------------------------------------------------\r
 \r
 // mifare commands\r
 //-----------------------------------------------------------------------------\r
 \r

-#include <stdio.h>\r
-#include <stdlib.h> \r
-#include <string.h>\r
-#include <pthread.h>\r

 #include "mifarehost.h"\r
 #include "mifarehost.h"\r

-#include "proxmark3.h"\r
-//#include "radixsort.h"\r
-#include <time.h>\r

 \r
 // MIFARE\r
 \r
 // MIFARE\r

-int compar_int(const void * a, const void * b) {\r
+extern int compar_int(const void * a, const void * b) {\r

        // didn't work: (the result is truncated to 32 bits)\r
        //return (*(uint64_t*)b - *(uint64_t*)a);\r
 \r
        // didn't work: (the result is truncated to 32 bits)\r
        //return (*(uint64_t*)b - *(uint64_t*)a);\r
 \r


@@ -44,25 +37,6 @@ int Compare16Bits(const void * a, const void * b) {
 */\r
 }\r
 \r
 */\r
 }\r
 \r

-typedef \r
-       struct {\r
-               union {\r
-                       struct Crypto1State *slhead;\r
-                       uint64_t *keyhead;\r
-               } head;\r
-               union {\r
-                       struct Crypto1State *sltail;\r
-                       uint64_t *keytail;\r
-               } tail;\r
-               uint32_t len;\r
-               uint32_t uid;\r
-               uint32_t blockNo;\r
-               uint32_t keyType;\r
-               uint32_t nt;\r
-               uint32_t ks1;\r
-       } StateList_t;\r
-\r
-\r

 // wrapper function for multi-threaded lfsr_recovery32\r
 void* nested_worker_thread(void *arg)\r
 {\r
 // wrapper function for multi-threaded lfsr_recovery32\r
 void* nested_worker_thread(void *arg)\r
 {\r

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 2355017cab9b03a4fdafbd0e2631f13a39940d6d..16c84264db1d0d02f346650441bad2fc58176e8a 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -11,17 +11,21 @@
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <unistd.h>\r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <unistd.h>\r

+#include <string.h>\r
+#include <pthread.h>\r
+#include "proxmark3.h"\r
+//#include "radixsort.h"\r
+#include <time.h>\r

 #include "common.h"\r
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r
 #include "util.h"\r
 #include "common.h"\r
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r
 #include "util.h"\r

-#include "nonce2key/nonce2key.h"\r
+//#include "nonce2key/nonce2key.h"\r

 #include "nonce2key/crapto1.h"\r
 #include "iso14443crc.h"\r
 #include "protocols.h"\r
 \r
 #include "nonce2key/crapto1.h"\r
 #include "iso14443crc.h"\r
 #include "protocols.h"\r
 \r

-#define MEM_CHUNK               1000000\r

 #define NESTED_SECTOR_RETRY     10\r
 \r
 // mifare tracer flags\r
 #define NESTED_SECTOR_RETRY     10\r
 \r
 // mifare tracer flags\r


@@ -32,15 +36,31 @@
 #define TRACE_READ_DATA                0x04\r
 #define TRACE_WRITE_OK                 0x05\r
 #define TRACE_WRITE_DATA               0x06\r
 #define TRACE_READ_DATA                0x04\r
 #define TRACE_WRITE_OK                 0x05\r
 #define TRACE_WRITE_DATA               0x06\r

-\r

 #define TRACE_ERROR                            0xFF\r
 \r
 #define TRACE_ERROR                            0xFF\r
 \r

+typedef struct {\r
+               union {\r
+                       struct Crypto1State *slhead;\r
+                       uint64_t *keyhead;\r
+               } head;\r
+               union {\r
+                       struct Crypto1State *sltail;\r
+                       uint64_t *keytail;\r
+               } tail;\r
+               uint32_t len;\r
+               uint32_t uid;\r
+               uint32_t blockNo;\r
+               uint32_t keyType;\r
+               uint32_t nt;\r
+               uint32_t ks1;\r
+} StateList_t;\r
+       \r

 typedef struct {\r
        uint64_t Key[2];\r
        int foundKey[2];\r
 } sector;\r
  \r
 typedef struct {\r
        uint64_t Key[2];\r
        int foundKey[2];\r
 } sector;\r
  \r

-int compar_int(const void * a, const void * b);\r
+extern int compar_int(const void * a, const void * b);\r

 extern char logHexFileName[FILE_PATH_SIZE];\r
 \r
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);\r
 extern char logHexFileName[FILE_PATH_SIZE];\r
 \r
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);\r