Enable SRAM for contentless cores

This commit is contained in:
jdgleaver 2021-10-14 13:59:23 +01:00
parent c19b04e21e
commit 40925baacd
2 changed files with 15 additions and 9 deletions

View File

@ -5882,10 +5882,7 @@ static bool event_init_content(
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);
/* TODO/FIXME - just because we have a contentless core does not p_rarch->rarch_use_sram = (current_core_type == CORE_TYPE_PLAIN);
* necessarily mean there should be no SRAM, try to find a solution here */
p_rarch->rarch_use_sram = (current_core_type == CORE_TYPE_PLAIN)
&& !contentless;
/* No content to be loaded for dummy core, /* No content to be loaded for dummy core,
* just successfully exit. */ * just successfully exit. */
@ -5896,7 +5893,12 @@ static bool event_init_content(
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);
if (!contentless) /* If core is contentless, just initialise SRAM
* interface, otherwise fill all content-related
* paths */
if (contentless)
path_init_savefile_internal(global, p_rarch);
else
path_fill_names(p_rarch, input_st); path_fill_names(p_rarch, input_st);
if (!content_init()) if (!content_init())
@ -5904,8 +5906,8 @@ static bool event_init_content(
command_event_set_savestate_auto_index(settings, global); command_event_set_savestate_auto_index(settings, global);
if (event_load_save_files(p_rarch->rarch_is_sram_load_disabled)) if (!event_load_save_files(p_rarch->rarch_is_sram_load_disabled))
RARCH_LOG("[SRAM]: %s.\n", RARCH_LOG("[SRAM]: %s\n",
msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD)); msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD));
/* /*

View File

@ -2072,14 +2072,18 @@ bool event_save_files(bool is_sram_used)
bool event_load_save_files(bool is_sram_load_disabled) bool event_load_save_files(bool is_sram_load_disabled)
{ {
unsigned i; unsigned i;
bool success = false;
if (!task_save_files || is_sram_load_disabled) if (!task_save_files || is_sram_load_disabled)
return false; return false;
/* Report a successful load operation if
* any type of ram file is found and
* processed correctly */
for (i = 0; i < task_save_files->size; i++) for (i = 0; i < task_save_files->size; i++)
content_load_ram_file(i); success |= content_load_ram_file(i);
return true; return success;
} }
void path_init_savefile_rtc(const char *savefile_path) void path_init_savefile_rtc(const char *savefile_path)