Merge pull request #243 from pwpiwi/cleanup

Deduplicate mfkey32 and mfkey64

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 648966f3e5592258bf5a3f4e107c9ac5a76e3c90..c60b7a57a4c2fbe8b69511c4bf03be22a880a402 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <stdio.h>      // sscanf
 #include "proxmark3.h"  // Definitions, USB controls, etc
+#include "cmdlfawid.h"
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "lfdemod.h"    // parityTest +

diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index 480c828b3311d0242fa5184913ac8ce86f418465..699465a81a35373bea2696cc2e568b29d3447382 100644 (file)
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -11,6 +11,8 @@
 #ifndef CMDLFAWID_H__
 #define CMDLFAWID_H__
 
+#include <stdint.h>  // for uint_32+
+
 int CmdLFAWID(const char *Cmd);
 int CmdAWIDReadFSK(const char *Cmd);
 int CmdAWIDSim(const char *Cmd);

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 12300955da5172f6186cb5ca6d240ea1ae11183e..1dfab39430704b191e18aeca498097665a06357a 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
+#include "cmdlfem4x.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"

diff --git a/client/cmdlfem4x.h b/client/cmdlfem4x.h
index ff8e1c4df39859a04700e646fa0c5e60f0f60a26..cdb59acd21fe85d3f66b952c018dd873d24a72d2 100644 (file)
--- a/client/cmdlfem4x.h
+++ b/client/cmdlfem4x.h
@@ -11,6 +11,8 @@
 #ifndef CMDLFEM4X_H__
 #define CMDLFEM4X_H__
 
+#include <stdbool.h>    // for bool
+
 extern int CmdLFEM4X(const char *Cmd);
 extern void printEM410x(uint32_t hi, uint64_t id);
 extern int CmdEMdemodASK(const char *Cmd);

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 68e9b07f6dc29891f97b51e2dde50eac0d5b1247..a4b49481447601214d1be2f9b5da5e8d71054fe1 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -10,6 +10,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "cmdlfhid.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"

diff --git a/client/cmdlfio.c b/client/cmdlfio.c
index 626fe63973bcaa9b3ca30ee28364403d3c5840a8..1b43d7dd9c0faf4f74910917665803d1d102c727 100644 (file)
--- a/client/cmdlfio.c
+++ b/client/cmdlfio.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <limits.h>
+#include "cmdlfio.h"
 #include "proxmark3.h"
 #include "data.h"
 #include "graph.h"

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index d1b4c293e396044a5eba952b15155407a835ba31..613a0b66a61cb7913328cc201756b8eab1ab5107 100644 (file)
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -9,6 +9,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include <stdio.h>
+#include "cmdlfpyramid.h"
 #include "proxmark3.h"
 #include "ui.h"
 #include "util.h"

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index edbc35009029a3b1b4f2a6d074f0559d554c1bd2..601c29f22e712de36a07d9111c5764cced73b70c 100644 (file)
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <inttypes.h>
 #include "proxmark3.h"
+#include "cmdlfviking.h"
 #include "ui.h"
 #include "util.h"
 #include "graph.h"