X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fgp2x.c;h=d6a701c97801ec529ccc681f899531d0e4e5c6a4;hb=aae35e84da8631de2c0e0faec578bc7f187c3b62;hp=0d0017b401309f5bf11495835826e22042e7d39b;hpb=e11c55481f1703298b3e7e213f73cec8a136f974;p=picodrive.git

diff --git a/platform/gp2x/gp2x.c b/platform/gp2x/gp2x.c
index 0d0017b..d6a701c 100644
--- a/platform/gp2x/gp2x.c
+++ b/platform/gp2x/gp2x.c
@@ -34,6 +34,7 @@
 
 #include "gp2x.h"
 #include "usbjoy.h"
+#include "asmutils.h"
 
 volatile unsigned short *gp2x_memregs;
 //static
@@ -46,26 +47,27 @@ static int sounddev = 0, mixerdev = 0;
 
 void *gp2x_screen;
 
-#define FRAMEBUFF_ADDR0 0x4000000-640*480
-#define FRAMEBUFF_ADDR1 0x4000000-640*480*2
-#define FRAMEBUFF_ADDR2 0x4000000-640*480*3
-#define FRAMEBUFF_ADDR3 0x4000000-640*480*4
+#define FRAMEBUFF_WHOLESIZE (0x30000*4) // 320*240*2 + some more
+#define FRAMEBUFF_ADDR0 (0x4000000-FRAMEBUFF_WHOLESIZE)
+#define FRAMEBUFF_ADDR1 (FRAMEBUFF_ADDR0+0x30000)
+#define FRAMEBUFF_ADDR2 (FRAMEBUFF_ADDR1+0x30000)
+#define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)
 
-static const int gp2x_screenaddrs[] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };
+static const int gp2x_screenaddrs[4] = { FRAMEBUFF_ADDR0, FRAMEBUFF_ADDR1, FRAMEBUFF_ADDR2, FRAMEBUFF_ADDR3 };
+static int gp2x_screenaddrs_use[4];
 static unsigned short gp2x_screenaddr_old[4];
 
 
 /* video stuff */
 void gp2x_video_flip(void)
 {
-	unsigned int address = gp2x_screenaddrs[screensel&3];
-	unsigned short msb16 = (unsigned short)(address >> 16);
-	unsigned short lsb16 = (unsigned short)(address);
+	unsigned short lsw = (unsigned short) gp2x_screenaddrs_use[screensel&3];
+	unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&3] >> 16);
 
-	gp2x_memregs[0x290E>>1] = lsb16;
-  	gp2x_memregs[0x2910>>1] = msb16;
-  	gp2x_memregs[0x2912>>1] = lsb16;
-  	gp2x_memregs[0x2914>>1] = msb16;
+  	gp2x_memregs[0x2910>>1] = msw;
+  	gp2x_memregs[0x2914>>1] = msw;
+	gp2x_memregs[0x290E>>1] = lsw;
+  	gp2x_memregs[0x2912>>1] = lsw;
 
 	// jump to other buffer:
 	gp2x_screen = gp2x_screens[++screensel&3];
@@ -74,14 +76,12 @@ void gp2x_video_flip(void)
 /* doulblebuffered flip */
 void gp2x_video_flip2(void)
 {
-	unsigned int address = gp2x_screenaddrs[screensel&1];
-	unsigned short msb16 = (unsigned short)(address >> 16);
-	unsigned short lsb16 = (unsigned short)(address);
+	unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);
 
-	gp2x_memregs[0x290E>>1] = lsb16;
-  	gp2x_memregs[0x2910>>1] = msb16;
-  	gp2x_memregs[0x2912>>1] = lsb16;
-  	gp2x_memregs[0x2914>>1] = msb16;
+  	gp2x_memregs[0x2910>>1] = msw;
+  	gp2x_memregs[0x2914>>1] = msw;
+	gp2x_memregs[0x290E>>1] = 0;
+  	gp2x_memregs[0x2912>>1] = 0;
 
 	// jump to other buffer:
 	gp2x_screen = gp2x_screens[++screensel&1];
@@ -99,7 +99,7 @@ void gp2x_video_changemode(int bpp)
 {
 	gp2x_video_changemode2(bpp);
 
-  	gp2x_memset_all_buffers(0, 0, 640*480);
+  	gp2x_memset_all_buffers(0, 0, 320*240*2);
 	gp2x_video_flip();
 }
 
@@ -116,10 +116,17 @@ void gp2x_video_setpalette(int *pal, int len)
 
 
 // TV Compatible function //
