recognize the MED ssf2 header

[picodrive.git] / pico / pico.c

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