Changeset 362 for trunk/flashrom.c

Timestamp:

Dec 6, 2008 2:37:09 AM (4 years ago)

Author:

stuge

Message:

Original v2 revision: 3803

flashrom: Display test status in -L chip listing

Looks like this:

Supported flash chips: Tested OK operations: Known BAD operations:

AMD Am29F002(N)BB
AMD Am29F002(N)BT PROBE READ ERASE WRITE
AMD Am29F016D
AMD Am29F040B PROBE READ ERASE WRITE
AMD Am29LV040B
Atmel AT45CS1282 READ

Signed-off-by: Peter Stuge <peter@…>
Acked-by: Uwe Hermann <uwe@…>

File:

• trunk/flashrom.c (modified) (1 diff)

trunk/flashrom.c

@@ -206 +206 @@
 }
 
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#define POS_PRINT(x) do { pos += strlen(x); printf(x); } while (0)
+
 void print_supported_chips(void)
 {
-        int i;
-
-        printf("Supported ROM chips:\n\n");
-
-        for (i = 0; flashchips[i].name != NULL; i++)
-                printf("%s %s\n", flashchips[i].vendor, flashchips[i].name);
+        int okcol = 0, pos = 0;
+        struct flashchip *f;
+
+        for (f = flashchips; f->name != NULL; f++) {
+                if (GENERIC_DEVICE_ID == f->model_id)
+                        continue;
+                okcol = MAX(okcol, strlen(f->vendor) + 1 + strlen(f->name));
+        }
+        okcol = (okcol + 7) & ~7;
+
+        POS_PRINT("Supported flash chips:");
+        while (pos < okcol) {
+                printf("\t");
+                pos += 8 - (pos % 8);
+        }
+        printf("Tested OK operations:\tKnown BAD operations:\n\n");
+
+        for (f = flashchips; f->name != NULL; f++) {
+                printf("%s %s", f->vendor, f->name);
+                pos = strlen(f->vendor) + 1 + strlen(f->name);
+                while (pos < okcol) {
+                        printf("\t");
+                        pos += 8 - (pos % 8);
+                }
+                if ((f->tested & TEST_OK_MASK)) {
+                        if ((f->tested & TEST_OK_PROBE))
+                                POS_PRINT("PROBE ");
+                        if ((f->tested & TEST_OK_READ))
+                                POS_PRINT("READ ");
+                        if ((f->tested & TEST_OK_ERASE))
+                                POS_PRINT("ERASE ");
+                        if ((f->tested & TEST_OK_WRITE))
+                                POS_PRINT("WRITE");
+                }
+                while (pos < okcol + 24) {
+                        printf("\t");
+                        pos += 8 - (pos % 8);
+                }
+                if ((f->tested & TEST_BAD_MASK)) {
+                        if ((f->tested & TEST_BAD_PROBE))
+                                printf("PROBE ");
+                        if ((f->tested & TEST_BAD_READ))
+                                printf("READ ");
+                        if ((f->tested & TEST_BAD_ERASE))
+                                printf("ERASE ");
+                        if ((f->tested & TEST_BAD_WRITE))
+                                printf("WRITE");
+                }
+                printf("\n");
+        }
 }