X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FArea.c;h=a402d4eae8f7bab4292ccd1bf7e3527291fc22d1;hb=d2721b08bb50fd1b112befa4b9f1a918dbd1ca03;hp=aba08e3b46769972cd62f9638d85dc8765be71f7;hpb=b542be4686241c9e0722ff8e452980f9ac2b4d7c;p=picodrive.git

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index aba08e3..a402d4e 100644
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -10,6 +10,7 @@
 // sn76496
 extern int *sn76496_regs;
 
+carthw_state_chunk *carthw_chunks;
 void (*PicoStateProgressCB)(const char *str) = 0;
 
 
@@ -38,6 +39,8 @@ typedef enum {
 	CHUNK_SCD,
 	CHUNK_RC,
 	CHUNK_MISC_CD,
+	CHUNK_DEFAULT_COUNT
+	// CHUNK_CARTHW = 64,	// defined in PicoInt
 } chunk_name_e;
 
 
@@ -81,20 +84,24 @@ 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(name,len,data) { \
+	if (PicoStateProgressCB && name < CHUNK_DEFAULT_COUNT) \
+		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;
+#define CHECKED_WRITE_BUFF(name,buff) { \
+	if (PicoStateProgressCB && name < CHUNK_DEFAULT_COUNT) \
+		PicoStateProgressCB(chunk_names[name]); \
+	if (!write_chunk(name, sizeof(buff), &buff, file)) return 1; \
+}
 
 PICO_INTERNAL int PicoCdSaveState(void *file)
 {
 	unsigned char buff[0x60];
 	void *ym2612_regs = YM2612GetRegs();
 
-	areaWrite("PicoSMCD", 1, 8, file);
+	areaWrite("PicoSEXT", 1, 8, file);
 	areaWrite(&PicoVer, 1, 4, file);
 
 	memset(buff, 0, sizeof(buff));
@@ -107,19 +114,20 @@ PICO_INTERNAL int PicoCdSaveState(void *file)
 	CHECKED_WRITE_BUFF(CHUNK_VSRAM, Pico.vsram);
 	CHECKED_WRITE_BUFF(CHUNK_MISC,  Pico.m);
 	CHECKED_WRITE_BUFF(CHUNK_VIDEO, Pico.video);
-	if(PicoOpt&7) {
+	if (PicoOpt&7) {
 		memset(buff, 0, sizeof(buff));
 		z80_pack(buff);
 		CHECKED_WRITE_BUFF(CHUNK_Z80, buff);
 	}
-	if(PicoOpt&3)
+	if (PicoOpt&3)
 		CHECKED_WRITE(CHUNK_PSG, 28*4, sn76496_regs);
-	if(PicoOpt&1)
+	if (PicoOpt&1) {
+		ym2612_pack_state();
 		CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);
+	}
 
-	if (PicoMCD & 1)
+	if (PicoAHW & PAHW_MCD)
 	{
-		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?
@@ -143,6 +151,15 @@ PICO_INTERNAL int PicoCdSaveState(void *file)
 			wram_2M_to_1M(Pico_mcd->word_ram2M);
 	}
 
+	if (carthw_chunks != NULL)
+	{
+		carthw_state_chunk *chwc;
+		if (PicoStateProgressCB)
+			PicoStateProgressCB("Saving.. cart hw state");
+		for (chwc = carthw_chunks; chwc->ptr != NULL; chwc++)
+			CHECKED_WRITE(chwc->chunk, chwc->size, chwc->ptr);
+	}
+
 	return 0;
 }
 
@@ -150,7 +167,7 @@ static int g_read_offs = 0;
 
 #define R_ERROR_RETURN(error) \
 { \
-	printf("PicoCdLoadState @ %x: " error "\n", g_read_offs); \
+	elprintf(EL_STATUS, "PicoCdLoadState @ %x: " error, g_read_offs); \
 	return 1; \
 }
 
