Skip to content

Commit a6ae965

Browse files
authored
Remove missing firmware check option (#18470)
1 parent 7a6091c commit a6ae965

14 files changed

Lines changed: 25 additions & 162 deletions

config.def.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@
334334
#else
335335
#define DEFAULT_LOAD_DUMMY_ON_CORE_SHUTDOWN true
336336
#endif
337-
#define DEFAULT_CHECK_FIRMWARE_BEFORE_LOADING false
338337

339338
/* Specifies whether cores are allowed to
340339
* present core options in category submenus */

configuration.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1744,7 +1744,6 @@ static struct config_bool_setting *populate_settings_bool(
17441744
SETTING_BOOL("input_descriptor_label_show", &settings->bools.input_descriptor_label_show, true, DEFAULT_INPUT_DESCRIPTOR_LABEL_SHOW, false);
17451745
SETTING_BOOL("input_descriptor_hide_unbound", &settings->bools.input_descriptor_hide_unbound, true, DEFAULT_INPUT_DESCRIPTOR_HIDE_UNBOUND, false);
17461746
SETTING_BOOL("load_dummy_on_core_shutdown", &settings->bools.load_dummy_on_core_shutdown, true, DEFAULT_LOAD_DUMMY_ON_CORE_SHUTDOWN, false);
1747-
SETTING_BOOL("check_firmware_before_loading", &settings->bools.check_firmware_before_loading, true, DEFAULT_CHECK_FIRMWARE_BEFORE_LOADING, false);
17481747
SETTING_BOOL("core_option_category_enable", &settings->bools.core_option_category_enable, true, DEFAULT_CORE_OPTION_CATEGORY_ENABLE, false);
17491748
SETTING_BOOL("core_info_savestate_bypass", &settings->bools.core_info_savestate_bypass, true, DEFAULT_CORE_INFO_SAVESTATE_BYPASS, false);
17501749
#if defined(__WINRT__) || defined(WINAPI_FAMILY) && WINAPI_FAMILY == WINAPI_FAMILY_PHONE_APP

configuration.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,6 @@ typedef struct settings
10421042
bool network_remote_enable;
10431043
bool network_remote_enable_user[MAX_USERS];
10441044
bool load_dummy_on_core_shutdown;
1045-
bool check_firmware_before_loading;
10461045
bool core_option_category_enable;
10471046
bool core_info_cache_enable;
10481047
bool core_info_savestate_bypass;

core_info.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2263,8 +2263,7 @@ static int core_info_qsort_cmp(const void *a_, const void *b_)
22632263
static bool core_info_list_update_missing_firmware_internal(
22642264
core_info_list_t *core_info_list,
22652265
const char *core_path,
2266-
const char *systemdir,
2267-
bool *set_missing_bios)
2266+
const char *systemdir)
22682267
{
22692268
size_t i;
22702269
char path[PATH_MAX_LENGTH];
@@ -2285,8 +2284,6 @@ static bool core_info_list_update_missing_firmware_internal(
22852284
fill_pathname_join(path, systemdir,
22862285
info->firmware[i].path, sizeof(path));
22872286
info->firmware[i].missing = !path_is_valid(path);
2288-
if (info->firmware[i].missing && !info->firmware[i].optional)
2289-
*set_missing_bios = true;
22902287
}
22912288

22922289
return true;
@@ -2404,14 +2401,13 @@ size_t core_info_count(void)
24042401
}
24052402

24062403
bool core_info_list_update_missing_firmware(
2407-
core_info_ctx_firmware_t *info, bool *set_missing_bios)
2404+
core_info_ctx_firmware_t *info)
24082405
{
24092406
core_info_state_t *p_coreinfo = &core_info_st;
24102407
if (info)
24112408
return core_info_list_update_missing_firmware_internal(
24122409
p_coreinfo->curr_list,
2413-
info->path, info->directory.system,
2414-
set_missing_bios);
2410+
info->path, info->directory.system);
24152411
return false;
24162412
}
24172413

core_info.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,7 @@ bool core_info_get_list(core_info_list_t **core);
185185
/* Returns number of installed cores */
186186
size_t core_info_count(void);
187187

188-
bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info,
189-
bool *set_missing_bios);
188+
bool core_info_list_update_missing_firmware(core_info_ctx_firmware_t *info);
190189

191190
bool core_info_find(const char *core_path,
192191
core_info_t **core_info);

intl/msg_hash_us.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,6 @@ int msg_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len)
8585
case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN:
8686
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_DUMMY_ON_CORE_SHUTDOWN), len);
8787
break;
88-
case MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE:
89-
strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_HELP_CHECK_FOR_MISSING_FIRMWARE), len);
90-
break;
9188
case MENU_ENUM_LABEL_CORE_INFO_SAVESTATE_BYPASS:
9289
strlcpy(s, msg_hash_to_str(MENU_ENUM_SUBLABEL_CORE_INFO_SAVESTATE_BYPASS), len);
9390
break;

