X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcd%2Fmcd.c;h=af320bd00723e3e4b783c72269f9319d34e8131d;hb=24aab4da7352b5cecad4e09b0dcc0807b14786f2;hp=82ae1bc663e5634a1d3c1f6a90b9c20f02f83a87;hpb=ba6e8bfd4b707aab042e47bc3e2a14f70be01075;p=picodrive.git

diff --git a/pico/cd/mcd.c b/pico/cd/mcd.c
index 82ae1bc..af320bd 100644
--- a/pico/cd/mcd.c
+++ b/pico/cd/mcd.c
@@ -11,7 +11,9 @@
 
 extern unsigned char formatted_bram[4*0x10];
 
-static unsigned int m68k_cycle_mult;
+static unsigned int mcd_m68k_cycle_mult;
+static unsigned int mcd_m68k_cycle_base;
+static unsigned int mcd_s68k_cycle_base;
 
 void (*PicoMCDopenTray)(void) = NULL;
 void (*PicoMCDcloseTray)(void) = NULL;
@@ -20,58 +22,102 @@ void (*PicoMCDcloseTray)(void) = NULL;
 PICO_INTERNAL void PicoInitMCD(void)
 {
   SekInitS68k();
-  Init_CD_Driver();
 }
 
 PICO_INTERNAL void PicoExitMCD(void)
 {
-  End_CD_Driver();
 }
 
 PICO_INTERNAL void PicoPowerMCD(void)
 {
-  int fmt_size = sizeof(formatted_bram);
+  int fmt_size;
+
+  SekCycleCntS68k = SekCycleAimS68k = 0;
+
+  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
+  cdc_init();
+  gfx_init();
+
+  // 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)
+{
+  elprintf(EL_CD, "cd: soft reset");
 
-  Reset_CD();
-  LC89510_Reset();
-  gfx_cd_reset();
+  Pico_mcd->m.s68k_pend_ints = 0;
+  cdc_reset();
+  cdd_reset();
 #ifdef _ASM_CD_MEMORY_C
   //PicoMemResetCDdecode(1); // don't have to call this in 2M mode
 #endif
 
-  // use SRam.data for RAM cart
+  memset(&Pico_mcd->s68k_regs[0x38], 0, 9);
+  Pico_mcd->s68k_regs[0x38+9] = 0x0f;  // default checksum
+
+  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 Pico.sv.data for RAM cart
   if (PicoOpt & POPT_EN_MCD_RAMCART) {
-    if (SRam.data == NULL)
-      SRam.data = calloc(1, 0x12000);
+    if (Pico.sv.data == NULL)
+      Pico.sv.data = calloc(1, 0x12000);
   }
-  else if (SRam.data != NULL) {
-    free(SRam.data);
-    SRam.data = NULL;
+  else if (Pico.sv.data != NULL) {
+    free(Pico.sv.data);
+    Pico.sv.data = NULL;
   }
-  SRam.start = SRam.end = 0; // unused
-
-  pcd_event_schedule(0, PCD_EVENT_CDC, 12500000/75);
+  Pico.sv.start = Pico.sv.end = 0; // unused
 
   return 0;
 }
 
-static __inline void SekRunS68k(unsigned int to)
+static void SekRunM68kOnce(void)
+{
+  int cyc_do;
+  pevt_log_m68k_o(EVT_RUN_START);
+
+  if ((cyc_do = Pico.t.m68c_aim - Pico.t.m68c_cnt) > 0) {
+    Pico.t.m68c_cnt += cyc_do;
+
+#if defined(EMU_C68K)
+    PicoCpuCM68k.cycles = cyc_do;
+    CycloneRun(&PicoCpuCM68k);
+    Pico.t.m68c_cnt -= PicoCpuCM68k.cycles;
+#elif defined(EMU_M68K)
+    Pico.t.m68c_cnt += m68k_execute(cyc_do) - cyc_do;
+#elif defined(EMU_F68K)
+    Pico.t.m68c_cnt += fm68k_emulate(cyc_do, 0) - cyc_do;
+#endif
+  }
+
+  SekCyclesLeft = 0;
+
+  SekTrace(0);
+  pevt_log_m68k_o(EVT_RUN_END);
+}
+
+static void SekRunS68k(unsigned int to)
 {
   int cyc_do;
 
@@ -79,6 +125,9 @@ static __inline void SekRunS68k(unsigned int to)
   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;
@@ -90,22 +139,43 @@ static __inline void SekRunS68k(unsigned int to)
   m68k_set_context(&PicoCpuMM68k);
 #elif defined(EMU_F68K)
   g_m68kcontext = &PicoCpuFS68k;
-  SekCycleCntS68k += fm68k_emulate(cyc_do, 0, 0) - cyc_do;
+  SekCycleCntS68k += fm68k_emulate(cyc_do, 0) - cyc_do;
   g_m68kcontext = &PicoCpuFM68k;
 #endif
 }
 
+static void pcd_set_cycle_mult(void)
+{
+  // ~1.63 for NTSC, ~1.645 for PAL
+  if (Pico.m.pal)
+    mcd_m68k_cycle_mult = ((12500000ull << 16) / (50*313*488));
+  else
+    mcd_m68k_cycle_mult = ((12500000ull << 16) / (60*262*488)) + 1;
+}
 
 unsigned int pcd_cycles_m68k_to_s68k(unsigned int c)
 {
-  return (long long)c * m68k_cycle_mult >> 16;
+  return (long long)c * mcd_m68k_cycle_mult >> 16;
 }
 
 /* events */
 static void pcd_cdc_event(unsigned int now)
 {
   // 75Hz CDC update
-  Check_CD_Command();
+  cdd_update();
+
+  /* check if a new CDD command has been processed */
+  if (!(Pico_mcd->s68k_regs[0x4b] & 0xf0))
+  {
+    /* reset CDD command wait flag */
+    Pico_mcd->s68k_regs[0x4b] = 0xf0;
+
+    if (Pico_mcd->s68k_regs[0x33] & PCDS_IEN4) {
+      elprintf(EL_INTS|EL_CD, "s68k: cdd irq 4");
+      SekInterruptS68k(4);
+    }
+  }
+
   pcd_event_schedule(now, PCD_EVENT_CDC, 12500000/75);
 }
 
@@ -121,23 +191,9 @@ static void pcd_int3_timer_event(unsigned int now)
       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;
-	Update_CDC_TRansfer(ddx);
+  cdc_dma_update();
 }
 
 typedef void (event_cb)(unsigned int now);
@@ -146,10 +202,10 @@ typedef void (event_cb)(unsigned int now);
 unsigned int pcd_event_times[PCD_EVENT_COUNT];
 static unsigned int event_time_next;
 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_DMA]      = pcd_dma_event,
