X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico.c;h=23f7efb2e124a9a0e1f661d632400220f3e9da84;hb=6d28fb5023d53282209ade40fdd30f46905aacbf;hp=6888080be2a22d4e099d3309d938763ab84bd1b1;hpb=8e4e84c2150047dcbe3799083cdfa2a7d5cf9d7b;p=picodrive.git

diff --git a/pico/pico.c b/pico/pico.c
index 6888080..23f7efb 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -36,6 +36,10 @@ void PicoInit(void)
   memset(&PicoPad,0,sizeof(PicoPad));
   memset(&PicoPadInt,0,sizeof(PicoPadInt));
 
+  Pico.est.Pico_video = &Pico.video;
+  Pico.est.Pico_vram = Pico.vram;
+  Pico.est.PicoOpt = &PicoOpt;
+
   // Init CPUs:
   SekInit();
   z80_init(); // init even if we aren't going to use it
@@ -43,6 +47,9 @@ void PicoInit(void)
   PicoInitMCD();
   PicoSVPInit();
   Pico32xInit();
+
+  PicoDrawInit();
+  PicoDraw2Init();
 }
 
 // to be called once on emu exit
@@ -269,7 +276,8 @@ PICO_INTERNAL int CheckDMA(void)
     Pico.m.dma_xfers -= xfers_can;
   }
 
-  elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%i]", Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());
+  elprintf(EL_VDPDMA, "~Dma %i op=%i can=%i burn=%i [%u]",
+    Pico.m.dma_xfers, dma_op1, xfers_can, burn, SekCyclesDone());
   //dprintf("~aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);
   return burn;
 }
@@ -285,8 +293,11 @@ int z80_scanline_cycles;  /* cycles done until z80_scanline */
 /* sync z80 to 68k */
 PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done)
 {
+  int m68k_cnt;
   int cnt;
-  z80_cycle_aim += cycles_68k_to_z80(m68k_cycles_done - last_z80_sync);
+
+  m68k_cnt = m68k_cycles_done - last_z80_sync;
+  z80_cycle_aim += cycles_68k_to_z80(m68k_cnt);
   cnt = z80_cycle_aim - z80_cycle_cnt;
   last_z80_sync = m68k_cycles_done;