X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=gp2x%2Fmenu.c;h=f55b838bdfbd076b2c0e08d809d808b59f8e6b6d;hb=7a938d57b1dd2ff4170d801a5a70191a6e003717;hp=af7397eb97b933d21995a012ed89a924314687f2;hpb=1ceda4176ff86029e143802e2b5999dd2d091e9c;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index af7397e..f55b838 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -25,7 +25,7 @@
 #include <zlib/zlib.h>
 
 #ifndef _DIRENT_HAVE_D_TYPE
-#error "need d_type for file browser
+#error "need d_type for file browser"
 #endif
 
 extern int  mmuhack_status;
@@ -46,16 +46,16 @@ static int inp_prevjoy = 0;
 static unsigned long wait_for_input(unsigned long interesting)
 {
 	unsigned long ret;
-	static int repeats = 0, wait = 50*1000;
+	static int repeats = 0, wait = 20;
 	int release = 0, i;
 
-	if (repeats == 2 || repeats == 4) wait /= 2;
-	if (repeats == 6) wait = 15 * 1000;
+	if      (repeats == 2) wait = 3;
+	else if (repeats == 4) wait = 2;
+	else if (repeats == 6) wait = 1;
 
-	for (i = 0; i < 6 && inp_prev == gp2x_joystick_read(1); i++) {
+	for (i = 0; i < wait && inp_prev == gp2x_joystick_read(1); i++) {
 		if (i == 0) repeats++;
-		if (wait >= 30*1000) usleep(wait); // usleep sleeps for ~30ms minimum
-		else spend_cycles(wait * currentConfig.CPUclock);
+		usleep(30000);
 	}
 
 	while ( !((ret = gp2x_joystick_read(1)) & interesting) ) {
@@ -65,8 +65,10 @@ static unsigned long wait_for_input(unsigned long interesting)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 50*1000;
+		wait = 20;
 	}
+	if (wait > 6 && (ret&(GP2X_UP|GP2X_LEFT|GP2X_DOWN|GP2X_RIGHT|GP2X_L|GP2X_R)))
+		wait = 6;
 	inp_prev = ret;
 	inp_prevjoy = 0;
 
@@ -751,7 +753,7 @@ static void draw_key_config(const me_bind_action *opts, int opt_cnt, int player_
 		x = 40;
 	}
 
-	menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 130);
+	menu_draw_selection(x - 16, tl_y + sel*10, (player_idx >= 0) ? 66 : 140);
 
 	y = tl_y;
 	for (i = 0; i < opt_cnt; i++, y+=10)
@@ -857,21 +859,25 @@ static void draw_kc_sel(int menu_sel)
 }
 
 
-// player2_flag, ?, ?, ?, ?, ?, ?, menu
+// player2_flag, reserved, ?, ?,
+// ?, ?, fast forward, menu
 // "NEXT SAVE SLOT", "PREV SAVE SLOT", "SWITCH RENDERER", "SAVE STATE",
 // "LOAD STATE", "VOLUME UP", "VOLUME DOWN", "DONE"
 me_bind_action emuctrl_actions[] =
 {
-	{ "Load State     ", 1<<28 },
-	{ "Save State     ", 1<<27 },
-	{ "Prev Save Slot ", 1<<25 },
-	{ "Next Save Slot ", 1<<24 },
-	{ "Switch Renderer", 1<<26 },
-	{ "Volume Down    ", 1<<30 },
-	{ "Volume Up      ", 1<<29 },
-	{ "Fast forward   ", 1<<22 },
-	{ "Enter Menu     ", 1<<23 },
-	{ NULL,              0     }
+	{ "Load State       ", 1<<28 },
+	{ "Save State       ", 1<<27 },
+	{ "Prev Save Slot   ", 1<<25 },
+	{ "Next Save Slot   ", 1<<24 },
+	{ "Switch Renderer  ", 1<<26 },
+	{ "Volume Down      ", 1<<30 },
+	{ "Volume Up        ", 1<<29 },
+	{ "Fast forward     ", 1<<22 },
+	{ "Enter Menu       ", 1<<23 },
+	{ "Pico Next page   ", 1<<21 },
+	{ "Pico Prev page   ", 1<<20 },
+	{ "Pico Switch input", 1<<19 },
+	{ NULL,                0     }
 };
 
 static void kc_sel_loop(void)
