X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=b8ab19ba326cc94a6647994812b8a5631f852c24;hp=62f198b5d007b67d0187fd2af4ac4b2eda455961;hb=ddc0a02a811034532a8e013c14091b61a89439ba;hpb=a805c8556900f3abca95c6b6536a9c267f8135fc

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index 62f198b5..b8ab19ba 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.
@@ -15,19 +15,16 @@
 #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 "omap.h"
 #include "plat.h"
+#include "plat_omap.h"
+#include "menu.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 struct vout_fbdev *main_fb, *layer_fb;
 
 static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 {
@@ -79,7 +76,7 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 	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);
@@ -88,17 +85,44 @@ int omap_enable_layer(int enabled)
 		g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 }
 
-void plat_video_menu_enter(int is_rom_loaded)
+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 dummy;
+	void *buf;
 
+	vout_fbdev_clear(layer_fb);
+	buf = vout_fbdev_resize(layer_fb, *w, *h, *bpp, 0, 0, 0, 0, 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");
 
-	// hmh
-	xenv_update(&dummy);
+	xenv_update(NULL, NULL, NULL, NULL);
 }
 
 void plat_video_menu_begin(void)
@@ -123,23 +147,29 @@ void plat_video_menu_leave(void)
 
 void plat_minimize(void)
 {
-	omap_enable_layer(0);
+	int ret;
+
+	ret = vout_fbdev_save(layer_fb);
+	if (ret != 0) {
+		printf("minimize: layer/fb handling failed\n");
+		return;
+	}
+
 	xenv_minimize();
-	omap_enable_layer(1);
-}
 
-void plat_step_volume(int is_up)
-{
+	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_trigger_vibrate(void)
+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");
@@ -158,6 +188,9 @@ void plat_init(void)
 		exit(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) {
@@ -165,7 +198,7 @@ void plat_init(void)
 		exit(1);
 	}
 
-	xenv_init("PCSX-ReARMed");
+	xenv_init(NULL, "PCSX-ReARMed");
 
 	w = h = 0;
 	main_fb = vout_fbdev_init(main_fb_name, &w, &h, 16, 2);
@@ -177,6 +210,8 @@ 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;
@@ -186,26 +221,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);