fix headers

diff --git a/client/cmddata.h b/client/cmddata.h
index 3d803d4217dc36279cb40f6a75bff668c106f2f9..b708dd07cd0aec6f5f473e3b943ca00431f6e691 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -35,7 +35,6 @@ int CmdBuffClear(const char *Cmd);
 int CmdDec(const char *Cmd);
 int CmdDetectClockRate(const char *Cmd);
 int CmdFDXBdemodBI(const char *Cmd);
 int CmdDec(const char *Cmd);
 int CmdDetectClockRate(const char *Cmd);
 int CmdFDXBdemodBI(const char *Cmd);

-int CmdFSKdemodAWID(const char *Cmd);

 int CmdFSKdemodIO(const char *Cmd);
 int CmdFSKdemodParadox(const char *Cmd);
 int CmdFSKdemodPyramid(const char *Cmd);
 int CmdFSKdemodIO(const char *Cmd);
 int CmdFSKdemodParadox(const char *Cmd);
 int CmdFSKdemodPyramid(const char *Cmd);

diff --git a/client/cmdlfawid.c b/client/cmdlfawid.c
index 060ecb682e395be8d3aa38982bf9b7c0d1b9b2ef..648966f3e5592258bf5a3f4e107c9ac5a76e3c90 100644 (file)
--- a/client/cmdlfawid.c
+++ b/client/cmdlfawid.c
@@ -15,7 +15,6 @@
 #include "proxmark3.h"  // Definitions, USB controls, etc
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp
 #include "proxmark3.h"  // Definitions, USB controls, etc
 #include "ui.h"         // PrintAndLog
 #include "cmdparser.h"  // CmdsParse, CmdsHelp

-#include "cmdlfawid.h"  // AWID function declarations

 #include "lfdemod.h"    // parityTest +
 #include "util.h"       // weigandparity
 #include "protocols.h"  // for T55xx config register definitions
 #include "lfdemod.h"    // parityTest +
 #include "util.h"       // weigandparity
 #include "protocols.h"  // for T55xx config register definitions

diff --git a/client/cmdlfawid.h b/client/cmdlfawid.h
index 006229273ae597796a58763f82d7667000910d85..480c828b3311d0242fa5184913ac8ce86f418465 100644 (file)
--- a/client/cmdlfawid.h
+++ b/client/cmdlfawid.h
@@ -12,10 +12,10 @@
 #define CMDLFAWID_H__
 
 int CmdLFAWID(const char *Cmd);
 #define CMDLFAWID_H__
 
 int CmdLFAWID(const char *Cmd);

-//int CmdAWIDDemod(const char *Cmd);
-int CmdAWIDDemodFSK(const char *Cmd);
+int CmdAWIDReadFSK(const char *Cmd);

 int CmdAWIDSim(const char *Cmd);
 int CmdAWIDClone(const char *Cmd);
 int CmdAWIDSim(const char *Cmd);
 int CmdAWIDClone(const char *Cmd);

+int CmdFSKdemodAWID(const char *Cmd);

 int getAWIDBits(unsigned int fc, unsigned int cn, uint8_t *AWIDBits);
 int usage_lf_awid_fskdemod(void);
 int usage_lf_awid_clone(void);
 int getAWIDBits(unsigned int fc, unsigned int cn, uint8_t *AWIDBits);
 int usage_lf_awid_fskdemod(void);
 int usage_lf_awid_clone(void);

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index 892f70a903fa8e921a4a0f2368ca9597c74a78ae..68e9b07f6dc29891f97b51e2dde50eac0d5b1247 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -14,7 +14,6 @@
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"
 #include "ui.h"
 #include "graph.h"
 #include "cmdparser.h"

-//#include "cmdlfhid.h"

 #include "cmddata.h"  //for g_debugMode, demodbuff cmds
 #include "lfdemod.h" // for HIDdemodFSK
 
 #include "cmddata.h"  //for g_debugMode, demodbuff cmds
 #include "lfdemod.h" // for HIDdemodFSK