X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=common%2Femu.c;h=8ec61a2a7dd780eb0991dedbeedbd5aa9f7b4537;hb=0ae25549b5066ea8b42216ec875f5c3c5d5bd8d6;hp=99fca4979005f145e3d32b78012a2f472c8969e4;hpb=f013066e974c7d35b818a6fca43a9deba1ce5c3e;p=libpicofe.git

diff --git a/common/emu.c b/common/emu.c
index 99fca49..8ec61a2 100644
--- a/common/emu.c
+++ b/common/emu.c
@@ -14,6 +14,7 @@
 #include "menu.h"
 #include "fonts.h"
 #include "lprintf.h"
+#include "config.h"
 
 #include <Pico/PicoInt.h>
 #include <Pico/Patch.h>
@@ -26,12 +27,16 @@
 #elif defined(__GIZ__)
  #include "../gizmondo/giz.h"
  #define SCREEN_WIDTH 321
- #define SCREEN_BUFFER giz_screen // ?
+ #define SCREEN_BUFFER giz_screen
+#elif defined(PSP)
+ #include "../psp/psp.h"
+ #define SCREEN_WIDTH 512
+ #define SCREEN_BUFFER psp_screen
 #endif
 
-char *PicoConfigFile = "picoconfig.bin";
-currentConfig_t currentConfig;
-unsigned char *rom_data = NULL;
+char *PicoConfigFile = "picoconfig.cfg";
+currentConfig_t currentConfig, defaultConfig;
+int rom_loaded = 0;
 char noticeMsg[64];
 int state_slot = 0;
 int config_slot = 0, config_slot_current = 0;
@@ -133,6 +138,21 @@ int emu_findBios(int region, char **bios_file)
 	}
 }
 
+/* check if the name begins with BIOS name */
+static int emu_isBios(const char *name)
+{
+	int i;
+	for (i = 0; i < sizeof(biosfiles_us)/sizeof(biosfiles_us[0]); i++)
+		if (strstr(name, biosfiles_us[i]) != NULL) return 1;
+	for (i = 0; i < sizeof(biosfiles_eu)/sizeof(biosfiles_eu[0]); i++)
+		if (strstr(name, biosfiles_eu[i]) != NULL) return 1;
+	for (i = 0; i < sizeof(biosfiles_jp)/sizeof(biosfiles_jp[0]); i++)
+		if (strstr(name, biosfiles_jp[i]) != NULL) return 1;
+	return 0;
+}
+
+static unsigned char scd_id_header[0x100];
+
 /* checks if romFileName points to valid MegaCD image
  * if so, checks for suitable BIOS */
 int emu_cdCheck(int *pregion)
@@ -156,6 +176,9 @@ int emu_cdCheck(int *pregion)
 		return 0;
 	}
 
+	pm_seek(cd_f, (type == 1) ? 0x100 : 0x110, SEEK_SET);
+	pm_read(scd_id_header, sizeof(scd_id_header), cd_f);
+
 	/* it seems we have a CD image here. Try to detect region now.. */
 	pm_seek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);
 	pm_read(buf, 1, cd_f);
@@ -172,10 +195,73 @@ int emu_cdCheck(int *pregion)
 	return type;
 }
 
