Move update_firmware_status to tasks/task_content.c

This commit is contained in:
twinaphex 2016-12-06 08:28:26 +01:00
parent a4e1be2cdb
commit b3aef50dff
3 changed files with 29 additions and 31 deletions

View File

@ -56,7 +56,6 @@
#endif
#include "autosave.h"
#include "core_info.h"
#include "configuration.h"
#include "driver.h"
#include "movie.h"
@ -134,34 +133,6 @@ global_t *global_get_ptr(void)
return &g_extern;
}
void update_firmware_status(void)
{
char s[PATH_MAX_LENGTH];
core_info_ctx_firmware_t firmware_info;
core_info_t *core_info = NULL;
settings_t *settings = config_get_ptr();
core_info_get_current_core(&core_info);
if (!core_info || !settings)
return;
firmware_info.path = core_info->path;
if (!string_is_empty(settings->directory.system))
firmware_info.directory.system = settings->directory.system;
else
{
strlcpy(s, path_get(RARCH_PATH_CONTENT) ,sizeof(s));
path_basedir(s);
firmware_info.directory.system = s;
}
RARCH_LOG("Updating firmware status for: %s on %s\n", core_info->path,
firmware_info.directory.system);
core_info_list_update_missing_firmware(&firmware_info);
}
void runloop_msg_queue_push(const char *msg,
unsigned prio, unsigned duration,
bool flush)

View File

@ -223,8 +223,6 @@ char* runloop_msg_queue_pull(void);
bool runloop_ctl(enum runloop_ctl_state state, void *data);
void update_firmware_status();
RETRO_END_DECLS
#endif

View File

@ -73,6 +73,7 @@
#include "tasks_internal.h"
#include "../command.h"
#include "../core_info.h"
#include "../content.h"
#include "../configuration.h"
#include "../defaults.h"
@ -1027,6 +1028,34 @@ static bool command_event_cmd_exec(const char *data,
return true;
}
static void update_firmware_status(void)
{
char s[PATH_MAX_LENGTH];
core_info_ctx_firmware_t firmware_info;
core_info_t *core_info = NULL;
settings_t *settings = config_get_ptr();
core_info_get_current_core(&core_info);
if (!core_info || !settings)
return;
firmware_info.path = core_info->path;
if (!string_is_empty(settings->directory.system))
firmware_info.directory.system = settings->directory.system;
else
{
strlcpy(s, path_get(RARCH_PATH_CONTENT) ,sizeof(s));
path_basedir(s);
firmware_info.directory.system = s;
}
RARCH_LOG("Updating firmware status for: %s on %s\n", core_info->path,
firmware_info.directory.system);
core_info_list_update_missing_firmware(&firmware_info);
}
bool task_push_content_load_default(
const char *core_path,
const char *fullpath,