From 4146cedae45024077e5772d40a6de821e3738116 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 7 Jun 2010 11:10:43 +0000 Subject: 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 Acked-by: Uwe Hermann --- flash.h | 6 ------ print.c | 7 +++++++ print_wiki.c | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/flash.h b/flash.h index cf3bd21..62c567c 100644 --- a/flash.h +++ b/flash.h @@ -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[]; diff --git a/print.c b/print.c index b579664..3f39251 100644 --- a/print.c +++ b/print.c @@ -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 6e1aec3..b85bf19 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++; } -- cgit v1.1