Changeset 352

Timestamp:

Nov 29, 2008 12:45:27 AM (4 years ago)

Author:

hailfinger

Message:

Original v2 revision: 3780

If a chip has any TEST_BAD_* flag set, we don't even list the
unsupported functions, giving the user the impression that the
unsupported functions are tested.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Peter Stuge <peter@…>

Location:

trunk

Files:

• flash.h (modified) (2 diffs)
• flashrom.c (modified) (1 diff)

trunk/flash.h

@@ -96 +96 @@
 #define TEST_BAD_ERASE  (1<<6)
 #define TEST_BAD_WRITE  (1<<7)
+#define TEST_BAD_PREW   (TEST_BAD_PROBE|TEST_BAD_READ|TEST_BAD_ERASE|TEST_BAD_WRITE)
 #define TEST_BAD_MASK   0xf0
 
@@ -107 +108 @@
  * All LPC/FWH parts (parallel flash) have 8-bit device IDs if there is no
  * continuation code.
- * All SPI parts have 16-bit device IDs.
+ * SPI parts have 16-bit device IDs if they support RDID.
  */
 

trunk/flashrom.c

@@ -500 +500 @@
                                 printf(" WRITE");
                         printf("\n");
-                } else {
+                }
+                if ((!(flash->tested & TEST_BAD_PROBE) && !(flash->tested & TEST_OK_PROBE)) ||
+                    (!(flash->tested & TEST_BAD_READ) && !(flash->tested & TEST_OK_READ)) ||
+                    (!(flash->tested & TEST_BAD_ERASE) && !(flash->tested & TEST_OK_ERASE)) ||
+                    (!(flash->tested & TEST_BAD_WRITE) && !(flash->tested & TEST_OK_WRITE))) {
                         printf("This flash part has status UNTESTED for operations:");
-                        if (!(flash->tested & TEST_OK_PROBE))
+                        if (!(flash->tested & TEST_BAD_PROBE) && !(flash->tested & TEST_OK_PROBE))
                                 printf(" PROBE");
-                        if (!(flash->tested & TEST_OK_READ))
+                        if (!(flash->tested & TEST_BAD_READ) && !(flash->tested & TEST_OK_READ))
                                 printf(" READ");
-                        if (!(flash->tested & TEST_OK_ERASE))
+                        if (!(flash->tested & TEST_BAD_ERASE) && !(flash->tested & TEST_OK_ERASE))
                                 printf(" ERASE");
-                        if (!(flash->tested & TEST_OK_WRITE))
+                        if (!(flash->tested & TEST_BAD_WRITE) && !(flash->tested & TEST_OK_WRITE))
                                 printf(" WRITE");
                         printf("\n");