@@ -165,7 +182,7 @@ static int g_read_offs = 0;
 
 #define CHECKED_READ2(len2,data) \
 	if (len2 != len) { \
-		printf("unexpected len %i, wanted %i (%s)", len, len2, #len2); \
+		elprintf(EL_STATUS, "unexpected len %i, wanted %i (%s)", len, len2, #len2); \
 		if (len > len2) R_ERROR_RETURN("failed."); \
 		/* else read anyway and hope for the best.. */ \
 	} \
@@ -181,7 +198,8 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
 
 	g_read_offs = 0;
 	CHECKED_READ(8, buff);
-	if (strncmp((char *)buff, "PicoSMCD", 8)) R_ERROR_RETURN("bad header");
+	if (strncmp((char *)buff, "PicoSMCD", 8) && strncmp((char *)buff, "PicoSEXT", 8))
+		R_ERROR_RETURN("bad header");
 	CHECKED_READ(4, &ver);
 
 	while (!areaEof(file))
@@ -189,7 +207,8 @@ PICO_INTERNAL 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?");
+		if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))
+			R_ERROR_RETURN("cd chunk in non CD state?");
 
 		switch (buff[0])
 		{
@@ -213,7 +232,7 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
 			case CHUNK_PSG:   CHECKED_READ2(28*4, sn76496_regs); break;
 			case CHUNK_FM:
 				CHECKED_READ2(0x200+4, ym2612_regs);
-				YM2612PicoStateLoad();
+				ym2612_unpack_state();
 				break;
 
 			// cd stuff
@@ -235,24 +254,38 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
 			case CHUNK_MISC_CD:	CHECKED_READ_BUFF(Pico_mcd->m); break;
 
 			default:
-				printf("PicoCdLoadState: skipping unknown chunk %i of size %i\n", buff[0], len);
+				if (carthw_chunks != NULL)
+				{
+					carthw_state_chunk *chwc;
+					for (chwc = carthw_chunks; chwc->ptr != NULL; chwc++) {
+						if (chwc->chunk == buff[0]) {
+							CHECKED_READ2(chwc->size, chwc->ptr);
+							goto breakswitch;
+						}
+					}
+				}
+				elprintf(EL_STATUS, "PicoCdLoadState: skipping unknown chunk %i of size %i", buff[0], len);
 				areaSeek(file, len, SEEK_CUR);
 				break;
 		}
+		breakswitch:;
 	}
 
-	/* after load events */
-	if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
-		wram_2M_to_1M(Pico_mcd->word_ram2M);
-	PicoMemResetCD(Pico_mcd->s68k_regs[3]);
+	if (PicoAHW & PAHW_MCD)
+	{
+		/* after load events */
+		if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
+			wram_2M_to_1M(Pico_mcd->word_ram2M);
+		PicoMemResetCD(Pico_mcd->s68k_regs[3]);
 #ifdef _ASM_CD_MEMORY_C
-	if (Pico_mcd->s68k_regs[3]&4)
-		PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
+		if (Pico_mcd->s68k_regs[3]&4)
+			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;
+		if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
+			cdda_start_play();
+		// restore hint vector
+        	*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
+	}
 
 	return 0;
 }
@@ -265,7 +298,8 @@ int PicoCdLoadStateGfx(void *file)
 
 	g_read_offs = 0;
 	CHECKED_READ(8, buff);
-	if (strncmp(buff, "PicoSMCD", 8)) R_ERROR_RETURN("bad header");
+	if (strncmp((char *)buff, "PicoSMCD", 8) && strncmp((char *)buff, "PicoSEXT", 8))
+		R_ERROR_RETURN("bad header");
 	CHECKED_READ(4, &ver);
 
 	while (!areaEof(file) && found < 4)
@@ -273,7 +307,8 @@ int PicoCdLoadStateGfx(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?");
+		if (buff[0] > CHUNK_FM && buff[0] <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))
+			R_ERROR_RETURN("cd chunk in non CD state?");
 
 		switch (buff[0])
 		{