X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=e5b6c04ed48b066f51112673aa50d7cb5ed245a6;hp=d5e9db52479578668b680975f9f5e79b097cfdd3;hb=99d767a0cbf8ee7406000cbac647d9681d885282;hpb=96d9fde1230e5ae6de069ff9e4a0f16185650ab5 diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c index d5e9db52..e5b6c04e 100644 --- a/frontend/plat_omap.c +++ b/frontend/plat_omap.c @@ -1,5 +1,5 @@ /* - * (C) notaz, 2010 + * (C) Gražvydas "notaz" Ignotas, 2010-2012 * * This work is licensed under the terms of the GNU GPLv2 or later. * See the COPYING file in the top-level directory. @@ -10,64 +10,26 @@ #include #include #include +#include #include -#include #include -#include "common/input.h" #include "common/menu.h" +#include "common/input.h" #include "linux/fbdev.h" -#include "linux/oshide.h" +#include "linux/xenv.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, int first_call) +#include "pl_gun_ts.h" +#include "plat.h" +#include "plat_omap.h" +#include "menu.h" + +static struct vout_fbdev *main_fb, *layer_fb; + +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; + struct omapfb_plane_info pi = { 0, }; + struct omapfb_mem_info mi = { 0, }; int ret; ret = ioctl(fd, OMAPFB_QUERY_PLANE, &pi); @@ -90,8 +52,9 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, in perror("SETUP_PLANE"); } - if (first_call) { - mi.size = 640*512*2*3; + // upto 1024x512 (2x resolution enhancement) + if (mi.size < 1024*512*2 * 3) { + mi.size = 1024*512*2 * 3; ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi); if (ret != 0) { perror("SETUP_MEM"); @@ -114,14 +77,62 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, in return 0; } -int omap_enable_layer(int enabled) +static int omap_enable_layer(int enabled) { + if (enabled) + pl_set_gun_rect(g_layer_x, g_layer_y, g_layer_w, g_layer_h); + return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), enabled, - g_layer_x, g_layer_y, g_layer_w, g_layer_h, 0); + g_layer_x, g_layer_y, g_layer_w, g_layer_h); +} + +void plat_omap_gvideo_open(void) +{ + omap_enable_layer(1); + + // try to align redraws to vsync + vout_fbdev_wait_vsync(layer_fb); +} + +void *plat_gvideo_set_mode(int *w, int *h, int *bpp) +{ + int l = 0, r = 0, t = 0, b = 0; + void *buf; + + if (g_scaler == SCALE_1_1) { + if (*w > g_menuscreen_w) + l = r = (*w - g_menuscreen_w) / 2; + if (*h > g_menuscreen_h) + t = b = (*h - g_menuscreen_h) / 2; + } + + vout_fbdev_clear(layer_fb); + buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, + l, r, t, b, 3); + + omap_enable_layer(1); + + return buf; +} + +void *plat_gvideo_flip(void) +{ + return vout_fbdev_flip(layer_fb); +} + +void plat_gvideo_close(void) +{ + omap_enable_layer(0); } void plat_video_menu_enter(int is_rom_loaded) { + g_menuscreen_ptr = vout_fbdev_resize(main_fb, + g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 3); + if (g_menuscreen_ptr == NULL) + fprintf(stderr, "warning: vout_fbdev_resize failed\n"); + + xenv_update(NULL, NULL, NULL, NULL); } void plat_video_menu_begin(void) @@ -133,10 +144,42 @@ void plat_video_menu_end(void) g_menuscreen_ptr = vout_fbdev_flip(main_fb); } -void plat_init(void) +void plat_video_menu_leave(void) +{ + /* have to get rid of panning so that plugins that + * use fb0 and don't ever pan can work. */ + vout_fbdev_clear(main_fb); + g_menuscreen_ptr = vout_fbdev_resize(main_fb, + g_menuscreen_w, g_menuscreen_h, 16, 0, 0, 0, 0, 1); + if (g_menuscreen_ptr == NULL) + fprintf(stderr, "warning: vout_fbdev_resize failed\n"); +} + +void plat_minimize(void) +{ + int ret; + + ret = vout_fbdev_save(layer_fb); + if (ret != 0) { + printf("minimize: layer/fb handling failed\n"); + return; + } + + xenv_minimize(); + + in_set_config_int(0, IN_CFG_BLOCKING, 0); /* flush event queue */ + omap_enable_layer(0); /* restore layer mem */ + vout_fbdev_restore(layer_fb); +} + +void *plat_prepare_screenshot(int *w, int *h, int *bpp) +{ + return NULL; +} + +void plat_omap_init(void) { const char *main_fb_name, *layer_fb_name; - void *temp_frame; int fd, ret, w, h; main_fb_name = getenv("FBDEV_MAIN"); @@ -155,14 +198,17 @@ void plat_init(void) exit(1); } - ret = omap_setup_layer_(fd, 1, g_layer_x, g_layer_y, g_layer_w, g_layer_h, 1); + g_layer_x = 80, g_layer_y = 0; + g_layer_w = 640, g_layer_h = 480; + + ret = omap_setup_layer_(fd, 0, 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(); + xenv_init(NULL, "PCSX-ReARMed"); w = h = 0; main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2); @@ -174,32 +220,29 @@ void plat_init(void) g_menuscreen_w = w; g_menuscreen_h = h; g_menuscreen_ptr = vout_fbdev_flip(main_fb); + pl_rearmed_cbs.screen_w = w; + pl_rearmed_cbs.screen_h = h; w = 640; - h = 512; // ?? + 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); +} +void plat_omap_finish(void) +{ + omap_enable_layer(0); + vout_fbdev_finish(layer_fb); + vout_fbdev_finish(main_fb); + xenv_finish(); }