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

diff --git a/pico/pico.c b/pico/pico.c
index 6888080..b6a083d 100644
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -12,12 +12,13 @@
 
 struct Pico Pico;
 int PicoOpt;     
-int PicoSkipFrame;     // skip rendering frame?
-int PicoPad[2];        // Joypads, format is MXYZ SACB RLDU
-int PicoPadInt[2];     // internal copy
-int PicoAHW;           // active addon hardware: PAHW_*
-int PicoQuirks;        // game-specific quirks
-int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
+int PicoSkipFrame;          // skip rendering frame?
+int PicoPad[2];             // Joypads, format is MXYZ SACB RLDU
+int PicoPadInt[2];          // internal copy
+int PicoAHW;                // active addon hardware: PAHW_*
+int PicoQuirks;             // game-specific quirks
+int PicoRegionOverride;     // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
+int PicoRegionFPSOverride;  // override the refresh rate of the region 0: Auto, 1: NTSC, 2: PAL
 int PicoAutoRgnOrder;
 
 struct PicoSRAM SRam;
@@ -36,6 +37,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 +48,8 @@ void PicoInit(void)
   PicoInitMCD();
   PicoSVPInit();
   Pico32xInit();
+
+  PicoDrawInit();
 }
 
 // to be called once on emu exit
@@ -91,6 +98,10 @@ void PicoPower(void)
 
 PICO_INTERNAL void PicoDetectRegion(void)
 {
+  // PicoDetectRegion not ready yet
+  if (Pico.romsize <= 0)
+    return;
+
   int support=0, hw=0, i;
   unsigned char pal=0;
 
@@ -143,6 +154,10 @@ PICO_INTERNAL void PicoDetectRegion(void)
   else hw=0x80; // USA
 
   Pico.m.hardware=(unsigned char)(hw|0x20); // No disk attached
+
+  if (PicoRegionFPSOverride > 0)
+    pal = PicoRegionFPSOverride - 1; // pal - 0: NTSC, 1: PAL | PicoRegionFPSOverride - 0: Auto, 1: NTSC, 2: PAL
+    
   Pico.m.pal=pal;
 }
 
@@ -216,9 +231,16 @@ int PicoReset(void)
 // flush config changes before emu loop starts
 void PicoLoopPrepare(void)
 {
-  if (PicoRegionOverride)
+  if (PicoRegionFPSOverride) // PicoRegionFPSOverride is proprietary on PicoRegionOverride
+  {
+    // force setting possibly changed..
+    Pico.m.pal = PicoRegionFPSOverride - 1; // Pico.m.pal - 0: NTSC, 1: PAL | PicoRegionFPSOverride - 0: Auto, 1: NTSC, 2: PAL
+  }
+  else if (PicoRegionOverride)
+  {
     // force setting possibly changed..
     Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;
+  }
 
   // FIXME: PAL has 313 scanlines..
   scanlines_total = Pico.m.pal ? 312 : 262;
@@ -285,8 +307,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;