From af4308b97b5973fa2165f39797626e79c5f2f806 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Sun, 31 Jul 2016 22:00:49 +0200
Subject: [PATCH] CHG:  Moved some includes, defines, structs from .c into
 header file.

---
 client/mifarehost.c | 28 +---------------------------
 client/mifarehost.h | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/client/mifarehost.c b/client/mifarehost.c
index 1939b92b..72c1e897 100644
--- a/client/mifarehost.c
+++ b/client/mifarehost.c
@@ -8,17 +8,10 @@
 // mifare commands
 //-----------------------------------------------------------------------------
 
-#include <stdio.h>
-#include <stdlib.h> 
-#include <string.h>
-#include <pthread.h>
 #include "mifarehost.h"
-#include "proxmark3.h"
-//#include "radixsort.h"
-#include <time.h>
 
 // MIFARE
-int compar_int(const void * a, const void * b) {
+extern int compar_int(const void * a, const void * b) {
 	// didn't work: (the result is truncated to 32 bits)
 	//return (*(uint64_t*)b - *(uint64_t*)a);
 
@@ -44,25 +37,6 @@ int Compare16Bits(const void * a, const void * b) {
 */
 }
 
-typedef 
-	struct {
-		union {
-			struct Crypto1State *slhead;
-			uint64_t *keyhead;
-		} head;
-		union {
-			struct Crypto1State *sltail;
-			uint64_t *keytail;
-		} tail;
-		uint32_t len;
-		uint32_t uid;
-		uint32_t blockNo;
-		uint32_t keyType;
-		uint32_t nt;
-		uint32_t ks1;
-	} StateList_t;
-
-
 // wrapper function for multi-threaded lfsr_recovery32
 void* nested_worker_thread(void *arg)
 {
diff --git a/client/mifarehost.h b/client/mifarehost.h
index 2355017c..16c84264 100644
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -11,17 +11,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+#include "proxmark3.h"
+//#include "radixsort.h"
+#include <time.h>
 #include "common.h"
 #include "cmdmain.h"
 #include "ui.h"
 #include "data.h"
 #include "util.h"
-#include "nonce2key/nonce2key.h"
+//#include "nonce2key/nonce2key.h"
 #include "nonce2key/crapto1.h"
 #include "iso14443crc.h"
 #include "protocols.h"
 
-#define MEM_CHUNK               1000000
 #define NESTED_SECTOR_RETRY     10
 
 // mifare tracer flags
@@ -32,15 +36,31 @@
 #define TRACE_READ_DATA 		0x04
 #define TRACE_WRITE_OK			0x05
 #define TRACE_WRITE_DATA		0x06
-
 #define TRACE_ERROR		 		0xFF
 
+typedef struct {
+		union {
+			struct Crypto1State *slhead;
+			uint64_t *keyhead;
+		} head;
+		union {
+			struct Crypto1State *sltail;
+			uint64_t *keytail;
+		} tail;
+		uint32_t len;
+		uint32_t uid;
+		uint32_t blockNo;
+		uint32_t keyType;
+		uint32_t nt;
+		uint32_t ks1;
+} StateList_t;
+	
 typedef struct {
 	uint64_t Key[2];
 	int foundKey[2];
 } sector;
  
-int compar_int(const void * a, const void * b);
+extern int compar_int(const void * a, const void * b);
 extern char logHexFileName[FILE_PATH_SIZE];
 
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);
-- 
2.39.2