X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Femu.c;h=e564dfb71629070bdbd83e758af34a3c8315ff03;hb=4f265db77684ec33f9533e7c76734498df03bba4;hp=dcc8f6e16b99ad3b4d951dc2474183384eaf5dd1;hpb=cb0316e4c526ad4c8d50e40e53c9d39044dcaaf9;p=picodrive.git

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index dcc8f6e..e564dfb 100644
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -276,6 +276,7 @@ int emu_ReloadRom(void)
 		// bios_help() ?
 		return 0;
 	} else {
+		if (PicoMCD & 1) PicoExitMCD();
 		PicoMCD &= ~1;
 	}
 
@@ -374,7 +375,7 @@ int emu_ReloadRom(void)
 		}
 	}
 	gettimeofday(&noticeMsgTime, 0);
-printf("PicoMCD: %x\n", PicoMCD);
+
 	// load SRAM for this ROM
 	if(currentConfig.EmuOpt & 1)
 		emu_SaveLoadGame(1, 1);
@@ -452,10 +453,11 @@ int emu_ReadConfig(int game)
 		// set default config
 		memset(&currentConfig, 0, sizeof(currentConfig));
 		currentConfig.lastRomFile[0] = 0;
-		currentConfig.EmuOpt  = 0x1f | 0xc00; // | cd_leds | cd_cdda
-		currentConfig.PicoOpt = 0x0f | 0x200; // | use_940
+		currentConfig.EmuOpt  = 0x1f | 0x400; // | cd_leds
+		currentConfig.PicoOpt = 0x0f | 0xe00; // | use_940 | cd_pcm | cd_cdda
 		currentConfig.PsndRate = 44100;
 		currentConfig.PicoRegion = 0; // auto
+		currentConfig.PicoAutoRgnOrder = 0x184; // US, EU, JP
 		currentConfig.Frameskip = -1; // auto
 		currentConfig.CPUclock = 200;
 		currentConfig.volume = 50;
@@ -490,6 +492,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";
@@ -527,6 +530,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);
@@ -596,20 +600,20 @@ static void cd_leds(void)
 		// 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;
 	}
 }
 
@@ -1231,6 +1235,7 @@ if (Pico.m.frame_count == 31563) {
 
 	// save SRAM
 	if((currentConfig.EmuOpt & 1) && SRam.changed) {
+		blit("", "Writing SRAM/BRAM..");
 		emu_SaveLoadGame(0, 1);
 		SRam.changed = 0;
 	}
@@ -1260,7 +1265,6 @@ 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 *);
 
 int emu_SaveLoadGame(int load, int sram)
 {
@@ -1321,26 +1325,34 @@ int emu_SaveLoadGame(int load, int sram)
 			if( (PmovFile = gzopen(saveFname, load ? "rb" : "wb")) ) {
 				areaRead  = gzRead2;
 				areaWrite = gzWrite2;
+				areaEof   = (areaeof *) gzeof;
+				areaSeek  = (areaseek *) gzseek;
 				if(!load) gzsetparams(PmovFile, 9, Z_DEFAULT_STRATEGY);
 			} else
 				saveFname[strlen(saveFname)-3] = 0;
 		}
 		if(!PmovFile) { // gzip failed or was disabled
 			if( (PmovFile = fopen(saveFname, load ? "rb" : "wb")) ) {
-				areaRead  = (STATE_SL_FUNC) fread;
-				areaWrite = (STATE_SL_FUNC) fwrite;
+				areaRead  = (arearw *) fread;
+				areaWrite = (arearw *) fwrite;
+				areaEof   = (areaeof *) feof;
+				areaSeek  = (areaseek *) fseek;
 			}
 		}
 		if(PmovFile) {
-			PmovState(load ? 6 : 5, PmovFile);
-			strcpy(noticeMsg, load ? "GAME LOADED  " : "GAME SAVED   ");
+			ret = PmovState(load ? 6 : 5, PmovFile);
 			if(areaRead == gzRead2)
 				 gzclose(PmovFile);
 			else fclose ((FILE *) 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;
 		}