ISO loading, menus, LEDs

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@16 be3aeb3a-fb24-0410-a615-afba39da0efa

gp2x/emu.c

@@ -96,29 +96,131 @@ static int try_rfn_cut(void)
 	return 0;
 }
 
-static void get_ext(char *ext)
+static void get_ext(char *file, char *ext)
 {
 	char *p;
 
-	p = romFileName + strlen(romFileName) - 4;
+	p = file + strlen(file) - 4;
-	if (p < romFileName) p = romFileName;
+	if (p < file) p = file;
 	strncpy(ext, p, 4);
 	ext[4] = 0;
 	strlwr(ext);
 }
 
+char *biosfiles_us[] = { "us_scd2_9306", "SegaCDBIOS9303", "us_scd1_9210" };
+char *biosfiles_eu[] = { "eu_mcd2_9306", "eu_mcd2_9303",   "eu_mcd1_9210" };
+char *biosfiles_jp[] = { "jp_mcd1_9112", "jp_mcd1_9111" };
+
+extern char **g_argv;
+
+int find_bios(int region, char **bios_file)
+{
+	static char bios_path[1024];
+	int i, j, count;
+	char **files;
+	FILE *f = NULL;
+
+	if (region == 4) { // US
+		files = biosfiles_us;
+		count = sizeof(biosfiles_us) / sizeof(char *);
+	} else if (region == 8) { // EU
+		files = biosfiles_eu;
+		count = sizeof(biosfiles_eu) / sizeof(char *);
+	} else if (region == 1 || region == 2) {
+		files = biosfiles_jp;
+		count = sizeof(biosfiles_jp) / sizeof(char *);
+	} else {
+		return 0;
+	}
+
+	for (i = 0; i < count; i++)
+	{
+		strncpy(bios_path, g_argv[0], 1023);
+		bios_path[1024-32] = 0;
+		for (j = strlen(bios_path); j > 0; j--)
+			if (bios_path[j] == '/') { bios_path[j+1] = 0; break; }
+		strcat(bios_path, files[i]);
+		strcat(bios_path, ".bin");
+		f = fopen(bios_path, "rb");
+		if (f) break;
+
+		bios_path[strlen(bios_path) - 4] = 0;
+		strcat(bios_path, ".zip");
+		f = fopen(bios_path, "rb");
+		if (f) break;
+	}
+
+	if (f) {
+		printf("using bios: %s\n", bios_path);
+		fclose(f);
+		if (bios_file) *bios_file = bios_path;
+		return 1;
+	} else {
+		sprintf(menuErrorMsg, "no %s BIOS files found, read docs",
+			region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
+		printf("%s\n", menuErrorMsg);
+		return 0;
+	}
+}
+
+/* checks if romFileName points to valid MegaCD image
+ * if so, checks for suitable BIOS */
+static int cd_check(char *ext, char **bios_file)
+{
+	unsigned char buf[32];
+	FILE *cd_f;
+	int type = 0, region = 4; // 1: Japan, 4: US, 8: Europe
+
+	cd_f = fopen(romFileName, "rb");
+	if (!cd_f) return 0; // let the upper level handle this
+
+	if (fread(buf, 1, 32, cd_f) != 32) {
+		fclose(cd_f);
+		return 0;
+	}
+
+	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x00, 14)) type = 1;       // Sega CD (ISO)
+	if (!strncasecmp("SEGADISCSYSTEM", (char *)buf+0x10, 14)) type = 2;       // Sega CD (BIN)
+	if (type == 0) {
+		fclose(cd_f);
+		return 0;
+	}
+
+	/* it seems we have a CD image here. Try to detect region and load a suitable BIOS now.. */
+	fseek(cd_f, (type == 1) ? 0x100 : 0x110, SEEK_SET);
+	fread(buf, 1, 1, cd_f);
+	fclose(cd_f);
+
+	if (buf[0] == 0x64) region = 4; // EU
+	if (buf[0] == 0xa1) region = 1; // JAP
+
+	printf("detected %s Sega/Mega CD image with %s region\n",
+		type == 2 ? "BIN" : "ISO", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
+
+	if (PicoRegionOverride) {
+		region = PicoRegionOverride;
+		printf("overrided region to %s\n", region != 4 ? (region == 8 ? "EU" : "JAP") : "USA");
+	}
+
+	if(find_bios(region, bios_file))
+		 return type;	// CD and BIOS detected
+
+	return -1;     		// CD detected but load failed
+}
+
 int emu_ReloadRom(void)
 {
 	unsigned int rom_size = 0;
+	char *used_rom_name = romFileName;
 	char ext[5];
 	FILE *rom;
-	int ret;
+	int ret, cd_state;
 
 	printf("emu_ReloadRom(%s)\n", romFileName);
 
-	// detect wrong extensions
+	get_ext(romFileName, ext);
-	get_ext(ext);
 
+	// detect wrong extensions
 	if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz
 		sprintf(menuErrorMsg, "Not a ROM selected.");
 		return 0;
@@ -162,10 +264,22 @@ int emu_ReloadRom(void)
 			sprintf(menuErrorMsg, "Could't find a ROM for movie.");
 			return 0;
 		}
