Use correct type for BB offset

Author: bbogush

qt/chip_db.cpp

@@ -100,14 +100,14 @@ int ChipDb::setSpareSize(int chipIndex, uint32_t spareSize)
     return 0;
 }
 
-uint32_t ChipDb::getBBMarkOffset(int chipIndex)
+uint8_t ChipDb::getBBMarkOffset(int chipIndex)
 {
     ChipInfo *ci = getChipInfo(chipIndex);
 
     return ci ? ci->bbMarkOffset : 0;
 }
 
-int ChipDb::setBBMarkOffset(int chipIndex, uint32_t bbMarkOffset)
+int ChipDb::setBBMarkOffset(int chipIndex, uint8_t bbMarkOffset)
 {
     ChipInfo *ci = getChipInfo(chipIndex);
 

qt/chip_db.h

@@ -31,8 +31,8 @@ class ChipDb
     int setTotalSize(int chipIndex, uint32_t totalSize);
     uint32_t getSpareSize(int chipIndex);
     int setSpareSize(int chipIndex, uint32_t spareSize);
-    uint32_t getBBMarkOffset(int chipIndex);
-    int setBBMarkOffset(int chipIndex, uint32_t bbMarkOffset);
+    uint8_t getBBMarkOffset(int chipIndex);
+    int setBBMarkOffset(int chipIndex, uint8_t bbMarkOffset);
 };
 
 #endif // CHIP_DB_H

qt/chip_info.h

@@ -68,7 +68,7 @@ class ChipInfo
     uint32_t blockSize;
     uint32_t totalSize;
     uint32_t spareSize;
-    uint32_t bbMarkOffset;
+    uint8_t bbMarkOffset;
     uint32_t params[CHIP_PARAM_NUM];
     uint32_t hal;
 

qt/parallel_chip_db.cpp

@@ -45,6 +45,21 @@ int ParallelChipDb::getParamFromString(const QString &value, uint32_t &param)
     return 0;
 }
 
+int ParallelChipDb::getParamFromString(const QString &value, uint8_t &param)
+{
+    uint32_t temp;
+
+    if (getParamFromString(value, temp))
+        return -1;
+
+    if (temp > UINT8_MAX)
+        return -1;
+
+    param = temp;
+
+    return 0;
+}
+
 int ParallelChipDb::getParamFromHexString(const QString &value, uint32_t &param)
 {
     bool ok;

qt/parallel_chip_db.h

@@ -50,6 +50,7 @@ class ParallelChipDb : public ChipDb
     void commit();
     void reset();
     int getParamFromString(const QString &value, uint32_t &param);
+    int getParamFromString(const QString &value, uint8_t &param);
     int getParamFromHexString(const QString &value, uint32_t &param);
     int getStringFromParam(const uint32_t &param, QString &value);
     int getHexStringFromParam(const uint32_t &param, QString &value);

qt/programmer.cpp

@@ -305,7 +305,7 @@ void Programmer::confChip(ChipInfo *chipInfo)
     confCmd.blockSize = chipInfo->blockSize;
     confCmd.totalSize = chipInfo->totalSize;
     confCmd.spareSize = chipInfo->spareSize;
-    confCmd.bbMarkOff = static_cast<uint8_t>(chipInfo->bbMarkOffset);
+    confCmd.bbMarkOff = chipInfo->bbMarkOffset;
 
     QObject::connect(&reader, SIGNAL(result(int)), this,
         SLOT(confChipCb(int)));

qt/spi_chip_db.cpp

@@ -45,6 +45,21 @@ int SpiChipDb::getParamFromString(const QString &value, uint32_t &param)
     return 0;
 }
 
+int SpiChipDb::getParamFromString(const QString &value, uint8_t &param)
+{
+    uint32_t temp;
+
+    if (getParamFromString(value, temp))
+        return -1;
+
+    if (temp > UINT8_MAX)
+        return -1;
+
+    param = temp;
+
+    return 0;
+}
+
 int SpiChipDb::getParamFromHexString(const QString &value, uint32_t &param)
 {
     bool ok;

qt/spi_chip_db.h

@@ -50,6 +50,7 @@ class SpiChipDb : public ChipDb
     void commit();
     void reset();
     int getParamFromString(const QString &value, uint32_t &param);
+    int getParamFromString(const QString &value, uint8_t &param);
     int getParamFromHexString(const QString &value, uint32_t &param);
     int getStringFromParam(const uint32_t &param, QString &value);
     int getHexStringFromParam(const uint32_t &param, QString &value);