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: track output and psx sizes separately
[pcsx_rearmed.git]
/
frontend
/
plat_omap.c
diff --git
a/frontend/plat_omap.c
b/frontend/plat_omap.c
index
1a725ff
..
b8ab19b
100644
(file)
--- a/
frontend/plat_omap.c
+++ b/
frontend/plat_omap.c
@@
-15,11
+15,13
@@
#include <linux/omapfb.h>
#include "common/menu.h"
#include <linux/omapfb.h>
#include "common/menu.h"
+#include "common/input.h"
#include "linux/fbdev.h"
#include "linux/xenv.h"
#include "plugin_lib.h"
#include "pl_gun_ts.h"
#include "plat.h"
#include "linux/fbdev.h"
#include "linux/xenv.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;
@@
-83,7
+85,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);
@@
-145,17
+147,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
+167,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
+221,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);