Edward O'Callaghan submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved
ichspi.c: Make ich_init_spi() parametric on ich_generation

Work towards dropping ich_generation global usage and make
the ich_init_spi() function more pure.

Change-Id: I5293e7ae6f20a2299577172655c2926861091f5a
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/43498
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
M ichspi.c
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ichspi.c b/ichspi.c
index c780d52..c044eb9 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -1736,7 +1736,7 @@
memset(&desc, 0x00, sizeof(struct ich_descriptors));

/* Moving registers / bits */
- switch (ich_generation) {
+ switch (ich_gen) {
case CHIPSET_100_SERIES_SUNRISE_POINT:
case CHIPSET_C620_SERIES_LEWISBURG:
case CHIPSET_300_SERIES_CANNON_POINT:
@@ -1763,7 +1763,7 @@
hwseq_data.hsfc_fcycle = HSFC_FCYCLE;
break;
}
- switch (ich_generation) {
+ switch (ich_gen) {
case CHIPSET_100_SERIES_SUNRISE_POINT:
num_freg = 10;
break;
@@ -1779,7 +1779,7 @@
break;
}

- switch (ich_generation) {
+ switch (ich_gen) {
case CHIPSET_ICH7:
case CHIPSET_TUNNEL_CREEK:
case CHIPSET_CENTERTON:
@@ -2021,14 +2021,14 @@
return ERROR_FATAL;
}

- int tmpi = getFCBA_component_density(ich_generation, &desc, 0);
+ int tmpi = getFCBA_component_density(ich_gen, &desc, 0);
if (tmpi < 0) {
msg_perr("Could not determine density of flash component %d.\n", 0);
return ERROR_FATAL;
}
hwseq_data.size_comp0 = tmpi;

- tmpi = getFCBA_component_density(ich_generation, &desc, 1);
+ tmpi = getFCBA_component_density(ich_gen, &desc, 1);
if (tmpi < 0) {
msg_perr("Could not determine density of flash component %d.\n", 1);
return ERROR_FATAL;

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

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: I5293e7ae6f20a2299577172655c2926861091f5a
Gerrit-Change-Number: 43498
Gerrit-PatchSet: 2
Gerrit-Owner: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Edward O'Callaghan <quasisec@chromium.org>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged