Implemented configuration of bad block mark offset

Author: bbogush

firmware/chip_info.h

@@ -29,6 +29,7 @@ typedef struct
     uint8_t erase1_cmd;
     uint8_t erase2_cmd;
     uint8_t status_cmd;
+    uint8_t bb_mark_off;
 } chip_info_t;
 
 #endif /* _CHIP_INFO_H_ */

firmware/nand_programmer.c

@@ -126,6 +126,7 @@ typedef struct __attribute__((__packed__))
     uint8_t erase1_cmd;
     uint8_t erase2_cmd;
     uint8_t status_cmd;
+    uint8_t bb_mark_off;
 } np_conf_cmd_t;
 
 enum
@@ -323,7 +324,7 @@ static int np_read_bad_block_info_from_page(np_prog_t *prog, uint32_t block,
     uint32_t status, addr = block * prog->chip_info.block_size;
 
     status = nand_read_data(prog->page.buf, page, 0, prog->chip_info.page_size
-        + 1);
+        + prog->chip_info.spare_size);
     switch (status)
     {
     case NAND_READY:
@@ -339,8 +340,8 @@ static int np_read_bad_block_info_from_page(np_prog_t *prog, uint32_t block,
         return NP_ERR_NAND_RD;
     }
 
-    *is_bad = prog->page.buf[prog->chip_info.page_size] !=
-        NP_NAND_GOOD_BLOCK_MARK;
+    *is_bad = prog->page.buf[prog->chip_info.page_size +
+        prog->chip_info.bb_mark_off] != NP_NAND_GOOD_BLOCK_MARK;
 
     return 0;
 }
@@ -355,7 +356,7 @@ static int _np_cmd_read_bad_blocks(np_prog_t *prog)
     page_num = prog->chip_info.block_size / prog->chip_info.page_size;
 
     /* Bad block - not 0xFF value in the first or second page in the block at
-     * zero offset in the page spare area
+     * some offset in the page spare area
      */
     for (block = 0; block < block_num; block++)
     {
@@ -1000,6 +1001,7 @@ static void np_fill_chip_info(np_conf_cmd_t *conf_cmd, np_prog_t *prog)
     prog->chip_info.erase1_cmd = conf_cmd->erase1_cmd;
     prog->chip_info.erase2_cmd = conf_cmd->erase2_cmd;
     prog->chip_info.status_cmd = conf_cmd->status_cmd;
+    prog->chip_info.bb_mark_off = conf_cmd->bb_mark_off;
     prog->chip_is_conf = 1;    
 }
 
@@ -1026,6 +1028,7 @@ static void np_print_chip_info(np_prog_t *prog)
     DEBUG_PRINT("Erase 1 command: %d\r\n", prog->chip_info.erase1_cmd);
     DEBUG_PRINT("Erase 2 command: %d\r\n", prog->chip_info.erase2_cmd);
     DEBUG_PRINT("Status command: %d\r\n", prog->chip_info.status_cmd);
+    DEBUG_PRINT("Bad block mark offset: %d\r\n", prog->chip_info.bb_mark_off);
 }
 
 static int np_cmd_nand_conf(np_prog_t *prog)

qt/chip_db.h

@@ -51,6 +51,7 @@ enum
     CHIP_PARAM_ERASE1_CMD,
     CHIP_PARAM_ERASE2_CMD,
     CHIP_PARAM_STATUS_CMD,
+    CHIP_PARAM_BB_MARK_OFF,
     CHIP_PARAM_NUM,
 };
 

qt/chip_db_dialog.cpp

@@ -22,7 +22,7 @@ ChipDbDialog::ChipDbDialog(ChipDb *chipDb, QWidget *parent) : QDialog(parent),
         HEADER_MED_WIDTH);
     for (int i = CHIP_PARAM_T_CS; i <= CHIP_PARAM_T_REA; i++)
         ui->chipDbTableView->setColumnWidth(i, HEADER_SHORT_WIDTH);
