X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcarthw%2Fsvp%2Fsvp.c;h=8861de04d1164b4c2fe88f89f6f7c1b16c3945f3;hb=a90cc666d08526ada34a87c3e6d9a5312d90be84;hp=8be4e551e5dc510c7ea4035974efbf674c7206b7;hpb=9c9cda8c39bd2a6b99b8420a3034c454bc713954;p=picodrive.git

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 8be4e55..8861de0 100644
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -57,7 +57,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_SVP_DRC) && svp_dyn_ready)
+	if ((PicoOpt & POPT_EN_DRC) && svp_dyn_ready)
 		ssp1601_dyn_reset(&svp->ssp1601);
 #endif
 }
@@ -77,7 +77,7 @@ static void PicoSVPLine(void)
 #endif
 
 #ifdef _SVP_DRC
-	if ((PicoOpt&POPT_EN_SVP_DRC) && svp_dyn_ready)
+	if ((PicoOpt & POPT_EN_DRC) && svp_dyn_ready)
 		ssp1601_dyn_run(PicoSVPCycles * count);
 	else
 #endif
@@ -91,23 +91,20 @@ static void PicoSVPLine(void)
 }
 
 
-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);
@@ -151,7 +148,7 @@ void PicoSVPStartup(void)
 	// init SVP compiler
 	svp_dyn_ready = 0;
 #ifdef _SVP_DRC
-	if (PicoOpt & POPT_EN_SVP_DRC) {
+	if (PicoOpt & POPT_EN_DRC) {
 		if (ssp1601_dyn_startup())
 			return;
 		svp_dyn_ready = 1;