amalgamation

[picodrive.git] / Pico / cd / Area.c

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index 073033f..ea4220e 100644 (file)
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -1,9 +1,5 @@
-// This is part of Pico Library
-
-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+// Savestate handling for emulated Sega/Mega CD machine.
+// (c) Copyright 2007, Grazvydas "notaz" Ignotas
 
 
 #include "../PicoInt.h"
@@ -92,7 +88,7 @@ static int write_chunk(chunk_name_e name, int len, void *data, void *file)
        if (PicoStateProgressCB) PicoStateProgressCB(chunk_names[name]); \
        if (!write_chunk(name, sizeof(buff), &buff, file)) return 1;
 
-int PicoCdSaveState(void *file)
+PICO_INTERNAL int PicoCdSaveState(void *file)
 {
        unsigned char buff[0x60];
        void *ym2612_regs = YM2612GetRegs();
@@ -172,7 +168,7 @@ static int g_read_offs = 0;
 
 #define CHECKED_READ_BUFF(buff) CHECKED_READ2(sizeof(buff), &buff);
 
-int PicoCdLoadState(void *file)
+PICO_INTERNAL int PicoCdLoadState(void *file)
 {
        unsigned char buff[0x60];
        int ver, len;
@@ -243,10 +239,50 @@ int PicoCdLoadState(void *file)
        /* after load events */
        if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
                wram_2M_to_1M(Pico_mcd->word_ram2M);
-       mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+#ifdef _ASM_CD_MEMORY_C
+       PicoMemResetCD(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;
 
        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:
+                               areaSeek(file, len, SEEK_CUR);
+                               break;
+               }
+       }
+
+       return 0;
+}
+
+