X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=b01c634360e4196607243e63fca75e01972f6da9;hp=96f75cec471b3dde4d3b6e138818dde840b2bd6d;hb=9e5ac38fda66536f2a9e6dd2a747ae37538c3638;hpb=6469a8c407ff23af8b7a6218f759b368eec7c339

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index 96f75cec..b01c6343 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -15,11 +15,13 @@
 #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 "plat_omap.h"
 #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);
 }
 
-void plat_gvideo_open(void)
+void plat_omap_gvideo_open(void)
 {
 	omap_enable_layer(1);
 
@@ -93,10 +95,19 @@ void plat_gvideo_open(void)
 
 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, 0, 0, 0, 0, 3);
+	buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp,
+		l, r, t, b, 3);
 
 	omap_enable_layer(1);
 
@@ -145,17 +156,19 @@ void plat_video_menu_leave(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)
@@ -163,10 +176,9 @@ void *plat_prepare_screenshot(int *w, int *h, int *bpp)
 	return NULL;
 }
 
-void plat_init(void)
+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");
@@ -218,26 +230,14 @@ void plat_init(void)
 		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;
-
-	plat_pandora_init(); // XXX
-
 	return;
 
-fail1:
-	vout_fbdev_finish(layer_fb);
 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);