X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FArea.c;h=b71310486e26740373ec6566df0c426854b967cd;hb=8f8fe01e049d9963523928a910eb4f83aac1da54;hp=ea4220e554ea582eb50c0e1f14d2ca885151c07f;hpb=eff55556cff77fd64cff4be32e449e0a58aed6fe;p=picodrive.git

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index ea4220e..b713104 100644
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -42,6 +42,7 @@ typedef enum {
 
 
 static char *chunk_names[] = {
+	"INVALID!",
 	"Saving.. M68K state",
 	"Saving.. RAM",
 	"Saving.. VRAM",
@@ -149,7 +150,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 "\n", g_read_offs); \
 	return 1; \
 }
 
@@ -163,8 +164,12 @@ 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) { \
+		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.. */ \
+	} \
+	CHECKED_READ(len, data)
 
 #define CHECKED_READ_BUFF(buff) CHECKED_READ2(sizeof(buff), &buff);
 
@@ -230,7 +235,7 @@ 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);
+				elprintf(EL_STATUS, "PicoCdLoadState: skipping unknown chunk %i of size %i\n", buff[0], len);
 				areaSeek(file, len, SEEK_CUR);
 				break;
 		}
@@ -239,8 +244,8 @@ PICO_INTERNAL 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