diff options
author | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-06-07 11:10:43 +0000 |
---|---|---|
committer | Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> | 2010-06-07 11:10:43 +0000 |
commit | 4146cedae45024077e5772d40a6de821e3738116 (patch) | |
tree | 1357eba24cc65b24900151fcb032e9cd2bd8c52f | |
parent | e2f015836c8d9749d39d97b2f91adba965dc251a (diff) | |
download | flashrom-4146cedae45024077e5772d40a6de821e3738116.tar.gz flashrom-4146cedae45024077e5772d40a6de821e3738116.tar.bz2 flashrom-4146cedae45024077e5772d40a6de821e3738116.zip |
Fix wiki board enable parameter printing
The logic was incorrect in one place which had && instead of ||. Move
the board info #define B to the file where it is used.
Corresponding to flashrom svn r1035.
Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
-rw-r--r-- | flash.h | 6 | ||||
-rw-r--r-- | print.c | 7 | ||||
-rw-r--r-- | print_wiki.c | 6 |
3 files changed, 10 insertions, 9 deletions
@@ -309,12 +309,6 @@ struct board_info { #endif }; -#ifdef CONFIG_PRINT_WIKI -#define B(vendor, name, status, url, note) { vendor, name, status, url, note } -#else -#define B(vendor, name, status, url, note) { vendor, name, status } -#endif - extern const struct board_info boards_known[]; extern const struct board_info laptops_known[]; @@ -245,6 +245,13 @@ void print_supported(void) } #if CONFIG_INTERNAL == 1 + +#ifdef CONFIG_PRINT_WIKI +#define B(vendor, name, status, url, note) { vendor, name, status, url, note } +#else +#define B(vendor, name, status, url, note) { vendor, name, status } +#endif + /* Please keep this list alphabetically ordered by vendor/board. */ const struct board_info boards_known[] = { #if defined(__i386__) || defined(__x86_64__) diff --git a/print_wiki.c b/print_wiki.c index 6e1aec37..b85bf191 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -145,9 +145,9 @@ static void wiki_helper(const char *devicetype, int cols, color = !color; k = 0; - while ((b[k].vendor_name != NULL) - && strcmp(b[k].vendor_name, boards[i].vendor) - && strcmp(b[k].board_name, boards[i].name)) { + while ((b[k].vendor_name != NULL) && + (strcmp(b[k].vendor_name, boards[i].vendor) || + strcmp(b[k].board_name, boards[i].name))) { k++; } |