+  pcd_cdc_event,            // PCD_EVENT_CDC
+  pcd_int3_timer_event,     // PCD_EVENT_TIMER3
+  gfx_update,               // PCD_EVENT_GFX
+  pcd_dma_event,            // PCD_EVENT_DMA
 };
 
 void pcd_event_schedule(unsigned int now, enum pcd_event event, int after)
@@ -222,14 +278,17 @@ static void pcd_run_events(unsigned int until)
 int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync)
 {
   #define now SekCycleCntS68k
-  unsigned int s68k_target =
-    (unsigned long long)m68k_target * m68k_cycle_mult >> 16;
+  unsigned int s68k_target;
   unsigned int target;
 
+  target = m68k_target - mcd_m68k_cycle_base;
+  s68k_target = mcd_s68k_cycle_base +
+    ((unsigned long long)target * mcd_m68k_cycle_mult >> 16);
+
   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;
@@ -257,31 +316,41 @@ int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync)
 
 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()) {
-    int s68k_left = pcd_sync_s68k(SekCycleAim, 1);
+  Pico.t.m68c_aim += m68k_cycles;
+  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(Pico.t.m68c_aim, 1);
     if (s68k_left <= 0) {
       elprintf(EL_CDPOLL, "m68k poll [%02x] x%d @%06x",
         Pico_mcd->m.m68k_poll_a, Pico_mcd->m.m68k_poll_cnt, SekPc);
-      SekCycleCnt = SekCycleAim;
+      Pico.t.m68c_cnt = Pico.t.m68c_aim;
       return;
     }
-    SekCycleCnt = SekCycleAim - (s68k_left * 40220 >> 16);
+    Pico.t.m68c_cnt = Pico.t.m68c_aim - (s68k_left * 40220 >> 16);
   }
 
