lowercasing filenames, part1; makefile adjustments

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

diff --git a/Pico/carthw/svp/svp.c b/Pico/carthw/svp/svp.c
index 6821737..be9414e 100644 (file)
--- a/Pico/carthw/svp/svp.c
+++ b/Pico/carthw/svp/svp.c
@@ -6,14 +6,14 @@
 // For commercial use, separate licencing terms must be obtained.
 
 
-#include "../../PicoInt.h"
+#include "../../pico_int.h"
 #include "compiler.h"
 #ifdef __GP2X__
 #include <sys/mman.h>
 #endif
 
 svp_t *svp = NULL;
-int PicoSVPCycles = 820; // cycles/line, just a guess
+int PicoSVPCycles = 850; // cycles/line, just a guess
 static int svp_dyn_ready = 0;
 
 /* save state stuff */
@@ -38,16 +38,32 @@ static void PicoSVPReset(void)
 
        memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
        ssp1601_reset(&svp->ssp1601);
-       if ((PicoOpt&0x20000) && svp_dyn_ready)
+#ifndef PSP
+       if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
                ssp1601_dyn_reset(&svp->ssp1601);
+#endif
 }
 
 
-static void PicoSVPLine(int count)
+static void PicoSVPLine(void)
 {
-       if ((PicoOpt&0x20000) && svp_dyn_ready)
+       int count = 1;
+#if defined(ARM) || defined(PSP)
+       // performance hack
+       static int delay_lines = 0;
+       delay_lines++;
+       if ((Pico.m.scanline&0xf) != 0xf && Pico.m.scanline != 261 && Pico.m.scanline != 311)
+               return;
+       count = delay_lines;
+       delay_lines = 0;
+#endif
+
+#ifndef PSP
+       if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
                ssp1601_dyn_run(PicoSVPCycles * count);
-       else {
+       else
+#endif
+       {
                ssp1601_run(PicoSVPCycles * count);
                svp_dyn_ready = 0; // just in case
        }
@@ -126,10 +142,12 @@ void PicoSVPStartup(void)
 
        // init SVP compiler
        svp_dyn_ready = 0;
-       if (PicoOpt&0x20000) {
+#ifndef PSP
+       if (PicoOpt&POPT_EN_SVP_DRC) {
                if (ssp1601_dyn_startup()) return;
                svp_dyn_ready = 1;
        }
+#endif
 
        // init ok, setup hooks..
        PicoRead16Hook = PicoSVPRead16;
@@ -145,6 +163,7 @@ void PicoSVPStartup(void)
        svp_states[1].ptr = svp->dram;
        svp_states[2].ptr = &svp->ssp1601;
        carthw_chunks = svp_states;
+       PicoAHW |= PAHW_SVP;
 }