X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fminimal.c;h=ce64dee61c7f49c682294fa5d1671618099d5c25;hp=ba4ffe0e3340742d9bf2182db1d490fb61e98640;hb=c8c88d89f9bb0df71360b3b68327300f686a1c20;hpb=b2b95d2e0d1fd5e52d03c2152605b09b024c1d0e

diff --git a/drivers/gp2x/minimal.c b/drivers/gp2x/minimal.c
index ba4ffe0..ce64dee 100644
--- a/drivers/gp2x/minimal.c
+++ b/drivers/gp2x/minimal.c
@@ -33,13 +33,14 @@
 
 #include "minimal.h"
 #include "usbjoy.h"
-#include "asmutils.h"
+#include "../arm/asmutils.h"
 
 volatile unsigned short *gp2x_memregs;
 //static
 volatile unsigned long  *gp2x_memregl;
 static void *gp2x_screens[4];
 static int screensel = 0;
+static int gp2x_screen_offs = 0;
 //static
 int memdev = 0;
 static int sounddev = 0, mixerdev = 0;
@@ -53,24 +54,16 @@ void *gp2x_screen;
 #define FRAMEBUFF_ADDR3 (FRAMEBUFF_ADDR2+0x30000)
 
 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];
 
 
-// hack to simplify thing for fceu
-static int scaling_enabled = 0;
-
 /* video stuff */
 void gp2x_video_flip(void)
 {
 	unsigned short lsw, msw;
-	int addr = gp2x_screenaddrs_use[screensel&3];
-
-	if (scaling_enabled) addr += 32;
+	int addr = gp2x_screenaddrs[screensel&3];
 
-	// 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);
+	addr += gp2x_screen_offs;
 
 	lsw = (unsigned short) addr;
 	msw = (unsigned short)(addr >> 16);
@@ -87,7 +80,7 @@ void gp2x_video_flip(void)
 /* doulblebuffered flip */
 void gp2x_video_flip2(void)
 {
-	unsigned short msw = (unsigned short)(gp2x_screenaddrs_use[screensel&1] >> 16);
+	unsigned short msw = (unsigned short)(gp2x_screenaddrs[screensel&1] >> 16);
 
   	gp2x_memregs[0x2910>>1] = msw;
   	gp2x_memregs[0x2914>>1] = msw;
@@ -127,21 +120,12 @@ void gp2x_video_setpalette(int *pal, int len)
 
 
 // TV Compatible function //
-void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
+void gp2x_video_RGB_setscaling(int W, int H)
 {
 	float escalaw, escalah;
 	int bpp = (gp2x_memregs[0x28DA>>1]>>9)&0x3;
 	unsigned short scalw;
 
-	// fceu hack
-	scaling_enabled = (W == 320) ? 0 : 1;
-
-	// 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
 
@@ -163,6 +147,24 @@ void gp2x_video_RGB_setscaling(int ln_offs, int W, int H)
 	gp2x_memregl[0x2908>>2]=(unsigned long)((float)escalah *bpp *(H/240.0));
 }
 
+void gp2x_video_set_offs(int offs)
+{
+	gp2x_screen_offs = offs;
+}
+
+void gp2x_video_wait_vsync(void)
+{
+	unsigned short v = gp2x_memregs[0x1182>>1];
+	while (!((v ^ gp2x_memregs[0x1182>>1]) & 0x10));
+}
+
+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)
 {
@@ -220,7 +222,10 @@ void gp2x_start_sound(int rate, int bits, int stereo)
 	if (sounddev > 0) close(sounddev);
 	sounddev = open("/dev/dsp", O_WRONLY|O_ASYNC);
 	if (sounddev == -1)
+	{
 		printf("open(\"/dev/dsp\") failed with %i\n", errno);
+		return;
+	}
 
 	ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);
 	ioctl(sounddev, SNDCTL_DSP_SETFMT, &bits);
@@ -298,7 +303,6 @@ 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
@@ -322,14 +326,14 @@ void gp2x_deinit(void)
 	gp2x_memregs[0x2912>>1] = gp2x_screenaddr_old[2];
 	gp2x_memregs[0x2914>>1] = gp2x_screenaddr_old[3];
 
+	gp2x_usbjoy_deinit();
+
 	munmap(gp2x_screens[0], FRAMEBUFF_WHOLESIZE);
 	munmap((void *)gp2x_memregs, 0x10000);
 	close(memdev);
 	close(mixerdev);
 	if (sounddev > 0) close(sounddev);
 
-	gp2x_usbjoy_deinit();
-
 	printf("all done, running ");
 
 	// Zaq121's alternative frontend support from MAME