Merge branch 'master' of https://github.com/iceman1001/proxmark3

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index d8e516e86aa9d2823a93e5428e1752a1fb66955c..1771742a09e1584f6bcb678738e40d8e47e73570 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -28,8 +28,48 @@
 #define T55X7_GUARDPROXII_CONFIG_BLOCK 0x00150060      // bitrate 64pcb, Direct modulation, Biphase, 3 data blocks\r
 #define T55X7_VIKING_CONFIG_BLOCK              0x00088040      // compat mode, data rate 32, Manchester, 2 data blocks\r
 #define T55X7_NORALYS_CONFIG_BLOCK             0x00088C6A      // compat mode,   (NORALYS - KCP3000)\r
+#define T55X7_IOPROX_CONFIG_BLOCK              0x00147040  // maxblock 2\r
 #define T55X7_bin 0b0010\r
 \r
+#define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r
+enum {\r
+       T55x7_RAW = 0x00,\r
+       T55x7_DEFAULT = 0x00,\r
+       T5555_DEFAULT = 0x01,\r
+       EM_UNIQUE  = 0x0,\r
+       FDBX = 0x02,\r
+       HID_26 = 0x03,\r
+       INDALA_64 = 0x04,\r
+       INDALA_224 = 0x05,\r
+       GUARDPROXXII = 0x06,\r
+       VIKING = 0x07,\r
+       NORALSYS = 0x08,\r
+       IOPROX = 0x09,\r
+} t55xx_tag;\r
+\r
+typedef struct {\r
+       uint32_t bl1;\r
+       uint32_t bl2; \r
+       uint32_t acl; \r
+       uint32_t mfc; \r
+       uint32_t cid; \r
+       uint32_t year; \r
+       uint32_t quarter; \r
+       uint32_t icr;\r
+       uint32_t lotid; \r
+       uint32_t wafer; \r
+       uint32_t dw;\r
+} t55xx_tracedata_t;\r
+\r
+typedef struct {\r
+       uint32_t bl1;\r
+       uint32_t bl2;\r
+       uint32_t icr;\r
+       char lotidc;\r
+       uint32_t lotid;\r
+       uint32_t wafer;\r
+       uint32_t dw;\r
+} t5555_tracedata_t;\r
 \r
 typedef struct {\r
        enum {\r
@@ -59,7 +99,11 @@ typedef struct {
                RF_100 = 0x06,\r
                RF_128 = 0x07,\r
        } bitrate;\r
+       bool Q5;\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
 int CmdLFT55XX(const char *Cmd);\r
 int CmdT55xxSetConfig(const char *Cmd);\r
@@ -68,6 +112,9 @@ int CmdT55xxWriteBlock(const char *Cmd);
 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
+int CmdT55xxBruteForce(const char *Cmd);\r
 \r
 char * GetBitRateStr(uint32_t id);\r
 char * GetSaferStr(uint32_t id);\r
@@ -75,13 +122,19 @@ char * GetModulationStr( uint32_t id);
 char * GetModelStrFromCID(uint32_t cid);\r
 char * GetSelectedModulationStr( uint8_t id);\r
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);\r
+void printT5xxHeader(uint8_t page);\r
 void printT55xxBlock(const char *demodStr);\r
-void printConfiguration( t55xx_conf_block_t b);\r
+int printConfiguration( t55xx_conf_block_t b);\r
 \r
 bool DecodeT55xxBlock();\r
 bool tryDetectModulation();\r
-bool test(uint8_t mode, uint8_t *offset, int *fndBitRate);\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 block );\r
+int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
+\r
+bool detectPassword(int password);\r
+\r
+void printT55xxTrace( t55xx_tracedata_t data, uint8_t repeat );\r
+void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );\r
 \r
 #endif\r