rg_system: Added save_slot argument to rg_system_switch_app

Before we had to do bit manipulation to inject the slot number into the flags. This was a legacy from how I first implemented multi-state. We can now do better.

Author: ducalex

components/retro-go/rg_gui.c

@@ -1731,7 +1731,7 @@ void rg_gui_debug_menu(void)
     switch (rg_gui_dialog("Debugging", options, 0))
     {
     case 1:
-        rg_system_switch_app(RG_APP_FACTORY, 0, 0, 0);
+        rg_system_switch_app(RG_APP_FACTORY, NULL, NULL, 0, 0);
         break;
     case 2:
         rg_storage_delete(RG_BASE_PATH_CACHE);

components/retro-go/rg_system.c

@@ -95,6 +95,7 @@ static rg_task_t tasks[8];
 
 static const char *SETTING_BOOT_NAME = "BootName";
 static const char *SETTING_BOOT_ARGS = "BootArgs";
+static const char *SETTING_BOOT_SLOT = "BootSlot";
 static const char *SETTING_BOOT_FLAGS = "BootFlags";
 static const char *SETTING_TIMEZONE = "Timezone";
 static const char *SETTING_INDICATOR_MASK = "Indicators";
@@ -123,12 +124,13 @@ IRAM_ATTR void esp_panic_putchar_hook(char c)
     logbuf_putc(&panicTrace, c);
 }
 
