X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fplat.c;h=6fce7bc2f6b23d15879c88345e1315a9cb0076f5;hb=603c28b3176e8ae45721975e1798442c8dd3e92c;hp=4ae956c4457331a89d9ee68fd10605b7e69e5d53;hpb=0d9bf4fcda2bf375a1fabd4a42e244701b8a185f;p=picodrive.git

diff --git a/platform/gp2x/plat.c b/platform/gp2x/plat.c
index 4ae956c..6fce7bc 100644
--- a/platform/gp2x/plat.c
+++ b/platform/gp2x/plat.c
@@ -12,16 +12,19 @@
 #include "../common/emu.h"
 #include "../linux/sndout_oss.h"
 
+#include <pico/pico.h>
+
 /* GP2X local */
 int default_cpu_clock;
+int gp2x_dev_id;
+int gp2x_current_bpp;
 void *gp2x_screens[4];
 
 void gp2x_video_changemode(int bpp)
 {
 	gp2x_video_changemode_ll(bpp);
 
-  	gp2x_memset_all_buffers(0, 0, 320*240*2);
-	gp2x_video_flip();
+	gp2x_current_bpp = bpp < 0 ? -bpp : bpp;
 }
 
 static void gp2x_memcpy_buffers(int buffers, void *data, int offset, int len)
@@ -63,35 +66,27 @@ void gp2x_make_fb_bufferable(int yes)
 }
 
 /* common */
-char cpu_clk_name[16] = "GP2X CPU clocks";
-
 void plat_video_menu_enter(int is_rom_loaded)
 {
-	if (is_rom_loaded)
-	{
-		// darken the active framebuffer
-		memset(g_screen_ptr, 0, 320*8*2);
-		menu_darken_bg((char *)g_screen_ptr + 320*8*2, 320*224, 1);
-		memset((char *)g_screen_ptr + 320*232*2, 0, 320*8*2);
-	}
-	else
-	{
-		// should really only happen once, on startup..
-		readpng(g_screen_ptr, "skin/background.png", READPNG_BG);
+	if (gp2x_current_bpp != 16 || gp2x_dev_id == GP2X_DEV_WIZ) {
+		/* try to switch nicely avoiding glitches */
+		gp2x_video_wait_vsync();
+		memset(gp2x_screens[0], 0, 320*240*2);
+		memset(gp2x_screens[1], 0, 320*240*2);
+		gp2x_video_flip2(); // might flip to fb2/3
+		gp2x_video_flip2(); // ..so we do it again
+		// gp2x_video_wait_vsync();
 	}
 
-	// copy to buffer2
-	gp2x_memcpy_buffers((1<<2), g_screen_ptr, 0, 320*240*2);
-
 	// switch to 16bpp
 	gp2x_video_changemode_ll(16);
 	gp2x_video_RGB_setscaling(0, 320, 240);
-	gp2x_video_flip2();
 }
 
 void plat_video_menu_begin(void)
 {
 	memcpy(g_screen_ptr, gp2x_screens[2], 320*240*2);
+	g_menuscreen_ptr = g_screen_ptr;
 }
 
 void plat_video_menu_end(void)
@@ -101,6 +96,39 @@ void plat_video_menu_end(void)
 	gp2x_video_flip2();
 }
 
+void plat_early_init(void)
+{
+	gp2x_soc_t soc;
+	FILE *f;
+
+	soc = soc_detect();
+	switch (soc)
+	{
+	case SOCID_MMSP2:
+		default_cpu_clock = 200;
+		gp2x_dev_id = GP2X_DEV_GP2X;
+		break;
+	case SOCID_POLLUX:
+		default_cpu_clock = 533;
+		f = fopen("/dev/accel", "rb");
+		if (f) {
+			printf("detected Caanoo\n");
+			gp2x_dev_id = GP2X_DEV_CAANOO;
+			fclose(f);
+		}
+		else {
+			printf("detected Wiz\n");
+			gp2x_dev_id = GP2X_DEV_WIZ;
+		}
+		break;
+	default:
+		printf("could not recognize SoC, running in dummy mode.\n");
+		break;
+	}
+
+	gp2x_menu_init();
+}
+
 void plat_init(void)
 {
 	gp2x_soc_t soc;
@@ -110,22 +138,22 @@ void plat_init(void)
 	{
 	case SOCID_MMSP2:
 		mmsp2_init();
-		default_cpu_clock = 200;
 		break;
 	case SOCID_POLLUX:
 		pollux_init();
-		strcpy(cpu_clk_name, "Wiz CPU clock");
-		default_cpu_clock = 533;
 		break;
 	default:
-		fprintf(stderr, "could not recognize SoC, bailing out.\n");
-		exit(1);
+		dummy_init();
+		break;
 	}
 
 	warm_init();
 
 	gp2x_memset_all_buffers(0, 0, 320*240*2);
 
+	// use buffer2 for menubg to save mem (using only buffers 0, 1 in menu)
+	g_menubg_ptr = gp2x_screens[2];
+
 	// snd
 	sndout_oss_init();
 }
@@ -145,9 +173,11 @@ void plat_finish(void)
 	case SOCID_POLLUX:
 		pollux_finish();
 		break;
+	default:
+		dummy_finish();
+		break;
 	}
 
-	gp2x_video_changemode(16);
 	sndout_oss_exit();
 }