#include "sound/ym2612.h"\r
\r
struct Pico Pico;\r
+struct PicoMem PicoMem;\r
int PicoOpt; \r
int PicoSkipFrame; // skip rendering frame?\r
int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
int PicoAutoRgnOrder;\r
\r
-struct PicoSRAM SRam;\r
int emustatus; // rapid_ym2612, multi_ym_updates\r
\r
-struct PicoTiming timing;\r
-\r
void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware\r
void (*PicoResetHook)(void) = NULL;\r
void (*PicoLineHook)(void) = NULL;\r
{\r
// Blank space for state:\r
memset(&Pico,0,sizeof(Pico));\r
+ memset(&PicoMem,0,sizeof(PicoMem));\r
memset(&PicoPad,0,sizeof(PicoPad));\r
memset(&PicoPadInt,0,sizeof(PicoPadInt));\r
\r
- Pico.est.Pico_video = &Pico.video;\r
- Pico.est.Pico_vram = Pico.vram;\r
+ Pico.est.Pico = &Pico;\r
+ Pico.est.PicoMem_vram = PicoMem.vram;\r
+ Pico.est.PicoMem_cram = PicoMem.cram;\r
Pico.est.PicoOpt = &PicoOpt;\r
\r
// Init CPUs:\r
PicoCartUnload();\r
z80_exit();\r
\r
- if (SRam.data)\r
- free(SRam.data);\r
+ if (Pico.sv.data)\r
+ free(Pico.sv.data);\r
pevt_dump();\r
}\r
\r
void PicoPower(void)\r
{\r
Pico.m.frame_count = 0;\r
- SekCycleCnt = SekCycleAim = 0;\r
+ Pico.t.m68c_cnt = Pico.t.m68c_aim = 0;\r
\r
// clear all memory of the emulated machine\r
- memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);\r
+ memset(&PicoMem,0,sizeof(PicoMem));\r
\r
memset(&Pico.video,0,sizeof(Pico.video));\r
memset(&Pico.m,0,sizeof(Pico.m));\r
z80_reset();\r
\r
// my MD1 VA6 console has this in IO\r
- Pico.ioports[1] = Pico.ioports[2] = Pico.ioports[3] = 0xff;\r
+ PicoMem.ioports[1] = PicoMem.ioports[2] = PicoMem.ioports[3] = 0xff;\r
\r
// default VDP register values (based on Fusion)\r
Pico.video.reg[0] = Pico.video.reg[1] = 0x04;\r
\r
// reset sram state; enable sram access by default if it doesn't overlap with ROM\r
Pico.m.sram_reg = 0;\r
- if ((SRam.flags & SRF_EEPROM) || Pico.romsize <= SRam.start)\r
+ if ((Pico.sv.flags & SRF_EEPROM) || Pico.romsize <= Pico.sv.start)\r
Pico.m.sram_reg |= SRR_MAPPED;\r
\r
- if (SRam.flags & SRF_ENABLED)\r
- elprintf(EL_STATUS, "sram: %06x - %06x; eeprom: %i", SRam.start, SRam.end,\r
- !!(SRam.flags & SRF_EEPROM));\r
+ if (Pico.sv.flags & SRF_ENABLED)\r
+ elprintf(EL_STATUS, "sram: %06x - %06x; eeprom: %i", Pico.sv.start, Pico.sv.end,\r
+ !!(Pico.sv.flags & SRF_EEPROM));\r
\r
return 0;\r
}\r
\r
elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%u]",\r
Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());\r
- //dprintf("~aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);\r
+ //dprintf("~aim: %i, cnt: %i", Pico.t.m68c_aim, Pico.t.m68c_cnt);\r
return burn;\r
}\r
\r
int m68k_cnt;\r
int cnt;\r
\r
- m68k_cnt = m68k_cycles_done - timing.m68c_frame_start;\r
- timing.z80c_aim = cycles_68k_to_z80(m68k_cnt);\r
- cnt = timing.z80c_aim - timing.z80c_cnt;\r
+ m68k_cnt = m68k_cycles_done - Pico.t.m68c_frame_start;\r
+ Pico.t.z80c_aim = cycles_68k_to_z80(m68k_cnt);\r
+ cnt = Pico.t.z80c_aim - Pico.t.z80c_cnt;\r
\r
pprof_start(z80);\r
\r
elprintf(EL_BUSREQ, "z80 sync %i (%u|%u -> %u|%u)", cnt,\r
- timing.z80c_cnt, timing.z80c_cnt * 15 / 7 / 488,\r
- timing.z80c_aim, timing.z80c_aim * 15 / 7 / 488);\r
+ Pico.t.z80c_cnt, Pico.t.z80c_cnt * 15 / 7 / 488,\r
+ Pico.t.z80c_aim, Pico.t.z80c_aim * 15 / 7 / 488);\r
\r
if (cnt > 0)\r
- timing.z80c_cnt += z80_run(cnt);\r
+ Pico.t.z80c_cnt += z80_run(cnt);\r
\r
pprof_end(z80);\r
}\r