drop legacy save support

[picodrive.git] / pico / state.c

diff --git a/pico/state.c b/pico/state.c
index f4e685f..fce247a 100644 (file)
--- a/pico/state.c
+++ b/pico/state.c
@@ -78,54 +78,6 @@ static void *open_save_file(const char *fname, int is_save)
   return afile;\r
 }\r
 \r
-// legacy savestate loading\r
-#define SCANP(f, x) areaRead(&Pico.x, sizeof(Pico.x), 1, f)\r
-\r
-static int state_load_legacy(void *file)\r
-{\r
-  unsigned char head[32];\r
-  unsigned char cpu[0x60];\r
-  unsigned char cpu_z80[Z80_STATE_SIZE];\r
-  void *ym2612_regs;\r
-  int ok;\r
-\r
-  memset(&cpu,0,sizeof(cpu));\r
-  memset(&cpu_z80,0,sizeof(cpu_z80));\r
-\r
-  memset(head, 0, sizeof(head));\r
-  areaRead(head, sizeof(head), 1, file);\r
-  if (strcmp((char *)head, "Pico") != 0)\r
-    return -1;\r
-\r
-  elprintf(EL_STATUS, "legacy savestate");\r
-\r
-  // Scan all the memory areas:\r
-  SCANP(file, ram);\r
-  SCANP(file, vram);\r
-  SCANP(file, zram);\r
-  SCANP(file, cram);\r
-  SCANP(file, vsram);\r
-\r
-  // Pack, scan and unpack the cpu data:\r
-  areaRead(cpu, sizeof(cpu), 1, file);\r
-  SekUnpackCpu(cpu, 0);\r
-\r
-  SCANP(file, m);\r
-  SCANP(file, video);\r
-\r
-  ok = areaRead(cpu_z80, sizeof(cpu_z80), 1, file) == sizeof(cpu_z80);\r
-  // do not unpack if we fail to load z80 state\r
-  if (!ok) z80_reset();\r
-  else     z80_unpack(cpu_z80);\r
-\r
-  ym2612_regs = YM2612GetRegs();\r
-  areaRead(sn76496_regs, 28*4, 1, file);\r
-  areaRead(ym2612_regs, 0x200+4, 1, file);\r
-  ym2612_unpack_state();\r
-\r
-  return 0;\r
-}\r
-\r
 // ---------------------------------------------------------------------------\r
 \r
 typedef enum {\r
@@ -610,6 +562,9 @@ readend:
     pcd_state_loaded();\r
   }\r
 \r
+  Pico.m.dirtyPal = 1;\r
+  Pico.video.status &= ~(SR_VB | SR_F);\r
+\r
   retval = 0;\r
 \r
 out:\r
@@ -679,16 +634,8 @@ static int pico_state_internal(void *afile, int is_save)
 \r
   if (is_save)\r
     ret = state_save(afile);\r
-  else {\r
+  else\r
     ret = state_load(afile);\r
-    if (ret != 0) {\r
-      areaSeek(afile, 0, SEEK_SET);\r
-      ret = state_load_legacy(afile);\r
-    }\r
-\r
-    Pico.m.dirtyPal = 1;\r
-    Pico.video.status &= ~(SR_VB | SR_F);\r
-  }\r
 \r
   return ret;\r
 }\r