X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6426f6ba86c8a2d3e390fab1ced35223a92d8647..f133389866b5749a49265eb0477540ccdcc8a73f:/client/cmdlft55xx.h?ds=sidebyside

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 79e37cef..4276b1fa 100644
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -23,13 +23,55 @@
 // #define T55X7_FDXB_CONFIG_BLOCK         903F8080  // emulate fdx-b - xtended mode, BiPhase ('57), data rate 32, 4 data blocks
 #define T55X7_FDXB_CONFIG_BLOCK         0x903F0082  // emulate fdx-b - xtended mode, BiPhase ('50), invert data, data rate 32, 4 data blocks
 #define T55X7_HID_26_CONFIG_BLOCK       0x00107060  // hid 26 bit - compat mode, FSK2a, data rate 50, 3 data blocks
+#define T55X7_PYRAMID_CONFIG_BLOCK		0x00107080  // Pyramid 26 bit - compat mode, FSK2a, data rate 50, 4 data blocks
 #define T55X7_INDALA_64_CONFIG_BLOCK    0x00081040  // emulate indala 64 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 2
 #define T55X7_INDALA_224_CONFIG_BLOCK   0x000810E0  // emulate indala 224 bit - compat mode, PSK1, psk carrier FC * 2, data rate 32, maxblock 7
 #define T55X7_GUARDPROXII_CONFIG_BLOCK	0x00150060	// bitrate 64pcb, Direct modulation, Biphase, 3 data blocks
 #define T55X7_VIKING_CONFIG_BLOCK		0x00088040	// compat mode, data rate 32, Manchester, 2 data blocks
 #define T55X7_NORALYS_CONFIG_BLOCK		0x00088C6A	// compat mode,   (NORALYS - KCP3000)
+#define T55X7_IOPROX_CONFIG_BLOCK		0x00147040  // maxblock 2
+#define T55X7_PRESCO_CONFIG_BLOCK		0x00088088  // data rate 32, Manchester, 5 data blocks, STT
 #define T55X7_bin 0b0010
 
+#define T5555_DEFAULT_CONFIG_BLOCK		0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?
+enum {
+	T55x7_RAW = 0x00,
+	T55x7_DEFAULT = 0x00,
+	T5555_DEFAULT = 0x01,
+	EM_UNIQUE  = 0x0,
+	FDBX = 0x02,
+	HID_26 = 0x03,
+	INDALA_64 = 0x04,
+	INDALA_224 = 0x05,
+	GUARDPROXXII = 0x06,
+	VIKING = 0x07,
+	NORALSYS = 0x08,
+	IOPROX = 0x09,
+} t55xx_tag;
+
+typedef struct {
+	uint32_t bl1;
+	uint32_t bl2; 
+	uint32_t acl; 
+	uint32_t mfc; 
+	uint32_t cid; 
+	uint32_t year; 
+	uint32_t quarter; 
+	uint32_t icr;
+	uint32_t lotid; 
+	uint32_t wafer; 
+	uint32_t dw;
+} t55x7_tracedata_t;
+
+typedef struct {
+	uint32_t bl1;
+	uint32_t bl2;
+	uint32_t icr;
+	char lotidc;
+	uint32_t lotid;
+	uint32_t wafer;
+	uint32_t dw;
+} t5555_tracedata_t;
 
 typedef struct {
 	enum {
@@ -60,6 +102,7 @@ typedef struct {
 		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);
@@ -74,6 +117,7 @@ int CmdT55xxInfo(const char *Cmd);
 int CmdT55xxDetect(const char *Cmd);
 int CmdResetRead(const char *Cmd);
 int CmdT55xxWipe(const char *Cmd);
+int CmdT55xxBruteForce(const char *Cmd);
 
 char * GetBitRateStr(uint32_t id);
 char * GetSaferStr(uint32_t id);
@@ -91,4 +135,9 @@ 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 );
 
+bool detectPassword(int password);
+
+void printT55x7Trace( t55x7_tracedata_t data, uint8_t repeat );
+void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );
+
 #endif