Cyclone poll detection problem fixed

[picodrive.git] / platform / gp2x / gp2x.c

diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c
index f138be6..3ed64fb 100644 (file)
--- a/platform/gp2x/gp2x.c
+++ b/platform/gp2x/gp2x.c
@@ -22,6 +22,7 @@
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
+#include <stdarg.h>\r
 #include <string.h>\r
 #include <unistd.h>\r
 #include <sys/mman.h>\r
@@ -34,6 +35,7 @@
 \r
 #include "gp2x.h"\r
 #include "usbjoy.h"\r
+#include "../common/arm_utils.h"\r
 \r
 volatile unsigned short *gp2x_memregs;\r
 //static\r
@@ -149,20 +151,29 @@ void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
 }\r
 \r
 \r
-/* LCD updates @ 80Hz? */\r
 void gp2x_video_wait_vsync(void)\r
 {\r
-       gp2x_memregs[0x2846>>1] = 0x20|2; //(gp2x_memregs[0x2846>>1] | 0x20) & ~2;\r
-       while(!(gp2x_memregs[0x2846>>1] & 2));// usleep(1);\r
+       unsigned short v = gp2x_memregs[0x1182>>1];\r
+       while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10)) spend_cycles(1024);\r
+}\r
+\r
+\r
+void gp2x_video_flush_cache(void)\r
+{\r
+       // since we are using the mmu hack, we must flush the cache first\r
+       // (the params are most likely wrong, but they seem to work somehow)\r
+       //flushcache(addr, addr + 320*240*2, 0);\r
+       flushcache(gp2x_screen, (char *)gp2x_screen + 320*240*2, 0);\r
 }\r
 \r
 \r
 void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)\r
 {\r
-       if (buffers & (1<<0)) memcpy((char *)gp2x_screens[0] + offset, data, len);\r
-       if (buffers & (1<<1)) memcpy((char *)gp2x_screens[1] + offset, data, len);\r
-       if (buffers & (1<<2)) memcpy((char *)gp2x_screens[2] + offset, data, len);\r
-       if (buffers & (1<<3)) memcpy((char *)gp2x_screens[3] + offset, data, len);\r
+       char *dst;\r
+       if (buffers & (1<<0)) { dst = (char *)gp2x_screens[0] + offset; if (dst != data) memcpy(dst, data, len); }\r
+       if (buffers & (1<<1)) { dst = (char *)gp2x_screens[1] + offset; if (dst != data) memcpy(dst, data, len); }\r
+       if (buffers & (1<<2)) { dst = (char *)gp2x_screens[2] + offset; if (dst != data) memcpy(dst, data, len); }\r
+       if (buffers & (1<<3)) { dst = (char *)gp2x_screens[3] + offset; if (dst != data) memcpy(dst, data, len); }\r
 }\r
 \r
 \r
@@ -183,9 +194,7 @@ void gp2x_memset_all_buffers(int offset, int byte, int len)
 \r
 void gp2x_pd_clone_buffer2(void)\r
 {\r
-       memcpy(gp2x_screen, gp2x_screens[2], 320*240);\r
-       memset(gp2x_screen, 0xe0, 320*8);\r
-       memset(gp2x_screen + 320*232, 0xe0, 320*8);\r
+       memcpy(gp2x_screen, gp2x_screens[2], 320*240*2);\r
 }\r
 \r
 \r
@@ -367,4 +376,13 @@ void gp2x_deinit(void)
        }\r
 }\r
 \r
+/* lprintf */\r
+void lprintf(const char *fmt, ...)\r
+{\r
+       va_list vl;\r
+\r
+       va_start(vl, fmt);\r
+       vprintf(fmt, vl);\r
+       va_end(vl);\r
+}\r
 \r