summaryrefslogtreecommitdiffstats
path: root/cli_classic.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2011-12-14 22:25:15 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2011-12-14 22:25:15 +0000
commit4303a77daaed729c507182667d0704a114c4b157 (patch)
tree7d9ffba077715cf9e75c9f4a36d0d7f11a3181f6 /cli_classic.c
parente9874d155239573b9b0e95d2f96153d28063fb34 (diff)
downloadflashrom-4303a77daaed729c507182667d0704a114c4b157.zip
flashrom-4303a77daaed729c507182667d0704a114c4b157.tar.gz
Use struct flashctx instead of struct flashchip for flash chip access
Struct flashchip is used only for the flashchips array and for operations which do not access hardware, e.g. printing a list of supported flash chips. struct flashctx (flash context) contains all data available in struct flashchip, but it also contains runtime information like mapping addresses. struct flashctx is expected to grow additional members over time, a prime candidate being programmer info. struct flashctx contains all of struct flashchip with identical member layout, but struct flashctx has additional members at the end. The separation between struct flashchip/flashctx shrinks the memory requirement of the big flashchips array and allows future extension of flashctx without having to worry about bloat. Corresponding to flashrom svn r1473. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Diffstat (limited to 'cli_classic.c')
-rw-r--r--cli_classic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cli_classic.c b/cli_classic.c
index 49bc8a8..bb8c29f 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -169,8 +169,8 @@ int main(int argc, char *argv[])
unsigned long size;
/* Probe for up to three flash chips. */
const struct flashchip *flash;
- struct flashchip flashes[3];
- struct flashchip *fill_flash;
+ struct flashctx flashes[3];
+ struct flashctx *fill_flash;
const char *name;
int namelen, opt, i;
int startchip = 0, chipcount = 0, option_index = 0, force = 0;
@@ -409,6 +409,7 @@ int main(int argc, char *argv[])
}
#endif
+ /* Does a chip with the requested name exist in the flashchips array? */
if (chip_to_probe) {
for (flash = flashchips; flash && flash->name; flash++)
if (!strcmp(flash->name, chip_to_probe))
OpenPOWER on IntegriCloud