X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=0745352e70cdfe341af77f1147d1111b7a637bd9;hb=e8b6193660a3227fcd113a1eb82ed48727ca8195;hp=3ed768d76df0887024d5ef47bb0122f02911636e;hpb=c6f91b0ea34fceac83acb2c5c227e327f8d40786;p=picodrive.git

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 3ed768d..0745352 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -27,7 +27,7 @@
 
 static const char *rom_exts[] = {
 	"zip",
-	"bin", "smd", "gen",
+	"bin", "smd", "gen", "md",
 	"iso", "cso", "cue",
 	"32x",
 	"sms",
@@ -37,11 +37,16 @@ static const char *rom_exts[] = {
 // rrrr rggg gggb bbbb
 static unsigned short fname2color(const char *fname)
 {
-	const char *ext = fname + strlen(fname) - 3;
 	static const char *other_exts[] = { "gmv", "pat" };
+	const char *ext;
 	int i;
 
-	if (ext < fname) ext = fname;
+	ext = strrchr(fname, '.');
+	if (ext++ == NULL) {
+		ext = fname + strlen(fname) - 3;
+		if (ext < fname) ext = fname;
+	}
+
 	for (i = 0; rom_exts[i] != NULL; i++)
 		if (strcasecmp(ext, rom_exts[i]) == 0) return 0xbdff; // FIXME: mk defines
 	for (i = 0; i < array_size(other_exts); i++)
@@ -71,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;
@@ -439,26 +449,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;
 }
 
@@ -485,6 +497,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;
 }
 
@@ -1068,7 +1082,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();