Changeset 1441

Timestamp:

09/15/11 00:09:48 (8 months ago)

Author:

stefanct

Message:

Add printing of chip voltage ranges to print_wiki.c

• add voltage ranges
• center some headers (test values OK, No, ? are centered via wiki templates)
• fix style error in header (align:right -> text-align:right)

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/print_wiki.c (modified) (7 diffs)

trunk/print_wiki.c

@@ -30 +30 @@
 static const char wiki_header[] = "= Supported devices =\n\n\
 <div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \
-background-color:#eeeeee; align:right; border:1px solid #aabbcc;\"><small>\n\
+background-color:#eeeeee; text-align:right; border:1px solid #aabbcc;\">\
+<small>\n\
 Please do '''not''' edit these tables in the wiki directly, they are \
 generated by pasting '''flashrom -z''' output.<br />\
@@ -38 +39 @@
 static const char chipset_th[] = "{| border=\"0\" style=\"font-size: smaller\"\n\
 |- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\
-! align=\"left\" | Southbridge\n! align=\"left\" | PCI IDs\n\
-! align=\"left\" | Status\n\n";
+! align=\"left\" | Southbridge\n! align=\"center\" | PCI IDs\n\
+! align=\"center\" | Status\n\n";
 
 static const char board_th[] = "{| border=\"0\" style=\"font-size: smaller\" \
 valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\
-! align=\"left\" | Mainboard\n! align=\"left\" | Required option\n! align=\"left\" | Status\n\n";
+! align=\"left\" | Mainboard\n! align=\"left\" | Required option\n\
+! align=\"center\" | Status\n\n";
 
 static const char board_intro[] = "\
@@ -58 +60 @@
 #endif
 
-static const char chip_th[] = "{| border=\"0\" style=\"font-size: smaller\" \
-valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\
-! align=\"left\" | Device\n! align=\"left\" | Size / kB\n\
-! align=\"left\" | Type\n! align=\"left\" colspan=\"4\" | Status\n\n\
+static const char chip_th[] = "{\
+| border=\"0\" style=\"font-size: smaller\" valign=\"top\"\n\
+|- bgcolor=\"#6699dd\"\n\
+! align=\"left\" | Vendor\n\
+! align=\"left\" | Device\n\
+! align=\"center\" | Size [kB]\n\
+! align=\"center\" | Type\n\
+! align=\"center\" colspan=\"4\" | Status\n\
+! align=\"center\" colspan=\"2\" | Voltage [V]\n\n\
 |- bgcolor=\"#6699ff\"\n| colspan=\"4\" | &nbsp;\n\
-| Probe\n| Read\n| Erase\n| Write\n\n";
+| Probe\n| Read\n| Erase\n| Write\n\
+| align=\"center\" | min \n| align=\"center\" | max\n\n";
 
 static const char programmer_section[] = "\
@@ -70 +78 @@
 valign=\"top\"\n| valign=\"top\"|\n\n{| border=\"0\" style=\"font-size: \
 smaller\" valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\
-! align=\"left\" | Device\n! align=\"left\" | PCI IDs\n\
-! align=\"left\" | Status\n\n";
+! align=\"left\" | Device\n! align=\"center\" | PCI IDs\n\
+! align=\"center\" | Status\n\n";
 
 #if CONFIG_INTERNAL == 1
@@ -205 +213 @@
         uint32_t t;
         char *s;
+        char vmax[6];
+        char vmin[6];
 
         for (f = flashchips; f->name != NULL; f++) {
@@ -228 +238 @@
                 t = f->tested;
                 s = flashbuses_to_text(f->bustype);
-                printf("|- bgcolor=\"#%s\"\n| %s || %s || %d "
-                       "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n",
+                sprintf(vmin, "%0.03f", f->voltage.min / (double)1000);
+                sprintf(vmax, "%0.03f", f->voltage.max / (double)1000);
+                /* '{{%s}}' is used in combination with 'OK', 'No' and '?3' to
+                 * select special formatting templates for the bg color. */
+                printf("|- bgcolor=\"#%s\"\n| %s || %s || align=\"right\" | %d "
+                       "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}"
+                       "|| %s || %s \n",
                        (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name,
                        f->total_size, s,
@@ -239 +254 @@
                        (t & TEST_BAD_ERASE) ? "No" : "?3",
                        (t & TEST_OK_WRITE) ? "OK" :
-                       (t & TEST_BAD_WRITE) ? "No" : "?3");
+                       (t & TEST_BAD_WRITE) ? "No" : "?3",
+                       f->voltage.min ? vmin : "N/A",
+                       f->voltage.min ? vmax : "N/A");
                 free(s);