X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=e2b16a20251e4f22e6de834b18398bb88c9f643c;hb=2270612aa7ee7d04549e95c2ab4d72f6aa67fa8d;hp=3cee0c27238abd0398eae985f295df63474385b1;hpb=7a93adeb29f01f5867ff36606cd73a382b6ee0e3;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 3cee0c2..e2b16a2 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -71,12 +71,15 @@ int PicoReset(int hard)
   else PicoMemSetup();
   PicoMemReset();
   SekReset();
+  // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
+  SekSetRealTAS(PicoMCD & 1);
   SekCycleCntT=0;
   z80_reset();
 
   // reset VDP state, VRAM and PicoMisc
   //memset(&Pico.video,0,sizeof(Pico.video));
   //memset(&Pico.vram,0,sizeof(Pico.vram));
+  memset(Pico.ioports,0,sizeof(Pico.ioports)); // needed for MCD to reset properly
   memset(&Pico.m,0,sizeof(Pico.m));
   Pico.video.pending_ints=0;
   emustatus = 0;
@@ -146,7 +149,6 @@ int PicoReset(int hard)
 
   if (PicoMCD & 1) {
     PicoResetMCD(hard);
-    SRam.data = 0;
     return 0;
   }
 
@@ -192,6 +194,8 @@ int PicoReset(int hard)
     // Dino Dini's Soccer malfunctions if SRAM is not filled with 0xff
     if (strncmp((char *)Pico.rom+0x150, "IDOND NI'I", 10) == 0)
       memset(SRam.data, 0xff, sram_size);
+    dprintf("sram: det: %i; eeprom: %i; start: %06x; end: %06x\n",
+      (Pico.m.sram_reg>>4)&1, (Pico.m.sram_reg>>2)&1, SRam.start, SRam.end);
   }
 
   Pico.m.sram_reg = SRam.reg_back; // restore sram_reg
@@ -427,11 +431,18 @@ static int PicoFrameHints(void)
       getSamples(y);
 
     // Run scanline:
-    if(Pico.m.dma_bytes) SekCycleCnt+=CheckDMA();
+    if (Pico.m.dma_bytes) SekCyclesBurn(CheckDMA());
     SekRun(cycles_68k);
-    if((PicoOpt&4) && Pico.m.z80Run) {
-      Pico.m.z80Run|=2;
-      z80CycleAim+=cycles_z80;
+    if ((PicoOpt&4) && Pico.m.z80Run) {
+      if (Pico.m.z80Run & 2) z80CycleAim+=cycles_z80;
+      else {
+        int cnt = SekCyclesDone() - z80startCycle;
+        cnt = (cnt>>1)-(cnt>>5);
+        //if (cnt > cycles_z80) printf("FIXME: z80 cycles: %i\n", cnt);
+        if (cnt > cycles_z80) cnt = cycles_z80;
+        Pico.m.z80Run |= 2;
+        z80CycleAim+=cnt;
+      }
       total_z80+=z80_run(z80CycleAim-total_z80);
     }
   }
@@ -483,7 +494,13 @@ static int PicoFrameSimple(void)
   int y=0,line=0,lines=0,lines_step=0,sects;
   int cycles_68k_vblock,cycles_68k_block;
 
-  if(Pico.m.pal) {
+  // we don't emulate DMA timing in this mode
+  if (Pico.m.dma_bytes) {
+    Pico.m.dma_bytes=0;
+    Pico.video.status&=~2;
+  }
+
+  if (Pico.m.pal) {
     // M68k cycles/frame: 152009.78
     if(pv->reg[1]&8) { // 240 lines
       cycles_68k_block  = (int) ((double) OSC_PAL  /  7 / 50 / 312 * 15 + 0.4); // 16 sects, 16*15=240, 7308
@@ -636,19 +653,8 @@ int PicoFrame(void)
   return 0;
 }
 
-static int DefaultCram(int cram)
-{
-  int high=0x0841;
-  // Convert 0000bbbb ggggrrrr
-  // to      rrrr1ggg g10bbbb1
-  high|=(cram&0x00f)<<12; // Red
-  high|=(cram&0x0f0)<< 3; // Green
-  high|=(cram&0xf00)>> 7; // Blue
-  return high;
-}
-
-// Function to convert Megadrive Cram into a native colour:
-int (*PicoCram)(int cram)=DefaultCram;
+// callback to output message from emu
+void (*PicoMessage)(const char *msg)=NULL;
 
 #if defined(__DEBUG_PRINT) || defined(WIN32)
 // tmp debug: dump some stuff