1.32 release

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 5fd1557..104aef0 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -71,12 +71,15 @@ int PicoReset(int hard)
   else PicoMemSetup();\r
   PicoMemReset();\r
   SekReset();\r
+  // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
+  SekSetRealTAS(PicoMCD & 1);\r
   SekCycleCntT=0;\r
   z80_reset();\r
 \r
   // reset VDP state, VRAM and PicoMisc\r
   //memset(&Pico.video,0,sizeof(Pico.video));\r
   //memset(&Pico.vram,0,sizeof(Pico.vram));\r
+  memset(Pico.ioports,0,sizeof(Pico.ioports)); // needed for MCD to reset properly\r
   memset(&Pico.m,0,sizeof(Pico.m));\r
   Pico.video.pending_ints=0;\r
   emustatus = 0;\r
@@ -146,7 +149,6 @@ int PicoReset(int hard)
 \r
   if (PicoMCD & 1) {\r
     PicoResetMCD(hard);\r
-    SRam.data = 0;\r
     return 0;\r
   }\r
 \r
@@ -192,6 +194,8 @@ int PicoReset(int hard)
     // Dino Dini's Soccer malfunctions if SRAM is not filled with 0xff\r
     if (strncmp((char *)Pico.rom+0x150, "IDOND NI'I", 10) == 0)\r
       memset(SRam.data, 0xff, sram_size);\r
+    dprintf("sram: det: %i; eeprom: %i; start: %06x; end: %06x\n",\r
+      (Pico.m.sram_reg>>4)&1, (Pico.m.sram_reg>>2)&1, SRam.start, SRam.end);\r
   }\r
 \r
   Pico.m.sram_reg = SRam.reg_back; // restore sram_reg\r
@@ -427,11 +431,18 @@ static int PicoFrameHints(void)
       getSamples(y);\r
 \r
     // Run scanline:\r
-    if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();\r
+    if (Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();\r
     SekRun(cycles_68k);\r
-    if((PicoOpt&4) && Pico.m.z80Run) {\r
-      Pico.m.z80Run|=2;\r
-      z80CycleAim+=cycles_z80;\r
+    if ((PicoOpt&4) && Pico.m.z80Run) {\r
+      if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80;\r
+      else {\r
+        int cnt = SekCyclesDone() - z80startCycle;\r
+        cnt = (cnt>>1)-(cnt>>5);\r
+        //if (cnt > cycles_z80) printf("FIXME: z80 cycles: %i\n", cnt);\r
+        if (cnt > cycles_z80) cnt = cycles_z80;\r
+        Pico.m.z80Run |= 2;\r
+        z80CycleAim+=cnt;\r
+      }\r
       total_z80+=z80_run(z80CycleAim-total_z80);\r
     }\r
   }\r
@@ -483,7 +494,13 @@ static int PicoFrameSimple(void)
   int y=0,line=0,lines=0,lines_step=0,sects;\r
   int cycles_68k_vblock,cycles_68k_block;\r
 \r
-  if(Pico.m.pal) {\r
+  // we don't emulate DMA timing in this mode\r
+  if (Pico.m.dma_bytes) {\r
+    Pico.m.dma_bytes=0;\r
+    Pico.video.status&=~2;\r
+  }\r
+\r
+  if (Pico.m.pal) {\r
     // M68k cycles/frame: 152009.78\r
     if(pv->reg[1]&8) { // 240 lines\r
       cycles_68k_block  = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 15 + 0.4); // 16 sects, 16*15=240, 7308\r