rearrange globals

[picodrive.git] / pico / carthw / svp / svp.c

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 8861de0..c50eb85 100644 (file)
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -30,8 +30,9 @@
 #include <cpu/drc/cmn.h>
 #include "compiler.h"
 
+#define SVP_CYCLES_LINE 850
+
 svp_t *svp = NULL;
-int PicoSVPCycles = 850; // cycles/line, just a guess
 static int svp_dyn_ready = 0;
 
 /* save state stuff */
@@ -57,7 +58,7 @@ static void PicoSVPReset(void)
        memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
        ssp1601_reset(&svp->ssp1601);
 #ifdef _SVP_DRC
-       if ((PicoOpt & POPT_EN_DRC) && svp_dyn_ready)
+       if ((PicoIn.opt & POPT_EN_DRC) && svp_dyn_ready)
                ssp1601_dyn_reset(&svp->ssp1601);
 #endif
 }
@@ -77,17 +78,17 @@ static void PicoSVPLine(void)
 #endif
 
 #ifdef _SVP_DRC
-       if ((PicoOpt & POPT_EN_DRC) && svp_dyn_ready)
-               ssp1601_dyn_run(PicoSVPCycles * count);
+       if ((PicoIn.opt & POPT_EN_DRC) && svp_dyn_ready)
+               ssp1601_dyn_run(SVP_CYCLES_LINE * count);
        else
 #endif
        {
-               ssp1601_run(PicoSVPCycles * count);
+               ssp1601_run(SVP_CYCLES_LINE * count);
                svp_dyn_ready = 0; // just in case
        }
 
        // test mode
-       //if (Pico.m.frame_count == 13) PicoPad[0] |= 0xff;
+       //if (Pico.m.frame_count == 13) PicoIn.pad[0] |= 0xff;
 }
 
 
@@ -148,7 +149,7 @@ void PicoSVPStartup(void)
        // init SVP compiler
        svp_dyn_ready = 0;
 #ifdef _SVP_DRC
-       if (PicoOpt & POPT_EN_DRC) {
+       if (PicoIn.opt & POPT_EN_DRC) {
                if (ssp1601_dyn_startup())
                        return;
                svp_dyn_ready = 1;
@@ -167,6 +168,6 @@ void PicoSVPStartup(void)
        svp_states[1].ptr = svp->dram;
        svp_states[2].ptr = &svp->ssp1601;
        carthw_chunks = svp_states;
-       PicoAHW |= PAHW_SVP;
+       PicoIn.AHW |= PAHW_SVP;
 }