menu/cbs/menu_cbs_sublabel.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,6 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_vertical_sync, MENU_
592592
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_adaptive_vsync, MENU_ENUM_SUBLABEL_VIDEO_ADAPTIVE_VSYNC)
593593
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_allow_rotate, MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE)
594594
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_dummy_on_core_shutdown, MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN)
595-
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_dummy_check_missing_firmware, MENU_ENUM_SUBLABEL_CHECK_FOR_MISSING_FIRMWARE)
596595
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_option_category_enable, MENU_ENUM_SUBLABEL_CORE_OPTION_CATEGORY_ENABLE)
597596
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_info_cache_enable, MENU_ENUM_SUBLABEL_CORE_INFO_CACHE_ENABLE)
598597
DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_core_info_savestate_bypass, MENU_ENUM_SUBLABEL_CORE_INFO_SAVESTATE_BYPASS)
@@ -4712,9 +4711,6 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
47124711
case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN:
47134712
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dummy_on_core_shutdown);
47144713
break;
4715-
case MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE:
4716-
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_dummy_check_missing_firmware);
4717-
break;
47184714
case MENU_ENUM_LABEL_CORE_OPTION_CATEGORY_ENABLE:
47194715
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_core_option_category_enable);
47204716
break;

menu/menu_displaylist.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,6 @@ static int menu_displaylist_parse_core_info(
815815
core_info_ctx_firmware_t firmware_info;
816816
uint8_t flags = content_get_flags();
817817
bool update_missing_firmware = false;
818-
bool set_missing_firmware = false;
819818
bool systemfiles_in_content_dir = settings->bools.systemfiles_in_content_dir;
820819
bool content_is_inited = flags & CONTENT_ST_FLAG_IS_INITED;
821820

@@ -847,12 +846,7 @@ static int menu_displaylist_parse_core_info(
847846
else
848847
firmware_info.directory.system = settings->paths.directory_system;
849848

850-
update_missing_firmware = core_info_list_update_missing_firmware(&firmware_info, &set_missing_firmware);
851-
852-
if (set_missing_firmware)
853-
runloop_st->missing_bios = true;
854-
else
855-
runloop_st->missing_bios = false;
849+
update_missing_firmware = core_info_list_update_missing_firmware(&firmware_info);
856850

857851
if (update_missing_firmware)
858852
{
@@ -11543,7 +11537,6 @@ unsigned menu_displaylist_build_list(
1154311537
static const menu_displaylist_build_info_t build_list[] = {
1154411538
{MENU_ENUM_LABEL_CORE_INFO_CACHE_ENABLE, PARSE_ONLY_BOOL},
1154511539
{MENU_ENUM_LABEL_CORE_INFO_SAVESTATE_BYPASS, PARSE_ONLY_BOOL},
11546-
{MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE, PARSE_ONLY_BOOL},
1154711540
{MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE, PARSE_ONLY_BOOL},
1154811541
{MENU_ENUM_LABEL_CORE_OPTION_CATEGORY_ENABLE, PARSE_ONLY_BOOL},
1154911542
{MENU_ENUM_LABEL_DRIVER_SWITCH_ENABLE, PARSE_ONLY_BOOL},

menu/menu_setting.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11067,14 +11067,6 @@ static bool setting_append_list(
1106711067
bool_entries[listing].flags |= SD_FLAG_DEFAULT_VALUE;
1106811068
listing++;
1106911069

11070-
bool_entries[listing].target = &settings->bools.check_firmware_before_loading;
11071-
bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE;
11072-
bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE;
11073-
bool_entries[listing].flags = SD_FLAG_ADVANCED;
11074-
if (DEFAULT_CHECK_FIRMWARE_BEFORE_LOADING)
11075-
bool_entries[listing].flags |= SD_FLAG_DEFAULT_VALUE;
11076-
listing++;
11077-
1107811070
bool_entries[listing].target = &settings->bools.systemfiles_in_content_dir;
1107911071
bool_entries[listing].name_enum_idx = MENU_ENUM_LABEL_SYSTEMFILES_IN_CONTENT_DIR_ENABLE;
1108011072
bool_entries[listing].SHORT_enum_idx = MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE;

msg_hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3017,7 +3017,7 @@ enum msg_hash_enums
30173017
MENU_LABEL(NETWORK_USER_REMOTE_ENABLE),
30183018

30193019
MENU_LBL_H(DUMMY_ON_CORE_SHUTDOWN),
3020-
MENU_LBL_H(CHECK_FOR_MISSING_FIRMWARE),
3020+
MENU_LBL_H(CHECK_FOR_MISSING_FIRMWARE), /* Deprecated */
30213021
MENU_LABEL(CORE_INFO_SAVESTATE_BYPASS),
30223022
MENU_LABEL(CORE_OPTION_CATEGORY_ENABLE),
30233023
MENU_LABEL(CORE_INFO_CACHE_ENABLE),

0 commit comments

Comments
 (0)