Skip to content

Commit 7bd650a

Browse files
bbogushbbogush
committed
Moved BB offset parameter to optimise parsing
1 parent 9d44bfd commit 7bd650a

6 files changed

+29
-36
lines changed

‎qt/nando_parallel_chip_db.csv

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# 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 cycle com., read 2 cycle com., read spare com., read ID com., reset com., write 1 cycle com., write 2 cycle com., erase 1 cycle com., erase 2 cycle com., status com., bad block mark off., ID1, ID2, ID3, ID4, ID5
2-
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, 236, 218, 16, 149, 68
3-
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, 236, 241, 0, 149, 65
4-
K9F1208U0B, 512, 16384, 67108864, 16, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 45, 50, 30, 3, 1, 0, -, -, 144, 255, 128, 16, 96, 208, 112, 5, 236, 118, 165, 192, -
5-
K9G8G08U0A, 2048, 262144, 1073741824, 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, 236, 211, 20, 165, 100
6-
HY27US08561A, 512, 16384, 33554432, 16, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 50, 50, 30, 2, 1, 0, -, 80, 144, 255, 128, 16, 96, 208, 112, 5, 173, 117, -, -, -
7-
HY27US08121B, 512, 16384, 67108864, 16, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 50, 50, 30, 3, 1, 0, -, 80, 144, 255, 128, 16, 96, 208, 112, 5, 173, 118, -, -, -
8-
TC58NVG2S3E, 2048, 131072, 536870912, 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, 152, 220, 144, 21, 118
9-
TC58NVG1S3E, 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, 152, 218, 144, 21, 118
10-
F59L2G81A, 2048, 131072, 268435456, 64, 20, 12, 5, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0, 200, 218, 144, 149, 68
11-
MT29F4G08ABAD, 2048, 131072, 536870912, 64, 15, 10, 10, 10, 10, 10, 10, 7, 5, 5, 5, 20, 20, 16, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0, 44, 220, 144, 149, 86
12-
MX30LF2G18AC, 2048, 131072, 268435456, 64, 15, 10, 10, 10, 10, 10, 10, 7, 5, 5, 5, 20, 20, 16, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 0, 194, 218, 144, 149, 6
1+
# name, page size, block size, total size, spare size, bad block mark off., tCS, tCLS, tALS, tCLR, tAR, tWP, tRP, tDS, tCH, tCLH, tALH, tWC, tRC, tREA, row cycles, col. cycles, read 1 cycle com., read 2 cycle com., read spare com., read ID com., reset com., write 1 cycle com., write 2 cycle com., erase 1 cycle com., erase 2 cycle com., status com., ID1, ID2, ID3, ID4, ID5
2+
K9F2G08U0C, 2048, 131072, 268435456, 64, 0, 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, 236, 218, 16, 149, 68
3+
K9F1G08U0E, 2048, 131072, 134217728, 64, 0, 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, 236, 241, 0, 149, 65
4+
K9F1208U0B, 512, 16384, 67108864, 16, 5, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 45, 50, 30, 3, 1, 0, -, -, 144, 255, 128, 16, 96, 208, 112, 236, 118, 165, 192, -
5+
K9G8G08U0A, 2048, 262144, 1073741824, 64, 0, 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, 236, 211, 20, 165, 100
6+
HY27US08561A, 512, 16384, 33554432, 16, 5, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 50, 50, 30, 2, 1, 0, -, 80, 144, 255, 128, 16, 96, 208, 112, 173, 117, -, -, -
7+
HY27US08121B, 512, 16384, 67108864, 16, 5, 0, 0, 0, 10, 10, 25, 25, 20, 10, 10, 10, 50, 50, 30, 3, 1, 0, -, 80, 144, 255, 128, 16, 96, 208, 112, 173, 118, -, -, -
8+
TC58NVG2S3E, 2048, 131072, 536870912, 64, 0, 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, 152, 220, 144, 21, 118
9+
TC58NVG1S3E, 2048, 131072, 268435456, 64, 0, 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, 152, 218, 144, 21, 118
10+
F59L2G81A, 2048, 131072, 268435456, 64, 0, 20, 12, 5, 10, 10, 12, 12, 12, 5, 5, 5, 25, 25, 20, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 200, 218, 144, 149, 68
11+
MT29F4G08ABAD, 2048, 131072, 536870912, 64, 0, 15, 10, 10, 10, 10, 10, 10, 7, 5, 5, 5, 20, 20, 16, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 44, 220, 144, 149, 86
12+
MX30LF2G18AC, 2048, 131072, 268435456, 64, 0, 15, 10, 10, 10, 10, 10, 10, 7, 5, 5, 5, 20, 20, 16, 3, 2, 0, 48, -, 144, 255, 128, 16, 96, 208, 112, 194, 218, 144, 149, 6

