eliminate texrels (wip)

[picodrive.git] / pico / pico.c

diff --git a/pico/pico.c b/pico/pico.c
index af74dd0..e14c503 100644 (file)
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -12,12 +12,13 @@
 \r
 struct Pico Pico;\r
 int PicoOpt;     \r
-int PicoSkipFrame;     // skip rendering frame?\r
-int PicoPad[2];        // Joypads, format is MXYZ SACB RLDU\r
-int PicoPadInt[2];     // internal copy\r
-int PicoAHW;           // active addon hardware: PAHW_*\r
-int PicoQuirks;        // game-specific quirks\r
-int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
+int PicoSkipFrame;          // skip rendering frame?\r
+int PicoPad[2];             // Joypads, format is MXYZ SACB RLDU\r
+int PicoPadInt[2];          // internal copy\r
+int PicoAHW;                // active addon hardware: PAHW_*\r
+int PicoQuirks;             // game-specific quirks\r
+int PicoRegionOverride;     // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
+int PicoRegionFPSOverride;  // override the refresh rate of the region 0: Auto, 1: NTSC, 2: PAL\r
 int PicoAutoRgnOrder;\r
 \r
 struct PicoSRAM SRam;\r
@@ -36,6 +37,9 @@ 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
+\r
   // Init CPUs:\r
   SekInit();\r
   z80_init(); // init even if we aren't going to use it\r
@@ -61,6 +65,7 @@ void PicoExit(void)
 void PicoPower(void)\r
 {\r
   Pico.m.frame_count = 0;\r
+  SekCycleCnt = SekCycleAim = 0;\r
 \r
   // clear all memory of the emulated machine\r
   memset(&Pico.ram,0,(unsigned char *)&Pico.rom - Pico.ram);\r
@@ -90,6 +95,10 @@ void PicoPower(void)
 \r
 PICO_INTERNAL void PicoDetectRegion(void)\r
 {\r
+  // PicoDetectRegion not ready yet\r
+  if (Pico.romsize <= 0)\r
+    return;\r
+\r
   int support=0, hw=0, i;\r
   unsigned char pal=0;\r
 \r
@@ -142,6 +151,10 @@ PICO_INTERNAL void PicoDetectRegion(void)
   else hw=0x80; // USA\r
 \r
   Pico.m.hardware=(unsigned char)(hw|0x20); // No disk attached\r
+\r
+  if (PicoRegionFPSOverride > 0)\r
+    pal = PicoRegionFPSOverride - 1; // pal - 0: NTSC, 1: PAL | PicoRegionFPSOverride - 0: Auto, 1: NTSC, 2: PAL\r
+    \r
   Pico.m.pal=pal;\r
 }\r
 \r
@@ -167,15 +180,15 @@ int PicoReset(void)
   }\r
 \r
   SekReset();\r
+  // ..but do not reset SekCycle* to not desync with addons\r
+\r
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).\r
   SekSetRealTAS(PicoAHW & PAHW_MCD);\r
-  SekCycleCnt = SekCycleAim = 0;\r
 \r
   Pico.m.dirtyPal = 1;\r
 \r
   Pico.m.z80_bank68k = 0;\r
   Pico.m.z80_reset = 1;\r
-  memset(Pico.zram, 0, sizeof(Pico.zram)); // ??\r
 \r
   PicoDetectRegion();\r
   Pico.video.status = 0x3428 | Pico.m.pal; // 'always set' bits | vblank | collision | pal\r
@@ -215,9 +228,16 @@ int PicoReset(void)
 // flush config changes before emu loop starts\r
 void PicoLoopPrepare(void)\r
 {\r
-  if (PicoRegionOverride)\r
+  if (PicoRegionFPSOverride) // PicoRegionFPSOverride is proprietary on PicoRegionOverride\r
+  {\r
+    // force setting possibly changed..\r
+    Pico.m.pal = PicoRegionFPSOverride - 1; // Pico.m.pal - 0: NTSC, 1: PAL | PicoRegionFPSOverride - 0: Auto, 1: NTSC, 2: PAL\r
+  }\r
+  else if (PicoRegionOverride)\r
+  {\r
     // force setting possibly changed..\r
     Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
+  }\r
 \r
   // FIXME: PAL has 313 scanlines..\r
   scanlines_total = Pico.m.pal ? 312 : 262;\r
@@ -284,8 +304,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
@@ -313,14 +336,13 @@ void PicoFrame(void)
     goto end;\r
   }\r
 \r
-  // TODO: MCD+32X\r
-  if (PicoAHW & PAHW_MCD) {\r
-    PicoFrameMCD();\r
+  if (PicoAHW & PAHW_32X) {\r
+    PicoFrame32x(); // also does MCD+32X\r
     goto end;\r
   }\r
 \r
-  if (PicoAHW & PAHW_32X) {\r
-    PicoFrame32x();\r
+  if (PicoAHW & PAHW_MCD) {\r
+    PicoFrameMCD();\r
     goto end;\r
   }\r
 \r