update iClass chip identification

diff --git a/client/cmdhficlass.c b/client/cmdhficlass.c
index ace506984192a07adfe58af16cf387f52cb6078b..3d745d7521fc9de623012265f76923d181a6844d 100644 (file)
--- a/client/cmdhficlass.c
+++ b/client/cmdhficlass.c
@@ -554,6 +554,8 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
        uint8_t blockno = 0;
        uint8_t numblks = 0;
        uint8_t maxBlk = 31;
        uint8_t blockno = 0;
        uint8_t numblks = 0;
        uint8_t maxBlk = 31;

+       uint8_t books = 1;
+       uint8_t kb = 2;

        uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
        uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
        uint8_t keyNbr = 0;
        uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
        uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
        uint8_t keyNbr = 0;


@@ -666,13 +668,8 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
                memcpy(tag_data, data, 8*3);
                blockno+=2; // 2 to force re-read of block 2 later. (seems to respond differently..)
                numblks = data[8];
                memcpy(tag_data, data, 8*3);
                blockno+=2; // 2 to force re-read of block 2 later. (seems to respond differently..)
                numblks = data[8];

-
-               if (data[13] & 0x80) {
-                       // large memory - not able to dump pages currently
-                       maxBlk = 255;
-               }       else {
-                       maxBlk = 31;
-               }
+               getMemConfig(data[13], data[12], &maxBlk, &books, &kb);
+               // large memory - not able to dump pages currently

                if (numblks > maxBlk) numblks = maxBlk;
        }
        ul_switch_off_field();
                if (numblks > maxBlk) numblks = maxBlk;
        }
        ul_switch_off_field();

diff --git a/common/protocols.c b/common/protocols.c
index 56a6924f78cafa9aa1c9d31ba9a70f96754afdb9..839717bd2211322a2c565a2effff6f67612839c0 100644 (file)
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -11,13 +11,13 @@
 
 
 typedef struct {
 
 
 typedef struct {

-       uint8_t app_limit;
-       uint8_t otp[2];
-       uint8_t block_writelock;
-       uint8_t chip_config;
-       uint8_t mem_config;
-       uint8_t eas;
-       uint8_t fuses;
+       uint8_t app_limit;      //[8]
+       uint8_t otp[2];         //[9-10]
+       uint8_t block_writelock;//[11]
+       uint8_t chip_config;    //[12]
+       uint8_t mem_config;     //[13]
+       uint8_t eas;            //[14]
+       uint8_t fuses;          //[15]

 }picopass_conf_block;
 
 
 }picopass_conf_block;
 
 


@@ -74,25 +74,48 @@ void fuse_config(const picopass_hdr *hdr)
        if( isset( fuses, FUSE_RA)) prnt("      RA: Read access enabled");
        else prnt("     RA: Read access not enabled");
 }
        if( isset( fuses, FUSE_RA)) prnt("      RA: Read access enabled");
        else prnt("     RA: Read access not enabled");
 }

+
+void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *books, uint8_t *kb) {
+       // mem-bit 5, mem-bit 7, chip-bit 4: defines chip type
+       if(isset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+               kb = 2;
+               books = 1;
+               max_blk = 31;
+       } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+               kb = 16;
+               books = 2;
+               max_blk = 255; //16kb
+       } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+               kb = 16;
+               books = 16;
+               max_blk = 255; //16kb
+       } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
+               kb = 32;
+               books = 2;
+               max_blk = 255; //16kb
+       } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
+               kb = 32;
+               books = 16;
+               max_blk = 255; //16kb
+       } else {
+               kb = 32;
+               max_blk = 255;
+       }
+}
+

 void mem_app_config(const picopass_hdr *hdr)
 {
        uint8_t mem = hdr->conf.mem_config;
 void mem_app_config(const picopass_hdr *hdr)
 {
        uint8_t mem = hdr->conf.mem_config;

+       uint8_t chip = hdr->conf.chip_config;

        uint8_t applimit = hdr->conf.app_limit;
        if (applimit < 6) applimit = 26;
        uint8_t applimit = hdr->conf.app_limit;
        if (applimit < 6) applimit = 26;

-       uint8_t kb=2;
-       uint8_t maxBlk = 32;
-       if( isset(mem, 0x10) && notset(mem, 0x80)){
-               // 2kb default
-       } else if( isset(mem, 0x80) && notset(mem, 0x10)){
-               kb = 16;
-               maxBlk = 255; //16kb
-       } else {
-               kb = 32;
-               maxBlk = 255;
-       }
-       prnt("  Mem: %u KBits ( %u * 8 bytes) [%02X]", kb, maxBlk, mem);
+       uint8_t kb = 2;
+       uint8_t books = 1;
+       uint8_t max_blk = 31;
+       getMemConfig(mem, chip, &max_blk, &books, &kb);
+       prnt("  Mem: %u KBits/%u Books (%u * 8 bytes) [%02X]", kb, books, max_blk, mem);

        prnt("  AA1: blocks 06-%02X", applimit);
        prnt("  AA1: blocks 06-%02X", applimit);

-       prnt("  AA2: blocks %02X-%02X", (applimit+1), (hdr->conf.mem_config));
+       prnt("  AA2: blocks %02X-%02X", applimit+1, max_blk);

 }
 void print_picopass_info(const picopass_hdr *hdr)
 {
 }
 void print_picopass_info(const picopass_hdr *hdr)
 {

diff --git a/common/protocols.h b/common/protocols.h
index 580342728b866ee7f76d3f09537580da1c43c72d..4d280abecd6777d050a70e0aa600232e73db4d44 100644 (file)
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -99,7 +99,7 @@ NXP/Philips CUSTOM COMMANDS
 #define ICLASS_CMD_CHECK            0x05
 #define ICLASS_CMD_DETECT           0x0F
 #define ICLASS_CMD_HALT             0x00
 #define ICLASS_CMD_CHECK            0x05
 #define ICLASS_CMD_DETECT           0x0F
 #define ICLASS_CMD_HALT             0x00

-#define ICLASS_CMD_UPDATE                      0x87
+#define ICLASS_CMD_UPDATE           0x87

 #define ICLASS_CMD_ACT              0x8E
 #define ICLASS_CMD_READ4            0x06
 
 #define ICLASS_CMD_ACT              0x8E
 #define ICLASS_CMD_READ4            0x06
 


@@ -196,5 +196,6 @@ NXP/Philips CUSTOM COMMANDS
 
 
 void printIclassDumpInfo(uint8_t* iclass_dump);
 
 
 void printIclassDumpInfo(uint8_t* iclass_dump);

+void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *books, uint8_t *kb);

 
 #endif // PROTOCOLS_H
 
 #endif // PROTOCOLS_H