optimizations, fixes, hacks, psp, ...

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

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index bd8d157..aba08e3 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"
@@ -46,6 +42,7 @@ typedef enum {
 
 
 static char *chunk_names[] = {
+       "INVALID!",
        "Saving.. M68K state",
        "Saving.. RAM",
        "Saving.. VRAM",
@@ -92,7 +89,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();
@@ -167,12 +164,16 @@ static int g_read_offs = 0;
        g_read_offs += len;
 
 #define CHECKED_READ2(len2,data) \
-       if (len2 != len) R_ERROR_RETURN("unexpected len, wanted " #len2); \
-       CHECKED_READ(len2, data)
+       if (len2 != len) { \
+               printf("unexpected len %i, wanted %i (%s)", len, len2, #len2); \
+               if (len > len2) R_ERROR_RETURN("failed."); \
+               /* else read anyway and hope for the best.. */ \
+       } \
+       CHECKED_READ(len, data)
 
 #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,8 +244,10 @@ int PicoCdLoadState(void *file)
        /* 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]);
+#ifdef _ASM_CD_MEMORY_C
+       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);