Roll back to previous method signatures

Author: Master92

src/core/thread.c

@@ -31,7 +31,7 @@
 #include "util/sdcard.h"
 #include "util/system.h"
 
-void (*sdcard_ready_cb)(void(*)()) = NULL;
+void (*sdcard_ready_cb)() = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////
 // SD card exist
@@ -51,7 +51,7 @@ static void detect_sdcard(void) {
         if (g_init_done) {
             if (sdcard_init_scan && g_sdcard_enable) {
                 if (sdcard_ready_cb) {
-                    sdcard_ready_cb(NULL);
+                    sdcard_ready_cb();
                 }
                 sdcard_init_scan = false;
             } else if (!g_sdcard_enable && sdcard_enable_last) {

src/ui/page_storage.c

@@ -16,7 +16,7 @@
 #include "util/sdcard.h"
 #include "util/system.h"
 
-extern void (*sdcard_ready_cb)(void(*)());
+extern void (*sdcard_ready_cb)();
 
 /**
  * Types
@@ -551,6 +551,14 @@ static void page_storage_on_click(uint8_t key, int sel) {
 static void page_storage_on_right_button(bool is_short) {
 }
 
+static void page_storage_post_bootup_action(void (*complete_callback)()) {
+    page_storage_init_auto_sd_repair();
+
+    if (complete_callback != NULL) {
+        complete_callback();
+    }
+}
+
 /**
  * Main Menu page data structure, notice max is set to zero
  * in order to allow us to override default user input logic.
@@ -570,14 +578,13 @@ page_pack_t pp_storage = {
     .on_click = page_storage_on_click,
     .on_right_button = page_storage_on_right_button,
     .post_bootup_run_priority = 50,
-    .post_bootup_run_function = page_storage_init_auto_sd_repair,
+    .post_bootup_run_function = page_storage_post_bootup_action,
 };
 
 /**
  * Worker thread for repairing SD Card.
  */
 static void *page_storage_repair_thread(void *arg) {
-    void (*complete_callback)() = arg;
     char buf[128];
     if (!page_storage.disable_controls) {
         page_storage.is_auto_sd_repair_active = true;
@@ -592,9 +599,6 @@ static void *page_storage_repair_thread(void *arg) {
     page_storage.is_sd_repair_complete = true;
     sdcard_ready_cb = page_storage_init_auto_sd_repair;
 
-    if (complete_callback != NULL) {
-        complete_callback();
-    }
     pthread_exit(NULL);
 }
 
@@ -608,11 +612,11 @@ bool page_storage_is_sd_repair_active() {
 /**
  * Once initialized detach until completed.
  */
-void page_storage_init_auto_sd_repair(void (*complete_callback)()) {
+void page_storage_init_auto_sd_repair() {
     page_storage.is_sd_repair_complete = false;
     if (!page_storage.is_auto_sd_repair_active) {
         pthread_t tid;
-        if (!pthread_create(&tid, NULL, page_storage_repair_thread, complete_callback)) {
+        if (!pthread_create(&tid, NULL, page_storage_repair_thread, NULL)) {
             pthread_detach(tid);
         }
     } else {

src/ui/page_storage.h

@@ -9,7 +9,7 @@ extern "C" {
 extern page_pack_t pp_storage;
 
 bool page_storage_is_sd_repair_active();
-void page_storage_init_auto_sd_repair(void(*complete_callback)());
+void page_storage_init_auto_sd_repair();
 
 #ifdef __cplusplus
 }

src/ui/page_wifi.c

@@ -268,7 +268,7 @@ static void page_wifi_mask_password(lv_obj_t *obj, int size) {
  *  Note: This function will be invoked asynchronously post bootup and may
  *        require additional APP_STATE checks to ensure integrity of execution.
  */
-static void page_wifi_update_settings(void (*complete_callback)()) {
+static void page_wifi_update_settings() {
     g_setting.wifi.enable = btn_group_get_sel(&page_wifi.page_1.enable.button) == 0;
     g_setting.wifi.mode = btn_group_get_sel(&page_wifi.page_1.mode.button);
     g_setting.wifi.dhcp = btn_group_get_sel(&page_wifi.page_2.dhcp.button) == 0;
@@ -319,10 +319,6 @@ static void page_wifi_update_settings(void (*complete_callback)()) {
             system_script(WIFI_STA_ON);
         }
     }
-
-    if (complete_callback != NULL) {
-        complete_callback();
-    }
 }
 
 /**
@@ -589,7 +585,7 @@ static void page_wifi_apply_settings_pending_cb(struct _lv_timer_t *timer) {
  * Callback invoked once `Apply Settings` is triggered and confirmed via the menu.
  */
 static void page_wifi_apply_settings_timer_cb(struct _lv_timer_t *timer) {
-    page_wifi_update_settings(NULL);
+    page_wifi_update_settings();
     page_wifi_dirty_flag_reset();
     page_wifi_apply_settings_reset();
 }
@@ -1147,6 +1143,14 @@ static void page_wifi_on_right_button(bool is_short) {
     }
 }
 
+void page_wifi_post_bootup_action(void (*complete_callback)()) {
+    page_wifi_update_settings();
+
+    if (complete_callback != NULL) {
+        complete_callback();
+    }
+}
+
 /**
  * Main Menu page data structure, notice max is set to zero
  * in order to allow us to override default user input logic.
@@ -1166,7 +1170,7 @@ page_pack_t pp_wifi = {
     .on_click = page_wifi_on_click,
     .on_right_button = page_wifi_on_right_button,
     .post_bootup_run_priority = 100,
-    .post_bootup_run_function = page_wifi_update_settings,
+    .post_bootup_run_function = page_wifi_post_bootup_action,
 };
 
 /**