-    for (int i = CHIP_PARAM_ROW_CYCLES; i <= CHIP_PARAM_STATUS_CMD; i++)
+    for (int i = CHIP_PARAM_ROW_CYCLES; i <= CHIP_PARAM_BB_MARK_OFF; i++)
         ui->chipDbTableView->setColumnWidth(i, HEADER_MED_WIDTH);
 
     connect(ui->addChipDbButton, SIGNAL(clicked()), this,

qt/chip_db_table_model.cpp

@@ -60,6 +60,7 @@ QVariant ChipDbTableModel::data(const QModelIndex &index, int role) const
     case CHIP_PARAM_ERASE1_CMD:
     case CHIP_PARAM_ERASE2_CMD:
     case CHIP_PARAM_STATUS_CMD:
+    case CHIP_PARAM_BB_MARK_OFF:
         return (*chipDb)[index.row()]->params[column];
     }
 
@@ -102,7 +103,8 @@ QVariant ChipDbTableModel::headerData(int section, Qt::Orientation orientation,
         case CHIP_PARAM_WRITE2_CMD: return tr("Write 2 com.");
         case CHIP_PARAM_ERASE1_CMD: return tr("Erase 1 com.");
         case CHIP_PARAM_ERASE2_CMD: return tr("Erase 2 com.");
-        case CHIP_PARAM_STATUS_CMD: return  tr("Status com.");
+        case CHIP_PARAM_STATUS_CMD: return tr("Status com.");
+        case CHIP_PARAM_BB_MARK_OFF: return tr("BB mark off.");
         }
     }
 
@@ -171,7 +173,9 @@ QVariant ChipDbTableModel::headerData(int section, Qt::Orientation orientation,
         case CHIP_PARAM_ERASE2_CMD:
             return tr("Erase 2 command");
         case CHIP_PARAM_STATUS_CMD:
-            return  tr("Status command");
+            return tr("Status command");
+        case CHIP_PARAM_BB_MARK_OFF:
+            return tr("Bad block mark offset");
         }
     }
 
@@ -238,6 +242,7 @@ bool ChipDbTableModel::setData(const QModelIndex &index, const QVariant &value,
     case CHIP_PARAM_ERASE1_CMD:
     case CHIP_PARAM_ERASE2_CMD:
     case CHIP_PARAM_STATUS_CMD:
+    case CHIP_PARAM_BB_MARK_OFF:
         paramVal = value.toUInt(&convOk);
         if (!convOk)
             return false;

qt/cmd.h

@@ -87,6 +87,7 @@ typedef struct __attribute__((__packed__))
     uint8_t erase1Cmd;
     uint8_t erase2Cmd;
     uint8_t statusCmd;
+    uint8_t bbMarkOff;
 } ConfCmd;
 
 enum

qt/nando_chip_db.csv

@@ -1,3 +1,3 @@
-# name, page size, block size, total size, spare size, tCS, tCLS, tALS, tCLR, tAR, tWP, tRP, tDS, tCH, tCLH, tALH, tWC, tRC, tREA, row cycles, col. cycles, read 1 com., read 2 com., read ID com., reset com., write 1 com., write 2 com., erase 1 com., erase 2 com., status com.
-K9F2G08U0C, 2048, 131072, 268435456, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, 144, 255, 128, 16, 96, 208, 112
-K9F1G08U0E, 2048, 131072, 134217728, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, 144, 255, 128, 16, 96, 208, 112
+# name, page size, block size, total size, spare size, tCS, tCLS, tALS, tCLR, tAR, tWP, tRP, tDS, tCH, tCLH, tALH, tWC, tRC, tREA, row cycles, col. cycles, read 1 com., read 2 com., read ID com., reset com., write 1 com., write 2 com., erase 1 com., erase 2 com., status com., bad block mark off.
+K9F2G08U0C, 2048, 131072, 268435456, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, 144, 255, 128, 16, 96, 208, 112, 0
+K9F1G08U0E, 2048, 131072, 134217728, 64, 20, 12, 12, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, 144, 255, 128, 16, 96, 208, 112, 0

qt/programmer.cpp

@@ -335,6 +335,8 @@ void Programmer::confChip(ChipInfo *chipInfo)
         (chipInfo->params[CHIP_PARAM_ERASE2_CMD]);
     confCmd.statusCmd = static_cast<uint8_t>
         (chipInfo->params[CHIP_PARAM_STATUS_CMD]);
+    confCmd.bbMarkOff = static_cast<uint8_t>
+        (chipInfo->params[CHIP_PARAM_BB_MARK_OFF]);
 
     QObject::connect(&reader, SIGNAL(result(int)), this,
         SLOT(confChipCb(int)));