X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FArea.c;h=baf501f2d809ea459aec592cdf1b96ca2c6c23cb;hb=48e8482fc2d74c9b96e581241390bade986acb22;hp=82e7b1ff56e13ec637d9d2eb4f10ee48b81404b8;hpb=76276b0bc0b532394d1ba067bf2b17a27b0b3be6;p=picodrive.git

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index 82e7b1f..baf501f 100644
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -125,10 +125,13 @@ int PicoCdSaveState(void *file)
 		Pico_mcd->m.audio_offset = mp3_get_offset();
 		memset(buff, 0, sizeof(buff));
 		PicoAreaPackCpu(buff, 1);
+		if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
+			wram_1M_to_2M(Pico_mcd->word_ram2M);
+        	Pico_mcd->m.hint_vector = *(unsigned short *)(Pico_mcd->bios + 0x72);
 
 		CHECKED_WRITE_BUFF(CHUNK_S68K,     buff);
 		CHECKED_WRITE_BUFF(CHUNK_PRG_RAM,  Pico_mcd->prg_ram);
-		CHECKED_WRITE_BUFF(CHUNK_WORD_RAM, Pico_mcd->word_ram); // in 2M format
+		CHECKED_WRITE_BUFF(CHUNK_WORD_RAM, Pico_mcd->word_ram2M); // in 2M format
 		CHECKED_WRITE_BUFF(CHUNK_PCM_RAM,  Pico_mcd->pcm_ram);
 		CHECKED_WRITE_BUFF(CHUNK_BRAM,     Pico_mcd->bram);
 		CHECKED_WRITE_BUFF(CHUNK_GA_REGS,  Pico_mcd->s68k_regs); // GA regs, not CPU regs
@@ -138,6 +141,9 @@ int PicoCdSaveState(void *file)
 		CHECKED_WRITE_BUFF(CHUNK_SCD,      Pico_mcd->scd);
 		CHECKED_WRITE_BUFF(CHUNK_RC,       Pico_mcd->rot_comp);
 		CHECKED_WRITE_BUFF(CHUNK_MISC_CD,  Pico_mcd->m);
+
+		if (Pico_mcd->s68k_regs[3]&4) // convert back
+			wram_2M_to_1M(Pico_mcd->word_ram2M);
 	}
 
 	return 0;
@@ -216,7 +222,7 @@ int PicoCdLoadState(void *file)
 				break;
 
 			case CHUNK_PRG_RAM:	CHECKED_READ_BUFF(Pico_mcd->prg_ram); break;
-			case CHUNK_WORD_RAM:	CHECKED_READ_BUFF(Pico_mcd->word_ram); break;
+			case CHUNK_WORD_RAM:	CHECKED_READ_BUFF(Pico_mcd->word_ram2M); break;
 			case CHUNK_PCM_RAM:	CHECKED_READ_BUFF(Pico_mcd->pcm_ram); break;
 			case CHUNK_BRAM:	CHECKED_READ_BUFF(Pico_mcd->bram); break;
 			case CHUNK_GA_REGS:	CHECKED_READ_BUFF(Pico_mcd->s68k_regs); break;
@@ -225,14 +231,55 @@ int PicoCdLoadState(void *file)
 			case CHUNK_CDC:		CHECKED_READ_BUFF(Pico_mcd->cdc); break;
 			case CHUNK_SCD:		CHECKED_READ_BUFF(Pico_mcd->scd); break;
 			case CHUNK_RC:		CHECKED_READ_BUFF(Pico_mcd->rot_comp); break;
+			case CHUNK_MISC_CD:	CHECKED_READ_BUFF(Pico_mcd->m); break;
 
-			case CHUNK_MISC_CD:
-				CHECKED_READ_BUFF(Pico_mcd->m);
-				mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+			default:
+				printf("PicoCdLoadState: skipping unknown chunk %i of size %i\n", buff[0], len);
+				areaSeek(file, len, SEEK_CUR);
 				break;
+		}
+	}
+
+	/* after load events */
+	if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
+		wram_2M_to_1M(Pico_mcd->word_ram2M);
+#ifdef _ASM_CD_MEMORY_C
+	PicoMemResetCD(Pico_mcd->s68k_regs[3]);
+	PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
+#endif
+	if (Pico_mcd->m.audio_track > 0 && Pico_mcd->m.audio_track < Pico_mcd->TOC.Last_Track)
+		mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+	// restore hint vector
+        *(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
 
+	return 0;
+}
+
+
+int PicoCdLoadStateGfx(void *file)
+{
+	int ver, len, found = 0;
+	char buff[8];
+
+	g_read_offs = 0;
+	CHECKED_READ(8, buff);
+	if (strncmp(buff, "PicoSMCD", 8)) R_ERROR_RETURN("bad header");
+	CHECKED_READ(4, &ver);
+
+	while (!areaEof(file) && found < 4)
+	{
+		CHECKED_READ(1, buff);
+		CHECKED_READ(4, &len);
+		if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");
+		if (buff[0] > CHUNK_FM && !(PicoMCD & 1)) R_ERROR_RETURN("cd chunk in non CD state?");
+
+		switch (buff[0])
+		{
+			case CHUNK_VRAM:  CHECKED_READ_BUFF(Pico.vram);  found++; break;
+			case CHUNK_CRAM:  CHECKED_READ_BUFF(Pico.cram);  found++; break;
+			case CHUNK_VSRAM: CHECKED_READ_BUFF(Pico.vsram); found++; break;
+			case CHUNK_VIDEO: CHECKED_READ_BUFF(Pico.video); found++; break;
 			default:
-				printf("skipping unknown chunk %i of size %i\n", buff[0], len);
 				areaSeek(file, len, SEEK_CUR);
 				break;
 		}
@@ -241,3 +288,4 @@ int PicoCdLoadState(void *file)
 	return 0;
 }
 
+