X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcarthw%2Fsvp%2Fsvp.c;h=c50eb8504bdf46b084a7b3fc5a8b9f9ac72538ee;hb=93f9619ed819dee07948416c98ca2f1c70a22666;hp=38e7a4f5ba929935f7b07d315f6815e5b3abea29;hpb=d4d626658a7a999f48009f408b4a22d280ab80ea;p=picodrive.git

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 38e7a4f..c50eb85 100644
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -26,12 +26,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../../pico_int.h"
-#include "../../cpu/drc/cmn.h"
+#include <pico/pico_int.h>
+#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 */
@@ -56,8 +57,8 @@ static void PicoSVPReset(void)
 
 	memcpy(svp->iram_rom + 0x800, Pico.rom + 0x800, 0x20000 - 0x800);
 	ssp1601_reset(&svp->ssp1601);
-#ifdef __arm__
-	if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
+#ifdef _SVP_DRC
+	if ((PicoIn.opt & POPT_EN_DRC) && svp_dyn_ready)
 		ssp1601_dyn_reset(&svp->ssp1601);
 #endif
 }
@@ -76,38 +77,35 @@ static void PicoSVPLine(void)
 	delay_lines = 0;
 #endif
 
-#ifdef __arm__
-	if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
-		ssp1601_dyn_run(PicoSVPCycles * count);
+#ifdef _SVP_DRC
+	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;
 }
 
 
-static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp)
+static int PicoSVPDma(unsigned int source, int len, unsigned short **base, unsigned int *mask)
 {
 	if (source < Pico.romsize) // Rom
 	{
-		source -= 2;
-		*srcp = (unsigned short *)(Pico.rom + (source&~1));
-		*limitp = (unsigned short *)(Pico.rom + Pico.romsize);
-		return 1;
+		*base = (unsigned short *)(Pico.rom + (source & 0xfe0000));
+		*mask = 0x1ffff;
+		return source - 2;
 	}
 	else if ((source & 0xfe0000) == 0x300000)
 	{
 		elprintf(EL_VDPDMA|EL_SVP, "SVP DmaSlow from %06x, len=%i", source, len);
-		source &= 0x1fffe;
-		source -= 2;
-		*srcp = (unsigned short *)(svp->dram + source);
-		*limitp = (unsigned short *)(svp->dram + sizeof(svp->dram));
-		return 1;
+		*base = (unsigned short *)svp->dram;
+		*mask = 0x1ffff;
+		return source - 2;
 	}
 	else
 		elprintf(EL_VDPDMA|EL_SVP|EL_ANOMALY, "SVP FIXME unhandled DmaSlow from %06x, len=%i", source, len);
@@ -118,7 +116,7 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 void PicoSVPInit(void)
 {
-#ifdef __arm__
+#ifdef _SVP_DRC
 	// this is to unmap tcache and make
 	// mem available for large ROMs, MCD, etc.
 	drc_cmn_cleanup();
@@ -127,7 +125,7 @@ void PicoSVPInit(void)
 
 static void PicoSVPExit(void)
 {
-#ifdef __arm__
+#ifdef _SVP_DRC
 	ssp1601_dyn_exit();
 #endif
 }
@@ -150,8 +148,8 @@ void PicoSVPStartup(void)
 
 	// init SVP compiler
 	svp_dyn_ready = 0;
-#ifdef __arm__
-	if (PicoOpt & POPT_EN_SVP_DRC) {
+#ifdef _SVP_DRC
+	if (PicoIn.opt & POPT_EN_DRC) {
 		if (ssp1601_dyn_startup())
 			return;
 		svp_dyn_ready = 1;
@@ -170,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;
 }