add assert_fatal function (commaai#1976)

* add assert function * fix * flip * rename * assert fatal
dzid26 · Jun 26, 2024 · ee1d5ce · ee1d5ce
1 parent cac94e3
commit ee1d5ce
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/board/jungle/main.c b/board/jungle/main.c
@@ -156,10 +156,7 @@ int main(void) {
   print("\n\n\n************************ MAIN START ************************\n");
 
   // check for non-supported board types
-  if (hw_type == HW_TYPE_UNKNOWN) {
-    print("Unsupported board type\n");
-    while (1) { /* hang */ }
-  }
+  assert_fatal(hw_type != HW_TYPE_UNKNOWN, "Unsupported board type\n");
 
   print("Config:\n");
   print("  Board type: 0x"); puth(hw_type); print("\n");

diff --git a/board/libc.h b/board/libc.h
@@ -5,6 +5,16 @@ void delay(uint32_t a) {
   for (i = 0; i < a; i++);
 }
 
+void assert_fatal(bool condition, const char *msg) {
+  if (!condition) {
+    print("ASSERT FAILED\n");
+    print(msg);
+    while (1) {
+      // hang
+    }
+  }
+}
+
 // cppcheck-suppress misra-c2012-21.2
 void *memset(void *str, int c, unsigned int n) {
   uint8_t *s = str;

diff --git a/board/main.c b/board/main.c
@@ -67,12 +67,8 @@ void set_safety_mode(uint16_t mode, uint16_t param) {
     print("Error: safety set mode failed. Falling back to SILENT\n");
     mode_copy = SAFETY_SILENT;
     err = set_safety_hooks(mode_copy, 0U);
-    if (err == -1) {
-      print("Error: Failed setting SILENT mode. Hanging\n");
-      while (true) {
-        // TERMINAL ERROR: we can't continue if SILENT safety mode isn't succesfully set
-      }
-    }
+    // TERMINAL ERROR: we can't continue if SILENT safety mode isn't succesfully set
+    assert_fatal(err == 0, "Error: Failed setting SILENT mode. Hanging\n");
   }
   safety_tx_blocked = 0;
   safety_rx_invalid = 0;
@@ -314,10 +310,7 @@ int main(void) {
   print("\n\n\n************************ MAIN START ************************\n");
 
   // check for non-supported board types
-  if(hw_type == HW_TYPE_UNKNOWN){
-    print("Unsupported board type\n");
-    while (1) { /* hang */ }
-  }
+  assert_fatal(hw_type != HW_TYPE_UNKNOWN, "Unsupported board type");
 
   print("Config:\n");
   print("  Board type: 0x"); puth(hw_type); print("\n");