-  SekSyncM68k();
+  while (CYCLES_GT(Pico.t.m68c_aim, Pico.t.m68c_cnt)) {
+    SekRunM68kOnce();
+    if (Pico_mcd->m.need_sync) {
+      Pico_mcd->m.need_sync = 0;
+      pcd_sync_s68k(Pico.t.m68c_cnt, 0);
+    }
+  }
 }
 
-static inline void pcd_run_cpus_lockstep(int m68k_cycles)
+void pcd_run_cpus_lockstep(int m68k_cycles)
 {
-  unsigned int target = SekCycleAim + m68k_cycles;
+  unsigned int target = Pico.t.m68c_aim + m68k_cycles;
   do {
-    SekCycleAim += 8;
+    Pico.t.m68c_aim += 8;
     SekSyncM68k();
-    pcd_sync_s68k(SekCycleAim, 0);
-  } while (CYCLES_GT(target, SekCycleAim));
+    pcd_sync_s68k(Pico.t.m68c_aim, 0);
+  } while (CYCLES_GT(target, Pico.t.m68c_aim));
+
+  Pico.t.m68c_aim = target;
 }
 
 #define PICO_CD
@@ -291,17 +360,21 @@ static inline void pcd_run_cpus_lockstep(int m68k_cycles)
 #include "../pico_cmn.c"
 
 
-PICO_INTERNAL void PicoFrameMCD(void)
+void pcd_prepare_frame(void)
 {
-  if (!(PicoOpt&POPT_ALT_RENDERER))
-    PicoFrameStart();
+  pcd_set_cycle_mult();
 
-  // ~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;
+  // need this because we can't have direct mapping between
+  // master<->slave cycle counters because of overflows
+  mcd_m68k_cycle_base = Pico.t.m68c_aim;
+  mcd_s68k_cycle_base = SekCycleAimS68k;
+}
 
+PICO_INTERNAL void PicoFrameMCD(void)
+{
+  PicoFrameStart();
+
+  pcd_prepare_frame();
   PicoFrameHints();
 }
 
@@ -310,10 +383,16 @@ void pcd_state_loaded(void)
   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;
+  Pico_mcd->pcm_regs_dirty = 1;
+
   // old savestates..
-  cycles = pcd_cycles_m68k_to_s68k(SekCycleAim);
+  cycles = pcd_cycles_m68k_to_s68k(Pico.t.m68c_aim);
   diff = cycles - SekCycleAimS68k;
   if (diff < -1000 || diff > 1000) {
     SekCycleCntS68k = SekCycleAimS68k = cycles;
@@ -324,16 +403,15 @@ void pcd_state_loaded(void)
     if (Pico_mcd->s68k_regs[0x31])
       pcd_event_schedule(SekCycleAimS68k, PCD_EVENT_TIMER3,
         Pico_mcd->s68k_regs[0x31] * 384);
-
-    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)
-        SekInterruptS68k(1);
-    }
-    if (Pico_mcd->scd.Status_CDC & 0x08)
-	    Update_CDC_TRansfer(Pico_mcd->s68k_regs[4] & 7);
   }
+
+  diff = cycles - Pico_mcd->pcm.update_cycles;
+  if ((unsigned int)diff > 12500000/50)
+    Pico_mcd->pcm.update_cycles = cycles;
+
+  // reschedule
+  event_time_next = 0;
+  pcd_run_events(SekCycleCntS68k);
 }
 
 // vim:shiftwidth=2:ts=2:expandtab