Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions config.def.h
Original file line number Diff line number Diff line change
Expand Up @@ -768,10 +768,6 @@
#ifdef HAVE_MIST
#define DEFAULT_MENU_SHOW_CORE_MANAGER_STEAM true
#endif
#if 0
/* Thumbnailpack removal */
#define DEFAULT_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER false
#endif
#define DEFAULT_MENU_SHOW_SUBLABELS true
#define DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE true
#define DEFAULT_MENU_SCROLL_FAST false
Expand Down Expand Up @@ -1358,8 +1354,6 @@

#define DEFAULT_NETPLAY_NAT_TRAVERSAL false

#define DEFAULT_NETPLAY_DELAY_FRAMES 16

#define DEFAULT_NETPLAY_CHECK_FRAMES 600

#define DEFAULT_NETPLAY_USE_MITM_SERVER false
Expand Down
4 changes: 0 additions & 4 deletions configuration.c
Original file line number Diff line number Diff line change
Expand Up @@ -2079,10 +2079,6 @@ static struct config_bool_setting *populate_settings_bool(
SETTING_BOOL("menu_show_shutdown", &settings->bools.menu_show_shutdown, true, DEFAULT_MENU_SHOW_SHUTDOWN, false);
SETTING_BOOL("menu_show_online_updater", &settings->bools.menu_show_online_updater, true, DEFAULT_MENU_SHOW_ONLINE_UPDATER, false);
SETTING_BOOL("menu_show_core_updater", &settings->bools.menu_show_core_updater, true, DEFAULT_MENU_SHOW_CORE_UPDATER, false);
#if 0
/* Thumbnailpack removal */
SETTING_BOOL("menu_show_legacy_thumbnail_updater", &settings->bools.menu_show_legacy_thumbnail_updater, true, DEFAULT_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, false);
#endif
#ifdef HAVE_MIST
SETTING_BOOL("menu_show_core_manager_steam", &settings->bools.menu_show_core_manager_steam, true, DEFAULT_MENU_SHOW_CORE_MANAGER_STEAM, false);
#endif
Expand Down
28 changes: 0 additions & 28 deletions frontend/drivers/platform_ctr.c
Original file line number Diff line number Diff line change
Expand Up @@ -481,33 +481,6 @@ static void frontend_ctr_init(void* data)
#endif
}

static int frontend_ctr_get_rating(void)
{
u8 device_model = 0xFF;

/*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/
CFGU_GetSystemModel(&device_model);

switch (device_model)
{
case 0:
case 1:
case 3:
/*Old 3/2DS*/
return 3;
case 2:
case 4:
case 5:
/*New 3/2DS*/
return 6;
default:
/*Unknown Device Or Check Failed*/
break;
}

return -1;
}

enum frontend_architecture frontend_ctr_get_arch(void)
{
return FRONTEND_ARCH_ARM;
Expand Down Expand Up @@ -642,7 +615,6 @@ frontend_ctx_driver_t frontend_ctx_ctr =
frontend_ctr_shutdown, /* shutdown */
frontend_ctr_get_name, /* get_name */
frontend_ctr_get_os, /* get_os */
frontend_ctr_get_rating, /* get_rating */
NULL, /* load_content */
frontend_ctr_get_arch, /* get_architecture */
frontend_ctr_get_powerstate, /* get_powerstate */
Expand Down
99 changes: 0 additions & 99 deletions frontend/drivers/platform_darwin.m
Original file line number Diff line number Diff line change
Expand Up @@ -496,104 +496,6 @@ static void frontend_darwin_get_env(int *argc, char *argv[],
path_mkdir(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]);
}

