X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=gp2x%2Fplat.c;h=d1e6d809c82e8f589f3d12c88135cd3a0de6f453;hb=662e622b59369f975691a70756f80188d8d27ea0;hp=4ae956c4457331a89d9ee68fd10605b7e69e5d53;hpb=fa5e045bdc817112c1abf19e65e2d3481d51c48a;p=libpicofe.git

diff --git a/gp2x/plat.c b/gp2x/plat.c
index 4ae956c..d1e6d80 100644
--- a/gp2x/plat.c
+++ b/gp2x/plat.c
@@ -12,6 +12,8 @@
 #include "../common/emu.h"
 #include "../linux/sndout_oss.h"
 
+#include <pico/pico.h>
+
 /* GP2X local */
 int default_cpu_clock;
 void *gp2x_screens[4];
@@ -67,26 +69,17 @@ 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);
-	}
-
-	// copy to buffer2
-	gp2x_memcpy_buffers((1<<2), g_screen_ptr, 0, 320*240*2);
+	/* try to switch nicely avoiding tearing on Wiz */
+	gp2x_video_wait_vsync();
+	memset(gp2x_screens[0], 0, 320*240*2);
+	memset(gp2x_screens[1], 0, 320*240*2);
+	gp2x_video_flip2();
+	gp2x_video_wait_vsync();
+	gp2x_video_wait_vsync();
 
 	// switch to 16bpp
 	gp2x_video_changemode_ll(16);
 	gp2x_video_RGB_setscaling(0, 320, 240);
-	gp2x_video_flip2();
 }
 
 void plat_video_menu_begin(void)
@@ -101,7 +94,7 @@ void plat_video_menu_end(void)
 	gp2x_video_flip2();
 }
 
-void plat_init(void)
+void plat_early_init(void)
 {
 	gp2x_soc_t soc;
 
@@ -109,23 +102,45 @@ void plat_init(void)
 	switch (soc)
 	{
 	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);
+		printf("could not recognize SoC, running in dummy mode.\n");
+		break;
+	}
+}
+
+void plat_init(void)
+{
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	switch (soc)
+	{
+	case SOCID_MMSP2:
+		mmsp2_init();
+		menu_plat_setup(0);
+		break;
+	case SOCID_POLLUX:
+		pollux_init();
+		menu_plat_setup(1);
+		break;
+	default:
+		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 +160,11 @@ void plat_finish(void)
 	case SOCID_POLLUX:
 		pollux_finish();
 		break;
+	default:
+		dummy_finish();
+		break;
 	}
 
-	gp2x_video_changemode(16);
 	sndout_oss_exit();
 }