Added UI configuration for skipping bad blocks

Author: bbogush

firmware/nand_programmer.c

@@ -58,11 +58,17 @@ typedef struct __attribute__((__packed__))
     np_cmd_code_t code;
 } np_cmd_t;
 
+typedef struct __attribute__((__packed__))
+{
+    uint8_t skip_bb : 1;
+} np_cmd_flags_t;
+
 typedef struct __attribute__((__packed__))
 {
     np_cmd_t cmd;
     uint32_t addr;
     uint32_t len;
+    np_cmd_flags_t flags;
 } np_erase_cmd_t;
 
 typedef struct __attribute__((__packed__))
@@ -270,9 +276,9 @@ static int np_nand_erase(np_prog_t *prog, uint32_t page)
 
 static int _np_cmd_nand_erase(np_prog_t *prog)
 {
-    int is_bad;
     uint32_t addr, page, pages_in_block, len;
     np_erase_cmd_t *erase_cmd = (np_erase_cmd_t *)prog->rx_buf;
+    bool is_bad = false, skip_bb = erase_cmd->flags.skip_bb;
 
     len = erase_cmd->len;
     addr = erase_cmd->addr;
@@ -318,7 +324,7 @@ static int _np_cmd_nand_erase(np_prog_t *prog)
             return NP_ERR_ADDR_EXCEEDED;
         }
 
-        if ((is_bad = nand_bad_block_table_lookup(addr)))
+        if (skip_bb && (is_bad = nand_bad_block_table_lookup(addr)))
         {
             DEBUG_PRINT("Skipped bad block at 0x%lx\r\n", addr);
             if (np_send_bad_block_info(addr))

qt/cmd.h

@@ -20,11 +20,17 @@ typedef struct __attribute__((__packed__))
     uint8_t code;
 } Cmd;
 
+typedef struct __attribute__((__packed__))
+{
+    uint8_t skipBB : 1;
+} CmdFlags;
+
 typedef struct __attribute__((__packed__))
 {
     Cmd cmd;
     uint32_t addr;
     uint32_t len;
+    CmdFlags flags;
 } EraseCmd;
 
 typedef struct __attribute__((__packed__))

qt/main_window.cpp

@@ -346,7 +346,11 @@ void MainWindow::slotSettingsProgrammer()
     SettingsProgrammerDialog progDialog(this);
 
     progDialog.setUsbDevName(prog->getUsbDevName());
+    progDialog.setSkipBB(prog->isSkipBB());
 
     if (progDialog.exec() == QDialog::Accepted)
+    {
         prog->setUsbDevName(progDialog.getUsbDevName());
+        prog->setSkipBB(progDialog.isSkipBB());
+    }
 }

qt/programmer.cpp

@@ -16,6 +16,7 @@
 Programmer::Programmer(QObject *parent) : QObject(parent)
 {
     usbDevName = USB_DEV_NAME;
+    skipBB = true;
     QObject::connect(&reader, SIGNAL(log(QtMsgType, QString)), this,
         SLOT(logCb(QtMsgType, QString)));
     QObject::connect(&writer, SIGNAL(log(QtMsgType, QString)), this,
@@ -79,6 +80,16 @@ QString Programmer::getUsbDevName()
     return usbDevName;
 }
 
+bool Programmer::isSkipBB()
+{
+    return skipBB;
+}
+
+void Programmer::setSkipBB(bool skip)
+{
+    skipBB = skip;
+}
+
 void Programmer::readChipIdCb(int ret)
 {
     emit readChipIdCompleted(ret);
@@ -114,7 +125,8 @@ void Programmer::eraseChipCb(int ret)
 void Programmer::eraseChip(uint32_t addr, uint32_t len)
 {
     Cmd cmd = { .code = CMD_NAND_ERASE };
-    EraseCmd eraseCmd = { .cmd = cmd, .addr = addr, .len = len };
+    EraseCmd eraseCmd = { .cmd = cmd, .addr = addr, .len = len,
+        .flags = { .skipBB = skipBB } };
 
     QObject::connect(&reader, SIGNAL(result(int)), this,
         SLOT(eraseChipCb(int)));

qt/programmer.h

@@ -25,6 +25,7 @@ class Programmer : public QObject
     Writer writer;
     Reader reader;
     bool isConn;
+    bool skipBB;
 
     int serialPortConnect();
     void serialPortDisconnect();
@@ -39,6 +40,8 @@ class Programmer : public QObject
     bool isConnected();
     void setUsbDevName(const QString &name);
     QString getUsbDevName();
+    bool isSkipBB();
+    void setSkipBB(bool skip);
     void readChipId(ChipId *chipId);
     void eraseChip(uint32_t addr, uint32_t len);
     void readChip(uint8_t *buf, uint32_t addr, uint32_t len);

qt/settings_programmer_dialog.cpp

@@ -22,3 +22,13 @@ QString SettingsProgrammerDialog::getUsbDevName()
 {
     return ui->usbDevNameLineEdit->text();
 }
+
+void SettingsProgrammerDialog::setSkipBB(bool skip)
+{
+    ui->skipBBCheckBox->setChecked(skip);
+}
+
+bool SettingsProgrammerDialog::isSkipBB()
+{
+    return ui->skipBBCheckBox->isChecked();
+}

qt/settings_programmer_dialog.h

@@ -16,6 +16,8 @@ class SettingsProgrammerDialog : public QDialog
     ~SettingsProgrammerDialog();
     void setUsbDevName(const QString &name);
     QString getUsbDevName();
+    void setSkipBB(bool skip);
+    bool isSkipBB();
 
 private:
     Ui::SettingsProgrammerDialog *ui;

qt/settings_programmer_dialog.ui

@@ -29,7 +29,7 @@
     <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
    </property>
   </widget>
-  <widget class="QWidget" name="">
+  <widget class="QWidget" name="layoutWidget">
    <property name="geometry">
     <rect>
      <x>10</x>
@@ -51,10 +51,25 @@
     </item>
    </layout>
   </widget>
+  <widget class="QCheckBox" name="skipBBCheckBox">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>60</y>
+     <width>101</width>
+     <height>20</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Skip bad blocks</string>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+  </widget>
+  <zorder>layoutWidget</zorder>
   <zorder>buttonBox</zorder>
-  <zorder>usbDevNameLabel</zorder>
-  <zorder>usbDevNameLineEdit</zorder>
-  <zorder>usbDevNameLabel</zorder>
+  <zorder>skipBBCheckBox</zorder>
  </widget>
  <resources/>
  <connections>