Sonic CD runs on GP2X

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index bd21a56..f821cf4 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -11,7 +11,7 @@
 #include "sound/sound.h"\r
 #include "sound/ym2612.h"\r
 \r
-int PicoVer=0x0080;\r
+int PicoVer=0x0110;\r
 struct Pico Pico;\r
 int PicoOpt=0; // disable everything by default\r
 int PicoSkipFrame=0; // skip rendering frame?\r
@@ -36,9 +36,6 @@ int PicoInit(void)
   SekInit();\r
   z80_init(); // init even if we aren't going to use it\r
 \r
-  // Setup memory callbacks:\r
-  PicoMemInit();\r
-\r
   PicoInitMCD();\r
 \r
   // notaz: sram\r
@@ -66,6 +63,10 @@ int PicoReset(int hard)
 \r
   if (Pico.romsize<=0) return 1;\r
 \r
+  // setup correct memory map\r
+  if (PicoMCD & 1)\r
+       PicoMemSetupCD();\r
+  else PicoMemSetup();\r
   PicoMemReset();\r
   SekReset();\r
   SekCycleCntT=0;\r
@@ -237,31 +238,6 @@ static __inline void SekRun(int cyc)
 {\r
   int cyc_do;\r
   SekCycleAim+=cyc;\r
-#if 0\r
-  if(Pico.m.dma_bytes) {\r
-    int burn=0;\r
-    if((Pico.video.status&8)||!(Pico.video.reg[1]&0x40)) { // vblank?\r
-      if(Pico.m.dma_bytes < 205) {\r
-       burn = Pico.m.dma_bytes*(((488<<8)/205))>>8;\r
-       Pico.m.dma_bytes = 0;\r
-      } else {\r
-        burn += 488;\r
-       Pico.m.dma_bytes -= 205;\r
-      }\r
-    } else {\r
-      if(Pico.m.dma_bytes < 18) {\r
-       burn = Pico.m.dma_bytes*(((488<<8)/18))>>8;\r
-       Pico.m.dma_bytes = 0;\r
-      } else {\r
-        burn += 488;\r
-       Pico.m.dma_bytes -= 18;\r
-      }\r
-    }\r
-    SekCycleCnt+=burn;\r
-    dprintf("~DmaSlow %i burn=%i do=%i [%i|%i]", Pico.m.dma_bytes, burn, SekCycleAim-SekCycleCnt,\r
-               Pico.m.scanline, SekCyclesDone());\r
-  }\r
-#endif\r
   //dprintf("aim: %i, cnt: %i", SekCycleAim, SekCycleCnt);\r
   if((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;\r
   //dprintf("cyc_do: %i", cyc_do);\r