CHG: moved includes into header file where it belong

[proxmark3-svn] / client / cmdhf14b.h

diff --git a/client/cmdhf14b.h b/client/cmdhf14b.h
index 66fd430f2bef20b110fe07f095a30cfb3a0a391e..873e2d511c9b980cfe72af86de44816f2547b324 100644 (file)
--- a/client/cmdhf14b.h
+++ b/client/cmdhf14b.h
@@ -11,17 +11,46 @@
 #ifndef CMDHF14B_H__
 #define CMDHF14B_H__
 
-int CmdHF14B(const char *Cmd);
+#include "iso14443crc.h"
+#include "proxmark3.h"
+#include "data.h"
+#include "graph.h"
+#include "util.h"
+#include "ui.h"
+#include "cmdparser.h"
+#include "cmdmain.h"
+#include "cmdhf14a.h"
+#include "tea.h"
+#include "cmdhf.h"
+#include "prng.h"
+#include "sha1.h"
+#include "mifare.h"            // structs/enum for ISO14B
+#include "protocols.h" // definitions of ISO14B protocol
+
 
-int CmdHF14BDemod(const char *Cmd);
+int usage_hf_14b_info(void);
+int usage_hf_14b_reader(void);
+int usage_hf_14b_raw(void);
+int usage_hf_14b_snoop(void);
+int usage_hf_14b_sim(void);
+int usage_hf_14b_read_srx(void);
+int usage_hf_14b_write_srx(void);
+
+int CmdHF14B(const char *Cmd);
 int CmdHF14BList(const char *Cmd);
-int CmdHF14BReader(const char *Cmd);
-int HF14BReader(bool verbose);
-int CmdHF14Sim(const char *Cmd);
-int CmdHFSimlisten(const char *Cmd);
+int CmdHF14BInfo(const char *Cmd);
+int CmdHF14BSim(const char *Cmd);
 int CmdHF14BSnoop(const char *Cmd);
-int CmdSri512Read(const char *Cmd);
-int CmdSrix4kRead(const char *Cmd);
 int CmdHF14BWrite( const char *cmd);
+int CmdHF14BReader(const char *Cmd);
+
+bool HF14BInfo(bool verbose);
+bool HF14BReader(bool verbose);
+int CmdHF14BCmdRaw (const char *Cmd);
+
+// SRi  ST Microelectronics read/write 
+int CmdHF14BReadSri(const char *Cmd);
+int CmdHF14BWriteSri(const char *Cmd);
 
+bool waitCmd(bool verbose);
 #endif