X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fcarthw%2Fsvp%2Fsvp.c;h=504f8d3d4f1bed46ccbfeedc7b84a614db5d416e;hb=45f2f245f51ef0c0d37df3c998595c132bfcaffa;hp=46f7ece819bf83fe7f409a2936817cb49a423640;hpb=bcd94522e8afb8d4b266f241adfd2e9aea111904;p=picodrive.git

diff --git a/pico/carthw/svp/svp.c b/pico/carthw/svp/svp.c
index 46f7ece..504f8d3 100644
--- a/pico/carthw/svp/svp.c
+++ b/pico/carthw/svp/svp.c
@@ -8,7 +8,7 @@
 
 #include "../../pico_int.h"
 #include "compiler.h"
-#ifdef __linux__
+#if defined(__linux__) && defined(ARM)
 #include <sys/mman.h>
 #endif
 
@@ -100,7 +100,7 @@ static int PicoSVPDma(unsigned int source, int len, unsigned short **srcp, unsig
 
 void PicoSVPInit(void)
 {
-#ifdef __linux__
+#if defined(__linux__) && defined(ARM)
 	int ret;
 	ret = munmap(tcache, SSP_DRC_SIZE);
 	printf("munmap tcache: %i\n", ret);
@@ -110,7 +110,7 @@ void PicoSVPInit(void)
 
 static void PicoSVPShutdown(void)
 {
-#ifdef __linux__
+#if defined(__linux__) && defined(ARM)
 	// also unmap tcache
 	PicoSVPInit();
 #endif
@@ -121,7 +121,7 @@ void PicoSVPStartup(void)
 {
 	void *tmp;
 
-	elprintf(EL_SVP, "SVP init");
+	elprintf(EL_STATUS, "SVP startup");
 
 	tmp = realloc(Pico.rom, 0x200000 + sizeof(*svp));
 	if (tmp == NULL)
@@ -135,7 +135,7 @@ void PicoSVPStartup(void)
 	svp = (void *) ((char *)tmp + 0x200000);
 	memset(svp, 0, sizeof(*svp));
 
-#ifdef __linux__
+#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
@@ -150,9 +150,7 @@ void PicoSVPStartup(void)
 #endif
 
 	// init ok, setup hooks..
-	PicoRead16Hook = PicoSVPRead16;
-	PicoWrite8Hook = PicoSVPWrite8;
-	PicoWrite16Hook = PicoSVPWrite16;
+	PicoCartMemSetup = PicoSVPMemSetup;
 	PicoDmaHook = PicoSVPDma;
 	PicoResetHook = PicoSVPReset;
 	PicoLineHook = PicoSVPLine;