X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fmenu.c;h=5efd26014119c12def3595c402e0961b71edd466;hb=41e82ad46e60f9c3291ff81ebe4a07512b1194c5;hp=9ddbe3762d7010963f816e03b8fd65c9db900305;hpb=c3341ffd2f06fadeca07b74279070c334b8d8cc1;p=pcsx_rearmed.git

diff --git a/frontend/menu.c b/frontend/menu.c
index 9ddbe376..5efd2601 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,7 +101,7 @@ int scanlines, scanline_level = 20;
 int soft_scaling, analog_deadzone; // for Caanoo
 int soft_filter;
 
-#ifdef __ARM_ARCH_7A__
+#ifndef HAVE_PRE_ARMV7
 #define DEFAULT_PSX_CLOCK 57
 #define DEFAULT_PSX_CLOCK_S "57"
 #else
@@ -705,6 +706,9 @@ fail:
 
 static const char *filter_exts[] = {
 	"bin", "img", "mdf", "iso", "cue", "z",
+	#ifdef HAVE_CHD
+	"chd",
+	#endif
 	"bz",  "znx", "pbp", "cbn", NULL
 };
 
@@ -732,7 +736,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
@@ -813,7 +817,7 @@ static void draw_savestate_bg(int slot)
 
 		// darken this so that menu text is visible
 		if (g_menuscreen_w - w < 320)
-			menu_darken_bg(d, d, w * 2, 0);
+			menu_darken_bg(d, d, w, 0);
 	}
 
 out:
@@ -852,7 +856,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 },
@@ -2521,7 +2525,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);
@@ -2581,7 +2585,11 @@ void menu_prepare_emu(void)
 
 	plat_video_menu_leave();
 
+	#ifndef DRC_DISABLE
 	psxCpu = (Config.Cpu == CPU_INTERPRETER) ? &psxInt : &psxRec;
+	#else
+	psxCpu = &psxInt;
+	#endif
 	if (psxCpu != prev_cpu) {
 		prev_cpu->Shutdown();
 		psxCpu->Init();