@@ -1069,6 +1075,7 @@ menu_entry opt2_entries[] =
 	{ "craigix's RAM timings",     MB_ONOFF, MA_OPT2_RAMTIMINGS,    &currentConfig.EmuOpt, 0x0100, 0, 0, 1, 1 },
 	{ NULL,                        MB_ONOFF, MA_OPT2_SQUIDGEHACK,   &currentConfig.EmuOpt, 0x0010, 0, 0, 1, 1 },
 	{ "SVP dynarec",               MB_ONOFF, MA_OPT2_SVP_DYNAREC,   &PicoOpt, 0x20000, 0, 0, 1, 1 },
+	{ "Disable idle loop patching",MB_ONOFF, MA_OPT2_NO_IDLE_LOOPS, &PicoOpt, 0x80000, 0, 0, 1, 1 },
 	{ "done",                      MB_NONE,  MA_OPT2_DONE,          NULL, 0, 0, 0, 1, 0 },
 };
 
@@ -1422,7 +1429,7 @@ static int menu_loop_options(void)
 
 static void draw_menu_credits(void)
 {
-	int tl_x = 15, tl_y = 64, y;
+	int tl_x = 15, tl_y = 56, y;
 	gp2x_pd_clone_buffer2();
 
 	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");
@@ -1432,17 +1439,19 @@ static void draw_menu_credits(void)
 	text_out16(tl_x, (y+=10), "      base code of PicoDrive");
 	text_out16(tl_x, (y+=10), "Reesy & FluBBa: DrZ80 core");
 	text_out16(tl_x, (y+=10), "MAME devs: YM2612 and SN76496 cores");
-	text_out16(tl_x, (y+=10), "Charles MacDonald: Genesis hw docs");
-	text_out16(tl_x, (y+=10), "Stephane Dallongeville:");
-	text_out16(tl_x, (y+=10), "      opensource Gens");
-	text_out16(tl_x, (y+=10), "Haze: Genesis hw info");
 	text_out16(tl_x, (y+=10), "rlyeh and others: minimal SDK");
 	text_out16(tl_x, (y+=10), "Squidge: squidgehack");
 	text_out16(tl_x, (y+=10), "Dzz: ARM940 sample");
-	text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joystick");
+	text_out16(tl_x, (y+=10), "GnoStiC / Puck2099: USB joy code");
 	text_out16(tl_x, (y+=10), "craigix: GP2X hardware");
 	text_out16(tl_x, (y+=10), "ketchupgun: skin design");
 
+	text_out16(tl_x, (y+=20), "special thanks (for docs, ideas):");
+	text_out16(tl_x, (y+=10), " Charles MacDonald, Haze,");
+	text_out16(tl_x, (y+=10), " Stephane Dallongeville,");
+	text_out16(tl_x, (y+=10), " Lordus, Exophase, Rokas,");
+	text_out16(tl_x, (y+=10), " Nemesis, Tasco Deluxe");
+
 	menu_flip();
 }
 
@@ -1541,6 +1550,7 @@ static void menu_loop_root(void)
 					if (rom_loaded) {
 						if(savestate_menu_loop(1))
 							continue;
+						while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);
 						engineState = PGS_Running;
 						return;
 					}
@@ -1548,6 +1558,7 @@ static void menu_loop_root(void)
 				case MA_MAIN_RESET_GAME:
 					if (rom_loaded) {
 						emu_ResetGame();
+						while (gp2x_joystick_read(1) & GP2X_B) usleep(50*1000);
 						engineState = PGS_Running;
 						return;
 					}