X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=0f599108a0468bf4c17e195f7440f42762487225;hb=5a49b8a2620bfdfaaf59ae25aa51bde44610371b;hp=0088a632f05702551e9302c10818adbf23bf5536;hpb=52d279a54510d3c73c53462f3f236d62fec2d6fa;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index 0088a632..0f599108 100644
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -39,6 +39,7 @@
 #include "../plugins/dfinput/externals.h"
 #include "../plugins/dfsound/spu_config.h"
 #include "psemu_plugin_defs.h"
+#include "arm_features.h"
 #include "revision.h"
 
 #define REARMED_BIRTHDAY_TIME 1293306830	/* 25 Dec 2010 */
@@ -100,13 +101,10 @@ int scanlines, scanline_level = 20;
 int soft_scaling, analog_deadzone; // for Caanoo
 int soft_filter;
 
-#ifdef __ARM_ARCH_7A__
-#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];
@@ -308,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) {
@@ -732,7 +730,7 @@ static unsigned short fname2color(const char *fname)
 static void draw_savestate_bg(int slot);
 
 #define MENU_ALIGN_LEFT
-#ifdef __ARM_ARCH_7A__ // assume hires device
+#ifndef HAVE_PRE_ARMV7 // assume hires device
 #define MENU_X2 1
 #else
 #define MENU_X2 0
@@ -852,7 +850,7 @@ me_bind_action emuctrl_actions[] =
 	{ "Toggle Frameskip ", 1 << SACTION_TOGGLE_FSKIP },
 	{ "Take Screenshot  ", 1 << SACTION_SCREENSHOT },
 	{ "Show/Hide FPS    ", 1 << SACTION_TOGGLE_FPS },
-#ifdef __ARM_ARCH_7A__
+#ifndef HAVE_PRE_ARMV7
 	{ "Switch Renderer  ", 1 << SACTION_SWITCH_DISPMODE },
 #endif
 	{ "Fast Forward     ", 1 << SACTION_FAST_FORWARD },
@@ -903,8 +901,6 @@ static void get_line(char *d, size_t size, const char *s)
 		len = size - 1;
 	strncpy(d, s, len);
 	d[len] = 0;
-
-	mystrip(d);
 }
 
 static void keys_write_all(FILE *f)
@@ -1011,7 +1007,10 @@ static void keys_load_all(const char *cfg)
 	while (p != NULL && (p = strstr(p, "binddev = ")) != NULL) {
 		p += 10;
 
+		// don't strip 'dev' because there are weird devices
+		// with names with space at the end
 		get_line(dev, sizeof(dev), p);
+
 		dev_id = in_config_parse_dev(dev);
 		if (dev_id < 0) {
 			printf("input: can't handle dev: %s\n", dev);
@@ -2520,7 +2519,7 @@ void menu_init(void)
 	me_enable(e_menu_gfx_options, MA_OPT_GAMMA,
 		plat_target.gamma_set != NULL);
 
-#ifndef __ARM_ARCH_7A__
+#ifdef HAVE_PRE_ARMV7
 	me_enable(e_menu_gfx_options, MA_OPT_SWFILTER, 0);
 #endif
 	me_enable(e_menu_gfx_options, MA_OPT_VARSCALER, MENU_SHOW_VARSCALER);