frame limiter opt, menu btn on cfg load fix

[libpicofe.git] / gp2x / plat.c

diff --git a/gp2x/plat.c b/gp2x/plat.c
index 0160634..aa60412 100644 (file)
--- a/gp2x/plat.c
+++ b/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,6 +48,22 @@ 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";
 
@@ -58,17 +78,28 @@ 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
+       // copy to buffer2, switch to black
        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,7 +114,24 @@ 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 (soc != SOCID_POLLUX)
+               currentConfig.EmuOpt &= ~EOPT_WIZ_TEAR_FIX;
+
+       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;
 
@@ -91,16 +139,37 @@ 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);
        }
+}
+
+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();
 
        gp2x_memset_all_buffers(0, 0, 320*240*2);
 
@@ -110,7 +179,12 @@ void plat_init(void)
 
 void plat_finish(void)
 {
-       switch (gp2x_soc)
+       gp2x_soc_t soc;
+
+       warm_finish();
+
+       soc = soc_detect();
+       switch (soc)
        {
        case SOCID_MMSP2:
                mmsp2_finish();
@@ -120,7 +194,6 @@ void plat_finish(void)
                break;
        }
 
-       gp2x_video_changemode(16);
        sndout_oss_exit();
 }