‎qt/parallel_chip_db.cpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ ChipInfo *ParallelChipDb::stringToChipInfo(const QString &s)
8888

8989
for (int i = CHIP_PARAM_T_CS; i < CHIP_PARAM_NUM; i++)
9090
{
91-
if (i == CHIP_PARAM_BB_MARK_OFF)
92-
continue;
93-
9491
if (getOptParamFromString(paramsList[i], paramValue))
9592
{
9693
QMessageBox::critical(nullptr, QObject::tr("Error"),
@@ -119,15 +116,10 @@ int ParallelChipDb::chipInfoToString(ChipInfo *chipInfo, QString &s)
119116
paramsList.append(csvValue);
120117
getStringFromParam(ci->getSpareSize(), csvValue);
121118
paramsList.append(csvValue);
119+
getStringFromParam(ci->getBBMarkOffset(), csvValue);
120+
paramsList.append(csvValue);
122121
for (int i = CHIP_PARAM_T_CS; i < CHIP_PARAM_NUM; i++)
123122
{
124-
if (i == CHIP_PARAM_BB_MARK_OFF)
125-
{
126-
getStringFromParam(ci->getBBMarkOffset(), csvValue);
127-
paramsList.append(csvValue);
128-
continue;
129-
}
130-
131123
if (getStringFromOptParam(ci->getParam(i - CHIP_PARAM_T_CS), csvValue))
132124
return -1;
133125
paramsList.append(csvValue);

‎qt/parallel_chip_db.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class ParallelChipDb : public ChipDb
3333
CHIP_PARAM_BLOCK_SIZE,
3434
CHIP_PARAM_TOTAL_SIZE,
3535
CHIP_PARAM_SPARE_SIZE,
36+
CHIP_PARAM_BB_MARK_OFF,
3637
CHIP_PARAM_T_CS,
3738
CHIP_PARAM_T_CLS,
3839
CHIP_PARAM_T_ALS,
@@ -59,7 +60,6 @@ class ParallelChipDb : public ChipDb
5960
CHIP_PARAM_ERASE1_CMD,
6061
CHIP_PARAM_ERASE2_CMD,
6162
CHIP_PARAM_STATUS_CMD,
62-
CHIP_PARAM_BB_MARK_OFF,
6363
CHIP_PARAM_ID1,
6464
CHIP_PARAM_ID2,
6565
CHIP_PARAM_ID3,

‎qt/parallel_chip_db_dialog.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ ParallelChipDbDialog::ParallelChipDbDialog(ParallelChipDb *chipDb,
2727
HEADER_MED_WIDTH);
2828
ui->chipDbTableView->setColumnWidth(ParallelChipDb::CHIP_PARAM_SPARE_SIZE,
2929
HEADER_MED_WIDTH);
30+
ui->chipDbTableView->setColumnWidth(ParallelChipDb::CHIP_PARAM_BB_MARK_OFF,
31+
HEADER_MED_WIDTH);
3032
for (int i = ParallelChipDb::CHIP_PARAM_T_CS;
3133
i <= ParallelChipDb::CHIP_PARAM_T_REA; i++)
3234
{
3335
ui->chipDbTableView->setColumnWidth(i, HEADER_SHORT_WIDTH);
3436
}
3537
for (int i = ParallelChipDb::CHIP_PARAM_ROW_CYCLES;
36-
i <= ParallelChipDb::CHIP_PARAM_BB_MARK_OFF; i++)
38+
i <= ParallelChipDb::CHIP_PARAM_STATUS_CMD; i++)
3739
{
3840
ui->chipDbTableView->setColumnWidth(i, HEADER_MED_WIDTH);
3941
}

‎qt/parallel_chip_db_table_model.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ QVariant ParallelChipDbTableModel::data(const QModelIndex &index,
5555
chipDb->getHexStringFromParam(chipDb->getSpareSize(index.row()),
5656
paramStr);
5757
return paramStr;
58+
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
59+
return chipDb->getBBMarkOffset(index.row());
5860
case ParallelChipDb::CHIP_PARAM_T_CS:
5961
return chipDb->getChipParam(index.row(),
6062
ParallelChipInfo::CHIP_PARAM_T_CS);
@@ -143,8 +145,6 @@ QVariant ParallelChipDbTableModel::data(const QModelIndex &index,
143145
chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(),
144146
ParallelChipInfo::CHIP_PARAM_STATUS_CMD), paramStr);
145147
return paramStr;
146-
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
147-
return chipDb->getBBMarkOffset(index.row());
148148
case ParallelChipDb::CHIP_PARAM_ID1:
149149
chipDb->getHexStringFromParam(chipDb->getChipParam(index.row(),
150150
ParallelChipInfo::CHIP_PARAM_ID1), paramStr);
@@ -187,6 +187,8 @@ QVariant ParallelChipDbTableModel::headerData(int section,
187187
return tr("Total size");
188188
case ParallelChipDb::CHIP_PARAM_SPARE_SIZE:
189189
return tr("Spare size");
190+
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
191+
return tr("BB mark off.");
190192
case ParallelChipDb::CHIP_PARAM_T_CS:
191193
return tr("tCS");
192194
case ParallelChipDb::CHIP_PARAM_T_CLS:
@@ -239,8 +241,6 @@ QVariant ParallelChipDbTableModel::headerData(int section,
239241
return tr("Erase 2 com.");
240242
case ParallelChipDb::CHIP_PARAM_STATUS_CMD:
241243
return tr("Status com.");
242-
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
243-
return tr("BB mark off.");
244244
case ParallelChipDb::CHIP_PARAM_ID1:
245245
return tr("ID 1");
246246
case ParallelChipDb::CHIP_PARAM_ID2:
@@ -268,6 +268,8 @@ QVariant ParallelChipDbTableModel::headerData(int section,
268268
return tr("Total size in bytes");
269269
case ParallelChipDb::CHIP_PARAM_SPARE_SIZE:
270270
return tr("Spare area size in bytes");
271+
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
272+
return tr("Bad block mark offset");
271273
case ParallelChipDb::CHIP_PARAM_T_CS:
272274
return tr("Chip enable setup time");
273275
case ParallelChipDb::CHIP_PARAM_T_CLS:
@@ -322,8 +324,6 @@ QVariant ParallelChipDbTableModel::headerData(int section,
322324
return tr("Erase 2 cycle command");
323325
case ParallelChipDb::CHIP_PARAM_STATUS_CMD:
324326
return tr("Status command");
325-
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
326-
return tr("Bad block mark offset");
327327
case ParallelChipDb::CHIP_PARAM_ID1:
328328
return tr("Chip ID 1st byte");
329329
case ParallelChipDb::CHIP_PARAM_ID2:
@@ -378,6 +378,11 @@ bool ParallelChipDbTableModel::setData(const QModelIndex &index,
378378
return false;
379379
chipDb->setSpareSize(index.row(), paramVal);
380380
return true;
381+
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
382+
if (chipDb->getParamFromString(value.toString(), paramVal))
383+
return false;
384+
chipDb->setBBMarkOffset(index.row(), paramVal);
385+
return true;
381386
case ParallelChipDb::CHIP_PARAM_T_CS:
382387
if (chipDb->getParamFromString(value.toString(), paramVal))
383388
return false;
@@ -564,11 +569,6 @@ bool ParallelChipDbTableModel::setData(const QModelIndex &index,
564569
chipDb->setChipParam(index.row(),
565570
ParallelChipInfo::CHIP_PARAM_STATUS_CMD, paramVal);
566571
return true;
567-
case ParallelChipDb::CHIP_PARAM_BB_MARK_OFF:
568-
if (chipDb->getParamFromString(value.toString(), paramVal))
569-
return false;
570-
chipDb->setBBMarkOffset(index.row(), paramVal);
571-
return true;
572572
case ParallelChipDb::CHIP_PARAM_ID1:
573573
if (chipDb->getParamFromHexString(value.toString(), paramVal))
574574
return false;

‎qt/parallel_chip_info.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ class ParallelChipInfo : public ChipInfo
3939
CHIP_PARAM_ERASE1_CMD,
4040
CHIP_PARAM_ERASE2_CMD,
4141
CHIP_PARAM_STATUS_CMD,
42-
CHIP_PARAM_BB_MARK_OFF,
4342
CHIP_PARAM_ID1,
4443
CHIP_PARAM_ID2,
4544
CHIP_PARAM_ID3,

0 commit comments

Comments
 (0)