X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FArea.c;h=82e7b1ff56e13ec637d9d2eb4f10ee48b81404b8;hb=3a81ecde1cf95372e27a3e6ca6f9c2cccc86e272;hp=2502a7a21322aa0d569d68639633033403789ad3;hpb=75736070161d40608ba3052b4c95b42943f9de3d;p=picodrive.git

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index 2502a7a..82e7b1f 100644
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -1,6 +1,6 @@
 // This is part of Pico Library
 
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2007 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -14,6 +14,8 @@
 // sn76496
 extern int *sn76496_regs;
 
+void (*PicoStateProgressCB)(const char *str) = 0;
+
 
 typedef enum {
 	CHUNK_M68K = 1,
@@ -31,16 +33,46 @@ typedef enum {
 	CHUNK_S68K,
 	CHUNK_PRG_RAM,
 	CHUNK_WORD_RAM,
-	CHUNK_BRAM,	// 15
+	CHUNK_PCM_RAM,	// 15
+	CHUNK_BRAM,
 	CHUNK_GA_REGS,
+	CHUNK_PCM,
 	CHUNK_CDC,
-	CHUNK_CDD,
+	CHUNK_CDD,	// 20
 	CHUNK_SCD,
-	CHUNK_RC,	// 20
+	CHUNK_RC,
 	CHUNK_MISC_CD,
 } chunk_name_e;
 
 
+static char *chunk_names[] = {
+	"Saving.. M68K state",
+	"Saving.. RAM",
+	"Saving.. VRAM",
+	"Saving.. ZRAM",
+	"Saving.. CRAM",	// 5
+	"Saving.. VSRAM",
+	"Saving.. emu state",
+	"Saving.. VIDEO",
+	"Saving.. Z80 state",
+	"Saving.. PSG",		// 10
+	"Saving.. FM",
+	// CD stuff
+	"Saving.. S68K state",
+	"Saving.. PRG_RAM",
+	"Saving.. WORD_RAM",
+	"Saving.. PCM_RAM",	// 15
+	"Saving.. BRAM",
+	"Saving.. GATE ARRAY regs",
+	"Saving.. PCM state",
+	"Saving.. CDC",
+	"Saving.. CDD",		// 20
+	"Saving.. SCD",
+	"Saving.. GFX chip",
+	"Saving.. MCD state",
+};
+
+
 static int write_chunk(chunk_name_e name, int len, void *data, void *file)
 {
 	size_t bwritten = 0;
@@ -53,9 +85,11 @@ static int write_chunk(chunk_name_e name, int len, void *data, void *file)
 
 
 #define CHECKED_WRITE(name,len,data) \
+	if (PicoStateProgressCB) PicoStateProgressCB(chunk_names[name]); \
 	if (!write_chunk(name, len, data, file)) return 1;
 
 #define CHECKED_WRITE_BUFF(name,buff) \
+	if (PicoStateProgressCB) PicoStateProgressCB(chunk_names[name]); \
 	if (!write_chunk(name, sizeof(buff), &buff, file)) return 1;
 
 int PicoCdSaveState(void *file)
@@ -86,7 +120,6 @@ int PicoCdSaveState(void *file)
 	if(PicoOpt&1)
 		CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);
 
-	// TODO: cd stuff
 	if (PicoMCD & 1)
 	{
 		Pico_mcd->m.audio_offset = mp3_get_offset();
@@ -96,8 +129,10 @@ int PicoCdSaveState(void *file)
 		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_PCM_RAM,  Pico_mcd->pcm_ram);
 		CHECKED_WRITE_BUFF(CHUNK_BRAM,     Pico_mcd->bram);
-		CHECKED_WRITE_BUFF(CHUNK_GA_REGS,  Pico_mcd->s68k_regs);
+		CHECKED_WRITE_BUFF(CHUNK_GA_REGS,  Pico_mcd->s68k_regs); // GA regs, not CPU regs
+		CHECKED_WRITE_BUFF(CHUNK_PCM,      Pico_mcd->pcm);
 		CHECKED_WRITE_BUFF(CHUNK_CDD,      Pico_mcd->cdd);
 		CHECKED_WRITE_BUFF(CHUNK_CDC,      Pico_mcd->cdc);
 		CHECKED_WRITE_BUFF(CHUNK_SCD,      Pico_mcd->scd);
@@ -147,6 +182,7 @@ int PicoCdLoadState(void *file)
 		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])
 		{
@@ -181,8 +217,10 @@ int PicoCdLoadState(void *file)
 
 			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_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;
+			case CHUNK_PCM:		CHECKED_READ_BUFF(Pico_mcd->pcm); break;
 			case CHUNK_CDD:		CHECKED_READ_BUFF(Pico_mcd->cdd); break;
 			case CHUNK_CDC:		CHECKED_READ_BUFF(Pico_mcd->cdc); break;
 			case CHUNK_SCD:		CHECKED_READ_BUFF(Pico_mcd->scd); break;