@@ -257,19 +257,18 @@ void MainWindow::slotProgEraseCompleted(int status)
257257void MainWindow::slotProgErase ()
258258{
259259 int index = ui->chipSelectComboBox ->currentIndex ();
260- ChipInfo *chipInfo = chipDb.chipInfoGetById (CHIP_INDEX2ID (index));
260+ uint32_t eraseSize = chipDb.sizeGetById (CHIP_INDEX2ID (index));
261261
262262 connect (prog, SIGNAL (eraseChipCompleted (int )), this ,
263263 SLOT (slotProgEraseCompleted (int )));
264264
265- prog->eraseChip (START_ADDRESS, chipInfo-> params [CHIP_PARAM_BLOCK_SIZE] );
265+ prog->eraseChip (START_ADDRESS, eraseSize );
266266}
267267
268268void MainWindow::slotProgReadCompleted (int status)
269269{
270270 int index = ui->chipSelectComboBox ->currentIndex ();
271- ChipInfo *chipInfo = chipDb.chipInfoGetById (CHIP_INDEX2ID (index));
272- uint32_t readSize = chipInfo->params [CHIP_PARAM_SIZE];
271+ uint32_t readSize = chipDb.sizeGetById (CHIP_INDEX2ID (index));
273272
274273 disconnect (prog, SIGNAL (readChipCompleted (int )), this ,
275274 SLOT (slotProgReadCompleted (int )));
@@ -287,8 +286,7 @@ void MainWindow::slotProgReadCompleted(int status)
287286void MainWindow::slotProgRead ()
288287{
289288 int index = ui->chipSelectComboBox ->currentIndex ();
290- ChipInfo *chipInfo = chipDb.chipInfoGetById (CHIP_INDEX2ID (index));
291- uint32_t readSize = chipInfo->params [CHIP_PARAM_SIZE];
289+ uint32_t readSize = chipDb.sizeGetById (CHIP_INDEX2ID (index));
292290
293291 if (!readSize)
294292 {
0 commit comments