X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=6cc4eaa716193e4026776b555763326a17660222;hp=b0490c77deaf9e182c441269dd8f9c4cebf8eebb;hb=366631aa62737a8a715e80bcb35cb198fae5fd29;hpb=2c8869044c0faff01c6bb8986346f78f631ceac1

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index b0490c77..6cc4eaa7 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -18,6 +18,7 @@
 #include "linux/fbdev.h"
 #include "linux/oshide.h"
 #include "plugin_lib.h"
+#include "pl_gun_ts.h"
 #include "omap.h"
 #include "pandora.h"
 
@@ -28,7 +29,7 @@ int g_layer_w = 640, g_layer_h = 480;
 
 struct vout_fbdev *layer_fb;
 
-static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, int first_call)
+static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h)
 {
 	struct omapfb_plane_info pi = { 0, };
 	struct omapfb_mem_info mi = { 0, };
@@ -54,7 +55,7 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, in
 			perror("SETUP_PLANE");
 	}
 
-	if (first_call) {
+	if (mi.size < 640*512*3*3) {
 		mi.size = 640*512*3*3;
 		ret = ioctl(fd, OMAPFB_SETUP_MEM, &mi);
 		if (ret != 0) {
@@ -80,8 +81,11 @@ static int omap_setup_layer_(int fd, int enabled, int x, int y, int w, int h, in
 
 int omap_enable_layer(int enabled)
 {
+	if (enabled)
+		pl_set_gun_rect(g_layer_x, g_layer_y, g_layer_w, g_layer_h);
+
 	return omap_setup_layer_(vout_fbdev_get_fd(layer_fb), enabled,
-		g_layer_x, g_layer_y, g_layer_w, g_layer_h, 0);
+		g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 }
 
 void plat_video_menu_enter(int is_rom_loaded)
@@ -134,7 +138,7 @@ void plat_init(void)
 		exit(1);
 	}
 
-	ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h, 1);
+	ret = omap_setup_layer_(fd, 0, g_layer_x, g_layer_y, g_layer_w, g_layer_h);
 	close(fd);
 	if (ret != 0) {
 		fprintf(stderr, "failed to set up layer, exiting.\n");
@@ -169,7 +173,9 @@ void plat_init(void)
 	}
 	g_menubg_ptr = temp_frame;
 
-	pandora_init();
+	// hmh
+	pandora_rescan_inputs();
+
 	return;
 
 fail1: