X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7f0d5926362d50ed01ea04af95a1e03777fce47c..3544b99715671fa9809ad2e2565a436cf79316f8:/client/cmdlft55xx.h?ds=sidebyside

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 8ad98597..4f0fd21d 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -36,18 +36,18 @@ typedef struct {
 
 typedef struct {
 	enum {
-		DEMOD_NRZ  = 0x00,    
+		DEMOD_NRZ  = 0x00,
 		DEMOD_PSK1 = 0x01,
 		DEMOD_PSK2 = 0x02,
 		DEMOD_PSK3 = 0x03,
-		DEMOD_FSK1  = 0x04,     
-		DEMOD_FSK1a = 0x05,     
-		DEMOD_FSK2  = 0x06,     
+		DEMOD_FSK1  = 0x04,
+		DEMOD_FSK1a = 0x05,
+		DEMOD_FSK2  = 0x06,
 		DEMOD_FSK2a = 0x07, 
 		DEMOD_FSK   = 0xF0, //generic FSK (auto detect FCs)    
 		DEMOD_ASK  = 0x08,
 		DEMOD_BI   = 0x10,
-		DEMOD_BIa  = 0x18,		
+		DEMOD_BIa  = 0x18
 	}  modulation;
 	bool inverted;
 	uint8_t offset;
@@ -60,26 +60,27 @@ typedef struct {
 		RF_50 = 0x04,
 		RF_64 = 0x05,
 		RF_100 = 0x06,
-		RF_128 = 0x07,
+		RF_128 = 0x07
 	} bitrate;
 	bool Q5;
+	bool ST;
 } t55xx_conf_block_t;
-t55xx_conf_block_t Get_t55xx_Config();
-void Set_t55xx_Config(t55xx_conf_block_t conf);
 
+t55xx_conf_block_t Get_t55xx_Config(void);
+void Set_t55xx_Config(t55xx_conf_block_t conf);
 
-int CmdLFT55XX(const char *Cmd);
-int CmdT55xxBruteForce(const char *Cmd);
-int CmdT55xxSetConfig(const char *Cmd);
-int CmdT55xxReadBlock(const char *Cmd);
-int CmdT55xxWriteBlock(const char *Cmd);
-int CmdT55xxReadTrace(const char *Cmd);
-int CmdT55xxInfo(const char *Cmd);
-int CmdT55xxDetect(const char *Cmd);
-int CmdResetRead(const char *Cmd);
-int CmdT55xxWipe(const char *Cmd);
+extern int CmdLFT55XX(const char *Cmd);
+extern int CmdT55xxBruteForce(const char *Cmd);
+extern int CmdT55xxSetConfig(const char *Cmd);
+extern int CmdT55xxReadBlock(const char *Cmd);
+extern int CmdT55xxWriteBlock(const char *Cmd);
+extern int CmdT55xxReadTrace(const char *Cmd);
+extern int CmdT55xxInfo(const char *Cmd);
+extern int CmdT55xxDetect(const char *Cmd);
+extern int CmdResetRead(const char *Cmd);
+extern int CmdT55xxWipe(const char *Cmd);
 
-char * GetBitRateStr(uint32_t id);
+char * GetBitRateStr(uint32_t id, bool xmode);
 char * GetSaferStr(uint32_t id);
 char * GetModulationStr( uint32_t id);
 char * GetModelStrFromCID(uint32_t cid);
@@ -89,8 +90,9 @@ void printT5xxHeader(uint8_t page);
 void printT55xxBlock(const char *demodStr);
 int printConfiguration( t55xx_conf_block_t b);
 
-bool DecodeT55xxBlock();
-bool tryDetectModulation();
+bool DecodeT55xxBlock(void);
+bool tryDetectModulation(void);
+extern bool tryDetectP1(bool getData);
 bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5);
 int special(const char *Cmd);
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );