X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fgp2x%2Fplat.c;h=0e207bf523b9d8c72ba69bea1eebecc252e4def8;hb=697746df021a83dcb556afdb36abc6977780985c;hp=01606349fccd2d1f984b6e0249c58b34624f442e;hpb=421713439805e3d389c420a04afc48fc267eb28f;p=picodrive.git

diff --git a/platform/gp2x/plat.c b/platform/gp2x/plat.c
index 0160634..0e207bf 100644
--- a/platform/gp2x/plat.c
+++ b/platform/gp2x/plat.c
@@ -3,15 +3,19 @@
 #include <string.h>
 #include <stdarg.h>
 
-#include "gp2x.h"
+#include "plat_gp2x.h"
 #include "soc.h"
+#include "warm.h"
 #include "../common/plat.h"
 #include "../common/readpng.h"
 #include "../common/menu.h"
 #include "../common/emu.h"
 #include "../linux/sndout_oss.h"
 
+#include <pico/pico.h>
+
 /* GP2X local */
+int default_cpu_clock;
 void *gp2x_screens[4];
 
 void gp2x_video_changemode(int bpp)
@@ -44,31 +48,38 @@ void gp2x_memset_all_buffers(int offset, int byte, int len)
 	memset((char *)gp2x_screens[3] + offset, byte, len);
 }
 
+void gp2x_make_fb_bufferable(int yes)
+{
+	int ret = 0;
+	
+	yes = yes ? 1 : 0;
+	ret |= warm_change_cb_range(WCB_B_BIT, yes, gp2x_screens[0], 320*240*2);
+	ret |= warm_change_cb_range(WCB_B_BIT, yes, gp2x_screens[1], 320*240*2);
+	ret |= warm_change_cb_range(WCB_B_BIT, yes, gp2x_screens[2], 320*240*2);
+	ret |= warm_change_cb_range(WCB_B_BIT, yes, gp2x_screens[3], 320*240*2);
+
+	if (ret)
+		fprintf(stderr, "could not make fb buferable.\n");
+	else
+		printf("made fb buferable.\n");
+}
+
 /* 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);
-	}
-
-	// 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)
@@ -83,6 +94,26 @@ void plat_video_menu_end(void)
 	gp2x_video_flip2();
 }
 
+void plat_early_init(void)
+{
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	switch (soc)
+	{
+	case SOCID_MMSP2:
+		default_cpu_clock = 200;
+		break;
+	case SOCID_POLLUX:
+		strcpy(cpu_clk_name, "Wiz CPU clock");
+		default_cpu_clock = 533;
+		break;
+	default:
+		printf("could not recognize SoC, running in dummy mode.\n");
+		break;
+	}
+}
+
 void plat_init(void)
 {
 	gp2x_soc_t soc;
@@ -92,25 +123,36 @@ void plat_init(void)
 	{
 	case SOCID_MMSP2:
 		mmsp2_init();
+		menu_plat_setup(0);
 		break;
 	case SOCID_POLLUX:
 		pollux_init();
-		strcpy(cpu_clk_name, "Wiz CPU clock");
+		menu_plat_setup(1);
 		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 (using only buffers 0, 1 in menu)
+	g_menubg_ptr = gp2x_screens[2];
+
 	// snd
 	sndout_oss_init();
 }
 
 void plat_finish(void)
 {
-	switch (gp2x_soc)
+	gp2x_soc_t soc;
+
+	warm_finish();
+
+	soc = soc_detect();
+	switch (soc)
 	{
 	case SOCID_MMSP2:
 		mmsp2_finish();
@@ -118,9 +160,11 @@ void plat_finish(void)
 	case SOCID_POLLUX:
 		pollux_finish();
 		break;
+	default:
+		dummy_finish();
+		break;
 	}
 
-	gp2x_video_changemode(16);
 	sndout_oss_exit();
 }