qt: Refactored Select command to use thread and removed unused functions

Author: bbogush

qt/main_window.cpp

@@ -271,14 +271,21 @@ void MainWindow::slotProgWrite()
     prog->writeChip(buffer, START_ADDRESS, bufferSize, pageSize);
 }
 
-void MainWindow::selectChipCb()
+void MainWindow::slotProgSelectCompleted(int status)
 {
-    qInfo() << "Chip has been selected successfully";
+    disconnect(prog, SIGNAL(selectChipCompleted(int)), this,
+        SLOT(slotProgSelectCompleted(int)));
+
+    if (!status)
+        qInfo() << "Chip has been selected successfully";
 }
 
 void MainWindow::slotSelectChip(int selectedChipNum)
 {
     this->selectedChipNum = selectedChipNum;
-    prog->selectChip(std::bind(&MainWindow::selectChipCb, this),
-        selectedChipNum);
+
+    connect(prog, SIGNAL(selectChipCompleted(int)), this,
+        SLOT(slotProgSelectCompleted(int)));
+
+    prog->selectChip(selectedChipNum);
 }

qt/main_window.h

@@ -34,17 +34,12 @@ class MainWindow : public QMainWindow
     void initBufTable();
     void resetBufTable();
 
-    void readChipIdCb(ChipId id);
-    void selectChipCb();
-    void eraseChipCb();
-    void readChipCb(int status);
-    void writeChipCb(int status);
-
 private slots:
     void slotProgReadDeviceIdCompleted(int status);
     void slotProgReadCompleted(int status);
     void slotProgWriteCompleted(int status);
     void slotProgEraseCompleted(int status);
+    void slotProgSelectCompleted(int status);
 
 public slots:
     void slotFileOpen();

qt/programmer.cpp

@@ -16,8 +16,6 @@
 
 Programmer::Programmer(QObject *parent) : QObject(parent)
 {
-    serialPortReader = new SerialPortReader(&serialPort, this);
-    serialPortWriter = new SerialPortWriter(&serialPort, this);
 }
 
 Programmer::~Programmer()
@@ -67,56 +65,6 @@ bool Programmer::isConnected()
     return isConn;
 }
 
