X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=e6a1105def8751e9bc29908faea52a4357dc9550;hp=e5f9ebda680c159623683f64919be8f619791be0;hb=fba064572196c69de43e3c69245369d94d3be929;hpb=ccf51908872ddeb811b1245e6751600b860d90b5

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index e5f9ebda..e6a1105d 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -64,7 +64,7 @@ struct in_default_bind in_evdev_defbinds[] = {
 	{ 0, 0, 0 }
 };
 
-static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
+static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, int first_call)
 {
 	struct omapfb_plane_info pi;
 	struct omapfb_mem_info mi;
@@ -90,11 +90,13 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 			perror("SETUP_PLANE");
 	}
 
-	mi.size = 640*512*2*3;
-	ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
-	if (ret != 0) {
-		perror("SETUP_MEM");
-		return -1;
+	if (first_call) {
+		mi.size = 640*512*3*3;
+		ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
+		if (ret != 0) {
+			perror("SETUP_MEM");
+			return -1;
+		}
 	}
 
 	pi.pos_x = x;
@@ -115,11 +117,15 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 int omap_enable_layer(int enabled)
 {
 	return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), 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, 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");
 }
 
 void plat_video_menu_begin(void)
@@ -131,6 +137,17 @@ void plat_video_menu_end(void)
 	g_menuscreen_ptr = vout_fbdev_flip(main_fb);
 }
 
+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_init(void)
 {
 	const char *main_fb_name, *layer_fb_name;
@@ -153,7 +170,7 @@ void plat_init(void)
 		exit(1);
 	}
 
-	ret = omap_setup_layer_(fd, 1, g_layer_x, g_layer_y, g_layer_w, g_layer_h);
+	ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h, 1);
 	close(fd);
 	if (ret != 0) {
 		fprintf(stderr, "failed to set up layer, exiting.\n");
@@ -187,7 +204,6 @@ void plat_init(void)
 		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));
@@ -201,3 +217,11 @@ fail0:
 
 }
 
+void plat_finish(void)
+{
+	omap_enable_layer(0);
+	vout_fbdev_finish(layer_fb);
+	vout_fbdev_finish(main_fb);
+	oshide_finish();
+}
+