Merge branch 'master' into hf-mf-ultimatecard-script-max-rw-blocks

Signed-off-by: Iceman <iceman@iuse.se>

CHANGELOG.md

@@ -4,6 +4,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
 
 ## [unreleased][unreleased]
 - Add option to set and get maximum read/write block number using `hf_mf_ultimatecard` script (@piotrva)
+- Added JEDEC information for SPI flash W25Q64JV (@ANTodorov)
 - Added special iclass legacy config cards in `hf iclass configcard` (@antiklesys)
 - Added simulation function to `hf iclass legrec` (@antiklesys)
 

client/resources/aid_desfire.json

@@ -1151,6 +1151,22 @@
         "Description": "FIDs 02: Card Balance; 04: Refill History; 08: Card Information; 0E: Trip History",
         "Type": "transport"
     },
+    {
+        "AID": "F21201",
+        "Vendor": "Green Bay Metro Transit via Genfare",
+        "Country": "US",
+        "Name": "Tap-N-Go Card (GRB)",
+        "Description": "GRB Tap-N-Go Card",
+        "Type": "transport"
+    },
+    {
+        "AID": "F21202",
+        "Vendor": "Green Bay Metro Transit via Genfare",
+        "Country": "US",
+        "Name": "Tap-N-Go Card (GRB)",
+        "Description": "GRB Tap-N-Go Card",
+        "Type": "transport"
+    },
     {
         "AID": "F21360",
         "Vendor": "INIT",

client/src/cmdlfem410x.c

@@ -732,6 +732,7 @@ static int CmdEM410xClone(const char *Cmd) {
 
             packet.cmd = HTSF_82xx;
             memcpy(packet.pwd, "\xBB\xDD\x33\x99", HITAGS_PAGE_SIZE);
+            packet.mode = HITAGS_UID_REQ_FADV;
             SendCommandNG(CMD_LF_HITAGS_WRITE, (uint8_t *)&packet, sizeof(packet));
             if (WaitForResponseTimeout(CMD_LF_HITAGS_WRITE, &resp, 4000) == false) {
                 PrintAndLogEx(WARNING, "timeout while waiting for reply.");

common/commonutil.c

@@ -554,8 +554,8 @@ size_t concatbits(uint8_t *dest, int dest_offset, const uint8_t *src, int src_of
         end = nbits;
         step = 1;
     } else {
-        i = nbits;
-        end = 0;
+        i = nbits - 1;
+        end = -1;
         step = -1;
     }
 

common_arm/flashmem.h

@@ -148,10 +148,7 @@ static const spi_flash_t SpiFlashTable[] = {
     // first element is the default of 4 * 64kB pages (256kB)
     { 0x00, 0x00, 0x0000,   4, "unknown" },     //  256k
     // Manufacturer: Puya
-    { 0x85, 0x00, 0x6015, 32, "P25Q16H" },     // 2048k
-    /// Manufacturer: Renesas
-    { 0x1F, 0x46, 0x0000, 32, "AT25XE161D" },  // 2048k
-    { 0x1F, 0x47, 0x0000, 64, "AT25XE321D" },  // 4096k
+    { 0x85, 0x14, 0x6015,  32, "P25Q16H" },     // 2048k
     // Manufacturer: Winbond
     { 0xEF, 0x00, 0x3012,   4, "W25X20BV" },    //  256k
     { 0xEF, 0x00, 0x3013,   8, "W25X40BV" },    //  512k
@@ -161,13 +158,21 @@ static const spi_flash_t SpiFlashTable[] = {
     { 0xEF, 0x14, 0x4015,  32, "W25Q16BV" },    // 2048k
     { 0xEF, 0x15, 0x4016,  64, "W25Q32BV" },    // 4096k
 
+    { 0xEF, 0x16, 0x7017, 128, "W25Q64JV" },    // 8192k
     { 0xEF, 0x21, 0x7022,   4, "W25Q02JV" },
-    // identified by Manufacturer /Device ID
-//    { 0xEF, 0x05, 0x0000,  1, "Winbond!!!" },
-    { 0xEF, 0x10, 0x0000,  2, "W25*10BV!!!" }, //  128k
+
+    // identified by Manufacturer /Device ID only
+    /// Manufacturer: Renesas
+    { 0x1F, 0x46, 0x0000,  32, "AT25XE161D" },  // 2048k
+    { 0x1F, 0x47, 0x0000,  64, "AT25XE321D" },  // 4096k
+//    { 0xEF, 0x05, 0x0000,  1, "Winbond!!!" },  //  64k (too small !!!)
+    { 0xEF, 0x10, 0x0000,   2, "W25*10BV!" },   //  128k (small !!!)
     { 0xEF, 0x11, 0x0000,   4, "W25*20BV" },    //  256k
     { 0xEF, 0x12, 0x0000,   8, "W25*40BV" },    //  512k
-    { 0xEF, 0x13, 0x0000, 16, "W25*80BV" }     // 1024k
+    { 0xEF, 0x13, 0x0000,  16, "W25*80BV" },    // 1024k
+    { 0xEF, 0x14, 0x0000,  32, "W25*16*" },     // 2048k
+    { 0xEF, 0x15, 0x0000,  64, "W25*32*" },     // 4096k
+    { 0xEF, 0x16, 0x0000, 128, "W25*64*" }      // 8192k
 };
 
 extern uint8_t spi_flash_pages64k;

include/hitag.h

@@ -161,7 +161,7 @@ typedef struct {
     uint8_t logdata_1[4];
     uint8_t nonce[4];
 
-    //Hitag s section
+    // Hitag S section
     uint8_t mode;
 } PACKED lf_hitag_data_t;