32x: preliminary PWM implementation. 32x opts in menu

[picodrive.git] / pico / pico.c

diff --git a/pico/pico.c b/pico/pico.c
index ab2302e..54de78c 100644 (file)
--- a/pico/pico.c
+++ b/pico/pico.c
@@ -10,17 +10,18 @@
 #include "pico_int.h"\r
 #include "sound/ym2612.h"\r
 \r
-int PicoVer=0x0133;\r
 struct Pico Pico;\r
-int PicoOpt = 0;\r
-int PicoSkipFrame = 0; // skip rendering frame?\r
-int emustatus = 0;     // rapid_ym2612, multi_ym_updates\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 = 0;       // active addon hardware: scd_active, 32x_active, svp_active, pico_active\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
-struct PicoSRAM SRam = {0,};\r
+int PicoAHW;           // active addon hardware: PAHW_*\r
+int PicoRegionOverride; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
+int PicoAutoRgnOrder;\r
+\r
+struct PicoSRAM SRam;\r
+int emustatus;         // rapid_ym2612, multi_ym_updates\r
+int scanlines_total;\r
 \r
 void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware\r
 void (*PicoResetHook)(void) = NULL;\r
@@ -40,8 +41,7 @@ void PicoInit(void)
 \r
   PicoInitMCD();\r
   PicoSVPInit();\r
-\r
-  SRam.data=0;\r
+  Pico32xInit();\r
 }\r
 \r
 // to be called once on emu exit\r
@@ -52,13 +52,12 @@ void PicoExit(void)
   PicoCartUnload();\r
   z80_exit();\r
 \r
-  if (SRam.data) free(SRam.data); SRam.data=0;\r
+  if (SRam.data)\r
+    free(SRam.data);\r
 }\r
 \r
 void PicoPower(void)\r
 {\r
-  unsigned char sram_status = Pico.m.sram_status; // must be preserved\r
-\r
   Pico.m.frame_count = 0;\r
 \r
   // clear all memory of the emulated machine\r
@@ -78,7 +77,9 @@ void PicoPower(void)
   if (PicoAHW & PAHW_MCD)\r
     PicoPowerMCD();\r
 \r
-  Pico.m.sram_status = sram_status;\r
+  if (PicoOpt & POPT_EN_32X)\r
+    PicoPower32x();\r
+\r
   PicoReset();\r
 }\r
 \r
@@ -141,8 +142,6 @@ PICO_INTERNAL void PicoDetectRegion(void)
 \r
 int PicoReset(void)\r
 {\r
-  unsigned char sram_status = Pico.m.sram_status; // must be preserved\r
-\r
   if (Pico.romsize <= 0)\r
     return 1;\r
 \r
@@ -193,17 +192,37 @@ int PicoReset(void)
   if (!(PicoOpt & POPT_DIS_IDLE_DET))\r
     SekInitIdleDet();\r
 \r
+  if (PicoOpt & POPT_EN_32X) {\r
+    PicoReset32x();\r
+    return 0;\r
+  }\r
+\r
   // reset sram state; enable sram access by default if it doesn't overlap with ROM\r
-  Pico.m.sram_status = sram_status & (SRS_DETECTED|SRS_EEPROM);\r
-  if (!(Pico.m.sram_status & SRS_EEPROM) && Pico.romsize <= SRam.start)\r
-    Pico.m.sram_status |= SRS_MAPPED;\r
+  Pico.m.sram_reg = 0;\r
+  if ((SRam.flags & SRF_EEPROM) || Pico.romsize <= SRam.start)\r
+    Pico.m.sram_reg |= SRR_MAPPED;\r
 \r
-  elprintf(EL_STATUS, "sram: det: %i; eeprom: %i; start: %06x; end: %06x",\r
-    !!(sram_status & SRS_DETECTED), !!(sram_status & SRS_EEPROM), SRam.start, SRam.end);\r
+  if (SRam.flags & SRF_ENABLED)\r
+    elprintf(EL_STATUS, "sram: %06x - %06x; eeprom: %i", SRam.start, SRam.end,\r
+      !!(SRam.flags & SRF_EEPROM));\r
 \r
   return 0;\r
 }\r
 \r
+// flush cinfig changes before emu loop starts\r
+void PicoLoopPrepare(void)\r
+{\r
+  if (PicoRegionOverride)\r
+    // force setting possibly changed..\r
+    Pico.m.pal = (PicoRegionOverride == 2 || PicoRegionOverride == 8) ? 1 : 0;\r
+\r
+  // FIXME: PAL has 313 scanlines..\r
+  scanlines_total = Pico.m.pal ? 312 : 262;\r
+\r
+  if (PicoAHW & PAHW_32X)\r
+    p32x_pwm_refresh();\r
+}\r
+\r
 \r
 // dma2vram settings are just hacks to unglitch Legend of Galahad (needs <= 104 to work)\r
 // same for Outrunners (92-121, when active is set to 24)\r
@@ -301,11 +320,17 @@ void PicoFrame(void)
     return;\r
   }\r
 \r
+  // TODO: MCD+32X\r
   if (PicoAHW & PAHW_MCD) {\r
     PicoFrameMCD();\r
     return;\r
   }\r
 \r
+  if (PicoAHW & PAHW_32X) {\r
+    PicoFrame32x();\r
+    return;\r
+  }\r
+\r
   //if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode\r
 \r
   PicoFrameStart();\r