-		get_ext(ext);
+		get_ext(romFileName, ext);
 	}
 
-	rom = fopen(romFileName, "rb");
+	// check for MegaCD image
+	cd_state = cd_check(ext, &used_rom_name);
+	if (cd_state > 0) {
+		PicoMCD |= 1;
+		get_ext(used_rom_name, ext);
+	} else if (cd_state == -1) {
+		// bios_help() ?
+		return 0;
+	} else {
+		PicoMCD &= ~1;
+	}
+
+	rom = fopen(used_rom_name, "rb");
 	if(!rom) {
 		sprintf(menuErrorMsg, "Failed to open rom.");
 		return 0;
@@ -180,9 +294,9 @@ int emu_ReloadRom(void)
 	// zipfile support
 	if(!strcasecmp(ext, ".zip")) {
 		fclose(rom);
-		ret = CartLoadZip(romFileName, &rom_data, &rom_size);
+		ret = CartLoadZip(used_rom_name, &rom_data, &rom_size);
 		if(ret) {
-			if (ret == 4) strcpy(menuErrorMsg, "No ROMs in zip found.");
+			if (ret == 4) strcpy(menuErrorMsg, "No ROMs found in zip.");
 			else sprintf(menuErrorMsg, "Unzip failed with code %i", ret);
 			printf("%s\n", menuErrorMsg);
 			return 0;
@@ -206,16 +320,28 @@ int emu_ReloadRom(void)
 		return 0;
 	}
 
+	// load config for this ROM (do this before insert to get correct region)
+	ret = emu_ReadConfig(1);
+	if (!ret)
+		emu_ReadConfig(0);
+
 	printf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
 	if(PicoCartInsert(rom_data, rom_size)) {
 		sprintf(menuErrorMsg, "Failed to load ROM.");
 		return 0;
 	}
 
-	// load config for this ROM
+	Pico.m.frame_count = 0;
-	ret = emu_ReadConfig(1);
+
-	if (!ret)
+	// insert CD if it was detected
-		emu_ReadConfig(0);
+	if (cd_state > 0) {
+		ret = Insert_CD(romFileName, cd_state == 2);
+		if (ret != 0) {
+			sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
+			printf("%s\n", menuErrorMsg);
+			return 0;
+		}
+	}
 
 	// emu_ReadConfig() might have messed currentConfig.lastRomFile
 	strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
@@ -253,8 +379,6 @@ int emu_ReloadRom(void)
 	if(currentConfig.EmuOpt & 1)
 		emu_SaveLoadGame(1, 1);
 
-	Pico.m.frame_count = 0;
-
 	return 1;
 }
 
@@ -440,19 +564,14 @@ void osd_text(int x, int y, char *text)
 	int len = strlen(text)*8;
 
 	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		int *p, i, h, black, white;
+		int *p, i, h;
-		if (PicoOpt&0x10) {
-			black = 0x40404040; white = 0x41;
-		} else {
-			black = 0xe0e0e0e0; white = 0xf0;
-		}
 		x &= ~3; // align x
 		len = (len+3) >> 2;
 		for (h = 0; h < 8; h++) {
 			p = (int *) ((unsigned char *) gp2x_screen+x+320*(y+h));
-			for (i = len; i; i--, p++) *p = black;
+			for (i = len; i; i--, p++) *p = 0xe0e0e0e0;
 		}
-		gp2x_text_out8_2(x, y, text, white);
+		gp2x_text_out8_2(x, y, text, 0xf0);
 	} else {
 		int *p, i, h;
 		x &= ~1; // align x
@@ -465,6 +584,33 @@ void osd_text(int x, int y, char *text)
 	}
 }
 
