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

diff --git a/gp2x/plat.c b/gp2x/plat.c
index 4ae956c..c2dce2d 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];
@@ -101,7 +103,22 @@ void plat_video_menu_end(void)
 	gp2x_video_flip2();
 }
 
-void plat_init(void)
+void plat_validate_config(void)
+{
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	if (soc != SOCID_MMSP2)
+		PicoOpt &= ~POPT_EXT_FM;
+
+	if (currentConfig.gamma < 10 || currentConfig.gamma > 300)
+		currentConfig.gamma = 100;
+
+	if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 1024)
+		currentConfig.CPUclock = default_cpu_clock;
+}
+
+void plat_early_init(void)
 {
 	gp2x_soc_t soc;
 
@@ -109,11 +126,9 @@ 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;
@@ -121,6 +136,25 @@ void plat_init(void)
 		fprintf(stderr, "could not recognize SoC, bailing out.\n");
 		exit(1);
 	}
+}
+
+void plat_init(void)
+{
+	gp2x_soc_t soc;
+
+	soc = soc_detect();
+	switch (soc)
+	{
+	case SOCID_MMSP2:
+		mmsp2_init();
+		break;
+	case SOCID_POLLUX:
+		pollux_init();
+		menu_plat_setup(1);
+		break;
+	default:
+		break;
+	}
 
 	warm_init();