X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcarthw%2Fsvp%2Fsvp.c;h=a3ed89eb52e78517d9a398031fd577ff3ceed08a;hb=4685e5a10e388a9a07f1b11c3c14cce6e4e8ef5b;hp=17d4aeafdeddcdd83f40f814ac87e55da2f6d306;hpb=27701801c1b106f347ae81862f2426daf2e76fd8;p=picodrive.git

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 17d4aea..a3ed89e 100644
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -7,10 +7,8 @@
 
 
 #include "../../pico_int.h"
+#include "../../cpu/drc/cmn.h"
 #include "compiler.h"
-#if defined(__linux__) && defined(ARM)
-#include <sys/mman.h>
-#endif
 
 svp_t *svp = NULL;
 int PicoSVPCycles = 850; // cycles/line, just a guess
@@ -100,63 +98,52 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 void PicoSVPInit(void)
 {
-#if defined(__linux__) && defined(ARM)
-	int ret;
-	ret = munmap(tcache, SSP_DRC_SIZE);
-	printf("munmap tcache: %i\n", ret);
+#ifndef PSP
+	// this is to unmap tcache and make
+	// mem available for large ROMs, MCD, etc.
+	drc_cmn_cleanup();
 #endif
 }
 
-
-static void PicoSVPShutdown(void)
+static void PicoSVPExit(void)
 {
-#if defined(__linux__) && defined(ARM)
-	// also unmap tcache
-	PicoSVPInit();
+#ifndef PSP
+	ssp1601_dyn_exit();
 #endif
 }
 
 
 void PicoSVPStartup(void)
 {
-	void *tmp;
+	int ret;
 
-	elprintf(EL_SVP, "SVP init");
+	elprintf(EL_STATUS, "SVP startup");
 
-	tmp = realloc(Pico.rom, 0x200000 + sizeof(*svp));
-	if (tmp == NULL)
-	{
+	ret = PicoCartResize(Pico.romsize + sizeof(*svp));
+	if (ret != 0) {
 		elprintf(EL_STATUS|EL_SVP, "OOM for SVP data");
 		return;
 	}
 
-	//PicoOpt &= ~0x20000;
-	Pico.rom = tmp;
-	svp = (void *) ((char *)tmp + 0x200000);
+	svp = (void *) ((char *)Pico.rom + Pico.romsize);
 	memset(svp, 0, sizeof(*svp));
 
-#if defined(__linux__) && defined(ARM)
-	tmp = mmap(tcache, SSP_DRC_SIZE, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_SHARED|MAP_ANONYMOUS, -1, 0);
-	printf("mmap tcache: %p, asked %p\n", tmp, tcache);
-#endif
-
 	// init SVP compiler
 	svp_dyn_ready = 0;
 #ifndef PSP
-	if (PicoOpt&POPT_EN_SVP_DRC) {
-		if (ssp1601_dyn_startup()) return;
+	if (PicoOpt & POPT_EN_SVP_DRC) {
+		if (ssp1601_dyn_startup())
+			return;
 		svp_dyn_ready = 1;
 	}
 #endif
 
 	// init ok, setup hooks..
-	PicoRead16Hook = PicoSVPRead16;
-	PicoWrite8Hook = PicoSVPWrite8;
-	PicoWrite16Hook = PicoSVPWrite16;
+	PicoCartMemSetup = PicoSVPMemSetup;
 	PicoDmaHook = PicoSVPDma;
 	PicoResetHook = PicoSVPReset;
 	PicoLineHook = PicoSVPLine;
-	PicoCartUnloadHook = PicoSVPShutdown;
+	PicoCartUnloadHook = PicoSVPExit;
 
 	// save state stuff
 	svp_states[0].ptr = svp->iram_rom;
@@ -166,4 +153,3 @@ void PicoSVPStartup(void)
 	PicoAHW |= PAHW_SVP;
 }
 
-