Cyclone poll detection problem fixed

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

diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c
index 552318c..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
@@ -52,19 +54,21 @@ void *gp2x_screen;
 #define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000)\r
 #define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)\r
 \r
-static const int gp2x_screenaddrs[] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };\r
+static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };\r
+static int gp2x_screenaddrs_use[4];\r
 static unsigned short gp2x_screenaddr_old[4];\r
 \r
 \r
 /* video stuff */\r
 void gp2x_video_flip(void)\r
 {\r
-       unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&3] >> 16);\r
+       unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3];\r
+       unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16);\r
 \r
        gp2x_memregs[0x2910>>1] = msw;\r
        gp2x_memregs[0x2914>>1] = msw;\r
-       gp2x_memregs[0x290E>>1] = 0;\r
-       gp2x_memregs[0x2912>>1] = 0;\r
+       gp2x_memregs[0x290E>>1] = lsw;\r
+       gp2x_memregs[0x2912>>1] = lsw;\r
 \r
        // jump to other buffer:\r
        gp2x_screen = gp2x_screens[++screensel&3];\r
@@ -73,7 +77,7 @@ void gp2x_video_flip(void)
 /* doulblebuffered flip */\r
 void gp2x_video_flip2(void)\r
 {\r
-       unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&1] >> 16);\r
+       unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);\r
 \r
        gp2x_memregs[0x2910>>1] = msw;\r
        gp2x_memregs[0x2914>>1] = msw;\r
@@ -113,10 +117,17 @@ void gp2x_video_setpalette(int *pal, int len)
 \r
 \r
 // TV Compatible function //\r
-void gp2x_video_RGB_setscaling(int W, int H)\r
+void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)\r
 {\r
        float escalaw, escalah;\r
        int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;\r
+       unsigned short scalw;\r
+\r
+       // set offset\r
+       gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp;\r
+       gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp;\r
+       gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp;\r
+       gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp;\r
 \r
        escalaw = 1024.0; // RGB Horiz LCD\r
        escalah = 320.0; // RGB Vert LCD\r
@@ -131,26 +142,44 @@ void gp2x_video_RGB_setscaling(int W, int H)
        }\r
 \r
        // scale horizontal\r
-       gp2x_memregs[0x2906>>1]=(unsigned short)((float)escalaw *(W/320.0));\r
+       scalw = (unsigned short)((float)escalaw *(W/320.0));\r
+       /* if there is no horizontal scaling, vertical doesn't work. Here is a nasty wrokaround... */\r
+       if (H != 240 && W == 320) scalw--;\r
+       gp2x_memregs[0x2906>>1]=scalw;\r
        // scale vertical\r
        gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0));\r
 }\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
+       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
 void gp2x_memcpy_all_buffers(void *data, int offset, int len)\r
 {\r
-       memcpy((char *)gp2x_screens[0] + offset, data, len);\r
-       memcpy((char *)gp2x_screens[1] + offset, data, len);\r
-       memcpy((char *)gp2x_screens[2] + offset, data, len);\r
-       memcpy((char *)gp2x_screens[3] + offset, data, len);\r
+       gp2x_memcpy_buffers(0xf, data, offset, len);\r
 }\r
 \r
 \r
@@ -165,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
@@ -298,6 +325,7 @@ void gp2x_init(void)
        gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1];\r
        gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1];\r
 \r
+       memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs));\r
        gp2x_memset_all_buffers(0, 0, 320*240*2);\r
 \r
        // snd\r
@@ -348,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