From ff6d79b2cc61965a03badb0a350a63e0ccbafe11 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 1 Feb 2020 03:32:24 +0100
Subject: [PATCH] Get rid of more RARCH_CTL_ enums

---
 retroarch.c            | 8 ++------
 retroarch.h            | 3 ---
 tasks/task_save.c      | 5 ++---
 tasks/tasks_internal.h | 2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 6c69c53655..f544e33409 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1820,7 +1820,7 @@ static bool path_init_subsystem(void)
 static void path_init_savefile(void)
 {
    bool should_sram_be_used = rarch_use_sram
-      && !rarch_ctl(RARCH_CTL_IS_SRAM_SAVE_DISABLED, NULL);
+      && !rarch_is_sram_save_disabled;
 
    rarch_use_sram    = should_sram_be_used;
 
@@ -5688,7 +5688,7 @@ static bool event_init_content(void)
 
    command_event_set_savestate_auto_index();
 
-   if (event_load_save_files())
+   if (event_load_save_files(rarch_is_sram_load_disabled))
       RARCH_LOG("%s.\n",
             msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD));
 
@@ -25812,10 +25812,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          sthread_tls_delete(&rarch_tls);
 #endif
          break;
-      case RARCH_CTL_IS_SRAM_LOAD_DISABLED:
-         return rarch_is_sram_load_disabled;
-      case RARCH_CTL_IS_SRAM_SAVE_DISABLED:
-         return rarch_is_sram_save_disabled;
       case RARCH_CTL_SET_BLOCK_CONFIG_READ:
          rarch_block_config_read = true;
          break;
diff --git a/retroarch.h b/retroarch.h
index 0115955898..24aff8882d 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -100,9 +100,6 @@ enum rarch_ctl_state
    RARCH_CTL_IS_IPS_PREF,
    RARCH_CTL_UNSET_IPS_PREF,
 
-   RARCH_CTL_IS_SRAM_LOAD_DISABLED,
-   RARCH_CTL_IS_SRAM_SAVE_DISABLED,
-
    /* Block config read */
    RARCH_CTL_SET_BLOCK_CONFIG_READ,
    RARCH_CTL_UNSET_BLOCK_CONFIG_READ,
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 3ab9b004ea..773b0aea3f 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -1567,12 +1567,11 @@ bool event_save_files(bool is_sram_used)
    return true;
 }
 
-bool event_load_save_files(void)
+bool event_load_save_files(bool is_sram_load_disabled)
 {
    unsigned i;
 
-   if (!task_save_files ||
-         rarch_ctl(RARCH_CTL_IS_SRAM_LOAD_DISABLED, NULL))
+   if (!task_save_files || is_sram_load_disabled)
       return false;
 
    for (i = 0; i < task_save_files->size; i++)
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index a90136c696..d7f4949cab 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -166,7 +166,7 @@ bool take_screenshot(
       const char *path, bool silence,
       bool has_valid_framebuffer, bool fullpath, bool use_thread);
 
-bool event_load_save_files(void);
+bool event_load_save_files(bool is_sram_load_disabled);
 
 bool event_save_files(bool sram_used);