fix another way

[proxmark3-svn] / client / cmddata.h

diff --git a/client/cmddata.h b/client/cmddata.h
index 052bce060bb056e806e6637d63ec45a9da996847..0484acdbe44ed58346e3d1598b47812bef1dc294 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -11,32 +11,29 @@
 #ifndef CMDDATA_H__
 #define CMDDATA_H__
 
 #ifndef CMDDATA_H__
 #define CMDDATA_H__
 

+#include <stdlib.h>  //size_t
+#include <stdint.h>  //uint_32+
+#include <stdbool.h> //bool
+
+#include "cmdparser.h" // for command_t
+

 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);
 void printDemodBuff(void);
 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);
 void printDemodBuff(void);

-void printBitStream(uint8_t BitStream[], uint32_t bitLen);

 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);
 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx);

-int CmdAmp(const char *Cmd);
-int Cmdaskdemod(const char *Cmd);
-int CmdAskEM410xDemod(const char *Cmd);
-int CmdG_Prox_II_Demod(const char *Cmd);
+bool getDemodBuf(uint8_t *buff, size_t *size);
+void save_restoreDB(uint8_t saveOpt);// option '1' to save DemodBuffer any other to restore
+int CmdPrintDemodBuff(const char *Cmd);

 int Cmdaskrawdemod(const char *Cmd);
 int Cmdaskmandemod(const char *Cmd);
 int Cmdaskrawdemod(const char *Cmd);
 int Cmdaskmandemod(const char *Cmd);

-int AutoCorrelate(int window, bool SaveGrph, bool verbose);
+int AutoCorrelate(const int *in, int *out, size_t len, int window, bool SaveGrph, bool verbose);

 int CmdAutoCorr(const char *Cmd);
 int CmdBiphaseDecodeRaw(const char *Cmd);
 int CmdBitsamples(const char *Cmd);
 int CmdAutoCorr(const char *Cmd);
 int CmdBiphaseDecodeRaw(const char *Cmd);
 int CmdBitsamples(const char *Cmd);

-int CmdBitstream(const char *Cmd);

 int CmdBuffClear(const char *Cmd);
 int CmdDec(const char *Cmd);
 int CmdDetectClockRate(const char *Cmd);
 int CmdBuffClear(const char *Cmd);
 int CmdDec(const char *Cmd);
 int CmdDetectClockRate(const char *Cmd);

-int CmdFSKdemodAWID(const char *Cmd);
-int CmdFSKdemod(const char *Cmd);
-int CmdFSKdemodHID(const char *Cmd);
-int CmdFSKdemodIO(const char *Cmd);
-int CmdFSKdemodParadox(const char *Cmd);
-int CmdFSKdemodPyramid(const char *Cmd);

 int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
 int CmdPSK1rawDemod(const char *Cmd);
 int CmdPSK2rawDemod(const char *Cmd);


@@ -49,33 +46,35 @@ int CmdLoad(const char *Cmd);
 int CmdLtrim(const char *Cmd);
 int CmdRtrim(const char *Cmd);
 int Cmdmandecoderaw(const char *Cmd);
 int CmdLtrim(const char *Cmd);
 int CmdRtrim(const char *Cmd);
 int Cmdmandecoderaw(const char *Cmd);

-int CmdManchesterDemod(const char *Cmd);
-int CmdManchesterMod(const char *Cmd);

 int CmdNorm(const char *Cmd);
 int CmdNRZrawDemod(const char *Cmd);
 int CmdPlot(const char *Cmd);
 int CmdNorm(const char *Cmd);
 int CmdNRZrawDemod(const char *Cmd);
 int CmdPlot(const char *Cmd);

+int CmdPrintDemodBuff(const char *Cmd);

 int CmdRawDemod(const char *Cmd);
 int CmdSamples(const char *Cmd);
 int CmdTuneSamples(const char *Cmd);
 int CmdSave(const char *Cmd);
 int CmdScale(const char *Cmd);
 int CmdRawDemod(const char *Cmd);
 int CmdSamples(const char *Cmd);
 int CmdTuneSamples(const char *Cmd);
 int CmdSave(const char *Cmd);
 int CmdScale(const char *Cmd);

-int CmdThreshold(const char *Cmd);

 int CmdDirectionalThreshold(const char *Cmd);
 int CmdZerocrossings(const char *Cmd);
 int CmdDirectionalThreshold(const char *Cmd);
 int CmdZerocrossings(const char *Cmd);

-int CmdIndalaDecode(const char *Cmd);
-int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo);

 int ASKbiphaseDemod(const char *Cmd, bool verbose);
 int ASKbiphaseDemod(const char *Cmd, bool verbose);

-int ASKmanDemod(const char *Cmd, bool verbose, bool emSearch);
-int ASKrawDemod(const char *Cmd, bool verbose);
+int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType);
+int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck);

 int FSKrawDemod(const char *Cmd, bool verbose);
 int PSKDemod(const char *Cmd, bool verbose);
 int NRZrawDemod(const char *Cmd, bool verbose);
 int FSKrawDemod(const char *Cmd, bool verbose);
 int PSKDemod(const char *Cmd, bool verbose);
 int NRZrawDemod(const char *Cmd, bool verbose);

-void printEM410x(uint32_t hi, uint64_t id);
+int getSamples(int n, bool silent);
+void setClockGrid(int clk, int offset);
+int directionalThreshold(const int* in, int *out, size_t len, int8_t up, int8_t down);
+extern int AskEdgeDetect(const int *in, int *out, int len, int threshold);
+//int autoCorr(const int* in, int *out, size_t len, int window);

 
 #define MAX_DEMOD_BUF_LEN (1024*128)
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 
 #define MAX_DEMOD_BUF_LEN (1024*128)
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];

-extern int DemodBufferLen;
-
+extern size_t DemodBufferLen;
+extern int g_DemodStartIdx;
+extern int g_DemodClock;
+extern uint8_t g_debugMode;

 #define BIGBUF_SIZE 40000
 
 #endif
 #define BIGBUF_SIZE 40000
 
 #endif