NULL callback for main MCU watchdog

Remove application watchdog stubs and pass in NULL CB
worldcoin · Oct 21, 2024 · 465bc17 · 465bc17
1 parent 22301c0
commit 465bc17
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 41 deletions.
diff --git a/lib/watchdog/watchdog.c b/lib/watchdog/watchdog.c
@@ -29,13 +29,10 @@ static void
 watchdog_thread()
 {
     while (wdt_channel_id >= 0) {
-        // Allow null callback
-        if (watchdog_callback == NULL) {
+        // Allow null callback,
+        // Don't rearrange due to short circuit rules, NULL check must be first
+        if ((watchdog_callback == NULL) || (watchdog_callback() == true)) {
             wdt_feed(watchdog_dev, wdt_channel_id);
-        } else {
-            if (watchdog_callback() == true) {
-                wdt_feed(watchdog_dev, wdt_channel_id);
-            }
         }
         k_sleep(K_MSEC(WATCHDOG_RELOAD_MS));
     }

diff --git a/main_board/CMakeLists.txt b/main_board/CMakeLists.txt
@@ -97,7 +97,6 @@ list(APPEND SOURCES_FILES
     src/system/logs.c
     src/system/version/version.c
     src/system/stm32_timer_utils/stm32_timer_utils.c
-    src/system/app_watchdog.c
 
     src/temperature/sensors/temperature.c
     src/temperature/fan/fan.c

diff --git a/main_board/src/main.c b/main_board/src/main.c
@@ -7,7 +7,6 @@
 #include "power/boot/boot.h"
 #include "pubsub/pubsub.h"
 #include "runner/runner.h"
-#include "system/app_watchdog.h"
 #include "system/diag.h"
 #include "system/version/version.h"
 #include "temperature/fan/fan.h"
@@ -203,7 +202,7 @@ initialize(void)
     app_assert_init(app_assert_cb);
 
 #if CONFIG_ORB_LIB_WATCHDOG
-    err_code = watchdog_init(app_watchdog_callback);
+    err_code = watchdog_init(NULL);
     ASSERT_SOFT(err_code);
 #endif
 

diff --git a/main_board/src/system/app_watchdog.c b/main_board/src/system/app_watchdog.c
diff --git a/main_board/src/system/app_watchdog.h b/main_board/src/system/app_watchdog.h