X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=4e9e5948e5df7914f3a743917ca33eb6a1e59a57;hb=531a8f38839713938a441f9287724e5e72c492c3;hp=2dd582dc353c080bb1272914eb7828a9edf17764;hpb=53b2e51c0bb65344685b336a73216b059fb6d13c;p=picodrive.git

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 2dd582d..4e9e594 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -76,6 +76,11 @@ static void make_bg(int no_scale)
 	short *dst;
 	int x, y;
 
+	if (src == NULL) {
+		memset(g_menubg_ptr, 0, g_menuscreen_w * g_menuscreen_h * 2);
+		return;
+	}
+
 	if (!no_scale && g_menuscreen_w / w >= 2 && g_menuscreen_h / h >= 2)
 	{
 		unsigned int t, *d = g_menubg_ptr;
@@ -350,12 +355,15 @@ static const char *mgn_dev_name(int id, int *offs)
 static int mh_saveloadcfg(int id, int keys);
 static const char *mgn_saveloadcfg(int id, int *offs);
 
+const char *indev_names[] = { "none", "3 button pad", "6 button pad", NULL };
+
 static menu_entry e_menu_keyconfig[] =
 {
 	mee_handler_id("Player 1",          MA_CTRL_PLAYER1,    key_config_loop_wrap),
 	mee_handler_id("Player 2",          MA_CTRL_PLAYER2,    key_config_loop_wrap),
 	mee_handler_id("Emulator controls", MA_CTRL_EMU,        key_config_loop_wrap),
-	mee_onoff     ("6 button pad",      MA_OPT_6BUTTON_PAD, PicoOpt, POPT_6BTN_PAD),
+	mee_enum      ("Input device 1",    MA_OPT_INPUT_DEV0,  currentConfig.input_dev0, indev_names),
+	mee_enum      ("Input device 2",    MA_OPT_INPUT_DEV1,  currentConfig.input_dev1, indev_names),
 	mee_range     ("Turbo rate",        MA_CTRL_TURBO_RATE, currentConfig.turbo_rate, 1, 30),
 	mee_range     ("Analog deadzone",   MA_CTRL_DEADZONE,   currentConfig.analog_deadzone, 1, 99),
 	mee_cust_nosave("Save global config",       MA_OPT_SAVECFG, mh_saveloadcfg, mgn_saveloadcfg),
@@ -378,6 +386,10 @@ static int menu_loop_keyconfig(int id, int keys)
 
 	me_enable(e_menu_keyconfig, MA_OPT_SAVECFG_GAME, PicoGameLoaded);
 	me_loop(e_menu_keyconfig, &sel);
+
+	PicoSetInputDevice(0, currentConfig.input_dev0);
+	PicoSetInputDevice(1, currentConfig.input_dev1);
+
 	return 0;
 }
 
@@ -444,26 +456,28 @@ static int menu_loop_cd_options(int id, int keys)
 // convert from multiplier of VClk
 static int mh_opt_sh2cycles(int id, int keys)
 {
-	int *mul = (id == MA_32XOPT_MSH2_CYCLES) ? &p32x_msh2_multiplier : &p32x_ssh2_multiplier;
+	int *khz = (id == MA_32XOPT_MSH2_CYCLES) ?
+		&currentConfig.msh2_khz : &currentConfig.ssh2_khz;
 
 	if (keys & (PBTN_LEFT|PBTN_RIGHT))
-		*mul += (keys & PBTN_LEFT) ? -10 : 10;
+		*khz += (keys & PBTN_LEFT) ? -50 : 50;
 	if (keys & (PBTN_L|PBTN_R))
-		*mul += (keys & PBTN_L) ? -100 : 100;
+		*khz += (keys & PBTN_L) ? -500 : 500;
 
-	if (*mul < 1)
-		*mul = 1;
-	else if (*mul > (10 << SH2_MULTI_SHIFT))
-		*mul = 10 << SH2_MULTI_SHIFT;
+	if (*khz < 1)
+		*khz = 1;
+	else if (*khz > 0x7fffffff / 1000)
+		*khz = 0x7fffffff / 1000;
 
 	return 0;
 }
 
 static const char *mgn_opt_sh2cycles(int id, int *offs)
 {
-	int mul = (id == MA_32XOPT_MSH2_CYCLES) ? p32x_msh2_multiplier : p32x_ssh2_multiplier;
-	
-	sprintf(static_buff, "%d", 7670 * mul >> SH2_MULTI_SHIFT);
+	int khz = (id == MA_32XOPT_MSH2_CYCLES) ?
+		currentConfig.msh2_khz : currentConfig.ssh2_khz;
+
+	sprintf(static_buff, "%d", khz);
 	return static_buff;
 }
 
@@ -490,6 +504,8 @@ static int menu_loop_32x_options(int id, int keys)
 	me_enable(e_menu_32x_options, MA_32XOPT_RENDERER, renderer_names32x[0] != NULL);
 	me_loop(e_menu_32x_options, &sel);
 
+	Pico32xSetClocks(currentConfig.msh2_khz * 1000, currentConfig.msh2_khz * 1000);
+
 	return 0;
 }
 
@@ -1073,7 +1089,8 @@ int menu_loop_tray(void)
 		ret = 0; /* no CD inserted */
 	}
 
-	while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK));
+	while (in_menu_wait_any(NULL, 50) & (PBTN_MENU|PBTN_MOK|PBTN_MBACK))
+		;
 	in_set_config_int(0, IN_CFG_BLOCKING, 0);
 	plat_video_menu_leave();