+static int extract_text(char *dest, unsigned char *src, int len, int swab)
+{
+	char *p = dest;
+	int i;
+
+	if (swab) swab = 1;
+
+	for (i = len - 1; i >= 0; i--)
+	{
+		if (src[i^swab] != ' ') break;
+	}
+	len = i + 1;
+
+	for (i = 0; i < len; i++)
+	{
+		unsigned char s = src[i^swab];
+		if (s >= 0x20 && s < 0x7f && s != '#' && s != '|' &&
+			s != '[' && s != ']' && s != '\\')
+		{
+			*p++ = s;
+		}
+		else
+		{
+			sprintf(p, "\\%02x", s);
+			p += 3;
+		}
+	}
+
+	return p - dest;
+}
+
+char *emu_makeRomId(void)
+{
+	static char id_string[3+0x11+0x11+0x30+16];
+	unsigned char *id_header;
+	int pos;
+
+	if (Pico.rom == NULL) {
+		id_string[0] = 0;
+		return id_string;
+	}
+
+	if (PicoMCD & 1) {
+		id_header = scd_id_header;
+		strcpy(id_string, "CD|");
+	} else {
+		id_header = Pico.rom + 0x100;
+		strcpy(id_string, "MD|");
+	}
+	pos = 3;
+
+	pos += extract_text(id_string + pos, id_header + 0x80, 0x10, 1); // seral
+	id_string[pos] = '|'; pos++;
+	pos += extract_text(id_string + pos, id_header + 0xf0, 0x10, 1); // region
+	id_string[pos] = '|'; pos++;
+	pos += extract_text(id_string + pos, id_header + 0x50, 0x30, 1); // overseas name
+	id_string[pos] = 0;
+
+	printf("id_string: %s\n", id_string);
+	return id_string;
+}
+
 int emu_ReloadRom(void)
 {
 	unsigned int rom_size = 0;
 	char *used_rom_name = romFileName;
+	unsigned char *rom_data = NULL;
 	char ext[5];
 	pm_file *rom;
 	int ret, cd_state, cd_region, cfg_loaded = 0;
@@ -185,7 +271,7 @@ int emu_ReloadRom(void)
 	get_ext(romFileName, ext);
 
 	// detect wrong extensions
-	if(!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz
+	if (!strcmp(ext, ".srm") || !strcmp(ext, "s.gz") || !strcmp(ext, ".mds")) { // s.gz ~ .mds.gz
 		sprintf(menuErrorMsg, "Not a ROM selected.");
 		return 0;
 	}
@@ -193,11 +279,11 @@ int emu_ReloadRom(void)
 	PicoPatchUnload();
 
 	// check for movie file
-	if(movie_data) {
+	if (movie_data) {
 		free(movie_data);
 		movie_data = 0;
 	}
-	if(!strcmp(ext, ".gmv")) {
+	if (!strcmp(ext, ".gmv")) {
 		// check for both gmv and rom
 		int dummy;
 		FILE *movie_file = fopen(romFileName, "rb");
@@ -276,20 +362,17 @@ int emu_ReloadRom(void)
 	}
 
 	rom = pm_open(used_rom_name);
-	if(!rom) {
+	if (!rom) {
 		sprintf(menuErrorMsg, "Failed to open rom.");
 		return 0;
 	}
 
-	menu_romload_prepare(used_rom_name);
+	menu_romload_prepare(used_rom_name); // also CD load
 
-	if(rom_data) {
-		free(rom_data);
-		rom_data = 0;
-		rom_size = 0;
-	}
+	PicoCartUnload();
+	rom_loaded = 0;
 
-	if( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {
+	if ( (ret = PicoCartLoad(rom, &rom_data, &rom_size)) ) {
 		sprintf(menuErrorMsg, "PicoCartLoad() failed.");
 		lprintf("%s\n", menuErrorMsg);
 		pm_close(rom);
@@ -297,14 +380,13 @@ int emu_ReloadRom(void)
 		return 0;
 	}
 	pm_close(rom);
-	menu_romload_end();
 
 	// detect wrong files (Pico crashes on very small files), also see if ROM EP is good
-	if(rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||
+	if (rom_size <= 0x200 || strncmp((char *)rom_data, "Pico", 4) == 0 ||
 	  ((*(unsigned char *)(rom_data+4)<<16)|(*(unsigned short *)(rom_data+6))) >= (int)rom_size) {
 		if (rom_data) free(rom_data);
-		rom_data = 0;
 		sprintf(menuErrorMsg, "Not a ROM selected.");
+		menu_romload_end();
 		return 0;
 	}
 
@@ -315,8 +397,9 @@ int emu_ReloadRom(void)
 	}
 
 	lprintf("PicoCartInsert(%p, %d);\n", rom_data, rom_size);
-	if(PicoCartInsert(rom_data, rom_size)) {
+	if (PicoCartInsert(rom_data, rom_size)) {
 		sprintf(menuErrorMsg, "Failed to load ROM.");
+		menu_romload_end();
 		return 0;
 	}
 
@@ -328,13 +411,19 @@ int emu_ReloadRom(void)
 		if (ret != 0) {
 			sprintf(menuErrorMsg, "Insert_CD() failed, invalid CD image?");
 			lprintf("%s\n", menuErrorMsg);
+			menu_romload_end();
 			return 0;
 		}
 	}
 
-	// emu_ReadConfig() might have messed currentConfig.lastRomFile
-	strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
-	currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
+	menu_romload_end();
+
+	if (!emu_isBios(romFileName))
+	{
+		// emu_ReadConfig() might have messed currentConfig.lastRomFile
+		strncpy(currentConfig.lastRomFile, romFileName, sizeof(currentConfig.lastRomFile)-1);
+		currentConfig.lastRomFile[sizeof(currentConfig.lastRomFile)-1] = 0;
+	}
 
 	if (PicoPatches) {
 		PicoPatchPrepare();
@@ -371,9 +460,10 @@ int emu_ReloadRom(void)
 	emu_noticeMsgUpdated();
 
 	// load SRAM for this ROM
-	if(currentConfig.EmuOpt & 1)
+	if (currentConfig.EmuOpt & 1)
 		emu_SaveLoadGame(1, 1);
 
+	rom_loaded = 1;
 	return 1;
 }
 
@@ -399,107 +489,120 @@ static void romfname_ext(char *dst, const char *prefix, const char *ext)
 
 int emu_ReadConfig(int game, int no_defaults)
 {
+	char cfg[512];
 	FILE *f;
-	char cfg[512], extbuf[16];
-	int bread = 0;
+	int ret;
 
 	if (!game)
 	{
 		if (!no_defaults)
-		{
 			emu_setDefaultConfig();
-		}
 		strncpy(cfg, PicoConfigFile, 511);
 		if (config_slot != 0)
 		{
 			char *p = strrchr(cfg, '.');
 			if (p == NULL) p = cfg + strlen(cfg);
-			sprintf(extbuf, ".%i.pbcfg", config_slot);
-			strncpy(p, extbuf, 511 - (p - cfg));
+			sprintf(p, ".%i.cfg", config_slot);
 		}
 		cfg[511] = 0;
-	} else {
-		if (config_slot != 0)
-		     sprintf(extbuf, ".%i.pbcfg", config_slot);
-		else strcpy(extbuf, ".pbcfg");
-		romfname_ext(cfg, "cfg/", extbuf);
-		f = fopen(cfg, "rb");
-		if (!f) romfname_ext(cfg, NULL, ".pbcfg");
-		else fclose(f);
+		ret = config_readsect(cfg, NULL);
 	}
+	else
+	{
+		if (!no_defaults)
+			emu_setDefaultConfig();
 
-	lprintf("emu_ReadConfig: %s ", cfg);
-	f = fopen(cfg, "rb");
-	if (f) {
-		bread = fread(&currentConfig, 1, sizeof(currentConfig), f);
-		fclose(f);
+		// try new .cfg way
+		if (config_slot != 0)
+		     sprintf(cfg, "game.%i.cfg", config_slot);
+		else strcpy(cfg,  "game.cfg");
+		ret = config_readsect(cfg, emu_makeRomId());
+
+		if (ret != 0)
+		{
+			// fall back to old
+			char extbuf[16];
+			if (config_slot != 0)
+				sprintf(extbuf, ".%i.pbcfg", config_slot);
+			else strcpy(extbuf, ".pbcfg");
+			romfname_ext(cfg, "cfg/", extbuf);
+			f = fopen(cfg, "rb");
+			if (!f) {
+				romfname_ext(cfg, NULL, ".pbcfg");
+				f = fopen(cfg, "rb");
+			}
+			if (f) {
+				int bread = fread(&currentConfig, 1, sizeof(currentConfig), f);
+				lprintf("emu_ReadConfig: %s %s\n", cfg, bread > 0 ? "(ok)" : "(failed)");
+				fclose(f);
+				ret = 0;
+			}
+
+			if (ret == 0) {
+				PicoOpt = currentConfig.s_PicoOpt;
+				PsndRate = currentConfig.s_PsndRate;
+				PicoRegionOverride = currentConfig.s_PicoRegion;
+				PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
+				PicoCDBuffers = currentConfig.s_PicoCDBuffers;
+			}
+		}
+		else
+		{
+		}
 	}
-	lprintf(bread > 0 ? "(ok)\n" : "(failed)\n");
 
-	PicoOpt = currentConfig.PicoOpt;
-	PsndRate = currentConfig.PsndRate;
-	PicoRegionOverride = currentConfig.PicoRegion;
-	PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;
-	PicoCDBuffers = currentConfig.PicoCDBuffers;
-	//scaling_update();
 	// some sanity checks
 	if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
+#ifdef PSP
+	if (currentConfig.gamma < -4 || currentConfig.gamma >  16) currentConfig.gamma = 0;
+#else
 	if (currentConfig.gamma < 10 || currentConfig.gamma > 300) currentConfig.gamma = 100;
+#endif
 	if (currentConfig.volume < 0 || currentConfig.volume > 99) currentConfig.volume = 50;
+#ifdef __GP2X__
 	// if volume keys are unbound, bind them to volume control
 	if (!currentConfig.KeyBinds[23] && !currentConfig.KeyBinds[22]) {
 		currentConfig.KeyBinds[23] = 1<<29; // vol up
 		currentConfig.KeyBinds[22] = 1<<30; // vol down
 	}
-
-	if (bread > 0) config_slot_current = config_slot;
-	return (bread > 0); // == sizeof(currentConfig));
+#endif
+	if (ret == 0) config_slot_current = config_slot;
+	return (ret == 0);
 }
 
 
-int emu_WriteConfig(int game)
+int emu_WriteConfig(int is_game)
 {
-	FILE *f;
-	char cfg[512], extbuf[16];
-	int bwrite = 0;
+	char cfg[512], *game_sect = NULL;
+	int ret, write_lrom = 0;
 
-	if (!game)
+	if (!is_game)
 	{
 		strncpy(cfg, PicoConfigFile, 511);
 		if (config_slot != 0)
 		{
 			char *p = strrchr(cfg, '.');
 			if (p == NULL) p = cfg + strlen(cfg);
-			sprintf(extbuf, ".%i.pbcfg", config_slot);
-			strncpy(p, extbuf, 511 - (p - cfg));
+			sprintf(p, ".%i.cfg", config_slot);
 		}
 		cfg[511] = 0;
+		write_lrom = 1;
 	} else {
 		if (config_slot != 0)
-		     sprintf(extbuf, ".%i.pbcfg", config_slot);
-		else strcpy(extbuf, ".pbcfg");
-		romfname_ext(cfg, "cfg/", extbuf);
+		     sprintf(cfg, "game.%i.cfg", config_slot);
+		else strcpy(cfg,  "game.cfg");
+		game_sect = emu_makeRomId();
 	}
 
 	lprintf("emu_WriteConfig: %s ", cfg);
-	f = fopen(cfg, "wb");
-	if (f) {
-		currentConfig.PicoOpt = PicoOpt;
-		currentConfig.PsndRate = PsndRate;
-		currentConfig.PicoRegion = PicoRegionOverride;
-		currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;
-		currentConfig.PicoCDBuffers = PicoCDBuffers;
-		bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);
-		fflush(f);
-		fclose(f);
+	ret = config_writesect(cfg, game_sect);
 #ifndef NO_SYNC
-		sync();
+	sync();
 #endif
-	}
-	lprintf((bwrite == sizeof(currentConfig)) ? "(ok)\n" : "(failed)\n");
+	lprintf((ret == 0) ? "(ok)\n" : "(failed)\n");
 
-	if (bwrite == sizeof(currentConfig)) config_slot_current = config_slot;
-	return (bwrite == sizeof(currentConfig));
+	if (ret == 0) config_slot_current = config_slot;
+	return ret == 0;
 }
 
 
@@ -686,7 +789,8 @@ int emu_SaveLoadGame(int load, int sram)
 
 	lprintf("saveLoad (%i, %i): %s\n", load, sram, saveFname);
 
-	if(sram) {
+	if (sram)
+	{
 		FILE *sramFile;
 		int sram_size;
 		unsigned char *sram_data;
@@ -739,10 +843,11 @@ int emu_SaveLoadGame(int load, int sram)
 	else
 	{
 		void *PmovFile = NULL;
-		if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {
+		if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0)
+		{
 			if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {
 				emu_setSaveStateCbs(1);
-				if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
+				if (!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
 			}
 		}
 		else