X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=cdb69b75461a36d7c2f231e4dea47971234c508e;hb=860c6322c346c8e2ec2a4626e79f26d8b0d23777;hp=bea1569511c887437e6acd9d873b64f37f57d114;hpb=ab0607f7e4bb7cb12e6c0c18dce6f9c77ac466ad;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index bea1569..cdb69b7 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -6,6 +6,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <linux/limits.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -48,6 +50,7 @@ unsigned char *rom_data = NULL;
 
 extern int crashed_940;
 
+static short sndBuffer[2*44100/50];
 static char noticeMsg[64];					// notice msg to draw
 static struct timeval noticeMsgTime = { 0, 0 };	// when started showing
 static int reset_timing, osd_fps_x;
@@ -187,11 +190,11 @@ static int cd_check(char *ext, char **bios_file)
 	}
 
 	/* 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);
+	fseek(cd_f, (type == 1) ? 0x100+0x10B : 0x110+0x10B, SEEK_SET);
 	fread(buf, 1, 1, cd_f);
 	fclose(cd_f);
 
-	if (buf[0] == 0x64) region = 4; // EU
+	if (buf[0] == 0x64) region = 8; // EU
 	if (buf[0] == 0xa1) region = 1; // JAP
 
 	printf("detected %s Sega/Mega CD image with %s region\n",
@@ -276,6 +279,7 @@ int emu_ReloadRom(void)
 		// bios_help() ?
 		return 0;
 	} else {
+		if (PicoMCD & 1) PicoExitMCD();
 		PicoMCD &= ~1;
 	}
 
@@ -392,22 +396,36 @@ void emu_Init(void)
 		printf("framebuff == 0\n");
 	}
 
+	// make dirs for saves, cfgs, etc.
+	mkdir("mds", 0777);
+	mkdir("srm", 0777);
+	mkdir("brm", 0777);
+	mkdir("cfg", 0777);
+
 	PicoInit();
 
 //	logf = fopen("log.txt", "w");
 }
 
 
-static void romfname_ext(char *dst, char *ext)
+static void romfname_ext(char *dst, const char *prefix, const char *ext)
 {
 	char *p;
+	int prefix_len = 0;
 
 	// make save filename
 	for (p = romFileName+strlen(romFileName)-1; p >= romFileName && *p != '/'; p--); p++;
-	strncpy(dst, p, 511);
+	*dst = 0;
+	if (prefix) {
+		strcpy(dst, prefix);
+		prefix_len = strlen(prefix);
+	}
+	strncpy(dst + prefix_len, p, 511-prefix_len);
 	dst[511-8] = 0;
-	if(dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
-	strcat(dst, ext);
+	if (dst[strlen(dst)-4] == '.') dst[strlen(dst)-4] = 0;
+	if (ext) strcat(dst, ext);
+
+	printf("romfname_ext: %s\n", dst);
 }
 
 
@@ -452,10 +470,11 @@ int emu_ReadConfig(int game)
 		// set default config
 		memset(&currentConfig, 0, sizeof(currentConfig));
 		currentConfig.lastRomFile[0] = 0;
-		currentConfig.EmuOpt  = 0x1f;
-		currentConfig.PicoOpt = 0x0f;
-		currentConfig.PsndRate = 22050;
+		currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds
+		currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda
+		currentConfig.PsndRate = 22050; // 44100;
 		currentConfig.PicoRegion = 0; // auto
+		currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
 		currentConfig.Frameskip = -1; // auto
 		currentConfig.CPUclock = 200;
 		currentConfig.volume = 50;
@@ -476,7 +495,10 @@ int emu_ReadConfig(int game)
 		strncpy(cfg, PicoConfigFile, 511);
 		cfg[511] = 0;
 	} else {
-		romfname_ext(cfg, ".pbcfg");
+		romfname_ext(cfg, "cfg/", ".pbcfg");
+		f = fopen(cfg, "rb");
+		if (!f) romfname_ext(cfg, NULL, ".pbcfg");
+		else fclose(f);
 	}
 
 	printf("emu_ReadConfig: %s ", cfg);
@@ -490,6 +512,7 @@ int emu_ReadConfig(int game)
 	PicoOpt = currentConfig.PicoOpt;
 	PsndRate = currentConfig.PsndRate;
 	PicoRegionOverride = currentConfig.PicoRegion;
+	PicoAutoRgnOrder = currentConfig.PicoAutoRgnOrder;
 	if (PicoOpt & 0x20) {
 		actionNames[ 8] = "Z"; actionNames[ 9] = "Y";
 		actionNames[10] = "X"; actionNames[11] = "MODE";
@@ -518,7 +541,7 @@ int emu_WriteConfig(int game)
 		strncpy(cfg, PicoConfigFile, 511);
 		cfg[511] = 0;
 	} else {
-		romfname_ext(cfg, ".pbcfg");
+		romfname_ext(cfg, "cfg", ".pbcfg");
 	}
 
 	printf("emu_WriteConfig: %s ", cfg);
@@ -527,6 +550,7 @@ int emu_WriteConfig(int game)
 		currentConfig.PicoOpt = PicoOpt;
 		currentConfig.PsndRate = PsndRate;
 		currentConfig.PicoRegion = PicoRegionOverride;
+		currentConfig.PicoAutoRgnOrder = PicoAutoRgnOrder;
 		bwrite = fwrite(&currentConfig, 1, sizeof(currentConfig), f);
 		fflush(f);
 		fclose(f);
@@ -559,7 +583,7 @@ void emu_Deinit(void)
 }
 
 
-void osd_text(int x, int y, char *text)
+void osd_text(int x, int y, const char *text)
 {
 	int len = strlen(text)*8;
 
@@ -586,28 +610,30 @@ 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
+	// mmu problems?
+//	static
+	int old_reg;
+//	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;
+		*(unsigned int *)((char *)gp2x_screen + 320*2+ 4) =
+		*(unsigned int *)((char *)gp2x_screen + 320*3+ 4) =
+		*(unsigned int *)((char *)gp2x_screen + 320*4+ 4) = col_g;
+		*(unsigned int *)((char *)gp2x_screen + 320*2+12) =
+		*(unsigned int *)((char *)gp2x_screen + 320*3+12) =
+		*(unsigned int *)((char *)gp2x_screen + 320*4+12) = col_r;
 	} else {
 		// 16-bit modes
-		unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+306);
+		unsigned int *p = (unsigned int *)((short *)gp2x_screen + 320*2+4);
 		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;
+		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
+		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
+		*p++ = col_g; *p++ = col_g; p+=2; *p++ = col_r; *p++ = col_r; p += 320/2 - 12/2;
 	}
 }
 
@@ -627,10 +653,10 @@ static int EmuScan8(unsigned int num, void *sdata)
 	return 0;
 }
 
-static int localPal[0x100];
+int localPal[0x100];
 static void (*vidCpyM2)(void *dest, void *src) = NULL;
 
-static void blit(char *fps, char *notice)
+static void blit(const char *fps, const char *notice)
 {
 	int emu_opt = currentConfig.EmuOpt;
 
@@ -738,30 +764,17 @@ static void vidResetMode(void)
 }
 
 
-static int check_save_file(void)
+static void emu_state_cb(const char *str)
 {
-	char saveFname[512];
-	char ext[16];
-	FILE *f;
-
-	ext[0] = 0;
-	if(state_slot > 0 && state_slot < 10) sprintf(ext, ".%i", state_slot);
-	strcat(ext, ".mds");
-	if(currentConfig.EmuOpt & 8) strcat(ext, ".gz");
-
-	romfname_ext(saveFname, ext);
-	if ((f = fopen(saveFname, "rb"))) {
-		fclose(f);
-		return 1;
-	}
-	return 0;
+	clearArea(0);
+	blit("", str);
 }
 
 static void RunEvents(unsigned int which)
 {
 	if(which & 0x1800) { // save or load (but not both)
 		int do_it = 1;
-		if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && check_save_file()) {
+		if (!(which & 0x1000) && (currentConfig.EmuOpt & 0x200) && emu_check_save_file(state_slot)) {
 			unsigned long keys;
 			blit("", "OVERWRITE SAVE? (Y=yes, X=no)");
 			while( !((keys = gp2x_joystick_read(1)) & (GP2X_X|GP2X_Y)) )
@@ -770,8 +783,11 @@ static void RunEvents(unsigned int which)
 			clearArea(0);
 		}
 		if (do_it) {
-			blit("", (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
-			emu_SaveLoadGame(which & 0x1000, 0);
+			osd_text(4, 232, (which & 0x1000) ? "LOADING GAME" : "SAVING GAME");
+			PicoStateProgressCB = emu_state_cb;
+			gp2x_memcpy_all_buffers(gp2x_screen, 0, 320*240*2);
+			emu_SaveLoadGame((which & 0x1000) >> 12, 0);
+			PicoStateProgressCB = NULL;
 		}
 
 		reset_timing = 1;
@@ -801,7 +817,7 @@ static void RunEvents(unsigned int which)
 			state_slot += 1;
 			if(state_slot > 9) state_slot = 0;
 		}
-		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, check_save_file() ? "USED" : "FREE");
+		sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_check_save_file(state_slot) ? "USED" : "FREE");
 		gettimeofday(&noticeMsgTime, 0);
 	}
 	if(which & 0x0080) {
@@ -921,24 +937,10 @@ static void updateKeys(void)
 	prevEvents = (allActions[0] | allActions[1]) >> 16;
 }
 
-static int snd_excess_add = 0, snd_excess_cnt = 0; // hack
 
-static void updateSound(void)
+static void updateSound(int len)
 {
-	int len = (PicoOpt&8)?PsndLen*2:PsndLen;
-
-	snd_excess_cnt += snd_excess_add;
-	if (snd_excess_cnt >= 0x10000) {
-		snd_excess_cnt -= 0x10000;
-		if (PicoOpt&8) {
-			PsndOut[len]   = PsndOut[len-2];
-			PsndOut[len+1] = PsndOut[len-1];
-			len+=2;
-		} else {
-			PsndOut[len]   = PsndOut[len-1];
-			len++;
-		}
-	}
+	if (PicoOpt&8) len<<=1;
 
 	gp2x_sound_write(PsndOut, len<<1);
 }
@@ -962,6 +964,24 @@ static void SkipFrame(int do_sound)
 }
 
 
+void emu_forced_frame(void)
+{
+	int po_old = PicoOpt;
+
+	PicoOpt |= 0x10;
+	PicoFrameFull();
+	PicoOpt = po_old;
+
+	if (!(Pico.video.reg[12]&1)) {
+		vidCpyM2 = vidCpyM2_40col;
+		clearArea(1);
+	} else	vidCpyM2 = vidCpyM2_32col;
+
+	vidCpyM2((unsigned char *)gp2x_screen+320*8, framebuff+328*8);
+	vidConvCpyRGB32(localPal, Pico.cram, 0x40);
+	gp2x_video_setpalette(localPal, 0x40);
+}
+
 static void simpleWait(int thissec, int lim_time)
 {
 	struct timeval tval;
@@ -1008,6 +1028,7 @@ void emu_Loop(void)
 
 	// make sure we are in correct mode
 	vidResetMode();
+	Pico.m.dirtyPal = 1;
 	oldmodes = ((Pico.video.reg[12]&1)<<2) ^ 0xc;
 	find_combos();
 
@@ -1018,22 +1039,23 @@ void emu_Loop(void)
 
 	// prepare sound stuff
 	if(currentConfig.EmuOpt & 4) {
+		int snd_excess_add;
 		if(PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old || crashed_940) {
 			/* if 940 is turned off, we need it to be put back to sleep */
 			if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {
-				Reset940(1);
+				Reset940(1, 2);
 				Pause940(1);
 			}