-int Programmer::handleStatus(RespHeader *respHead)
-{
-    switch (respHead->info)
-    {
-    case STATUS_OK:
-        break;
-    case STATUS_ERROR:
-        qCritical() << "Programmer command failed";
-        return -1;
-    default:
-        qCritical() << "Programmer returned unknown status code" << respHead->info;
-        return -1;
-    }
-
-    return 0;
-}
-
-int Programmer::handleWrongResp(uint8_t code)
-{
-    qCritical() << "Programmer returned wrong response code: " << code;
-    return -1;
-}
-
-int Programmer::readRespHeader(const QByteArray *data, uint32_t offset,
-    RespHeader *&header)
-{
-    uint size = data->size();
-    uint bytes_left = size - offset;
-
-    if (bytes_left < sizeof(RespHeader))
-    {
-        qCritical() << "Programmer error: response header size is wrong:"
-            << bytes_left;
-        return -1;
-    }
-
-    header = (RespHeader *)(data->data() + offset);
-
-    return 0;
-}
-
-void Programmer::sendCmdCb(int status)
-{
-    if (status != SerialPortWriter::WRITE_OK)
-    {
-        serialPortReader->readCancel();
-        return;
-    }
-}
-
 void Programmer::readChipIdCb(int ret)
 {
     emit readChipIdCompleted(ret);
@@ -207,46 +155,29 @@ void Programmer::writeChip(uint8_t *buf, uint32_t addr, uint32_t len,
     writer.start();
 }
 
-void Programmer::readRespSelectChipCb(int status)
+void Programmer::selectChipCb(int ret)
 {
-    RespHeader *header;
-
-    if (status == SerialPortReader::READ_ERROR)
-        return;
-
-    if (readRespHeader(&readData, 0, header))
-        return;
-
-    switch (header->code)
-    {
-    case RESP_STATUS:
-        if (header->info == STATUS_OK)
-            selectChipCb();
-        else
-            qCritical() << "Programmer error: failed to select chip";
-        break;
-    default:
-        handleWrongResp(header->code);
-        break;
-    }
+    QObject::disconnect(&reader, SIGNAL(result(int)), this,
+        SLOT(selectChipCb(int)));
+    serialPortConnect();
+    emit selectChipCompleted(ret);
 }
 
-void Programmer::selectChip(std::function<void(void)> callback,
-    uint32_t chipNum)
+void Programmer::selectChip(uint32_t chipNum)
 {
     Cmd cmd = { .code = CMD_NAND_SELECT };
     SelectCmd selectCmd = { .cmd = cmd, .chipNum = chipNum };
 
-    readData.clear();
-    serialPortReader->read(std::bind(&Programmer::readRespSelectChipCb, this,
-        std::placeholders::_1), &readData, READ_TIMEOUT_MS,
-        sizeof(RespHeader));
+    QObject::connect(&reader, SIGNAL(result(int)), this,
+        SLOT(selectChipCb(int)));
 
-    selectChipCb = callback;
+    /* Serial port object cannot be used in other thread */
+    serialPortDisconnect();
     writeData.clear();
-    writeData.append((const char *)&selectCmd, sizeof(selectCmd));
-    serialPortWriter->write(std::bind(&Programmer::sendCmdCb, this,
-        std::placeholders::_1), &writeData);
+    writeData.append((const char *)&selectCmd, sizeof(SelectCmd));
+    reader.init(CDC_DEV_NAME, SERIAL_PORT_SPEED, NULL, 0,
+        (uint8_t *)writeData.constData(), writeData.size());
+    reader.start();
 }
 
 

qt/programmer.h

@@ -9,11 +9,7 @@
 #include <QObject>
 #include <QtSerialPort/QSerialPort>
 #include <QByteArray>
-#include <QTimer>
 #include <cstdint>
-#include <functional>
-#include "serial_port_writer.h"
-#include "serial_port_reader.h"
 #include "writer.h"
 #include "reader.h"
 #include "cmd.h"
@@ -27,36 +23,13 @@ class Programmer : public QObject
     QSerialPort serialPort;
     Writer writer;
     Reader reader;
-    QThread *currThread;
     bool isConn;
-    std::function<void(void)> selectChipCb;
-    uint8_t *readChipBuf;
-    uint32_t readChipLen;
-    uint8_t *writeChipBuf;
-    uint32_t writeSentBytes;
-    uint32_t writeRemainingBytes;
-    uint32_t writeAckBytes;
-    uint32_t writeAckBytesLim;
-    uint32_t writeLen;
-    bool isWriteInProgress;
-    bool isReadError;
-    bool schedWrite;
 
-    void sendCmdCb(int status);
-    int readRespHeader(const QByteArray *data, uint32_t offset,
-        RespHeader *&header);
-    void readRespSelectChipCb(int status);
-    int handleStatus(RespHeader *respHead);
-    int handleWrongResp(uint8_t code);
-    int handleBadBlock(QByteArray *data, uint32_t offset);
     int serialPortConnect();
     void serialPortDisconnect();
 
 public:
-    QByteArray readData;
     QByteArray writeData;
-    SerialPortWriter *serialPortWriter;
-    SerialPortReader *serialPortReader;
 
     explicit Programmer(QObject *parent = 0);
     ~Programmer();
@@ -68,19 +41,21 @@ class Programmer : public QObject
     void readChip(uint8_t *buf, uint32_t addr, uint32_t len);
     void writeChip(uint8_t *buf, uint32_t addr, uint32_t len,
         uint32_t pageSize);
-    void selectChip(std::function<void(void)> callback, uint32_t chipNum);
+    void selectChip(uint32_t chipNum);
 
 signals:
     void readChipIdCompleted(int ret);
     void writeChipCompleted(int ret);
     void readChipCompleted(int ret);
     void eraseChipCompleted(int ret);
+    void selectChipCompleted(int ret);
 
 private slots:
     void readChipIdCb(int ret);
     void writeCb(int ret);
     void readCb(int ret);
     void eraseChipCb(int ret);
+    void selectChipCb(int ret);
 };
 
 #endif // PROGRAMMER_H

qt/qt.pro

@@ -21,8 +21,6 @@ SOURCES += main.cpp\
         main_window.cpp \
     programmer.cpp \
     chip_db.cpp \
-    serial_port_writer.cpp \
-    serial_port_reader.cpp \
     logger.cpp \
     buffer_table_model.cpp \
     writer.cpp \
@@ -31,8 +29,6 @@ SOURCES += main.cpp\
 HEADERS  += main_window.h \
     programmer.h \
     chip_db.h \
-    serial_port_writer.h \
-    serial_port_reader.h \
     logger.h \
     buffer_table_model.h \
     cmd.h \