mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 19:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create CORE_INFO_CTL_LIST_UPDATE_MISSING_FIRMWARE

Browse Source
This commit is contained in:
twinaphex 2016-02-07 16:19:02 +01:00
parent 452df47c14
commit b647e8186d
3 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core_info.c
View File

@ -577,7 +577,7 @@ core_info_t *core_info_get(core_info_list_t *list, size_t i)
} }
void core_info_list_update_missing_firmware( static bool core_info_list_update_missing_firmware(
core_info_list_t *core_info_list, core_info_list_t *core_info_list,
const char *core, const char *systemdir) const char *core, const char *systemdir)
{ {
@ -586,10 +586,10 @@ void core_info_list_update_missing_firmware(
core_info_t *info = NULL; core_info_t *info = NULL;
if (!core_info_list || !core) if (!core_info_list || !core)
return; return false;
if (!(info = core_info_find(core_info_list, core))) if (!(info = core_info_find(core_info_list, core)))
return; return false;
for (i = 0; i < info->firmware_count; i++) for (i = 0; i < info->firmware_count; i++)
{ {
@ -600,6 +600,8 @@ void core_info_list_update_missing_firmware(
info->firmware[i].path, sizeof(path)); info->firmware[i].path, sizeof(path));
info->firmware[i].missing = !path_file_exists(path); info->firmware[i].missing = !path_file_exists(path);
} }
return true;
} }
#if 0 #if 0
@ -690,6 +692,16 @@ bool core_info_ctl(enum core_info_state state, void *data)
*core = core_info_curr_list; *core = core_info_curr_list;
} }
break; break;
case CORE_INFO_CTL_LIST_UPDATE_MISSING_FIRMWARE:
{
core_info_ctx_firmware_t *info = (core_info_ctx_firmware_t*)data;
if (!info)
return false;
return core_info_list_update_missing_firmware(core_info_curr_list,
info->path, info->system_directory);
}
break;
case CORE_INFO_CTL_FIND: case CORE_INFO_CTL_FIND:
{ {
core_info_ctx_find_t *info = (core_info_ctx_find_t*)data; core_info_ctx_find_t *info = (core_info_ctx_find_t*)data;

10
core_info.h
View File

@ -30,6 +30,7 @@ enum core_info_state
CORE_INFO_CTL_LIST_DEINIT, CORE_INFO_CTL_LIST_DEINIT,
CORE_INFO_CTL_LIST_INIT, CORE_INFO_CTL_LIST_INIT,
CORE_INFO_CTL_LIST_GET, CORE_INFO_CTL_LIST_GET,
CORE_INFO_CTL_LIST_UPDATE_MISSING_FIRMWARE,
CORE_INFO_CTL_CURRENT_CORE_FREE, CORE_INFO_CTL_CURRENT_CORE_FREE,
CORE_INFO_CTL_CURRENT_CORE_INIT, CORE_INFO_CTL_CURRENT_CORE_INIT,
CORE_INFO_CTL_CURRENT_CORE_GET, CORE_INFO_CTL_CURRENT_CORE_GET,
@ -82,6 +83,12 @@ typedef struct
char *all_ext; char *all_ext;
} core_info_list_t; } core_info_list_t;
typedef struct core_info_ctx_firmware
{
const char *path;
const char *system_directory;
} core_info_ctx_firmware_t;
typedef struct core_info_ctx_find typedef struct core_info_ctx_find
{ {
core_info_t *inf; core_info_t *inf;
@ -92,9 +99,6 @@ typedef struct core_info_ctx_find
void core_info_list_get_supported_cores(core_info_list_t *list, void core_info_list_get_supported_cores(core_info_list_t *list,
const char *path, const core_info_t **infos, size_t *num_infos); const char *path, const core_info_t **infos, size_t *num_infos);
void core_info_list_update_missing_firmware(core_info_list_t *list,
const char *core, const char *systemdir);
/* Shallow-copies internal state. Data in *info is invalidated when the /* Shallow-copies internal state. Data in *info is invalidated when the
* core_info_list is freed. */ * core_info_list is freed. */
bool core_info_list_get_info(core_info_list_t *list, bool core_info_list_get_info(core_info_list_t *list,

69
menu/menu_displaylist.c
View File

@ -269,44 +269,45 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info)
if (core_info->firmware_count > 0) if (core_info->firmware_count > 0)
{ {
core_info_list_t *list = NULL; core_info_ctx_firmware_t firmware_info;
core_info_ctl(CORE_INFO_CTL_LIST_GET, &list); firmware_info.path = core_info->path;
firmware_info.system_directory = settings->system_directory;
core_info_list_update_missing_firmware(list, core_info->path, if (core_info_ctl(CORE_INFO_CTL_LIST_UPDATE_MISSING_FIRMWARE, &firmware_info))
settings->system_directory);
strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_FIRMWARE),
sizeof(tmp));
strlcat(tmp, ": ", sizeof(tmp));
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
/* FIXME: This looks hacky and probably
* needs to be improved for good translation support. */
for (i = 0; i < core_info->firmware_count; i++)
{ {
if (core_info->firmware[i].desc) strlcpy(tmp, menu_hash_to_str(MENU_LABEL_VALUE_CORE_INFO_FIRMWARE),
{ sizeof(tmp));
snprintf(tmp, sizeof(tmp), " %s: %s", strlcat(tmp, ": ", sizeof(tmp));
menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_NAME), menu_entries_push(info->list, tmp, "",
core_info->firmware[i].desc ? MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
core_info->firmware[i].desc : "");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), " %s: %s, %s", /* FIXME: This looks hacky and probably
menu_hash_to_str(MENU_VALUE_STATUS), * needs to be improved for good translation support. */
core_info->firmware[i].missing ?
menu_hash_to_str(MENU_VALUE_MISSING) : for (i = 0; i < core_info->firmware_count; i++)
menu_hash_to_str(MENU_VALUE_PRESENT), {
core_info->firmware[i].optional ? if (core_info->firmware[i].desc)
menu_hash_to_str(MENU_VALUE_OPTIONAL) : {
menu_hash_to_str(MENU_VALUE_REQUIRED) snprintf(tmp, sizeof(tmp), " %s: %s",
); menu_hash_to_str(MENU_LABEL_VALUE_RDB_ENTRY_NAME),
menu_entries_push(info->list, tmp, "", core_info->firmware[i].desc ?
MENU_SETTINGS_CORE_INFO_NONE, 0, 0); core_info->firmware[i].desc : "");
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
snprintf(tmp, sizeof(tmp), " %s: %s, %s",
menu_hash_to_str(MENU_VALUE_STATUS),
core_info->firmware[i].missing ?
menu_hash_to_str(MENU_VALUE_MISSING) :
menu_hash_to_str(MENU_VALUE_PRESENT),
core_info->firmware[i].optional ?
menu_hash_to_str(MENU_VALUE_OPTIONAL) :
menu_hash_to_str(MENU_VALUE_REQUIRED)
);
menu_entries_push(info->list, tmp, "",
MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
}
} }
} }
} }