diff options
Diffstat (limited to 'frontend/menu.c')
| -rw-r--r-- | frontend/menu.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/frontend/menu.c b/frontend/menu.c index 0b3f553..babe109 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -101,13 +101,10 @@ int scanlines, scanline_level = 20; int soft_scaling, analog_deadzone; // for Caanoo int soft_filter; -#ifndef HAVE_PRE_ARMV7 -#define DEFAULT_PSX_CLOCK 57 -#define DEFAULT_PSX_CLOCK_S "57" -#else -#define DEFAULT_PSX_CLOCK 50 -#define DEFAULT_PSX_CLOCK_S "50" -#endif +// Default to 100% CPU speed as most hardware can handle it nowadays using the dynamic recompiler. +// If not, the option is in the advanced speed hacks menu, so in a logical place. +#define DEFAULT_PSX_CLOCK 100 +#define DEFAULT_PSX_CLOCK_S "100" static const char *bioses[24]; static const char *gpu_plugins[16]; @@ -309,12 +306,12 @@ static void menu_sync_config(void) switch (in_type_sel1) { case 1: in_type1 = PSE_PAD_TYPE_ANALOGPAD; break; - case 2: in_type1 = PSE_PAD_TYPE_GUNCON; break; + case 2: in_type1 = PSE_PAD_TYPE_NEGCON; break; default: in_type1 = PSE_PAD_TYPE_STANDARD; } switch (in_type_sel2) { case 1: in_type2 = PSE_PAD_TYPE_ANALOGPAD; break; - case 2: in_type2 = PSE_PAD_TYPE_GUNCON; break; + case 2: in_type2 = PSE_PAD_TYPE_NEGCON; break; default: in_type2 = PSE_PAD_TYPE_STANDARD; } if (in_evdev_allow_abs_only != allow_abs_only_old) { |