Edward O'Callaghan has uploaded this change for review.

View Change

cli_classic.c: Make count_max_decode_exceedings() pure

Pass by argument the max_rom_decode structure such that the
function is pure and defined upon it's parameters.

Change-Id: Ia01f77993deab68e251850008e885828e55b9462
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M cli_classic.c
1 file changed, 24 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/79/68479/1
diff --git a/cli_classic.c b/cli_classic.c
index b66094c..52733fb 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -518,43 +518,44 @@

/* 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. */
-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;
uint32_t size = flash->chip->total_size * 1024;
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++;
msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer "
"for %s interface, "
"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++;
msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer "
"for %s interface, "
"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++;
msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer "
"for %s interface, "
"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++;
msg_pdbg("Chip size %u kB is bigger than supported "
"size %u kB of chipset/board/programmer "
"for %s interface, "
"probe/read/erase/write may fail. ", size / 1024,
- max_rom_decode.spi / 1024, "SPI");
+ max_rom_decode->spi / 1024, "SPI");
}
return limitexceeded;
}
@@ -1057,7 +1058,7 @@

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) {
enum chipbustype commonbuses = fill_flash->mst->buses_supported & fill_flash->chip->bustype;


To view, visit change 68479. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Ia01f77993deab68e251850008e885828e55b9462
Gerrit-Change-Number: 68479
Gerrit-PatchSet: 1
Gerrit-Owner: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-MessageType: newchange