X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fmenu.c;h=4b3201e5ce2a48e8f32f7e7ac199ccbf605ae7dc;hb=b13a934cb86e271a92ef674eb9f428a8e8060f97;hp=55995b9e7d9063d1c4651eb30fb1a47dfca66382;hpb=558d8e1fdd54558c58fe5f661369f76458e1addc;p=libpicofe.git

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 55995b9..4b3201e 100644
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -30,7 +30,7 @@
 
 extern int  mmuhack_status;
 
-const char *keyNames[] = {
+const char * const keyNames[] = {
 	"UP",    "???",    "LEFT", "???",  "DOWN", "???", "RIGHT",    "???",
 	"START", "SELECT", "L",    "R",    "A",    "B",   "X",        "Y",
 	"???",   "???",    "???",  "???",  "???",  "???", "VOL DOWN", "VOL UP",
@@ -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 = 6;
 	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,7 +65,7 @@ static unsigned long wait_for_input(unsigned long interesting)
 
 	if (release || ret != inp_prev) {
 		repeats = 0;
-		wait = 50*1000;
+		wait = 6;
 	}
 	inp_prev = ret;
 	inp_prevjoy = 0;
@@ -200,7 +200,7 @@ void menu_romload_end(void)
 static unsigned short file2color(const char *fname)
 {
 	const char *ext = fname + strlen(fname) - 3;
-	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso" };
+	static const char *rom_exts[]   = { "zip", "bin", "smd", "gen", "iso", "cso", "cue" };
 	static const char *other_exts[] = { "gmv", "pat" };
 	int i;
 
@@ -256,7 +256,7 @@ static int scandir_cmp(const void *p1, const void *p2)
 
 static char *filter_exts[] = {
 	".mp3", ".MP3", ".srm", ".brm", "s.gz", ".mds",	"bcfg", ".txt", ".htm", "html",
-	".jpg", ".gpe", ".cue"
+	".jpg", ".gpe"
 };
 
 static int scandir_filter(const struct dirent *ent)
@@ -553,7 +553,7 @@ static void draw_savestate_bg(int slot)
 	}
 
 	if (file) {
-		if (PicoMCD & 1) {
+		if (PicoAHW & PAHW_MCD) {
 			PicoCdLoadStateGfx(file);
 		} else {
 			areaSeek(file, 0x10020, SEEK_SET);  // skip header and RAM in state file
@@ -751,7 +751,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,28 +857,32 @@ 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)
 {
 	int menu_sel = 3, menu_sel_max = 3;
 	unsigned long inp = 0;
-	int is_6button = PicoOpt & 0x020;
+	int is_6button = PicoOpt & POPT_6BTN_PAD;
 
 	while (1)
 	{
@@ -918,8 +922,8 @@ menu_entry cdopt_entries[] =
 	{ "done",                      MB_NONE,  MA_CDOPT_DONE,         NULL, 0, 0, 0, 1, 0 },
 };
 
-const int cdopt_entry_count = (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]));
 #define CDOPT_ENTRY_COUNT (sizeof(cdopt_entries) / sizeof(cdopt_entries[0]))
+const int cdopt_entry_count = CDOPT_ENTRY_COUNT;
 
 
 struct bios_names_t
@@ -1059,6 +1063,7 @@ menu_entry opt2_entries[] =
 	{ NULL,                        MB_NONE,  MA_OPT2_GAMMA,         NULL, 0, 0, 0, 1, 1 },
 	{ "A_SN's gamma curve",        MB_ONOFF, MA_OPT2_A_SN_GAMMA,    &currentConfig.EmuOpt, 0x1000, 0, 0, 1, 1 },
 	{ "Perfect vsync",             MB_ONOFF, MA_OPT2_VSYNC,         &currentConfig.EmuOpt, 0x2000, 0, 0, 1, 1 },
+	{ "Disable sprite limit",      MB_ONOFF, MA_OPT2_NO_SPRITE_LIM, &PicoOpt, 0x40000, 0, 0, 1, 1 },
 	{ "Emulate Z80",               MB_ONOFF, MA_OPT2_ENABLE_Z80,    &PicoOpt, 0x00004, 0, 0, 1, 1 },
 	{ "Emulate YM2612 (FM)",       MB_ONOFF, MA_OPT2_ENABLE_YM2612, &PicoOpt, 0x00001, 0, 0, 1, 1 },
 	{ "Emulate SN76496 (PSG)",     MB_ONOFF, MA_OPT2_ENABLE_SN76496,&PicoOpt, 0x00002, 0, 0, 1, 1 },
@@ -1072,7 +1077,7 @@ menu_entry opt2_entries[] =
 };
 
 #define OPT2_ENTRY_COUNT (sizeof(opt2_entries) / sizeof(opt2_entries[0]))
-const int opt2_entry_count = (sizeof(opt2_entries) / sizeof(opt2_entries[0]));
+const int opt2_entry_count = OPT2_ENTRY_COUNT;
 
 static void menu_opt2_cust_draw(const menu_entry *entry, int x, int y, void *param)
 {
@@ -1173,7 +1178,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 	switch (entry->id)
 	{
 		case MA_OPT_RENDERER:
-			if (PicoOpt&0x10)
+			if (PicoOpt & POPT_ALT_RENDERER)
 				str = " 8bit fast";
 			else if (currentConfig.EmuOpt&0x80)
 				str = "16bit accurate";
@@ -1197,7 +1202,7 @@ static void menu_opt_cust_draw(const menu_entry *entry, int x, int y, void *para
 			text_out16(x, y, "Frameskip                  %s", str24);
 			break;
 		case MA_OPT_SOUND_QUALITY:
-			str = (PicoOpt&0x08)?"stereo":"mono";
+			str = (PicoOpt & POPT_EN_STEREO) ? "stereo" : "mono";
 			text_out16(x, y, "Sound Quality:     %5iHz %s", PsndRate, str);
 			break;
 		case MA_OPT_REGION:
@@ -1287,7 +1292,7 @@ static void menu_options_save(void)
 		// force setting possibly changed..
 		Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
 	}
-	if (!(PicoOpt & 0x20)) {
+	if (!(PicoOpt & POPT_6BTN_PAD)) {
 		// unbind XYZ MODE, just in case
 		unbind_action(0xf00, -1, -1);
 	}
@@ -1424,7 +1429,7 @@ static void draw_menu_credits(void)
 	int tl_x = 15, tl_y = 64, y;
 	gp2x_pd_clone_buffer2();
 
-	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006,2007");
+	text_out16(tl_x, 20, "PicoDrive v" VERSION " (c) notaz, 2006-2008");
 	y = tl_y;
 	text_out16(tl_x, y, "Credits:");
 	text_out16(tl_x, (y+=10), "fDave: Cyclone 68000 core,");
@@ -1723,10 +1728,11 @@ int menu_loop_tray(void)
 				case 0: // select image
 					selfname = romsel_loop(curr_path);
 					if (selfname) {
-						int ret = -1, cd_type;
+						int ret = -1;
+						cd_img_type cd_type;
 						cd_type = emu_cdCheck(NULL);
-						if (cd_type > 0)
-							ret = Insert_CD(romFileName, cd_type == 2);
+						if (cd_type != CIT_NOT_CD)
+							ret = Insert_CD(romFileName, cd_type);
 						if (ret != 0) {
 							sprintf(menuErrorMsg, "Load failed, invalid CD image?");
 							printf("%s\n", menuErrorMsg);