From 035492a86cd50efd8a641f7246540cd067f4aed2 Mon Sep 17 00:00:00 2001 From: Stefan Tauner Date: Fri, 3 Feb 2012 22:32:09 +0000 Subject: print*.c: Refine the do not count nor print generic flash chip entries conditions Previously only the generic "unknown XXXX SPI chips" were ignored (because their name started with "unknown". This patch adds also all chips whose vendor starts with "Unknown" (none so far) and "Programmer" (currently used by the opaque flash chip framework) . A patch will add the SFDP chip template with an "Unknown" vendor field later. Rationale: these entries do not contain any useful information when shown in -L or wiki output. It would be better to add them to a general feature section or similar. Corresponding to flashrom svn r1488. Signed-off-by: Stefan Tauner Acked-by: Carl-Daniel Hailfinger --- print_wiki.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'print_wiki.c') diff --git a/print_wiki.c b/print_wiki.c index 1c9241e..0213c74 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -216,9 +216,10 @@ static void print_supported_chips_wiki(int cols) char vmin[6]; for (f = flashchips; f->name != NULL; f++) { - /* Don't count "unknown XXXX SPI chip" entries. */ - if (!strncmp(f->name, "unknown", 7)) - continue; + /* Don't count generic entries. */ + if (!strncmp(f->vendor, "Unknown", 7) || + !strncmp(f->vendor, "Programmer", 10) || + !strncmp(f->name, "unknown", 7)) chipcount++; } @@ -227,8 +228,10 @@ static void print_supported_chips_wiki(int cols) "| valign=\"top\"|\n\n%s", chipcount, chip_th); for (f = flashchips; f->name != NULL; f++, i++) { - /* Don't print "unknown XXXX SPI chip" entries. */ - if (!strncmp(f->name, "unknown", 7)) + /* Don't print generic entries. */ + if (!strncmp(f->vendor, "Unknown", 7) || + !strncmp(f->vendor, "Programmer", 10) || + !strncmp(f->name, "unknown", 7)) continue; /* Alternate colors if the vendor changes. */ -- cgit v1.1