region detection, cd states wip, fixes, stuff

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index bd21a56..1f201f4 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -11,11 +11,12 @@
 #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
 int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
+int PicoAutoRgnOrder = 0;\r
 int emustatus = 0;\r
 void (*PicoWriteSound)(void) = 0; // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
 \r
@@ -36,9 +37,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 +64,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
@@ -105,9 +107,12 @@ int PicoReset(int hard)
       c=region>>(i<<3); c&=0xff;\r
       if (c<=' ') continue;\r
 \r
-           if (c=='J') support|=1;\r
-      else if (c=='U') support|=4;\r
-      else if (c=='E') support|=8;\r
+           if (c=='J')  support|=1;\r
+      else if (c=='U')  support|=4;\r
+      else if (c=='E')  support|=8;\r
+      else if (c=='j') {support|=1; break; }\r
+      else if (c=='u') {support|=4; break; }\r
+      else if (c=='e') {support|=8; break; }\r
       else\r
       {\r
         // New style code:\r
@@ -118,6 +123,13 @@ int PicoReset(int hard)
     }\r
   }\r
 \r
+  // auto detection order override\r
+  if (PicoAutoRgnOrder) {\r
+         if (((PicoAutoRgnOrder>>0)&0xf) & support) support = (PicoAutoRgnOrder>>0)&0xf;\r
+    else if (((PicoAutoRgnOrder>>4)&0xf) & support) support = (PicoAutoRgnOrder>>4)&0xf;\r
+    else if (((PicoAutoRgnOrder>>8)&0xf) & support) support = (PicoAutoRgnOrder>>8)&0xf;\r
+  }\r
+\r
   // Try to pick the best hardware value for English/50hz:\r
        if (support&8) { hw=0xc0; pal=1; } // Europe\r
   else if (support&4)   hw=0x80;          // USA\r
@@ -237,31 +249,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