Moved HAL type to chip info structure

Author: bbogush

qt/chip_db.h

@@ -9,12 +9,6 @@
 #include "chip_info.h"
 #include <QStringList>
 
-enum CHIP_HAL
-{
-    CHIP_HAL_PARALLEL = 0,
-    CHIP_HAL_SPI = 1
-};
-
 class ChipDb
 {
 public:
@@ -26,7 +20,6 @@ class ChipDb
     virtual uint32_t extendedPageSizeGetByName(const QString &name) = 0;
     virtual uint32_t totalSizeGetByName(const QString &name) = 0;
     virtual uint32_t extendedTotalSizeGetByName(const QString &name) = 0;
-    virtual uint8_t getHal() = 0;
     virtual ChipInfo *getChipInfo(int chipIndex) = 0;
     QString getChipName(int chipIndex);
     int setChipName(int chipIndex, const QString &name);

qt/chip_info.h

@@ -50,6 +50,12 @@ enum
     CHIP_PARAM_NUM,
 };
 
+enum CHIP_HAL
+{
+    CHIP_HAL_PARALLEL = 0,
+    CHIP_HAL_SPI = 1
+};
+
 class ChipInfo
 {
 protected:
@@ -64,6 +70,7 @@ class ChipInfo
     uint32_t spareSize;
     uint32_t bbMarkOffset;
     uint32_t params[CHIP_PARAM_NUM];
+    uint32_t hal;
 
     virtual const QByteArray &getHalConf() = 0;
 };

qt/main_window.cpp

@@ -515,7 +515,7 @@ void MainWindow::slotSelectChip(int selectedChipNum)
         SLOT(slotProgSelectCompleted(int)));
 
     if (chipInfo)
-        prog->confChip(chipInfo, currentChipDb->getHal());
+        prog->confChip(chipInfo);
 }
 
 void MainWindow::slotProgDetectChipReadChipIdCompleted(int status)
@@ -545,7 +545,7 @@ void MainWindow::slotProgDetectChipReadChipIdCompleted(int status)
 
     if (chipName.isEmpty())
     {
-        if (currentChipDb->getHal() == spiChipDb.getHal())
+        if (currentChipDb == &spiChipDb)
             qInfo() << "Chip not found in database";
         else
         {
@@ -591,7 +591,7 @@ void MainWindow::detectChip(ChipDb *chipDb)
 
     connect(prog, SIGNAL(confChipCompleted(int)), this,
         SLOT(slotProgDetectChipConfCompleted(int)));
-    prog->confChip(chipInfo, currentChipDb->getHal());
+    prog->confChip(chipInfo);
 }
 
 void MainWindow::slotDetectChip()

qt/parallel_chip_db.cpp

@@ -560,8 +560,3 @@ int ParallelChipDb::setChipParam(int chipIndex, int paramIndex,
 
     return 0;
 }
-
-uint8_t ParallelChipDb::getHal()
-{
-    return CHIP_HAL_PARALLEL;
-}

qt/parallel_chip_db.h

@@ -61,7 +61,6 @@ class ParallelChipDb : public ChipDb
     bool isOptParamValid(uint32_t param, uint32_t min, uint32_t max);
     uint32_t getChipParam(int chipIndex, int paramIndex);
     int setChipParam(int chipIndex, int paramIndex, uint32_t paramValue);
-    uint8_t getHal();
 };
 
 #endif // PARALLEL_CHIP_DB_H

qt/parallel_chip_info.cpp

@@ -33,6 +33,7 @@ typedef struct __attribute__((__packed__))
 
 ParallelChipInfo::ParallelChipInfo()
 {
+    hal = CHIP_HAL_PARALLEL;
 }
 
 ParallelChipInfo::~ParallelChipInfo()

qt/programmer.cpp

@@ -295,12 +295,12 @@ void Programmer::confChipCb(int ret)
     emit confChipCompleted(ret);
 }
 
-void Programmer::confChip(ChipInfo *chipInfo, uint8_t hal)
+void Programmer::confChip(ChipInfo *chipInfo)
 {
     ConfCmd confCmd;
 
     confCmd.cmd.code = CMD_NAND_CONF;
-    confCmd.hal = hal;
+    confCmd.hal = chipInfo->hal;
     confCmd.pageSize = chipInfo->pageSize;
     confCmd.blockSize = chipInfo->blockSize;
     confCmd.totalSize = chipInfo->totalSize;

qt/programmer.h

@@ -82,7 +82,7 @@ class Programmer : public QObject
     void writeChip(uint8_t *buf, uint32_t addr, uint32_t len,
         uint32_t pageSize);
     void readChipBadBlocks();
-    void confChip(ChipInfo *chipInfo, uint8_t hal);
+    void confChip(ChipInfo *chipInfo);
     void detectChip();
     QString fwVersionToString(FwVersion fwVersion);
     void firmwareUpdate(const QString &fileName);

qt/spi_chip_db.cpp

@@ -560,8 +560,3 @@ int SpiChipDb::setChipParam(int chipIndex, int paramIndex,
 
     return 0;
 }
-
-uint8_t SpiChipDb::getHal()
-{
-    return CHIP_HAL_SPI;
-}

qt/spi_chip_db.h

@@ -61,7 +61,6 @@ class SpiChipDb : public ChipDb
     bool isOptParamValid(uint32_t param, uint32_t min, uint32_t max);
     uint32_t getChipParam(int chipIndex, int paramIndex);
     int setChipParam(int chipIndex, int paramIndex, uint32_t paramValue);
-    uint8_t getHal();
 };
 
 #endif // SPI_CHIP_DB_H