-void gp2x_video_RGB_setscaling(int W, int H)
+void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
 {
 	float escalaw, escalah;
 	int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;
+	unsigned short scalw;
+
+	// set offset
+	gp2x_screenaddrs_use[0] = gp2x_screenaddrs[0] + ln_offs * 320 * bpp;
+	gp2x_screenaddrs_use[1] = gp2x_screenaddrs[1] + ln_offs * 320 * bpp;
+	gp2x_screenaddrs_use[2] = gp2x_screenaddrs[2] + ln_offs * 320 * bpp;
+	gp2x_screenaddrs_use[3] = gp2x_screenaddrs[3] + ln_offs * 320 * bpp;
 
 	escalaw = 1024.0; // RGB Horiz LCD
 	escalah = 320.0; // RGB Vert LCD
@@ -134,26 +141,34 @@ void gp2x_video_RGB_setscaling(int W, int H)
 	}
 
 	// scale horizontal
-	gp2x_memregs[0x2906>>1]=(unsigned short)((float)escalaw *(W/320.0));
+	scalw = (unsigned short)((float)escalaw *(W/320.0));
+	/* if there is no horizontal scaling, vertical doesn't work. Here is a nasty wrokaround... */
+	if (H != 240 && W == 320) scalw--;
+	gp2x_memregs[0x2906>>1]=scalw;
 	// scale vertical
 	gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0));
 }
 
 
-/* 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_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);
 }
 
 
 void gp2x_memcpy_all_buffers(void *data, int offset, int len)
 {
-	memcpy((char *)gp2x_screens[0] + offset, data, len);
-	memcpy((char *)gp2x_screens[1] + offset, data, len);
-	memcpy((char *)gp2x_screens[2] + offset, data, len);
-	memcpy((char *)gp2x_screens[3] + offset, data, len);
+	gp2x_memcpy_buffers(0xf, data, offset, len);
 }
 
 
@@ -256,7 +271,7 @@ void Pause940(int yes)
 
 void Reset940(int yes, int bank)
 {
-	gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03); /* bank=3 */
+	gp2x_memregs[0x3B48>>1] = ((yes&1) << 7) | (bank & 0x03);
 }
 
 
@@ -282,16 +297,16 @@ void gp2x_init(void)
 	}
 	gp2x_memregl = (unsigned long *) gp2x_memregs;
 
-  	gp2x_screens[3] = mmap(0, 640*480*4, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR3);
-	if(gp2x_screens[3] == MAP_FAILED)
+  	gp2x_screens[0] = mmap(0, FRAMEBUFF_WHOLESIZE, PROT_WRITE, MAP_SHARED, memdev, FRAMEBUFF_ADDR0);
+	if(gp2x_screens[0] == MAP_FAILED)
 	{
 		printf("mmap(gp2x_screen) failed with %i\n", errno);
 		exit(1);
 	}
-	printf("framebuffers point to %p\n", gp2x_screens[3]);
-	gp2x_screens[2] = (char *) gp2x_screens[3]+640*480;
-	gp2x_screens[1] = (char *) gp2x_screens[2]+640*480;
-	gp2x_screens[0] = (char *) gp2x_screens[1]+640*480;
+	printf("framebuffers point to %p\n", gp2x_screens[0]);
+	gp2x_screens[1] = (char *) gp2x_screens[0]+0x30000;
+	gp2x_screens[2] = (char *) gp2x_screens[1]+0x30000;
+	gp2x_screens[3] = (char *) gp2x_screens[2]+0x30000;
 
 	gp2x_screen = gp2x_screens[0];
 	screensel = 0;
@@ -301,6 +316,9 @@ void gp2x_init(void)
 	gp2x_screenaddr_old[2] = gp2x_memregs[0x2912>>1];
 	gp2x_screenaddr_old[3] = gp2x_memregs[0x2914>>1];
 
+	memcpy(gp2x_screenaddrs_use, gp2x_screenaddrs, sizeof(gp2x_screenaddrs));
+	gp2x_memset_all_buffers(0, 0, 320*240*2);
+
 	// snd
   	mixerdev = open("/dev/mixer", O_RDWR);
 	if (mixerdev == -1)
@@ -325,7 +343,7 @@ void gp2x_deinit(void)
 	gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2];
 	gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3];
 
-	munmap(gp2x_screens[0], 640*480*4);
+	munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE);
 	munmap((void *)gp2x_memregs, 0x10000);
 	close(memdev);
 	close(mixerdev);