+static void cd_leds(void)
+{
+	static int old_reg = 0;
+	if (!((Pico_mcd->s68k_regs[0] ^ old_reg) & 3)) return; // no change
+	old_reg = Pico_mcd->s68k_regs[0];
+
+	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+		// 8-bit modes
+		unsigned int col_g = (old_reg & 2) ? 0xc0c0c0c0 : 0xe0e0e0e0;
+		unsigned int col_r = (old_reg & 1) ? 0xd0d0d0d0 : 0xe0e0e0e0;
+		*(unsigned int *)((char *)gp2x_screen + 320*2+306) =
+		*(unsigned int *)((char *)gp2x_screen + 320*3+306) =
+		*(unsigned int *)((char *)gp2x_screen + 320*4+306) = col_g;
+		*(unsigned int *)((char *)gp2x_screen + 320*2+312) =
+		*(unsigned int *)((char *)gp2x_screen + 320*3+312) =
+		*(unsigned int *)((char *)gp2x_screen + 320*4+312) = col_r;
+	} else {
+		// 16-bit modes
+		unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+306);
+		unsigned int col_g = (old_reg & 2) ? 0x06000600 : 0;
+		unsigned int col_r = (old_reg & 1) ? 0xc000c000 : 0;
+		*p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;
+		*p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;
+		*p++ = col_g; *p++ = col_g; p++; *p++ = col_r; *p++ = col_r; p += 320/2 - 10/2;
+	}
+}
+
 static int EmuScan16(unsigned int num, void *sdata)
 {
 	if (!(Pico.video.reg[1]&8)) num += 8;
@@ -486,6 +632,8 @@ static void (*vidCpyM2)(void *dest, void *src) = NULL;
 
 static void blit(char *fps, char *notice)
 {
+	int emu_opt = currentConfig.EmuOpt;
+
 	if (PicoOpt&0x10) {
 		// 8bit fast renderer
 		if (Pico.m.dirtyPal) {
@@ -495,7 +643,7 @@ static void blit(char *fps, char *notice)
 			gp2x_video_setpalette(localPal, 0x40);
 		}
 		vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
-	} else if (!(currentConfig.EmuOpt&0x80)) {
+	} else if (!(emu_opt&0x80)) {
 		// 8bit accurate renderer
 		if (Pico.m.dirtyPal) {
 			Pico.m.dirtyPal = 0;
@@ -504,6 +652,8 @@ static void blit(char *fps, char *notice)
 				vidConvCpyRGB32sh(localPal+0x40, Pico.cram, 0x40);
 				vidConvCpyRGB32hi(localPal+0x80, Pico.cram, 0x40);
 				blockcpy(localPal+0xc0, localPal+0x40, 0x40*4);
+				localPal[0xc0] = 0x0000c000;
+				localPal[0xd0] = 0x00c00000;
 				localPal[0xe0] = 0x00000000; // reserved pixels for OSD
 				localPal[0xf0] = 0x00ffffff;
 				gp2x_video_setpalette(localPal, 0x100);
@@ -520,8 +670,10 @@ static void blit(char *fps, char *notice)
 	}
 
 	if (notice) osd_text(4, 232, notice);
-	if (currentConfig.EmuOpt & 2)
+	if (emu_opt & 2)
 		osd_text(osd_fps_x, 232, fps);
+	if ((emu_opt & 0x400) && (PicoMCD & 1))
+		cd_leds();
 
 	//gp2x_video_wait_vsync();
 	gp2x_video_flip();
@@ -543,18 +695,14 @@ static void blit(char *fps, char *notice)
 // clears whole screen or just the notice area (in all buffers)
 static void clearArea(int full)
 {
-	if (PicoOpt&0x10) {
+	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
-		// 8bit fast renderer
+		// 8-bit renderers
-		if (full) gp2x_memset_all_buffers(0, 0x40, 320*240);
+		if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);
-		else      gp2x_memset_all_buffers(320*232, 0x40, 320*8);
+		else      gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
-	} else if (currentConfig.EmuOpt&0x80) {
+	} else {
 		// 16bit accurate renderer
 		if (full) gp2x_memset_all_buffers(0, 0, 320*240*2);
 		else      gp2x_memset_all_buffers(320*232*2, 0, 320*8*2);
-	} else {
-		// 8bit accurate renderer
-		if (full) gp2x_memset_all_buffers(0, 0xe0, 320*240);
-		else      gp2x_memset_all_buffers(320*232, 0xe0, 320*8);
 	}
 }
 
@@ -562,28 +710,28 @@ static void clearArea(int full)
 static void vidResetMode(void)
 {
 	if (PicoOpt&0x10) {
-		localPal[0x40] = 0;
-		localPal[0x41] = 0x00ffffff;
 		gp2x_video_changemode(8);
-		gp2x_video_setpalette(localPal, 0x42);
-		gp2x_memset_all_buffers(0, 0x40, 320*240);
-		gp2x_video_flip();
 	} else if (currentConfig.EmuOpt&0x80) {
 		gp2x_video_changemode(15);
 		PicoDrawSetColorFormat(1);
 		PicoScan = EmuScan16;
 		PicoScan(0, 0);
 	} else {
-		localPal[0xe0] = 0x00000000; // reserved pixels for OSD
-		localPal[0xf0] = 0x00ffffff;
 		gp2x_video_changemode(8);
-		gp2x_video_setpalette(localPal, 0x100);
-		gp2x_memset_all_buffers(0, 0xe0, 320*240);
-		gp2x_video_flip();
 		PicoDrawSetColorFormat(2);
 		PicoScan = EmuScan8;
 		PicoScan(0, 0);
 	}
+	if ((PicoOpt&0x10)||!(currentConfig.EmuOpt&0x80)) {
+		// setup pal for 8-bit modes
+		localPal[0xc0] = 0x0000c000; // MCD LEDs
+		localPal[0xd0] = 0x00c00000;
+		localPal[0xe0] = 0x00000000; // reserved pixels for OSD
+		localPal[0xf0] = 0x00ffffff;
+		gp2x_video_setpalette(localPal, 0x100);
+		gp2x_memset_all_buffers(0, 0xe0, 320*240);
+		gp2x_video_flip();
+	}
 	Pico.m.dirtyPal = 1;
 	// reset scaling
 	gp2x_video_RGB_setscaling((PicoOpt&0x100)&&!(Pico.video.reg[12]&1) ? 256 : 320, 240);

gp2x/emu.h

@@ -19,7 +19,8 @@ typedef struct {
 	char lastRomFile[512];
 	int EmuOpt;		// LSb->MSb: use_sram, show_fps, enable_sound, gzip_saves,
 					// squidgehack, save_cfg_on_exit, <unused>, 16_bit_mode
-					// craigix_ram, confirm_save
+					// craigix_ram, confirm_save, show_cd_leds, enable_cdda
+					// enable_pcm
 	int PicoOpt;  // used for config saving only, see Pico.h
 	int PsndRate; // ditto
 	int PicoRegion; // ditto
@@ -44,3 +45,5 @@ void emu_Loop(void);
 void emu_ResetGame(void);
 int  emu_ReadConfig(int game);
 int  emu_WriteConfig(int game);
+int  find_bios(int region, char **bios_file);
+

gp2x/menu.c

@@ -562,10 +562,8 @@ static void kc_sel_loop(void)
 
 
 
-
-// --------- advanced options ----------
-
 // order must match that of currentConfig_t
+
 struct {
 	int EmuOpt;
 	int PicoOpt;
@@ -576,6 +574,94 @@ struct {
 } tmp_opts;
 int tmp_gamma;
 
+// --------- sega/mega cd options ----------
+
+static void draw_cd_menu_options(int menu_sel, char *b_us, char *b_eu, char *b_jp)
+{
+	int tl_x = 25, tl_y = 60, y;
+
+	y = tl_y;
+	memset(gp2x_screen, 0, 320*240);
+	gp2x_text_out8(tl_x, y,       "USA BIOS:     %s", b_us); // 0
+	gp2x_text_out8(tl_x, (y+=10), "EUR BIOS:     %s", b_eu); // 1
+	gp2x_text_out8(tl_x, (y+=10), "JAP BIOS:     %s", b_jp); // 2
+	gp2x_text_out8(tl_x, (y+=10), "CD LEDs                    %s", (tmp_opts.EmuOpt &0x400)?"ON":"OFF"); // 3
+	gp2x_text_out8(tl_x, (y+=10), "CDDA audio (using mp3s)    %s", (tmp_opts.EmuOpt &0x800)?"ON":"OFF"); // 4
+	gp2x_text_out8(tl_x, (y+=10), "Done");
+
+	// draw cursor
+	gp2x_text_out8(tl_x - 16, tl_y + menu_sel*10, ">");
+
+	if ((menu_sel == 0 && strcmp(b_us, "NOT FOUND")) ||
+		(menu_sel == 1 && strcmp(b_eu, "NOT FOUND")) ||
+		(menu_sel == 2 && strcmp(b_jp, "NOT FOUND")))
+			gp2x_text_out8(tl_x, 220, "Press start to test selected BIOS");
+
+	gp2x_video_flip();
+}
+
+static void cd_menu_loop_options(void)
+{
+	int menu_sel = 0, menu_sel_max = 5;
+	unsigned long inp = 0;
+	char bios_us[32], bios_eu[32], bios_jp[32], *bios, *p;
+
+	if (find_bios(4, &bios)) { // US
+		for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
+		strncpy(bios_us, p, 31); bios_us[31] = 0;
+	} else	strcpy(bios_us, "NOT FOUND");
+
+	if (find_bios(8, &bios)) { // EU
+		for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
+		strncpy(bios_eu, p, 31); bios_eu[31] = 0;
+	} else	strcpy(bios_eu, "NOT FOUND");
+
+	if (find_bios(1, &bios)) { // JP
+		for (p = bios+strlen(bios)-1; p > bios && *p != '/'; p--); p++;
+		strncpy(bios_jp, p, 31); bios_jp[31] = 0;
+	} else	strcpy(bios_jp, "NOT FOUND");
+
+	for(;;)
+	{
+		draw_cd_menu_options(menu_sel, bios_us, bios_eu, bios_jp);
+		inp = wait_for_input(GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT|GP2X_B|GP2X_X|GP2X_A|GP2X_START);
+		if(inp & GP2X_UP  ) { menu_sel--; if (menu_sel < 0) menu_sel = menu_sel_max; }
+		if(inp & GP2X_DOWN) { menu_sel++; if (menu_sel > menu_sel_max) menu_sel = 0; }
+		if((inp& GP2X_B)||(inp&GP2X_LEFT)||(inp&GP2X_RIGHT)) { // toggleable options
+			switch (menu_sel) {
+				case  3: tmp_opts.EmuOpt ^=0x400; break;
+				case  4: return;
+			}
+		}
+		if(inp & (GP2X_X|GP2X_A)) return;
+		if(inp &  GP2X_START) { // BIOS testers
+			switch (menu_sel) {
+				case 0:	if (find_bios(4, &bios)) { // test US
+						strcpy(romFileName, bios);
+						engineState = PGS_ReloadRom;
+						return;
+					}
+					break;
+				case 1:	if (find_bios(8, &bios)) { // test EU
+						strcpy(romFileName, bios);
+						engineState = PGS_ReloadRom;
+						return;
+					}
+					break;
+				case 2:	if (find_bios(1, &bios)) { // test JP
+						strcpy(romFileName, bios);
+						engineState = PGS_ReloadRom;
+						return;
+					}
+					break;
+			}
+		}
+	}
+}
+
+
+// --------- advanced options ----------
+
 static void draw_amenu_options(int menu_sel)
 {
 	int tl_x = 25, tl_y = 60, y;
@@ -683,11 +769,12 @@ static void draw_menu_options(int menu_sel)
 	gp2x_text_out8(tl_x, (y+=10), "Use ARM940 core for sound  %s", (tmp_opts.PicoOpt&0x200)?"ON":"OFF"); // 7
 	gp2x_text_out8(tl_x, (y+=10), "6 button pad               %s", (tmp_opts.PicoOpt&0x020)?"ON":"OFF"); // 8
 	gp2x_text_out8(tl_x, (y+=10), "Genesis Region:            %s", region_name(tmp_opts.PicoRegion));
-	gp2x_text_out8(tl_x, (y+=10), "Use SRAM savestates        %s", (tmp_opts.EmuOpt &0x001)?"ON":"OFF"); // 10
+	gp2x_text_out8(tl_x, (y+=10), "Use SRAM/BRAM savestates   %s", (tmp_opts.EmuOpt &0x001)?"ON":"OFF"); // 10
 	gp2x_text_out8(tl_x, (y+=10), "Confirm save overwrites    %s", (tmp_opts.EmuOpt &0x200)?"ON":"OFF"); // 11
 	gp2x_text_out8(tl_x, (y+=10), "Save slot                  %i", state_slot); // 12
 	gp2x_text_out8(tl_x, (y+=10), "GP2X CPU clocks            %iMhz", tmp_opts.CPUclock);
-	gp2x_text_out8(tl_x, (y+=10), "[advanced options]");
+	gp2x_text_out8(tl_x, (y+=10), "[Sega/Mega CD options]");
+	gp2x_text_out8(tl_x, (y+=10), "[advanced options]");		// 15
 	gp2x_text_out8(tl_x, (y+=10), "Save cfg as default");
 	if (rom_data)
 		gp2x_text_out8(tl_x, (y+=10), "Save cfg for current game only");
@@ -726,9 +813,9 @@ static void menu_options_save(void)
 	}
 }
 
-static void menu_loop_options(void)
+static int menu_loop_options(void)
 {
-	int menu_sel = 0, menu_sel_max = 15;
+	int menu_sel = 0, menu_sel_max = 16;
 	unsigned long inp = 0;
 
 	if (rom_data) menu_sel_max++;
@@ -754,21 +841,27 @@ static void menu_loop_options(void)
 				case  8: tmp_opts.PicoOpt^=0x020; break;
 				case 10: tmp_opts.EmuOpt ^=0x001; break;
 				case 11: tmp_opts.EmuOpt ^=0x200; break;
-				case 14: amenu_loop_options();    break;
+				case 14: cd_menu_loop_options();
-				case 15: // done (save)
+					if (engineState == PGS_ReloadRom)
+						return 0; // test BIOS
+					break;
+				case 15: amenu_loop_options();    break;
+				case 16: // done (update and write)
 					menu_options_save();
-					emu_WriteConfig(0);
+					if (emu_WriteConfig(0)) strcpy(menuErrorMsg, "config saved");
-					return;
+					else strcpy(menuErrorMsg, "failed to write config");
-				case 16: // done (save for current game)
+					return 1;
+				case 17: // done (update and write for current game)
 					menu_options_save();
-					emu_WriteConfig(1);
+					if (emu_WriteConfig(1)) strcpy(menuErrorMsg, "config saved");
-					return;
+					else strcpy(menuErrorMsg, "failed to write config");
+					return 1;
 			}
 		}
-		if(inp & GP2X_X) return;  // done (no save)
+		if(inp & GP2X_X) return 0;  // done (no update or write)
 		if(inp & GP2X_A) {
 			menu_options_save();
-			return;  // done (save)
+			return 0;  // done (update, no write)
 		}
 		if(inp & (GP2X_LEFT|GP2X_RIGHT)) { // multi choise
 			switch (menu_sel) {
@@ -882,7 +975,7 @@ static void draw_menu_root(int menu_sel)
 
 static void menu_loop_root(void)
 {
-	int menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;
+	int ret, menu_sel = 4, menu_sel_max = 8, menu_sel_min = 4;
 	unsigned long inp = 0;
 	char curr_path[PATH_MAX], *selfname;
 	FILE *tstf;
@@ -948,13 +1041,14 @@ static void menu_loop_root(void)
 					selfname = romsel_loop(curr_path);
 					if (selfname) {
 						printf("selected file: %s\n", selfname);
-						strncpy(currentConfig.lastRomFile, selfname, sizeof(currentConfig.lastRomFile)-1);
-						currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
 						engineState = PGS_ReloadRom;
 					}
 					return;
 				case 5: // options
-					menu_loop_options();
+					ret = menu_loop_options();
+					if (ret == 1) continue; // status update
+					if (engineState == PGS_ReloadRom)
+						return; // BIOS test
 					break;
 				case 6: // controls
 					kc_sel_loop();

linux/Makefile

@@ -30,7 +30,7 @@ OBJS += ../../Pico/Area.o ../../Pico/Cart.o ../../Pico/Utils.o ../../Pico/Memory
 		../../Pico/Pico.o ../../Pico/Sek.o ../../Pico/VideoPort.o ../../Pico/Draw2.o ../../Pico/Draw.o
 # Pico - CD
 OBJS += ../../Pico/cd/Pico.o ../../Pico/cd/Memory.o ../../Pico/cd/Sek.o ../../Pico/cd/LC89510.o \
-		../../Pico/cd/cd_sys.o
+		../../Pico/cd/cd_sys.o ../../Pico/cd/cd_file.o
 # Pico - sound
 OBJS += ../../Pico/sound/sound.o ../../Pico/sound/sn76496.o ../../Pico/sound/ym2612.o
 # zlib