fix bug in st detect +

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 8ad98597e69f071f49bc3c2cd82cdb763646ec56..4f0fd21d34aba79cc7e28efafd1070a93dbca25e 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -36,18 +36,18 @@ typedef struct {
 \r
 typedef struct {\r
        enum {\r
 \r
 typedef struct {\r
        enum {\r

-               DEMOD_NRZ  = 0x00,    \r
+               DEMOD_NRZ  = 0x00,\r

                DEMOD_PSK1 = 0x01,\r
                DEMOD_PSK2 = 0x02,\r
                DEMOD_PSK3 = 0x03,\r
                DEMOD_PSK1 = 0x01,\r
                DEMOD_PSK2 = 0x02,\r
                DEMOD_PSK3 = 0x03,\r

-               DEMOD_FSK1  = 0x04,     \r
-               DEMOD_FSK1a = 0x05,     \r
-               DEMOD_FSK2  = 0x06,     \r
+               DEMOD_FSK1  = 0x04,\r
+               DEMOD_FSK1a = 0x05,\r
+               DEMOD_FSK2  = 0x06,\r

                DEMOD_FSK2a = 0x07, \r
                DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    \r
                DEMOD_ASK  = 0x08,\r
                DEMOD_BI   = 0x10,\r
                DEMOD_FSK2a = 0x07, \r
                DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    \r
                DEMOD_ASK  = 0x08,\r
                DEMOD_BI   = 0x10,\r

-               DEMOD_BIa  = 0x18,              \r
+               DEMOD_BIa  = 0x18\r

        }  modulation;\r
        bool inverted;\r
        uint8_t offset;\r
        }  modulation;\r
        bool inverted;\r
        uint8_t offset;\r


@@ -60,26 +60,27 @@ typedef struct {
                RF_50 = 0x04,\r
                RF_64 = 0x05,\r
                RF_100 = 0x06,\r
                RF_50 = 0x04,\r
                RF_64 = 0x05,\r
                RF_100 = 0x06,\r

-               RF_128 = 0x07,\r
+               RF_128 = 0x07\r

        } bitrate;\r
        bool Q5;\r
        } bitrate;\r
        bool Q5;\r

+       bool ST;\r

 } t55xx_conf_block_t;\r
 } t55xx_conf_block_t;\r

-t55xx_conf_block_t Get_t55xx_Config();\r
-void Set_t55xx_Config(t55xx_conf_block_t conf);\r

 \r
 \r

+t55xx_conf_block_t Get_t55xx_Config(void);\r
+void Set_t55xx_Config(t55xx_conf_block_t conf);\r

 \r
 \r

-int CmdLFT55XX(const char *Cmd);\r
-int CmdT55xxBruteForce(const char *Cmd);\r
-int CmdT55xxSetConfig(const char *Cmd);\r
-int CmdT55xxReadBlock(const char *Cmd);\r
-int CmdT55xxWriteBlock(const char *Cmd);\r
-int CmdT55xxReadTrace(const char *Cmd);\r
-int CmdT55xxInfo(const char *Cmd);\r
-int CmdT55xxDetect(const char *Cmd);\r
-int CmdResetRead(const char *Cmd);\r
-int CmdT55xxWipe(const char *Cmd);\r
+extern int CmdLFT55XX(const char *Cmd);\r
+extern int CmdT55xxBruteForce(const char *Cmd);\r
+extern int CmdT55xxSetConfig(const char *Cmd);\r
+extern int CmdT55xxReadBlock(const char *Cmd);\r
+extern int CmdT55xxWriteBlock(const char *Cmd);\r
+extern int CmdT55xxReadTrace(const char *Cmd);\r
+extern int CmdT55xxInfo(const char *Cmd);\r
+extern int CmdT55xxDetect(const char *Cmd);\r
+extern int CmdResetRead(const char *Cmd);\r
+extern int CmdT55xxWipe(const char *Cmd);\r

 \r
 \r

-char * GetBitRateStr(uint32_t id);\r
+char * GetBitRateStr(uint32_t id, bool xmode);\r

 char * GetSaferStr(uint32_t id);\r
 char * GetModulationStr( uint32_t id);\r
 char * GetModelStrFromCID(uint32_t cid);\r
 char * GetSaferStr(uint32_t id);\r
 char * GetModulationStr( uint32_t id);\r
 char * GetModelStrFromCID(uint32_t cid);\r


@@ -89,8 +90,9 @@ void printT5xxHeader(uint8_t page);
 void printT55xxBlock(const char *demodStr);\r
 int printConfiguration( t55xx_conf_block_t b);\r
 \r
 void printT55xxBlock(const char *demodStr);\r
 int printConfiguration( t55xx_conf_block_t b);\r
 \r

-bool DecodeT55xxBlock();\r
-bool tryDetectModulation();\r
+bool DecodeT55xxBlock(void);\r
+bool tryDetectModulation(void);\r
+extern bool tryDetectP1(bool getData);\r

 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);\r
 int special(const char *Cmd);\r
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);\r
 int special(const char *Cmd);\r
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r