X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/96f39a47a98990dbe0ea35f15d9a764d188e1ead..623db3559bd3da895035f61cf1f1a7374f2365cf:/client/cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index cbd6312a..364f0271 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -10,19 +10,57 @@
 #ifndef CMDLFT55XX_H__
 #define CMDLFT55XX_H__
 
+typedef struct {
+	enum {
+		DEMOD_NRZ  = 0x00,    
+		DEMOD_PSK1 = 0x01,
+		DEMOD_PSK2 = 0x02,
+		DEMOD_PSK3 = 0x03,
+		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,		
+	}  modulation;
+	bool inverted;
+	uint8_t offset;
+	uint32_t block0;
+	enum {
+		RF_8 = 0x00,
+		RF_16 = 0x01,
+		RF_32 = 0x02,
+		RF_40 = 0x03,
+		RF_50 = 0x04,
+		RF_64 = 0x05,
+		RF_100 = 0x06,
+		RF_128 = 0x07,
+	} bitrate;
+} t55xx_conf_block_t;
+
 int CmdLFT55XX(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 CmdReadBlk(const char *Cmd);
-int CmdWriteBlk(const char *Cmd);
-int CmdReadTrace(const char *Cmd);
-int CmdInfo(const char *Cmd);
-int CmdIceFsk(const char *Cmd);
-int CmdIceManchester(const char *Cmd);
-int ManchesterDemod(int block);
 char * GetBitRateStr(uint32_t id);
 char * GetSaferStr(uint32_t id);
 char * GetModulationStr( uint32_t id);
-uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bitstream);
-bool tryDemod(uint8_t bits[], uint32_t bitlen);
-bool analyseDemod( int errCnt, size_t bitlen, uint8_t clock, uint8_t invert);
+char * GetModelStrFromCID(uint32_t cid);
+char * GetSelectedModulationStr( uint8_t id);
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);
+void printT55xxBlock(const char *demodStr);
+void printConfiguration( t55xx_conf_block_t b);
+
+bool DecodeT55xxBlock();
+bool tryDetectModulation();
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate);
+int special(const char *Cmd);
+int AquireData( uint8_t block );
+
 #endif