X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpatch.c;h=558658c3f03a2b9e50bc5e2edf05d6cd9ca45b18;hb=cb5021471da11969696c474d922fdaac05e2eb83;hp=99632dda8ef029163299e0a1a605086ffb1006d4;hpb=af37bca858874b5cbd5ab126eaba1fad6ff7ab72;p=picodrive.git

diff --git a/pico/patch.c b/pico/patch.c
index 99632dd..558658c 100644
--- a/pico/patch.c
+++ b/pico/patch.c
@@ -142,7 +142,7 @@ static void hex_decode(const char *code, struct patch *result)
 /* THIS is the function you call from the MegaDrive or whatever. This figures
  * out whether it's a genie or hex code, depunctuates it, and calls the proper
  * decoder. */
-static void decode(const char* code, struct patch* result)
+void decode(const char* code, struct patch* result)
 {
   int len = strlen(code), i, j;
   char code_to_pass[16], *x;
@@ -211,13 +211,8 @@ bad_code:
 
 unsigned int PicoRead16(unsigned int a);
 void PicoWrite16(unsigned int a, unsigned short d);
-
-
-/* avoid dependency on newer glibc */
-static int isspace_(int c)
-{
-	return (0x09 <= c && c <= 0x0d) || c == ' ';
-}
+extern unsigned short m68k_read16(unsigned int a);
+extern void m68k_write16(int a, unsigned short d);
 
 void PicoPatchUnload(void)
 {
@@ -305,6 +300,8 @@ void PicoPatchPrepare(void)
 		PicoPatches[i].addr &= ~1;
 		if (PicoPatches[i].addr < Pico.romsize)
 			PicoPatches[i].data_old = *(unsigned short *)(Pico.rom + PicoPatches[i].addr);
+		else
+			PicoPatches[i].data_old = (unsigned short) m68k_read16(PicoPatches[i].addr);
 		if (strstr(PicoPatches[i].name, "AUTO"))
 			PicoPatches[i].active = 1;
 	}
@@ -334,7 +331,15 @@ void PicoPatchApply(void)
 		}
 		else
 		{
-			/* TODO? */
+			if (PicoPatches[i].active)
+				m68k_write16(PicoPatches[i].addr,PicoPatches[i].data);
+			else {
+				// if current addr is not patched by older patch, write back original val
+				for (u = 0; u < i; u++)
+					if (PicoPatches[u].addr == addr) break;
+				if (u == i)
+					m68k_write16(PicoPatches[i].addr,PicoPatches[i].data_old);
+			}
 		}
 	}
 }