perfect vsync, bugfixes

[fceu.git] / drivers / gp2x / minimal.c

diff --git a/drivers/gp2x/minimal.c b/drivers/gp2x/minimal.c
index 86bfdfb..34f5ea7 100644 (file)
--- a/drivers/gp2x/minimal.c
+++ b/drivers/gp2x/minimal.c
@@ -54,7 +54,6 @@ void *gp2x_screen;
 #define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)\r
 \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
@@ -62,15 +61,10 @@ static unsigned short gp2x_screenaddr_old[4];
 void gp2x_video_flip(void)\r
 {\r
        unsigned short lsw, msw;\r
-       int addr = gp2x_screenaddrs_use[screensel&3];\r
+       int addr = gp2x_screenaddrs[screensel&3];\r
 \r
        addr += gp2x_screen_offs;\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
        lsw = (unsigned short) addr;\r
        msw = (unsigned short)(addr >> 16);\r
 \r
@@ -86,7 +80,7 @@ void gp2x_video_flip(void)
 /* doulblebuffered flip */\r
 void gp2x_video_flip2(void)\r
 {\r
-       unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);\r
+       unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&1] >> 16);\r
 \r
        gp2x_memregs[0x2910>>1] = msw;\r
        gp2x_memregs[0x2914>>1] = msw;\r
@@ -126,18 +120,12 @@ void gp2x_video_setpalette(int *pal, int len)
 \r
 \r
 // TV Compatible function //\r
-void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)\r
+void gp2x_video_RGB_setscaling(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
 \r
@@ -164,6 +152,20 @@ void gp2x_video_set_offs(int offs)
        gp2x_screen_offs = offs;\r
 }\r
 \r
+void gp2x_video_wait_vsync(void)\r
+{\r
+       unsigned short v = gp2x_memregs[0x1182>>1];\r
+       while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10));\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
 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
@@ -301,7 +303,6 @@ 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