-			sound_rerate();
+			sound_rerate(1);
 		}
 		//excess_samples = PsndRate - PsndLen*target_fps;
-		snd_excess_cnt = 0;
 		snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;
 		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n", PsndRate, PsndLen, snd_excess_add, (PicoOpt&8)>>3, Pico.m.pal);
 		gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);
 		gp2x_sound_volume(currentConfig.volume, currentConfig.volume);
 		PicoWriteSound = updateSound;
-		PsndOut = calloc((PicoOpt&8) ? (PsndLen*4+4) : (PsndLen*2+2), 1);
+		memset(sndBuffer, 0, sizeof(sndBuffer));
+		PsndOut = sndBuffer;
 		PsndRate_old = PsndRate;
 		PsndLen_real = PsndLen;
 		PicoOpt_old  = PicoOpt;
@@ -1229,14 +1251,17 @@ if (Pico.m.frame_count == 31563) {
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
+		osd_text(4, 232, "Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
 
-	if (PsndOut != 0) {
-		free(PsndOut);
-		PsndOut = 0;
-	}
+	// if in 16bit mode, generate 8it image for menu background
+	if (!(PicoOpt&0x10) && (currentConfig.EmuOpt&0x80))
+		emu_forced_frame();
+
+	// for menu bg
+	gp2x_memcpy_buffers((1<<2), gp2x_screen, 0, 320*240*2);
 }
 
 
@@ -1258,19 +1283,95 @@ size_t gzWrite2(void *p, size_t _size, size_t _n, void *file)
 	return gzwrite(file, p, _n);
 }
 
