X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplat_omap.c;h=5474bda0cda9cf1921f89f2ab52ca8071eb5eb51;hp=516e06f18a9a5dfd84d296f9b5e3b35c1ead67cd;hb=9b4bd105989e1186ca09d93e70d14484a528a238;hpb=ef94866c5ee97402b81a173093c0be4ca0daa4a0

diff --git a/frontend/plat_omap.c b/frontend/plat_omap.c
index 516e06f1..5474bda0 100644
--- a/frontend/plat_omap.c
+++ b/frontend/plat_omap.c
@@ -18,8 +18,9 @@
 #include "linux/fbdev.h"
 #include "linux/oshide.h"
 #include "plugin_lib.h"
+#include "pl_gun_ts.h"
 #include "omap.h"
-#include "pandora.h"
+#include "plat.h"
 
 
 static struct vout_fbdev *main_fb;
@@ -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)
@@ -112,6 +116,10 @@ void plat_video_menu_leave(void)
 		fprintf(stderr, "warning: vout_fbdev_resize failed\n");
 }
 
+void plat_step_volume(int is_up)
+{
+}
+
 void plat_init(void)
 {
 	const char *main_fb_name, *layer_fb_name;
@@ -134,7 +142,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,8 +177,7 @@ void plat_init(void)
 	}
 	g_menubg_ptr = temp_frame;
 
-	// hmh
-	pandora_rescan_inputs();
+	plat_pandora_init(); // XXX
 
 	return;