X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fgp2x.c;h=4995f08b6be7a3925758a083dff75f99869c80fa;hb=c7a4ff64287b12487c7e9cc13ce3b7d2aa6e1f06;hp=f138be636ae501fb2bf8020892404014bed2a686;hpb=79cad122559536a7831b121c5ec798847102d0de;p=libpicofe.git

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index f138be6..4995f08 100644
--- a/gp2x/gp2x.c
+++ b/gp2x/gp2x.c
@@ -34,6 +34,7 @@
 
 #include "gp2x.h"
 #include "usbjoy.h"
+#include "../common/arm_utils.h"
 
 volatile unsigned short *gp2x_memregs;
 //static
@@ -149,20 +150,29 @@ void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
 }
 
 
-/* LCD updates @ 80Hz? */
 void gp2x_video_wait_vsync(void)
 {
-	gp2x_memregs[0x2846>>1] = 0x20|2; //(gp2x_memregs[0x2846>>1] | 0x20) & ~2;
-	while(!(gp2x_memregs[0x2846>>1] & 2));// usleep(1);
+	unsigned short v = gp2x_memregs[0x1182>>1];
+	while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10)) spend_cycles(1024);
+}
+
+
+void gp2x_video_flush_cache(void)
+{
+	// since we are using the mmu hack, we must flush the cache first
+	// (the params are most likely wrong, but they seem to work somehow)
+	//flushcache(addr, addr + 320*240*2, 0);
+	flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);
 }
 
 
 void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
 {
-	if (buffers & (1<<0)) memcpy((char *)gp2x_screens[0] + offset, data, len);
-	if (buffers & (1<<1)) memcpy((char *)gp2x_screens[1] + offset, data, len);
-	if (buffers & (1<<2)) memcpy((char *)gp2x_screens[2] + offset, data, len);
-	if (buffers & (1<<3)) memcpy((char *)gp2x_screens[3] + offset, data, len);
+	char *dst;
+	if (buffers & (1<<0)) { dst = (char *)gp2x_screens[0] + offset; if (dst != data) memcpy(dst, data, len); }
+	if (buffers & (1<<1)) { dst = (char *)gp2x_screens[1] + offset; if (dst != data) memcpy(dst, data, len); }
+	if (buffers & (1<<2)) { dst = (char *)gp2x_screens[2] + offset; if (dst != data) memcpy(dst, data, len); }
+	if (buffers & (1<<3)) { dst = (char *)gp2x_screens[3] + offset; if (dst != data) memcpy(dst, data, len); }
 }
 
 
@@ -183,9 +193,7 @@ void gp2x_memset_all_buffers(int offset, int byte, int len)
 
 void gp2x_pd_clone_buffer2(void)
 {
-	memcpy(gp2x_screen, gp2x_screens[2], 320*240);
-	memset(gp2x_screen, 0xe0, 320*8);
-	memset(gp2x_screen + 320*232, 0xe0, 320*8);
+	memcpy(gp2x_screen, gp2x_screens[2], 320*240*2);
 }