static int frontend_darwin_get_rating(void)
{
char model[PATH_MAX_LENGTH] = {0};

frontend_darwin_get_name(model, sizeof(model));

/* iPhone 4S */
if (strstr(model, "iPhone4,1"))
return 8;

/* iPad 2/iPad Mini 1 */
if (strstr(model, "iPad2"))
return 9;

/* iPhone 5/5C */
if (strstr(model, "iPhone5"))
return 13;

/* iPhone 5S */
if (strstr(model, "iPhone6,1") || strstr(model, "iPhone6,2"))
return 14;

/* iPad Mini 2/3 */
if ( strstr(model, "iPad4,4")
|| strstr(model, "iPad4,5")
|| strstr(model, "iPad4,6")
|| strstr(model, "iPad4,7")
|| strstr(model, "iPad4,8")
|| strstr(model, "iPad4,9")
)
return 15;

/* iPad Air */
if ( strstr(model, "iPad4,1")
|| strstr(model, "iPad4,2")
|| strstr(model, "iPad4,3")
)
return 16;

/* iPhone 6, iPhone 6 Plus */
if (strstr(model, "iPhone7"))
return 17;

/* iPad Air 2 */
if (strstr(model, "iPad5,3") || strstr(model, "iPad5,4"))
return 18;

/* iPad Pro (12.9 Inch) */
if (strstr(model, "iPad6,7") || strstr(model, "iPad6,8"))
return 19;

/* iPad Pro (9.7 Inch) */
if (strstr(model, "iPad6,3") || strstr(model, "iPad6,4"))
return 19;

/* iPad 5th Generation */
if (strstr(model, "iPad6,11") || strstr(model, "iPad6,12"))
return 19;

/* iPad Pro (12.9 Inch 2nd Generation) */
if (strstr(model, "iPad7,1") || strstr(model, "iPad7,2"))
return 19;

/* iPad Pro (10.5 Inch) */
if (strstr(model, "iPad7,3") || strstr(model, "iPad7,4"))
return 19;

/* iPad Pro 6th Generation) */
if (strstr(model, "iPad7,5") || strstr(model, "iPad7,6"))
return 19;

/* iPad Pro (11 Inch) */
if ( strstr(model, "iPad8,1")
|| strstr(model, "iPad8,2")
|| strstr(model, "iPad8,3")
|| strstr(model, "iPad8,4")
)
return 19;

/* iPad Pro (12.9 3rd Generation) */
if ( strstr(model, "iPad8,5")
|| strstr(model, "iPad8,6")
|| strstr(model, "iPad8,7")
|| strstr(model, "iPad8,8")
)
return 19;

/* iPad Air 3rd Generation) */
if ( strstr(model, "iPad11,3")
|| strstr(model, "iPad11,4"))
return 19;

/* TODO/FIXME -
- more ratings for more systems
- determine rating more intelligently*/
return -1;
}

