openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

cli_classic.c: Make count_max_decode_exceedings() pure

Browse Source 
Pass by argument the max_rom_decode structure such that the
function is pure and defined upon its parameters.

Note, unfortunately a itermediate step of a '_' suffix is
required for the 'max_rom_decode' parameter as to not alias
the global symbol within the function body.

Change-Id: Ia01f77993deab68e251850008e885828e55b9462
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/68479
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2022-09-05 11:13:56 +10:00 committed by Edward O'Callaghan
parent 748575abb2
commit eda27e4d1b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cli_classic.c
View File

@ -520,43 +520,44 @@ _free_ret:
/* Returns the number of buses commonly supported by the current programmer and flash chip where the latter /* Returns the number of buses commonly supported by the current programmer and flash chip where the latter
* can not be completely accessed due to size/address limits of the programmer. */ * can not be completely accessed due to size/address limits of the programmer. */
static unsigned int count_max_decode_exceedings(const struct flashctx *flash) static unsigned int count_max_decode_exceedings(const struct flashctx *flash,
const struct decode_sizes *max_rom_decode_)
{ {
unsigned int limitexceeded = 0; unsigned int limitexceeded = 0;
uint32_t size = flash->chip->total_size * 1024; uint32_t size = flash->chip->total_size * 1024;
enum chipbustype buses = flash->mst->buses_supported & flash->chip->bustype; enum chipbustype buses = flash->mst->buses_supported & flash->chip->bustype;
if ((buses & BUS_PARALLEL) && (max_rom_decode.parallel < size)) { if ((buses & BUS_PARALLEL) && (max_rom_decode_->parallel < size)) {
limitexceeded++; limitexceeded++;
msg_pdbg("Chip size %u kB is bigger than supported " msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer " "size %u kB of chipset/board/programmer "
"for %s interface, " "for %s interface, "
"probe/read/erase/write may fail. ", size / 1024, "probe/read/erase/write may fail. ", size / 1024,
max_rom_decode.parallel / 1024, "Parallel"); max_rom_decode_->parallel / 1024, "Parallel");
} }
if ((buses & BUS_LPC) && (max_rom_decode.lpc < size)) { if ((buses & BUS_LPC) && (max_rom_decode_->lpc < size)) {
limitexceeded++; limitexceeded++;
msg_pdbg("Chip size %u kB is bigger than supported " msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer " "size %u kB of chipset/board/programmer "
"for %s interface, " "for %s interface, "
"probe/read/erase/write may fail. ", size / 1024, "probe/read/erase/write may fail. ", size / 1024,
max_rom_decode.lpc / 1024, "LPC"); max_rom_decode_->lpc / 1024, "LPC");
} }
if ((buses & BUS_FWH) && (max_rom_decode.fwh < size)) { if ((buses & BUS_FWH) && (max_rom_decode_->fwh < size)) {
limitexceeded++; limitexceeded++;
msg_pdbg("Chip size %u kB is bigger than supported " msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer " "size %u kB of chipset/board/programmer "
"for %s interface, " "for %s interface, "
"probe/read/erase/write may fail. ", size / 1024, "probe/read/erase/write may fail. ", size / 1024,
max_rom_decode.fwh / 1024, "FWH"); max_rom_decode_->fwh / 1024, "FWH");
} }
if ((buses & BUS_SPI) && (max_rom_decode.spi < size)) { if ((buses & BUS_SPI) && (max_rom_decode_->spi < size)) {
limitexceeded++; limitexceeded++;
msg_pdbg("Chip size %u kB is bigger than supported " msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer " "size %u kB of chipset/board/programmer "
"for %s interface, " "for %s interface, "
"probe/read/erase/write may fail. ", size / 1024, "probe/read/erase/write may fail. ", size / 1024,
max_rom_decode.spi / 1024, "SPI"); max_rom_decode_->spi / 1024, "SPI");
} }
return limitexceeded; return limitexceeded;
} }
@ -1060,7 +1061,7 @@ int main(int argc, char *argv[])
print_chip_support_status(fill_flash->chip); print_chip_support_status(fill_flash->chip);
unsigned int limitexceeded = count_max_decode_exceedings(fill_flash); unsigned int limitexceeded = count_max_decode_exceedings(fill_flash, &max_rom_decode);
if (limitexceeded > 0 && !force) { if (limitexceeded > 0 && !force) {
enum chipbustype commonbuses = fill_flash->mst->buses_supported & fill_flash->chip->bustype; enum chipbustype commonbuses = fill_flash->mst->buses_supported & fill_flash->chip->bustype;