Read 5 bytes of chip ID

Author: bbogush

firmware/fsmc_nand.c

@@ -122,11 +122,13 @@ void nand_read_id(nand_id_t *nand_id)
 
     /* Sequence to read ID from NAND flash */
     data = *(__IO uint32_t *)(Bank_NAND_ADDR | DATA_AREA);
+    nand_id->maker_id   = ADDR_1st_CYCLE(data);
+    nand_id->device_id  = ADDR_2nd_CYCLE(data);
+    nand_id->third_id   = ADDR_3rd_CYCLE(data);
+    nand_id->fourth_id  = ADDR_4th_CYCLE(data);
 
-    nand_id->maker_id   = ADDR_1st_CYCLE (data);
-    nand_id->device_id  = ADDR_2nd_CYCLE (data);
-    nand_id->third_id   = ADDR_3rd_CYCLE (data);
-    nand_id->fourth_id  = ADDR_4th_CYCLE (data);
+    data = *((__IO uint32_t *)(Bank_NAND_ADDR | DATA_AREA) + 1);
+    nand_id->fifth_id   = ADDR_1st_CYCLE(data);
 }
 
 void nand_write_page_async(uint8_t *buf, uint32_t page, uint32_t page_size)

firmware/fsmc_nand.h

@@ -14,6 +14,7 @@ typedef struct
     uint8_t device_id;
     uint8_t third_id;
     uint8_t fourth_id;
+    uint8_t fifth_id;
 } nand_id_t;
 
 #define CMD_AREA                   (uint32_t)(1<<16)  /* A16 = CLE  high */

firmware/nand_programmer.c

@@ -301,9 +301,9 @@ static int _np_cmd_nand_read_id(np_prog_t *prog)
     if (np_comm_cb)
         np_comm_cb->send((uint8_t *)&resp, resp_len);
 
-    DEBUG_PRINT("Chip ID: 0x%x 0x%x 0x%x 0x%x\r\n",
+    DEBUG_PRINT("Chip ID: 0x%x 0x%x 0x%x 0x%x 0x%x\r\n",
         resp.nand_id.maker_id, resp.nand_id.device_id, resp.nand_id.third_id,
-        resp.nand_id.fourth_id);
+        resp.nand_id.fourth_id, resp.nand_id.fifth_id);
 
     return 0;
 }

qt/cmd.h

@@ -120,6 +120,7 @@ typedef struct __attribute__((__packed__))
     uint8_t deviceId;
     uint8_t thirdId;
     uint8_t fourthId;
+    uint8_t fifthId;
 } ChipId;
 
 typedef struct __attribute__((__packed__))

qt/main_window.cpp

@@ -236,8 +236,8 @@ void MainWindow::slotProgReadDeviceIdCompleted(int status)
     if (status)
         return;
 
-    idStr.sprintf("0x%02X 0x%02X 0x%02X 0x%02X", chipId.makerId,
-        chipId.deviceId, chipId.thirdId, chipId.fourthId);
+    idStr.sprintf("0x%02X 0x%02X 0x%02X 0x%02X 0x%02X", chipId.makerId,
+        chipId.deviceId, chipId.thirdId, chipId.fourthId, chipId.fifthId);
     ui->deviceValueLabel->setText(idStr);
 
     qInfo() << QString("ID ").append(idStr).toLatin1().data();

qt/main_window.ui

@@ -65,7 +65,7 @@
         </property>
         <property name="minimumSize">
          <size>
-          <width>150</width>
+          <width>190</width>
           <height>0</height>
          </size>
         </property>
@@ -165,7 +165,7 @@
         <bool>false</bool>
        </attribute>
       </widget>
-      <widget class="QWidget" name="">
+      <widget class="QWidget" name="layoutWidget">
        <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0" columnstretch="0" rowminimumheight="0,0" columnminimumwidth="0">
         <property name="sizeConstraint">
          <enum>QLayout::SetDefaultConstraint</enum>