-typedef unsigned int (*STATE_SL_FUNC)(void *, unsigned int, unsigned int, void *);
+static int try_ropen_file(const char *fname)
+{
+	FILE *f;
+
+	f = fopen(fname, "rb");
+	if (f) {
+		fclose(f);
+		return 1;
+	}
+	return 0;
+}
+
+char *emu_GetSaveFName(int load, int is_sram, int slot)
+{
+	static char saveFname[512];
+	char ext[16];
+
+	if (is_sram)
+	{
+		romfname_ext(saveFname, (PicoMCD&1) ? "brm/" : "srm/", (PicoMCD&1) ? ".brm" : ".srm");
+		if (load) {
+			if (try_ropen_file(saveFname)) return saveFname;
+			// try in current dir..
+			romfname_ext(saveFname, NULL, (PicoMCD&1) ? ".brm" : ".srm");
+			if (try_ropen_file(saveFname)) return saveFname;
+			return NULL; // give up
+		}
+	}
+	else
+	{
+		ext[0] = 0;
+		if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);
+		strcat(ext, (currentConfig.EmuOpt & 8) ? ".mds.gz" : ".mds");
+
+		romfname_ext(saveFname, "mds/", ext);
+		if (load) {
+			if (try_ropen_file(saveFname)) return saveFname;
+			romfname_ext(saveFname, NULL, ext);
+			if (try_ropen_file(saveFname)) return saveFname;
+			if (currentConfig.EmuOpt & 8) {
+				ext[0] = 0;
+				if(slot > 0 && slot < 10) sprintf(ext, ".%i", slot);
+				strcat(ext, ".mds");
+
+				romfname_ext(saveFname, "mds/", ext);
+				if (try_ropen_file(saveFname)) return saveFname;
+				romfname_ext(saveFname, NULL, ext);
+				if (try_ropen_file(saveFname)) return saveFname;
+			}
+			return NULL;
+		}
+	}
+
+	return saveFname;
+}
+
+int emu_check_save_file(int slot)
+{
+	return emu_GetSaveFName(1, 0, slot) ? 1 : 0;
+}
+
+void emu_set_save_cbs(int gz)
+{
+	if (gz) {
+		areaRead  = gzRead2;
+		areaWrite = gzWrite2;
+		areaEof   = (areaeof *) gzeof;
+		areaSeek  = (areaseek *) gzseek;
+		areaClose = (areaclose *) gzclose;
+	} else {
+		areaRead  = (arearw *) fread;
+		areaWrite = (arearw *) fwrite;
+		areaEof   = (areaeof *) feof;
+		areaSeek  = (areaseek *) fseek;
+		areaClose = (areaclose *) fclose;
+	}
+}
 
 int emu_SaveLoadGame(int load, int sram)
 {
 	int ret = 0;
-	char saveFname[512];
+	char *saveFname;
 
 	// make save filename
-	romfname_ext(saveFname, "");
-	if(sram) strcat(saveFname, (PicoMCD&1) ? ".brm" : ".srm");
-	else {
-		if(state_slot > 0 && state_slot < 10) sprintf(saveFname, "%s.%i", saveFname, state_slot);
-		strcat(saveFname, ".mds");
+	saveFname = emu_GetSaveFName(load, sram, state_slot);
+	if (saveFname == NULL) {
+		strcpy(noticeMsg, load ? "LOAD FAILED (missing file)" : "SAVE FAILED  ");
+		gettimeofday(&noticeMsgTime, 0);
+		return -1;
 	}
 
 	printf("saveLoad (%i, %i): %s\n", load, sram, saveFname);
@@ -1313,32 +1414,30 @@ int emu_SaveLoadGame(int load, int sram)
 	else
 	{
 		void *PmovFile = NULL;
-		// try gzip first
-		if(currentConfig.EmuOpt & 8) {
-			strcat(saveFname, ".gz");
+		if (strcmp(saveFname + strlen(saveFname) - 3, ".gz") == 0) {
 			if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = gzRead2;
-				areaWrite = gzWrite2;
+				emu_set_save_cbs(1);
 				if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
-			} else
-				saveFname[strlen(saveFname)-3] = 0;
+			}
 		}
-		if(!PmovFile) { // gzip failed or was disabled
+		else
+		{
 			if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = (STATE_SL_FUNC) fread;
-				areaWrite = (STATE_SL_FUNC) fwrite;
+				emu_set_save_cbs(0);
 			}
 		}
 		if(PmovFile) {
-			PmovState(load ? 6 : 5, PmovFile);
-			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
-			if(areaRead == gzRead2)
-				 gzclose(PmovFile);
-			else fclose ((FILE *) PmovFile);
+			ret = PmovState(load ? 6 : 5, PmovFile);
+			areaClose(PmovFile);
 			PmovFile = 0;
 			if (!load) sync();
 			else Pico.m.dirtyPal=1;
-		} else {
+		}
+		else	ret = -1;
+		if (!ret)
+			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
+		else
+		{
 			strcpy(noticeMsg, load ? "LOAD FAILED  " : "SAVE FAILED  ");
 			ret = -1;
 		}