tweak and refactor frontends, menu and config

[libpicofe.git] / pandora / plat.c

diff --git a/pandora/plat.c b/pandora/plat.c
index 9951973..7ba6c57 100644 (file)
--- a/pandora/plat.c
+++ b/pandora/plat.c
@@ -18,6 +18,7 @@
 #include "../common/menu.h"\r
 #include "../common/plat.h"\r
 #include "../common/arm_utils.h"\r
+#include "../common/input.h"\r
 #include "../linux/sndout_oss.h"\r
 #include "../linux/fbdev.h"\r
 #include "plat.h"\r
@@ -26,6 +27,7 @@
 \r
 #include <pico/pico_int.h>\r
 \r
+#include <linux/input.h>\r
 \r
 static struct vout_fbdev *main_fb, *layer_fb;\r
 static int g_layer_x, g_layer_y;\r
@@ -40,6 +42,23 @@ unsigned char *PicoDraw2FB = temp_frame;
 const char *renderer_names[] = { NULL };\r
 const char *renderer_names32x[] = { NULL };\r
 \r
+static const char * const pandora_gpio_keys[KEY_MAX + 1] = {\r
+       [0 ... KEY_MAX] = NULL,\r
+       [KEY_UP]        = "Up",\r
+       [KEY_LEFT]      = "Left",\r
+       [KEY_RIGHT]     = "Right",\r
+       [KEY_DOWN]      = "Down",\r
+       [KEY_HOME]      = "A",\r
+       [KEY_PAGEDOWN]  = "X",\r
+       [KEY_END]       = "B",\r
+       [KEY_PAGEUP]    = "Y",\r
+       [KEY_RIGHTSHIFT]= "L",\r
+       [KEY_RIGHTCTRL] = "R",\r
+       [KEY_LEFTALT]   = "Start",\r
+       [KEY_LEFTCTRL]  = "Select",\r
+       [KEY_MENU]      = "Pandora",\r
+};\r
+\r
 static int get_cpu_clock(void)\r
 {\r
        FILE *f;\r
@@ -137,7 +156,6 @@ void plat_video_menu_enter(int is_rom_loaded)
 \r
 void plat_video_menu_begin(void)\r
 {\r
-       memcpy32(g_menuscreen_ptr, g_menubg_ptr, g_menuscreen_w * g_menuscreen_h * 2 / 4);\r
 }\r
 \r
 void plat_video_menu_end(void)\r
@@ -189,23 +207,45 @@ void plat_update_volume(int has_changed, int is_up)
        }\r
 }\r
 \r
-void pemu_forced_frame(int opts, int no_scale)\r
+static void make_bg(void)\r
 {\r
-       int oldscale = currentConfig.scaling;\r
-       int po_old = PicoOpt;\r
+       unsigned short *s = (void *)fb_copy;\r
+       unsigned int t, *d = (unsigned int *)g_menubg_src_ptr + 80 / 2;\r
+       int x, y;\r
+\r
+       memset32(g_menubg_src_ptr, 0, 800 * 480 * 2 / 4);\r
 \r
-       if (no_scale) {\r
-               currentConfig.scaling = SCALE_1x1;\r
-               emu_video_mode_change(8, 224, 0);\r
+       for (y = 0; y < 240; y++, s += 320, d += 800*2/2) {\r
+               for (x = 0; x < 320; x++) {\r
+                       t = s[x];\r
+                       t |= t << 16;\r
+                       d[x] = d[x + 800 / 2] = t;\r
+               }\r
        }\r
+}\r
 \r
-       PicoOpt |= opts|POPT_ACC_SPRITES;\r
+void pemu_forced_frame(int no_scale, int do_emu)\r
+{\r
+       int po_old = PicoOpt;\r
 \r
+       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
+\r
+       PicoOpt |= POPT_ACC_SPRITES;\r
+       if (!no_scale)\r
+               PicoOpt |= POPT_EN_SOFTSCALE;\r
+\r
+       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
        Pico.m.dirtyPal = 1;\r
-       PicoFrameDrawOnly();\r
+       if (do_emu)\r
+               PicoFrame();\r
+       else\r
+               PicoFrameDrawOnly();\r
+\r
+       // making a copy because enabling the layer clears it's mem\r
+       memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4);\r
+       make_bg(); // FIXME: honour no_scale\r
 \r
        PicoOpt = po_old;\r
-       currentConfig.scaling = oldscale;\r
 }\r
 \r
 static void updateSound(int len)\r
@@ -425,23 +465,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
        plat_video_flip();\r
 }\r
 \r
-static void make_bg(void)\r
-{\r
-       unsigned short *s = (void *)fb_copy;\r
-       unsigned int t, *d = (unsigned int *)g_menubg_src_ptr + 80 / 2;\r
-       int x, y;\r
-\r
-       memset32(g_menubg_src_ptr, 0, 800 * 480 * 2 / 4);\r
-\r
-       for (y = 0; y < 240; y++, s += 320, d += 800*2/2) {\r
-               for (x = 0; x < 320; x++) {\r
-                       t = s[x];\r
-                       t |= t << 16;\r
-                       d[x] = d[x + 800 / 2] = t;\r
-               }\r
-       }\r
-}\r
-\r
 void pemu_loop_prep(void)\r
 {\r
        static int pal_old = -1;\r
@@ -481,28 +504,12 @@ void pemu_loop_prep(void)
 \r
 void pemu_loop_end(void)\r
 {\r
-       int po_old = PicoOpt;\r
-       int eo_old = currentConfig.EmuOpt;\r
-\r
        pemu_sound_stop();\r
-       memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);\r
 \r
        /* do one more frame for menu bg */\r
-       PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;\r
-       currentConfig.EmuOpt |= EOPT_16BPP;\r
-\r
-       PicoDrawSetOutFormat(PDF_RGB555, 1);\r
-       Pico.m.dirtyPal = 1;\r
-       PicoFrame();\r
-\r
-       // making a copy because enabling the layer clears it's mem\r
-       memcpy32((void *)fb_copy, g_screen_ptr, sizeof(fb_copy) / 4);\r
-       make_bg();\r
+       pemu_forced_frame(0, 1);\r
 \r
        pnd_setup_layer(0, g_layer_x, g_layer_y, g_layer_w, g_layer_h);\r
-\r
-       PicoOpt = po_old;\r
-       currentConfig.EmuOpt = eo_old;\r
 }\r
 \r
 void plat_wait_till_us(unsigned int us_to)\r
@@ -613,6 +620,9 @@ void plat_init(void)
 \r
        sndout_oss_init();\r
        pnd_menu_init();\r
+\r
+       in_set_config(in_name_to_id("evdev:gpio-keys"), IN_CFG_KEY_NAMES,\r
+                     pandora_gpio_keys, sizeof(pandora_gpio_keys));\r
        return;\r
 \r
 fail1:\r