CHUNK_SDRAM,\r
CHUNK_DRAM,\r
CHUNK_32XPAL,\r
+ CHUNK_32X_EVT,\r
+ CHUNK_32X_FIRST = CHUNK_MSH2,\r
+ CHUNK_32X_LAST = CHUNK_32X_EVT,\r
//\r
CHUNK_DEFAULT_COUNT,\r
CHUNK_CARTHW_ = CHUNK_CARTHW, // defined in PicoInt\r
"SDRAM",\r
"DRAM",\r
"PAL",\r
+ "events",\r
};\r
\r
static int write_chunk(chunk_name_e name, int len, void *data, void *file)\r
CHECKED_WRITE_BUFF(CHUNK_DRAM, Pico32xMem->dram);\r
CHECKED_WRITE_BUFF(CHUNK_32XPAL, Pico32xMem->pal);\r
\r
- sh2s[0].m68krcycles_done = sh2s[1].m68krcycles_done = SekCycleCnt;\r
+ memset(buff, 0, 0x40);\r
+ memcpy(buff, event_times, sizeof(event_times));\r
+ CHECKED_WRITE(CHUNK_32X_EVT, 0x40, buff);\r
}\r
#endif\r
\r
unsigned char buff_m68k[0x60], buff_s68k[0x60];\r
unsigned char buff_z80[Z80_STATE_SIZE];\r
unsigned char buff_sh2[SH2_STATE_SIZE];\r
+ unsigned char buff[0x40];\r
unsigned char chunk;\r
void *ym2612_regs;\r
char header[8];\r
if (len < 0 || len > 1024*512) R_ERROR_RETURN("bad length");\r
if (CHUNK_S68K <= chunk && chunk <= CHUNK_MISC_CD && !(PicoAHW & PAHW_MCD))\r
R_ERROR_RETURN("cd chunk in non CD state?");\r
- if (CHUNK_MSH2 <= chunk && chunk <= CHUNK_32XPAL && !(PicoAHW & PAHW_32X))\r
- R_ERROR_RETURN("32x chunk in non 32x state?");\r
+ if (CHUNK_32X_FIRST <= chunk && chunk <= CHUNK_32X_LAST && !(PicoAHW & PAHW_32X))\r
+ Pico32xStartup();\r
\r
switch (chunk)\r
{\r
case CHUNK_SDRAM: CHECKED_READ_BUFF(Pico32xMem->sdram); break;\r
case CHUNK_DRAM: CHECKED_READ_BUFF(Pico32xMem->dram); break;\r
case CHUNK_32XPAL: CHECKED_READ_BUFF(Pico32xMem->pal); break;\r
+\r
+ case CHUNK_32X_EVT:\r
+ CHECKED_READ_BUFF(buff);\r
+ memcpy(event_times, buff, sizeof(event_times));\r
+ break;\r
#endif\r
default:\r
if (carthw_chunks != NULL)\r
\r
if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
cdda_start_play();\r
-\r
- SekUnpackCpu(buff_s68k, 1);\r
}\r
\r
+ if (PicoAHW & PAHW_32X)\r
+ Pico32xStateLoaded(1);\r
+\r
// must unpack 68k and z80 after banks are set up\r
if (!(PicoAHW & PAHW_SMS))\r
SekUnpackCpu(buff_m68k, 0);\r
+ if (PicoAHW & PAHW_MCD)\r
+ SekUnpackCpu(buff_s68k, 1);\r
\r
z80_unpack(buff_z80);\r
\r
+ // due to dep from 68k cycles..\r
if (PicoAHW & PAHW_32X)\r
- Pico32xStateLoaded();\r
+ Pico32xStateLoaded(0);\r
\r
return 0;\r
}\r