notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
frontend: add 2x scaling option
[pcsx_rearmed.git]
/
frontend
/
plat_omap.c
diff --git
a/frontend/plat_omap.c
b/frontend/plat_omap.c
index
1a725ff
..
f397cc6
100644
(file)
--- a/
frontend/plat_omap.c
+++ b/
frontend/plat_omap.c
@@
-14,12
+14,14
@@
#include <unistd.h>
#include <linux/omapfb.h>
#include <unistd.h>
#include <linux/omapfb.h>
-#include "common/menu.h"
-#include "linux/fbdev.h"
-#include "linux/xenv.h"
+#include "libpicofe/menu.h"
+#include "libpicofe/input.h"
+#include "libpicofe/linux/fbdev.h"
+#include "libpicofe/linux/xenv.h"
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "plat.h"
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "plat.h"
+#include "plat_omap.h"
#include "menu.h"
static struct vout_fbdev *main_fb, *layer_fb;
#include "menu.h"
static struct vout_fbdev *main_fb, *layer_fb;
@@
-50,8
+52,9
@@
static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
perror("SETUP_PLANE");
}
perror("SETUP_PLANE");
}
- if (mi.size < 640*512*3*3) {
- mi.size = 640*512*3*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");
ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
if (ret != 0) {
perror("SETUP_MEM");
@@
-83,7
+86,7
@@
static int omap_enable_layer(int enabled)
g_layer_x, g_layer_y, g_layer_w, g_layer_h);
}
g_layer_x, g_layer_y, g_layer_w, g_layer_h);
}
-void plat_gvideo_open(void)
+void plat_
omap_
gvideo_open(void)
{
omap_enable_layer(1);
{
omap_enable_layer(1);
@@
-93,10
+96,19
@@
void plat_gvideo_open(void)
void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
{
void *plat_gvideo_set_mode(int *w, int *h, int *bpp)
{
+ int l = 0, r = 0, t = 0, b = 0;
void *buf;
void *buf;
+ if (g_scaler == SCALE_1_1 || g_scaler == SCALE_2_2) {
+ 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);
vout_fbdev_clear(layer_fb);
- buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, 0, 0, 0, 0, 3);
+ buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp,
+ l, r, t, b, 3);
omap_enable_layer(1);
omap_enable_layer(1);
@@
-145,17
+157,19
@@
void plat_video_menu_leave(void)
void plat_minimize(void)
{
void plat_minimize(void)
{
- omap_enable_layer(0);
- xenv_minimize();
- omap_enable_layer(1);
-}
+ int ret;
-void plat_step_volume(int is_up)
-{
-}
+ ret = vout_fbdev_save(layer_fb);
+ if (ret != 0) {
+ printf("minimize: layer/fb handling failed\n");
+ return;
+ }
-void plat_trigger_vibrate(int is_strong)
-{
+ 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)
}
void *plat_prepare_screenshot(int *w, int *h, int *bpp)
@@
-163,7
+177,7
@@
void *plat_prepare_screenshot(int *w, int *h, int *bpp)
return NULL;
}
return NULL;
}
-void plat_init(void)
+void plat_
omap_
init(void)
{
const char *main_fb_name, *layer_fb_name;
int fd, ret, w, h;
{
const char *main_fb_name, *layer_fb_name;
int fd, ret, w, h;
@@
-217,19
+231,14
@@
void plat_init(void)
goto fail0;
}
goto fail0;
}
- plat_pandora_init(); // XXX
-
return;
return;
-fail1:
- vout_fbdev_finish(layer_fb);
fail0:
vout_fbdev_finish(main_fb);
exit(1);
fail0:
vout_fbdev_finish(main_fb);
exit(1);
-
}
}
-void plat_finish(void)
+void plat_
omap_
finish(void)
{
omap_enable_layer(0);
vout_fbdev_finish(layer_fb);
{
omap_enable_layer(0);
vout_fbdev_finish(layer_fb);