From ccf51908872ddeb811b1245e6751600b860d90b5 Mon Sep 17 00:00:00 2001 From: notaz Date: Fri, 10 Dec 2010 13:54:59 +0200 Subject: fix x86 build, minor refactoring --- frontend/omap.c | 203 -------------------------------------------------- frontend/plat_dummy.c | 36 +++++++++ frontend/plat_omap.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/plugin.c | 4 +- frontend/plugin_lib.c | 2 +- 5 files changed, 242 insertions(+), 206 deletions(-) delete mode 100644 frontend/omap.c create mode 100644 frontend/plat_dummy.c create mode 100644 frontend/plat_omap.c (limited to 'frontend') diff --git a/frontend/omap.c b/frontend/omap.c deleted file mode 100644 index e5f9ebd..0000000 --- a/frontend/omap.c +++ /dev/null @@ -1,203 +0,0 @@ -/* - * (C) notaz, 2010 - * - * This work is licensed under the terms of the GNU GPLv2 or later. - * See the COPYING file in the top-level directory. - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include "common/input.h" -#include "common/menu.h" -#include "linux/fbdev.h" -#include "linux/oshide.h" -#include "plugin_lib.h" -#include "omap.h" - - -static struct vout_fbdev *main_fb; -int g_layer_x = 80, g_layer_y = 0; -int g_layer_w = 640, g_layer_h = 480; - -struct vout_fbdev *layer_fb; - -static const char * const pandora_gpio_keys[KEY_MAX + 1] = { - [0 ... KEY_MAX] = NULL, - [KEY_UP] = "Up", - [KEY_LEFT] = "Left", - [KEY_RIGHT] = "Right", - [KEY_DOWN] = "Down", - [KEY_HOME] = "A", - [KEY_PAGEDOWN] = "X", - [KEY_END] = "B", - [KEY_PAGEUP] = "Y", - [KEY_RIGHTSHIFT]= "L", - [KEY_RIGHTCTRL] = "R", - [KEY_LEFTALT] = "Start", - [KEY_LEFTCTRL] = "Select", - [KEY_MENU] = "Pandora", -}; - -struct in_default_bind in_evdev_defbinds[] = { - { KEY_UP, IN_BINDTYPE_PLAYER12, DKEY_UP }, - { KEY_DOWN, IN_BINDTYPE_PLAYER12, DKEY_DOWN }, - { KEY_LEFT, IN_BINDTYPE_PLAYER12, DKEY_LEFT }, - { KEY_RIGHT, IN_BINDTYPE_PLAYER12, DKEY_RIGHT }, - { KEY_SPACE, IN_BINDTYPE_EMU, PEVB_MENU }, - { KEY_PAGEUP, IN_BINDTYPE_PLAYER12, DKEY_TRIANGLE }, - { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, DKEY_CROSS }, - { KEY_END, IN_BINDTYPE_PLAYER12, DKEY_CIRCLE }, - { KEY_HOME, IN_BINDTYPE_PLAYER12, DKEY_SQUARE }, - { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, DKEY_START }, - { KEY_LEFTCTRL, IN_BINDTYPE_PLAYER12, DKEY_SELECT }, - { KEY_RIGHTSHIFT,IN_BINDTYPE_PLAYER12, DKEY_L1 }, - { KEY_RIGHTCTRL, IN_BINDTYPE_PLAYER12, DKEY_R1 }, - { KEY_Q, IN_BINDTYPE_PLAYER12, DKEY_L2 }, - { KEY_P, IN_BINDTYPE_PLAYER12, DKEY_R2 }, - { 0, 0, 0 } -}; - -static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h) -{ - struct omapfb_plane_info pi; - struct omapfb_mem_info mi; - int ret; - - ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi); - if (ret != 0) { - perror("QUERY_PLANE"); - return -1; - } - - ret = ioctl(fd, OMAPFB_QUERY_MEM, &mi); - if (ret != 0) { - perror("QUERY_MEM"); - return -1; - } - - /* must disable when changing stuff */ - if (pi.enabled) { - pi.enabled = 0; - ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); - if (ret != 0) - perror("SETUP_PLANE"); - } - - mi.size = 640*512*2*3; - ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi); - if (ret != 0) { - perror("SETUP_MEM"); - return -1; - } - - pi.pos_x = x; - pi.pos_y = y; - pi.out_width = w; - pi.out_height = h; - pi.enabled = enabled; - - ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); - if (ret != 0) { - perror("SETUP_PLANE"); - return -1; - } - - return 0; -} - -int omap_enable_layer(int enabled) -{ - return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), enabled, - g_layer_x, g_layer_y, g_layer_w, g_layer_h); -} - -void plat_video_menu_enter(int is_rom_loaded) -{ -} - -void plat_video_menu_begin(void) -{ -} - -void plat_video_menu_end(void) -{ - g_menuscreen_ptr = vout_fbdev_flip(main_fb); -} - -void plat_init(void) -{ - const char *main_fb_name, *layer_fb_name; - void *temp_frame; - int fd, ret, w, h; - - main_fb_name = getenv("FBDEV_MAIN"); - if (main_fb_name == NULL) - main_fb_name = "/dev/fb0"; - - layer_fb_name = getenv("FBDEV_LAYER"); - if (layer_fb_name == NULL) - layer_fb_name = "/dev/fb1"; - - // must set the layer up first to be able to use it - fd = open(layer_fb_name, O_RDWR); - if (fd == -1) { - fprintf(stderr, "%s: ", layer_fb_name); - perror("open"); - exit(1); - } - - ret = omap_setup_layer_(fd, 1, g_layer_x, g_layer_y, g_layer_w, g_layer_h); - close(fd); - if (ret != 0) { - fprintf(stderr, "failed to set up layer, exiting.\n"); - exit(1); - } - - oshide_init(); - - w = h = 0; - main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2); - if (main_fb == NULL) { - fprintf(stderr, "couldn't init fb: %s\n", main_fb_name); - exit(1); - } - - g_menuscreen_w = w; - g_menuscreen_h = h; - g_menuscreen_ptr = vout_fbdev_flip(main_fb); - - w = 640; - h = 512; // ?? - layer_fb = vout_fbdev_init(layer_fb_name, &w, &h, 16, 3); - if (layer_fb == NULL) { - fprintf(stderr, "couldn't init fb: %s\n", layer_fb_name); - goto fail0; - } - - temp_frame = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); - if (temp_frame == NULL) { - fprintf(stderr, "OOM\n"); - goto fail1; - } - g_menubg_ptr = temp_frame; - g_menubg_src_ptr = temp_frame; - - in_set_config(in_name_to_id("evdev:gpio-keys"), IN_CFG_KEY_NAMES, - pandora_gpio_keys, sizeof(pandora_gpio_keys)); - return; - -fail1: - vout_fbdev_finish(layer_fb); -fail0: - vout_fbdev_finish(main_fb); - exit(1); - -} - diff --git a/frontend/plat_dummy.c b/frontend/plat_dummy.c new file mode 100644 index 0000000..b209f4f --- /dev/null +++ b/frontend/plat_dummy.c @@ -0,0 +1,36 @@ +/* + * (C) notaz, 2010 + * + * This work is licensed under the terms of the GNU GPLv2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "common/input.h" +#include "linux/fbdev.h" + +struct vout_fbdev *layer_fb; +struct in_default_bind in_evdev_defbinds[] = { + { 0, 0, 0 }, +}; + +int omap_enable_layer(int enabled) +{ + return 0; +} + +void plat_video_menu_enter(int is_rom_loaded) +{ +} + +void plat_video_menu_begin(void) +{ +} + +void plat_video_menu_end(void) +{ +} + +void plat_init(void) +{ +} + diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c new file mode 100644 index 0000000..e5f9ebd --- /dev/null +++ b/frontend/plat_omap.c @@ -0,0 +1,203 @@ +/* + * (C) notaz, 2010 + * + * This work is licensed under the terms of the GNU GPLv2 or later. + * See the COPYING file in the top-level directory. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "common/input.h" +#include "common/menu.h" +#include "linux/fbdev.h" +#include "linux/oshide.h" +#include "plugin_lib.h" +#include "omap.h" + + +static struct vout_fbdev *main_fb; +int g_layer_x = 80, g_layer_y = 0; +int g_layer_w = 640, g_layer_h = 480; + +struct vout_fbdev *layer_fb; + +static const char * const pandora_gpio_keys[KEY_MAX + 1] = { + [0 ... KEY_MAX] = NULL, + [KEY_UP] = "Up", + [KEY_LEFT] = "Left", + [KEY_RIGHT] = "Right", + [KEY_DOWN] = "Down", + [KEY_HOME] = "A", + [KEY_PAGEDOWN] = "X", + [KEY_END] = "B", + [KEY_PAGEUP] = "Y", + [KEY_RIGHTSHIFT]= "L", + [KEY_RIGHTCTRL] = "R", + [KEY_LEFTALT] = "Start", + [KEY_LEFTCTRL] = "Select", + [KEY_MENU] = "Pandora", +}; + +struct in_default_bind in_evdev_defbinds[] = { + { KEY_UP, IN_BINDTYPE_PLAYER12, DKEY_UP }, + { KEY_DOWN, IN_BINDTYPE_PLAYER12, DKEY_DOWN }, + { KEY_LEFT, IN_BINDTYPE_PLAYER12, DKEY_LEFT }, + { KEY_RIGHT, IN_BINDTYPE_PLAYER12, DKEY_RIGHT }, + { KEY_SPACE, IN_BINDTYPE_EMU, PEVB_MENU }, + { KEY_PAGEUP, IN_BINDTYPE_PLAYER12, DKEY_TRIANGLE }, + { KEY_PAGEDOWN, IN_BINDTYPE_PLAYER12, DKEY_CROSS }, + { KEY_END, IN_BINDTYPE_PLAYER12, DKEY_CIRCLE }, + { KEY_HOME, IN_BINDTYPE_PLAYER12, DKEY_SQUARE }, + { KEY_LEFTALT, IN_BINDTYPE_PLAYER12, DKEY_START }, + { KEY_LEFTCTRL, IN_BINDTYPE_PLAYER12, DKEY_SELECT }, + { KEY_RIGHTSHIFT,IN_BINDTYPE_PLAYER12, DKEY_L1 }, + { KEY_RIGHTCTRL, IN_BINDTYPE_PLAYER12, DKEY_R1 }, + { KEY_Q, IN_BINDTYPE_PLAYER12, DKEY_L2 }, + { KEY_P, IN_BINDTYPE_PLAYER12, DKEY_R2 }, + { 0, 0, 0 } +}; + +static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h) +{ + struct omapfb_plane_info pi; + struct omapfb_mem_info mi; + int ret; + + ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi); + if (ret != 0) { + perror("QUERY_PLANE"); + return -1; + } + + ret = ioctl(fd, OMAPFB_QUERY_MEM, &mi); + if (ret != 0) { + perror("QUERY_MEM"); + return -1; + } + + /* must disable when changing stuff */ + if (pi.enabled) { + pi.enabled = 0; + ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); + if (ret != 0) + perror("SETUP_PLANE"); + } + + mi.size = 640*512*2*3; + ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi); + if (ret != 0) { + perror("SETUP_MEM"); + return -1; + } + + pi.pos_x = x; + pi.pos_y = y; + pi.out_width = w; + pi.out_height = h; + pi.enabled = enabled; + + ret = ioctl(fd, OMAPFB_SETUP_PLANE, &pi); + if (ret != 0) { + perror("SETUP_PLANE"); + return -1; + } + + return 0; +} + +int omap_enable_layer(int enabled) +{ + return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), enabled, + g_layer_x, g_layer_y, g_layer_w, g_layer_h); +} + +void plat_video_menu_enter(int is_rom_loaded) +{ +} + +void plat_video_menu_begin(void) +{ +} + +void plat_video_menu_end(void) +{ + g_menuscreen_ptr = vout_fbdev_flip(main_fb); +} + +void plat_init(void) +{ + const char *main_fb_name, *layer_fb_name; + void *temp_frame; + int fd, ret, w, h; + + main_fb_name = getenv("FBDEV_MAIN"); + if (main_fb_name == NULL) + main_fb_name = "/dev/fb0"; + + layer_fb_name = getenv("FBDEV_LAYER"); + if (layer_fb_name == NULL) + layer_fb_name = "/dev/fb1"; + + // must set the layer up first to be able to use it + fd = open(layer_fb_name, O_RDWR); + if (fd == -1) { + fprintf(stderr, "%s: ", layer_fb_name); + perror("open"); + exit(1); + } + + ret = omap_setup_layer_(fd, 1, g_layer_x, g_layer_y, g_layer_w, g_layer_h); + close(fd); + if (ret != 0) { + fprintf(stderr, "failed to set up layer, exiting.\n"); + exit(1); + } + + oshide_init(); + + w = h = 0; + main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2); + if (main_fb == NULL) { + fprintf(stderr, "couldn't init fb: %s\n", main_fb_name); + exit(1); + } + + g_menuscreen_w = w; + g_menuscreen_h = h; + g_menuscreen_ptr = vout_fbdev_flip(main_fb); + + w = 640; + h = 512; // ?? + layer_fb = vout_fbdev_init(layer_fb_name, &w, &h, 16, 3); + if (layer_fb == NULL) { + fprintf(stderr, "couldn't init fb: %s\n", layer_fb_name); + goto fail0; + } + + temp_frame = calloc(g_menuscreen_w * g_menuscreen_h * 2, 1); + if (temp_frame == NULL) { + fprintf(stderr, "OOM\n"); + goto fail1; + } + g_menubg_ptr = temp_frame; + g_menubg_src_ptr = temp_frame; + + in_set_config(in_name_to_id("evdev:gpio-keys"), IN_CFG_KEY_NAMES, + pandora_gpio_keys, sizeof(pandora_gpio_keys)); + return; + +fail1: + vout_fbdev_finish(layer_fb); +fail0: + vout_fbdev_finish(main_fb); + exit(1); + +} + diff --git a/frontend/plugin.c b/frontend/plugin.c index c83da72..ca359d7 100644 --- a/frontend/plugin.c +++ b/frontend/plugin.c @@ -48,8 +48,8 @@ static uint8_t pad_byte; static unsigned char PADstartPoll(int pad) { pad_byte = 0; - pad_buf[2] = keystate; - pad_buf[3] = keystate >> 8; + pad_buf[2] = ~keystate; + pad_buf[3] = ~keystate >> 8; return 0xFF; } diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 7d5e15f..e2a0d58 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -47,7 +47,7 @@ void *pl_fbdev_flip(void) in_update(actions); if (actions[IN_BINDTYPE_EMU] & PEV_MENU) stop = 1; - keystate = ~actions[IN_BINDTYPE_PLAYER12]; + keystate = actions[IN_BINDTYPE_PLAYER12]; // let's flip now pl_fbdev_buf = vout_fbdev_flip(layer_fb); -- cgit v1.2.3