Added the new SRIX4K reading routine, thanks to jonor. Regression tested against...

[proxmark3-svn] / armsrc / iso14443.c

diff --git a/armsrc/iso14443.c b/armsrc/iso14443.c
index fab7336bc1bb73484bc14dbdc4c2eb816d3fb392..fbc3a6d40009b1eca639705548704e613df0412b 100644 (file)
--- a/armsrc/iso14443.c
+++ b/armsrc/iso14443.c
@@ -873,6 +873,15 @@ void AcquireRawAdcSamplesIso14443(DWORD parameter)
 //-----------------------------------------------------------------------------\r
 void ReadSRI512Iso14443(DWORD parameter)\r
 {\r
 //-----------------------------------------------------------------------------\r
 void ReadSRI512Iso14443(DWORD parameter)\r
 {\r

+     ReadSTMemoryIso14443(parameter,0x0F);
+}
+void ReadSRIX4KIso14443(DWORD parameter)
+{
+     ReadSTMemoryIso14443(parameter,0x7F);
+}
+
+void ReadSTMemoryIso14443(DWORD parameter,DWORD dwLast)
+{

     BYTE i = 0x00;\r
 \r
     // Make sure that we start from off, since the tags are stateful;\r
     BYTE i = 0x00;\r
 \r
     // Make sure that we start from off, since the tags are stateful;\r


@@ -961,8 +970,9 @@ void ReadSRI512Iso14443(DWORD parameter)
     DbpString("Tag memory dump, block 0 to 15");\r
     cmd1[0] = 0x08;\r
     i = 0x00;\r
     DbpString("Tag memory dump, block 0 to 15");\r
     cmd1[0] = 0x08;\r
     i = 0x00;\r

+    dwLast++;

     for (;;) {\r
     for (;;) {\r

-           if (i == 0x10) {\r
+           if (i == dwLast) {

                    DbpString("System area block (0xff):");\r
                    i = 0xff;\r
            }\r
                    DbpString("System area block (0xff):");\r
                    i = 0xff;\r
            }\r