Make the platform code provide the key mapping

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

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index 2171c03..f82d702 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -33,6 +33,8 @@
 \r
 #include <pico/pico_int.h>\r
 \r
+#define LAYER_MEM_SIZE (320*240*2 * 4)\r
+\r
 static struct vout_fbdev *main_fb, *layer_fb;\r
 // g_layer_* - in use, g_layer_c* - configured custom\r
 int g_layer_cx, g_layer_cy, g_layer_cw, g_layer_ch;\r
@@ -91,6 +93,36 @@ static struct in_default_bind in_evdev_defbinds[] =
        { 0, 0, 0 }\r
 };\r
 \r
+static const struct menu_keymap key_pbtn_map[] =\r
+{\r
+       { KEY_UP,       PBTN_UP },\r
+       { KEY_DOWN,     PBTN_DOWN },\r
+       { KEY_LEFT,     PBTN_LEFT },\r
+       { KEY_RIGHT,    PBTN_RIGHT },\r
+       /* Pandora */\r
+       { KEY_END,      PBTN_MOK },\r
+       { KEY_PAGEDOWN, PBTN_MBACK },\r
+       { KEY_HOME,     PBTN_MA2 },\r
+       { KEY_PAGEUP,   PBTN_MA3 },\r
+       { KEY_LEFTCTRL,   PBTN_MENU },\r
+       { KEY_RIGHTSHIFT, PBTN_L },\r
+       { KEY_RIGHTCTRL,  PBTN_R },\r
+       /* "normal" keyboards */\r
+       { KEY_ENTER,    PBTN_MOK },\r
+       { KEY_ESC,      PBTN_MBACK },\r
+       { KEY_SEMICOLON,  PBTN_MA2 },\r
+       { KEY_APOSTROPHE, PBTN_MA3 },\r
+       { KEY_BACKSLASH,  PBTN_MENU },\r
+       { KEY_LEFTBRACE,  PBTN_L },\r
+       { KEY_RIGHTBRACE, PBTN_R },\r
+};\r
+\r
+static const struct in_pdata pandora_evdev_pdata = {\r
+       .defbinds = in_evdev_defbinds,\r
+       .key_map = key_pbtn_map,\r
+       .kmap_size = sizeof(key_pbtn_map) / sizeof(key_pbtn_map[0]),\r
+};\r
+\r
 void pemu_prep_defconfig(void)\r
 {\r
        defaultConfig.EmuOpt |= EOPT_VSYNC|EOPT_16BPP;\r
@@ -239,6 +271,8 @@ static int pnd_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 {\r
        struct omapfb_plane_info pi;\r
        struct omapfb_mem_info mi;\r
+       int is_enabled;\r
+       int retval = 0;\r
        int ret;\r
 \r
        ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi);\r
@@ -254,18 +288,27 @@ static int pnd_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
        }\r
 \r
        /* must disable when changing stuff */\r
-       if (pi.enabled) {\r
+       is_enabled = pi.enabled;\r
+       if (is_enabled) {\r
                pi.enabled = 0;\r
                ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);\r
                if (ret != 0)\r
                        perror("SETUP_PLANE");\r
+               else\r
+                       is_enabled = 0;\r
        }\r
 \r
-       mi.size = 320*240*2*4;\r
-       ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);\r
-       if (ret != 0) {\r
-               perror("SETUP_MEM");\r
-               return -1;\r
+       if (mi.size < LAYER_MEM_SIZE) {\r
+               unsigned int size_old = mi.size;\r
+\r
+               mi.size = LAYER_MEM_SIZE;\r
+               ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);\r
+               if (ret != 0) {\r
+                       perror("SETUP_MEM");\r
+                       fprintf(stderr, "(requested %u, had %u)\n",\r
+                               mi.size, size_old);\r
+                       return -1;\r
+               }\r
        }\r
 \r
        pi.pos_x = x;\r
@@ -275,12 +318,17 @@ static int pnd_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
        pi.enabled = enabled;\r
 \r
        ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi);\r
-       if (ret != 0) {\r
+       if (ret == 0) {\r
+               is_enabled = pi.enabled;\r
+       }\r
+       else {\r
                perror("SETUP_PLANE");\r
-               return -1;\r
+               retval = -1;\r
        }\r
 \r
-       return 0;\r
+       plat_target_switch_layer(1, is_enabled);\r
+\r
+       return retval;\r
 }\r
 \r
 int pnd_setup_layer(int enabled, int x, int y, int w, int h)\r
@@ -479,7 +527,10 @@ void plat_init(void)
 \r
        pnd_menu_init();\r
 \r
-       in_evdev_init(in_evdev_defbinds);\r
+       // default ROM path\r
+       strcpy(rom_fname_loaded, "/media");\r
+\r
+       in_evdev_init(&pandora_evdev_pdata);\r
        in_probe();\r
        plat_target_setup_input();\r
 \r