Merge pull request #13 from k02a/patch-1

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 9df0cb550d8277fe7a3b775fcaae8eef8e8eefee..4276b1fa46582f737db96eb9542d9a0beaf8e9e2 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -30,6 +30,7 @@
 #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_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_PRESCO_CONFIG_BLOCK              0x00088088  // data rate 32, Manchester, 5 data blocks, STT\r

 #define T55X7_bin 0b0010\r
 \r
 #define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r
 #define T55X7_bin 0b0010\r
 \r
 #define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r


@@ -60,7 +61,7 @@ typedef struct {
        uint32_t lotid; \r
        uint32_t wafer; \r
        uint32_t dw;\r
        uint32_t lotid; \r
        uint32_t wafer; \r
        uint32_t dw;\r

-} t55xx_tracedata_t;\r
+} t55x7_tracedata_t;\r

 \r
 typedef struct {\r
        uint32_t bl1;\r
 \r
 typedef struct {\r
        uint32_t bl1;\r


@@ -101,6 +102,7 @@ typedef struct {
                RF_128 = 0x07,\r
        } bitrate;\r
        bool Q5;\r
                RF_128 = 0x07,\r
        } bitrate;\r
        bool Q5;\r

+       bool ST;\r

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


@@ -135,7 +137,7 @@ int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );
 \r
 bool detectPassword(int password);\r
 \r
 \r
 bool detectPassword(int password);\r
 \r

-void printT55xxTrace( t55xx_tracedata_t data, uint8_t repeat );\r
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat );\r

 void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );\r
 \r
 #endif\r
 void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );\r
 \r
 #endif\r