PICO_INTERNAL void PicoPowerMCD(void)
{
+ SekCycleCntS68k = SekCycleAimS68k = 0;
+
int fmt_size = sizeof(formatted_bram);
memset(Pico_mcd->prg_ram, 0, sizeof(Pico_mcd->prg_ram));
memset(Pico_mcd->word_ram2M, 0, sizeof(Pico_mcd->word_ram2M));
memset(Pico_mcd->pcm_ram, 0, sizeof(Pico_mcd->pcm_ram));
memset(Pico_mcd->bram, 0, sizeof(Pico_mcd->bram));
- memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size, formatted_bram, fmt_size);
-}
-
-PICO_INTERNAL int PicoResetMCD(void)
-{
+ memcpy(Pico_mcd->bram + sizeof(Pico_mcd->bram) - fmt_size,
+ formatted_bram, fmt_size);
memset(Pico_mcd->s68k_regs, 0, sizeof(Pico_mcd->s68k_regs));
memset(&Pico_mcd->pcm, 0, sizeof(Pico_mcd->pcm));
memset(&Pico_mcd->m, 0, sizeof(Pico_mcd->m));
- memset(Pico_mcd->bios + 0x70, 0xff, 4); // reset hint vector (simplest way to implement reg6)
- Pico_mcd->m.state_flags = 0;
- Pico_mcd->s68k_regs[3] = 1; // 2M word RAM mode with m68k access after reset
-
Reset_CD();
+
+ // cold reset state (tested)
+ Pico_mcd->m.state_flags = PCD_ST_S68K_RST;
+ Pico_mcd->m.busreq = 2; // busreq on, s68k in reset
+ Pico_mcd->s68k_regs[3] = 1; // 2M word RAM mode, m68k access
+ memset(Pico_mcd->bios + 0x70, 0xff, 4);
+}
+
+void pcd_soft_reset(void)
+{
+ // Reset_CD(); // breaks Fahrenheit CD swap
+
LC89510_Reset();
gfx_cd_reset();
#ifdef _ASM_CD_MEMORY_C
//PicoMemResetCDdecode(1); // don't have to call this in 2M mode
#endif
+ pcd_event_schedule_s68k(PCD_EVENT_CDC, 12500000/75);
+
+ // TODO: test if register state/timers change
+}
+
+PICO_INTERNAL int PicoResetMCD(void)
+{
+ // reset button doesn't affect MCD hardware
+
// use SRam.data for RAM cart
if (PicoOpt & POPT_EN_MCD_RAMCART) {
if (SRam.data == NULL)
}
SRam.start = SRam.end = 0; // unused
- pcd_event_schedule(0, PCD_EVENT_CDC, 12500000/75);
-
return 0;
}
if ((cyc_do = SekCycleAimS68k - SekCycleCntS68k) <= 0)
return;
+ if (SekShouldInterrupt())
+ Pico_mcd->m.s68k_poll_a = 0;
+
SekCycleCntS68k += cyc_do;
#if defined(EMU_C68K)
PicoCpuCS68k.cycles = cyc_do;
#endif
}
+static void pcd_set_cycle_mult(void)
+{
+ // ~1.63 for NTSC, ~1.645 for PAL
+ if (Pico.m.pal)
+ m68k_cycle_mult = ((12500000ull << 16) / (50*312*488));
+ else
+ m68k_cycle_mult = ((12500000ull << 16) / (60*262*488)) + 1;
+}
unsigned int pcd_cycles_m68k_to_s68k(unsigned int c)
{
Pico_mcd->s68k_regs[0x31] * 384);
}
-static void pcd_gfx_event(unsigned int now)
-{
- // update gfx chip
- if (Pico_mcd->rot_comp.Reg_58 & 0x8000) {
- Pico_mcd->rot_comp.Reg_58 &= 0x7fff;
- Pico_mcd->rot_comp.Reg_64 = 0;
- if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN1) {
- elprintf(EL_INTS |EL_CD, "s68k: gfx_cd irq 1");
- SekInterruptS68k(1);
- }
- }
-}
-
static void pcd_dma_event(unsigned int now)
{
int ddx = Pico_mcd->s68k_regs[4] & 7;
static event_cb *pcd_event_cbs[PCD_EVENT_COUNT] = {
[PCD_EVENT_CDC] = pcd_cdc_event,
[PCD_EVENT_TIMER3] = pcd_int3_timer_event,
- [PCD_EVENT_GFX] = pcd_gfx_event,
+ [PCD_EVENT_GFX] = gfx_cd_update,
[PCD_EVENT_DMA] = pcd_dma_event,
};
elprintf(EL_CD, "s68k sync to %u, %u->%u",
m68k_target, now, s68k_target);
- if ((Pico_mcd->m.busreq & 3) != 1) { /* busreq/reset */
+ if (Pico_mcd->m.busreq != 1) { /* busreq/reset */
SekCycleCntS68k = SekCycleAimS68k = s68k_target;
pcd_run_events(m68k_target);
return 0;
static void SekSyncM68k(void);
-static inline void pcd_run_cpus_normal(int m68k_cycles)
+void pcd_run_cpus_normal(int m68k_cycles)
{
SekCycleAim += m68k_cycles;
- if (Pico_mcd->m.m68k_poll_cnt >= 16 && !SekShouldInterrupt()) {
+ if (SekShouldInterrupt() || Pico_mcd->m.m68k_poll_cnt < 12)
+ Pico_mcd->m.m68k_poll_cnt = 0;
+ else if (Pico_mcd->m.m68k_poll_cnt >= 16) {
int s68k_left = pcd_sync_s68k(SekCycleAim, 1);
if (s68k_left <= 0) {
elprintf(EL_CDPOLL, "m68k poll [%02x] x%d @%06x",
SekSyncM68k();
}
-static inline void pcd_run_cpus_lockstep(int m68k_cycles)
+void pcd_run_cpus_lockstep(int m68k_cycles)
{
unsigned int target = SekCycleAim + m68k_cycles;
do {
SekSyncM68k();
pcd_sync_s68k(SekCycleAim, 0);
} while (CYCLES_GT(target, SekCycleAim));
+
+ SekCycleAim = target;
}
#define PICO_CD
if (!(PicoOpt&POPT_ALT_RENDERER))
PicoFrameStart();
- // ~1.63 for NTSC, ~1.645 for PAL
- if (Pico.m.pal)
- m68k_cycle_mult = ((12500000ull << 16) / (50*312*488));
- else
- m68k_cycle_mult = ((12500000ull << 16) / (60*262*488)) + 1;
-
+ pcd_set_cycle_mult();
PicoFrameHints();
}
unsigned int cycles;
int diff;
+ pcd_set_cycle_mult();
pcd_state_loaded_mem();
+ memset(Pico_mcd->pcm_mixbuf, 0, sizeof(Pico_mcd->pcm_mixbuf));
+ Pico_mcd->pcm_mixbuf_dirty = 0;
+ Pico_mcd->pcm_mixpos = 0;
+
// old savestates..
cycles = pcd_cycles_m68k_to_s68k(SekCycleAim);
diff = cycles - SekCycleAimS68k;
if (Pico_mcd->scd.Status_CDC & 0x08)
Update_CDC_TRansfer(Pico_mcd->s68k_regs[4] & 7);
}
+ if (Pico_mcd->pcm.update_cycles == 0)
+ Pico_mcd->pcm.update_cycles = cycles;
+
+ // reschedule
+ event_time_next = 0;
+ pcd_run_events(SekCycleCntS68k);
}
// vim:shiftwidth=2:ts=2:expandtab