Changeset 1426

Timestamp:

09/03/11 19:15:00 (9 months ago)

Author:

uwe

Message:

Introduce ERROR_FATAL, abort upon failed chipset enables.

Signed-off-by: Tadas Slotkus <devtadas@…>
Acked-by: Uwe Hermann <uwe@…>

Location:

trunk

Files:

• chipset_enable.c (modified) (1 diff)
• flash.h (modified) (1 diff)
• internal.c (modified) (1 diff)

trunk/chipset_enable.c

@@ -1326 +1326 @@
                 else if (ret == ERROR_NONFATAL)
                         msg_pinfo("PROBLEMS, continuing anyway\n");
+                if (ret == ERROR_FATAL) {
+                        msg_perr("FATAL ERROR!\n");
+                        return ret;
+                }
         }
 

trunk/flash.h

@@ -225 +225 @@
 #define NT 1    /* Not tested */
 
-/* Something happened that shouldn't happen, but we can go on */
+/* Something happened that shouldn't happen, but we can go on. */
 #define ERROR_NONFATAL 0x100
+
+/* Something happened that shouldn't happen, we'll abort. */
+#define ERROR_FATAL -0xee
 
 /* cli_output.c */

trunk/internal.c

@@ -269 +269 @@
                 msg_perr("WARNING: No chipset found. Flash detection "
                          "will most likely fail.\n");
-        }
+        } else if (ret == ERROR_FATAL)
+                return ret;
 
 #if defined(__i386__) || defined(__x86_64__)