X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fcommon%2Fmenu_pico.c;h=e3a6de3d92c5a81ada3315396eae7399adee2688;hb=ed4402a7dfd12dbbf34c547b438a671ae8114197;hp=2dd582dc353c080bb1272914eb7828a9edf17764;hpb=9b5713af95da3f72cb659d4d8017559aca593a31;p=picodrive.git

diff --git a/platform/common/menu_pico.c b/platform/common/menu_pico.c
index 2dd582d..e3a6de3 100644
--- a/platform/common/menu_pico.c
+++ b/platform/common/menu_pico.c
@@ -444,26 +444,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 +492,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;
 }