clear binds feature

[picodrive.git] / platform / gp2x / plat.c

diff --git a/platform/gp2x/plat.c b/platform/gp2x/plat.c
index 4ae956c..8b9e0ae 100644 (file)
--- a/platform/gp2x/plat.c
+++ b/platform/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];
@@ -76,8 +78,12 @@ void plat_video_menu_enter(int is_rom_loaded)
        }
        else
        {
+               char buff[256];
+
                // should really only happen once, on startup..
-               readpng(g_screen_ptr, "skin/background.png", READPNG_BG);
+               emu_make_path(buff, "skin/background.png", sizeof(buff));
+               if (readpng(g_screen_ptr, buff, READPNG_BG) < 0)
+                       memset(g_screen_ptr, 0, 320*240*2);
        }
 
        // copy to buffer2
@@ -101,7 +107,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 +130,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 +140,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();
 
@@ -147,7 +185,6 @@ void plat_finish(void)
                break;
        }
 
-       gp2x_video_changemode(16);
        sndout_oss_exit();
 }