-static bool update_boot_config(const char *partition, const char *name, const char *args, uint32_t flags)
+static bool update_boot_config(const char *partition, const char *name, const char *args, int save_slot, uint32_t flags)
 {
     if (app.initialized)
     {
         rg_settings_set_string(NS_BOOT, SETTING_BOOT_NAME, name);
         rg_settings_set_string(NS_BOOT, SETTING_BOOT_ARGS, args);
+        rg_settings_set_number(NS_BOOT, SETTING_BOOT_SLOT, save_slot);
         rg_settings_set_number(NS_BOOT, SETTING_BOOT_FLAGS, flags);
         rg_settings_commit();
     }
@@ -348,7 +350,7 @@ static void enter_recovery_mode(void)
             rg_storage_delete(RG_BASE_PATH_CACHE);
             break;
         case 1:
-            rg_system_switch_app(RG_APP_FACTORY, 0, 0, 0);
+            rg_system_switch_app(RG_APP_FACTORY, NULL, NULL, 0, 0);
         case 2:
         default:
             rg_system_exit();
@@ -470,6 +472,7 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, void *_u
     app.configNs = rg_settings_get_string(NS_BOOT, SETTING_BOOT_NAME, app.configNs);
     app.bootArgs = rg_settings_get_string(NS_BOOT, SETTING_BOOT_ARGS, app.bootArgs);
     app.bootFlags = rg_settings_get_number(NS_BOOT, SETTING_BOOT_FLAGS, app.bootFlags);
+    app.saveSlot = rg_settings_get_number(NS_BOOT, SETTING_BOOT_SLOT, app.saveSlot);
     rg_display_init();
     rg_gui_init();
 
@@ -500,7 +503,6 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, void *_u
     app.lowMemoryMode = statistics.totalMemoryExt == 0;
 
     app.indicatorsMask = rg_settings_get_number(NS_GLOBAL, SETTING_INDICATOR_MASK, app.indicatorsMask);
-    app.saveSlot = (app.bootFlags & RG_BOOT_SLOT_MASK) >> 4;
     app.romPath = app.bootArgs ?: ""; // For whatever reason some of our code isn't NULL-aware, sigh..
 
     rg_gui_draw_hourglass();
@@ -523,7 +525,7 @@ rg_app_t *rg_system_init(int sampleRate, const rg_handlers_t *handlers, void *_u
         rg_gui_alert("External memory not detected", "Boot will continue but it will surely crash...");
 
     if (app.bootFlags & RG_BOOT_ONCE)
-        update_boot_config(RG_APP_LAUNCHER, NULL, NULL, 0);
+        update_boot_config(RG_APP_LAUNCHER, NULL, NULL, 0, 0);
 
     rg_task_create("rg_sysmon", &system_monitor_task, NULL, 3 * 1024, RG_TASK_PRIORITY_5, -1);
     app.initialized = true;
@@ -902,14 +904,14 @@ void rg_system_restart(void)
 void rg_system_exit(void)
 {
     RG_LOGW("Exiting application!");
-    rg_system_switch_app(RG_APP_LAUNCHER, 0, 0, 0);
+    rg_system_switch_app(RG_APP_LAUNCHER, NULL, NULL, 0, 0);
 }
 
-void rg_system_switch_app(const char *partition, const char *name, const char *args, uint32_t flags)
+void rg_system_switch_app(const char *partition, const char *name, const char *args, int save_slot, uint32_t flags)
 {
     RG_LOGI("Switching to app %s (%s)", partition ?: "-", name ?: "-");
 
-    if (update_boot_config(partition, name, args, flags))
+    if (update_boot_config(partition, name, args, save_slot, flags))
         rg_system_restart();
 
     RG_PANIC("Failed to switch app!");
@@ -1227,12 +1229,7 @@ static void emu_update_save_slot(uint8_t slot)
 
     // Set bootflags to resume from this state on next boot
     if ((app.bootFlags & RG_BOOT_ONCE) == 0)
-    {
-        app.bootFlags &= ~RG_BOOT_SLOT_MASK;
-        app.bootFlags |= app.saveSlot << 4;
-        app.bootFlags |= RG_BOOT_RESUME;
-        update_boot_config(NULL, app.configNs, app.bootArgs, app.bootFlags);
-    }
+        update_boot_config(NULL, app.configNs, app.bootArgs, app.saveSlot, app.bootFlags | RG_BOOT_RESUME);
 
     rg_storage_commit();
 }

components/retro-go/rg_system.h

@@ -57,13 +57,7 @@ typedef enum
     RG_BOOT_RESET     = 0x04,
     RG_BOOT_NETPLAY   = 0x08,
     RG_BOOT_MODE_MASK = 0x0F,
-    // bits 4-7: slot
-    RG_BOOT_SLOT0     = 0x00,
-    RG_BOOT_SLOT1     = 0x10,
-    RG_BOOT_SLOT2     = 0x20,
-    RG_BOOT_SLOT3     = 0x30,
-    RG_BOOT_SLOT_MASK = 0xF0,
-    // bits 8-31: unused...
+    // bits 4-31: unused...
 } rg_boot_flags_t;
 
 // RG_TASK_PRIORITY_1 is the same as the main task's. Anything
@@ -216,7 +210,7 @@ void rg_system_shutdown(void) __attribute__((noreturn));
 void rg_system_sleep(void) __attribute__((noreturn));
 void rg_system_restart(void) __attribute__((noreturn));
 void rg_system_exit(void) __attribute__((noreturn));
-void rg_system_switch_app(const char *part, const char *name, const char *args, uint32_t flags) __attribute__((noreturn));
+void rg_system_switch_app(const char *part, const char *name, const char *args, int save_slot, uint32_t flags) __attribute__((noreturn));
 bool rg_system_have_app(const char *app);
 void rg_system_set_indicator(rg_indicator_t indicator, bool on);
 bool rg_system_get_indicator(rg_indicator_t indicator);

launcher/main/applications.c

@@ -129,14 +129,9 @@ static void application_start(retro_file_t *file, int load_state)
     char *part = strdup(file->app->partition);
     char *name = strdup(file->app->short_name);
     char *path = strdup(get_file_path(file));
-    int flags = (gui.startup_mode ? RG_BOOT_ONCE : 0);
-    if (load_state != -1)
-    {
-        flags |= RG_BOOT_RESUME;
-        flags |= (load_state << 4) & RG_BOOT_SLOT_MASK;
-    }
+    int flags = (gui.startup_mode ? RG_BOOT_ONCE : 0) | (load_state != -1 ? RG_BOOT_RESUME : 0);
     bookmark_add(BOOK_TYPE_RECENT, file); // This could relocate *file, but we no longer need it
-    rg_system_switch_app(part, name, path, flags);
+    rg_system_switch_app(part, name, path, load_state, flags);
 }
 
 static uint32_t crc_read_file(retro_file_t *file, bool interactive)

launcher/main/updater.c

@@ -149,7 +149,7 @@ static rg_gui_event_t view_release_cb(rg_gui_option_t *option, rg_gui_event_t ev
             if (download_file(release->assets[sel].url, dest_path))
             {
                 if (rg_gui_confirm(_("Download complete!"), _("Reboot to flash?"), true))
-                    rg_system_switch_app(RG_UPDATER_APPLICATION, NULL, dest_path, 0);
+                    rg_system_switch_app(RG_UPDATER_APPLICATION, NULL, dest_path, 0, 0);
             }
         }
     #else