[flashrom] [commit] r1009 - trunk
repository service
svn at flashrom.org
Mon May 24 17:28:12 CEST 2010
Author: uwe
Date: Mon May 24 17:28:12 2010
New Revision: 1009
URL: http://flashrom.org/trac/coreboot/changeset/1009
Log:
Various wiki output improvements as per IRC discussion (trivial).
- Use '?3' wiki template (light greenish, not gray) for untested stuff.
- Reduce page width a bit to improve readability on smaller screens.
- Generalize some functions a bit (pass in how many columns to generate).
- Mark untested board-enables as such (were incorrectly marked "OK" so far).
- Drop some useless 'valign=top' entries.
- Make a few more functions 'static' while we're at it.
Signed-off-by: Uwe Hermann <uwe at hermann-uwe.de>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>
Modified:
trunk/print_wiki.c
Modified: trunk/print_wiki.c
==============================================================================
--- trunk/print_wiki.c Sat May 22 09:31:50 2010 (r1008)
+++ trunk/print_wiki.c Mon May 24 17:28:12 2010 (r1009)
@@ -371,7 +371,7 @@
return -1;
}
-void print_supported_chipsets_wiki(void)
+static void print_supported_chipsets_wiki(int cols)
{
int i, j, enablescount = 0, color = 1;
const struct penable *e;
@@ -389,14 +389,14 @@
if (i > 0 && strcmp(e[i].vendor_name, e[i - 1].vendor_name))
color = !color;
- printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s "
+ printf("|- bgcolor=\"#%s\"\n| %s || %s "
"|| %04x:%04x || %s\n", (color) ? "eeeeee" : "dddddd",
e[i].vendor_name, e[i].device_name,
e[i].vendor_id, e[i].device_id,
- (e[i].status == OK) ? "{{OK}}" : "?");
+ (e[i].status == OK) ? "{{OK}}" : "{{?3}}");
- /* Split table in three columns. */
- if (j >= (enablescount / 3 + 1)) {
+ /* Split table in 'cols' columns. */
+ if (j >= (enablescount / cols + 1)) {
printf("\n|}\n\n| valign=\"top\"|\n\n%s", chipset_th);
j = 0;
}
@@ -429,7 +429,7 @@
k = url(b[i].vendor, b[i].name);
c = note(b[i].vendor, b[i].name);
- printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s%s %s%s ||"
+ printf("|- bgcolor=\"#%s\"\n| %s || %s%s %s%s ||"
" {{%s}}", (color) ? "eeeeee" : "dddddd", b[i].vendor,
(k != -1 && u[k].url) ? "[" : "",
(k != -1 && u[k].url) ? u[k].url : "",
@@ -479,17 +479,18 @@
k = url(b[i].vendor_name, b[i].board_name);
- printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s%s %s%s "
- "|| %s%s%s%s || {{OK}}\n", (color) ? "eeeeee" : "dddddd",
+ printf("|- bgcolor=\"#%s\"\n| %s || %s%s %s%s "
+ "|| %s%s%s%s || {{%s}}\n", (color) ? "eeeeee" : "dddddd",
b[i].vendor_name, (k != -1 && u[k].url) ? "[" : "",
(k != -1 && u[k].url) ? u[k].url : "", b[i].board_name,
(k != -1 && u[k].url) ? "]" : "",
(b[i].lb_vendor) ? "-m " : "—",
(b[i].lb_vendor) ? b[i].lb_vendor : "",
(b[i].lb_vendor) ? ":" : "",
- (b[i].lb_vendor) ? b[i].lb_part : "");
+ (b[i].lb_vendor) ? b[i].lb_part : "",
+ (b[i].status == OK) ? "OK" : "?3");
- /* Split table in three columns. */
+ /* Split table in 'cols' columns. */
if (j >= (boardcount / cols + 1)) {
printf("\n|}\n\n| valign=\"top\"|\n\n%s", board_th2);
j = 0;
@@ -499,11 +500,11 @@
printf("\n|}\n\n|}\n");
}
-void print_supported_boards_wiki(void)
+static void print_supported_boards_wiki(void)
{
printf("%s", board_intro);
wiki_helper("Known good (worked out of the box)", "OK", 3, boards_ok);
- wiki_helper2("Known good (with write-enable code in flashrom)", 3);
+ wiki_helper2("Known good (with write-enable code in flashrom)", 2);
wiki_helper("Not supported (yet)", "No", 3, boards_bad);
printf("%s", laptop_intro);
@@ -512,7 +513,7 @@
}
#endif
-void print_supported_chips_wiki(void)
+static void print_supported_chips_wiki(int cols)
{
int i = 0, c = 1, chipcount = 0;
struct flashchip *f, *old = NULL;
@@ -535,21 +536,21 @@
c = !c;
t = f->tested;
- printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || %d "
+ printf("|- bgcolor=\"#%s\"\n| %s || %s || %d "
"|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n",
(c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name,
f->total_size, flashbuses_to_text(f->bustype),
(t & TEST_OK_PROBE) ? "OK" :
- (t & TEST_BAD_PROBE) ? "No" : ((c) ? "?2" : "?"),
+ (t & TEST_BAD_PROBE) ? "No" : "?3",
(t & TEST_OK_READ) ? "OK" :
- (t & TEST_BAD_READ) ? "No" : ((c) ? "?2" : "?"),
+ (t & TEST_BAD_READ) ? "No" : "?3",
(t & TEST_OK_ERASE) ? "OK" :
- (t & TEST_BAD_ERASE) ? "No" : ((c) ? "?2" : "?"),
+ (t & TEST_BAD_ERASE) ? "No" : "?3",
(t & TEST_OK_WRITE) ? "OK" :
- (t & TEST_BAD_WRITE) ? "No" : ((c) ? "?2" : "?"));
+ (t & TEST_BAD_WRITE) ? "No" : "?3");
- /* Split table into three columns. */
- if (i >= (chipcount / 3 + 1)) {
+ /* Split table into 'cols' columns. */
+ if (i >= (chipcount / cols + 1)) {
printf("\n|}\n\n| valign=\"top\"|\n\n%s", chip_th);
i = 0;
}
@@ -560,7 +561,7 @@
printf("\n|}\n\n|}\n");
}
-void print_supported_pcidevs_wiki(struct pcidev_status *devs)
+static void print_supported_pcidevs_wiki(struct pcidev_status *devs)
{
int i = 0;
static int c = 0;
@@ -569,11 +570,11 @@
c = !c;
for (i = 0; devs[i].vendor_name != NULL; i++) {
- printf("|- bgcolor=\"#%s\" valign=\"top\"\n| %s || %s || "
+ printf("|- bgcolor=\"#%s\"\n| %s || %s || "
"%04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd",
devs[i].vendor_name, devs[i].device_name,
devs[i].vendor_id, devs[i].device_id,
- (devs[i].status == NT) ? (c) ? "?2" : "?" : "OK");
+ (devs[i].status == NT) ? "?3" : "OK");
}
}
@@ -583,8 +584,8 @@
printf(wiki_header, ctime(&t), flashrom_version);
#if INTERNAL_SUPPORT == 1
- print_supported_chips_wiki();
- print_supported_chipsets_wiki();
+ print_supported_chips_wiki(2);
+ print_supported_chipsets_wiki(3);
print_supported_boards_wiki();
#endif
printf("%s", programmer_section);
More information about the flashrom
mailing list