static enum frontend_powerstate frontend_darwin_get_powerstate(
int *seconds, int *percent)
{
Expand Down Expand Up @@ -1172,7 +1074,6 @@ static void frontend_darwin_content_loaded(void)
NULL, /* shutdown */
frontend_darwin_get_name, /* get_name */
frontend_darwin_get_os, /* get_os */
frontend_darwin_get_rating, /* get_rating */
frontend_darwin_content_loaded, /* content_loaded */
frontend_darwin_get_arch, /* get_architecture */
frontend_darwin_get_powerstate, /* get_powerstate */
Expand Down
2 changes: 0 additions & 2 deletions frontend/drivers/platform_dos.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ static void frontend_dos_init(void *data)

/* TODO/FIXME - implement */
static void frontend_dos_shutdown(bool unused) { }
static int frontend_dos_get_rating(void) { return -1; }

enum frontend_architecture frontend_dos_get_arch(void)
{
Expand Down Expand Up @@ -168,7 +167,6 @@ frontend_ctx_driver_t frontend_ctx_dos = {
frontend_dos_shutdown, /* shutdown */
NULL, /* get_name */
NULL, /* get_os */
frontend_dos_get_rating, /* get_rating */
NULL, /* content_loaded */
frontend_dos_get_arch, /* get_architecture */
NULL, /* get_powerstate */
Expand Down
1 change: 0 additions & 1 deletion frontend/drivers/platform_emscripten.c
Original file line number Diff line number Diff line change
Expand Up @@ -1067,7 +1067,6 @@ frontend_ctx_driver_t frontend_ctx_emscripten = {
NULL, /* shutdown */
NULL, /* get_name */
NULL, /* get_os */
NULL, /* get_rating */
NULL, /* load_content */
NULL, /* get_architecture */
frontend_emscripten_get_powerstate, /* get_powerstate */
Expand Down
10 changes: 0 additions & 10 deletions frontend/drivers/platform_gx.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,15 +501,6 @@ static bool frontend_gx_set_fork(enum frontend_fork fork_mode)
}
#endif

static int frontend_gx_get_rating(void)
{
#ifdef HW_RVL
return 8;
#else
return 6;
#endif
}

static enum frontend_architecture frontend_gx_get_arch(void)
{
return FRONTEND_ARCH_PPC;
Expand Down Expand Up @@ -589,7 +580,6 @@ frontend_ctx_driver_t frontend_ctx_gx = {
frontend_gx_shutdown, /* shutdown */
NULL, /* get_name */
NULL, /* get_os */
frontend_gx_get_rating, /* get_rating */
NULL, /* load_content */
frontend_gx_get_arch, /* get_architecture */
NULL, /* get_powerstate */
Expand Down
7 changes: 0 additions & 7 deletions frontend/drivers/platform_orbis.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,6 @@ static void frontend_orbis_exitspawn(char *s, size_t len, char *args)
frontend_orbis_exec(s, should_load_game);
}

static int frontend_orbis_get_rating(void)
{
/* TODO/FIXME - needs a different rating */
return 6;
}

enum frontend_architecture frontend_orbis_get_arch(void)
{
return FRONTEND_ARCH_X86_64;
Expand Down Expand Up @@ -340,7 +334,6 @@ frontend_ctx_driver_t frontend_ctx_orbis = {
frontend_orbis_shutdown,
NULL, /* get_name */
NULL, /* get_os */
frontend_orbis_get_rating,
NULL, /* content_loaded */
frontend_orbis_get_arch,
NULL,
Expand Down
3 changes: 0 additions & 3 deletions frontend/drivers/platform_ps2.c
Original file line number Diff line number Diff line change
Expand Up @@ -425,8 +425,6 @@ static void frontend_ps2_exitspawn(char *s, size_t len, char *args)
frontend_ps2_exec(s, should_load_content);
}

static int frontend_ps2_get_rating(void) { return 4; }

enum frontend_architecture frontend_ps2_get_arch(void)
{
return FRONTEND_ARCH_MIPS;
Expand Down Expand Up @@ -556,7 +554,6 @@ frontend_ctx_driver_t frontend_ctx_ps2 = {
NULL, /* shutdown */
NULL, /* get_name */
NULL, /* get_os */
frontend_ps2_get_rating, /* get_rating */
NULL, /* load_content */
frontend_ps2_get_arch, /* get_architecture */
NULL, /* get_powerstate */
Expand Down
6 changes: 0 additions & 6 deletions frontend/drivers/platform_ps3.c
Original file line number Diff line number Diff line change
Expand Up @@ -534,11 +534,6 @@ static void frontend_ps3_exitspawn(char *s, size_t len, char *args)
#endif
}

static int frontend_ps3_get_rating(void)
{
return 10;
}

enum frontend_architecture frontend_ps3_get_arch(void)
{
return FRONTEND_ARCH_PPC;
Expand Down Expand Up @@ -665,7 +660,6 @@ frontend_ctx_driver_t frontend_ctx_ps3 = {
NULL, /* shutdown */
NULL, /* get_name */
NULL, /* get_os */
frontend_ps3_get_rating, /* get_rating */
NULL, /* load_content */
frontend_ps3_get_arch, /* get_architecture */
NULL, /* get_powerstate */
Expand Down
10 changes: 0 additions & 10 deletions frontend/drivers/platform_psp.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,15 +428,6 @@ static void frontend_psp_exitspawn(char *s, size_t len, char *args)
frontend_psp_exec(s, should_load_content);
}

static int frontend_psp_get_rating(void)
{
#ifdef VITA
return 6; /* Go with a conservative figure for now. */
#else
return 4;
#endif
}

static enum frontend_powerstate frontend_psp_get_powerstate(int *seconds, int *percent)
{
enum frontend_powerstate ret = FRONTEND_POWERSTATE_NONE;
Expand Down Expand Up @@ -606,7 +597,6 @@ frontend_ctx_driver_t frontend_ctx_psp = {
frontend_psp_shutdown, /* shutdown */
NULL, /* get_name */
NULL, /* get_os */
frontend_psp_get_rating, /* get_rating */
NULL, /* content_loaded */
frontend_psp_get_arch, /* get_architecture */
frontend_psp_get_powerstate,
Expand Down
8 changes: 0 additions & 8 deletions frontend/drivers/platform_qnx.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@ static void frontend_qnx_shutdown(bool unused)
bps_shutdown();
}

static int frontend_qnx_get_rating(void)
{
/* TODO/FIXME - look at unique identifier per device and
* determine rating for some */
return -1;
}

static void frontend_qnx_get_env_settings(int *argc, char *argv[],
void *data, void *params_data)
{
Expand Down Expand Up @@ -181,7 +174,6 @@ frontend_ctx_driver_t frontend_ctx_qnx = {
frontend_qnx_shutdown,
NULL, /* get_name */
NULL, /* get_os */
frontend_qnx_get_rating,
NULL, /* load_content */
frontend_qnx_get_arch, /* get_architecture */
NULL, /* get_powerstate */
Expand Down
6 changes: 0 additions & 6 deletions frontend/drivers/platform_switch.c
Original file line number Diff line number Diff line change
Expand Up @@ -626,11 +626,6 @@ static void frontend_switch_init(void *data)
#endif /* HAVE_LIBNX (splash) */
}

static int frontend_switch_get_rating(void)
{
return 11;
}

enum frontend_architecture frontend_switch_get_arch(void)
{
return FRONTEND_ARCH_ARMV8;
Expand Down Expand Up @@ -792,7 +787,6 @@ frontend_ctx_driver_t frontend_ctx_switch =
frontend_switch_shutdown,
frontend_switch_get_name,
frontend_switch_get_os,
frontend_switch_get_rating,
NULL, /* content_loaded */
frontend_switch_get_arch, /* get_architecture */
frontend_switch_get_powerstate, /* get_powerstate */
Expand Down
16 changes: 0 additions & 16 deletions frontend/drivers/platform_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -1192,21 +1192,6 @@ static bool frontend_unix_powerstate_check_acpi_sysfs(
}
#endif

static int frontend_unix_get_rating(void)
{
#ifdef ANDROID
char device_model[PROP_VALUE_MAX] = {0};
system_property_get("getprop", "ro.product.model", device_model);
if (g_platform_android_flags & PLAT_ANDROID_FLAG_XPERIA_PLAY_DEVICE)
return 6;
else if (strstr(device_model, "GT-I9505"))
return 12;
else if (strstr(device_model, "SHIELD"))
return 13;
#endif
return -1;
}

static enum frontend_powerstate frontend_unix_get_powerstate(
int *seconds, int *percent)
{
Expand Down Expand Up @@ -3368,7 +3353,6 @@ frontend_ctx_driver_t frontend_ctx_unix = {
NULL, /* get_name */
#endif
frontend_unix_get_os,
frontend_unix_get_rating, /* get_rating */
NULL, /* content_loaded */
frontend_unix_get_arch, /* get_architecture */
frontend_unix_get_powerstate,
Expand Down
1 change: 0 additions & 1 deletion frontend/drivers/platform_uwp.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ frontend_ctx_driver_t frontend_ctx_uwp = {
NULL, /* shutdown */
NULL, /* get_name */
frontend_uwp_get_os,
NULL, /* get_rating */
NULL, /* content_loaded */
frontend_uwp_get_arch, /* get_architecture */
frontend_uwp_get_powerstate,
Expand Down
Loading
Loading