notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: fix sub assem_debug print
[pcsx_rearmed.git]
/
frontend
/
plat_omap.c
diff --git
a/frontend/plat_omap.c
b/frontend/plat_omap.c
index
516e06f
..
65478cb
100644
(file)
--- 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 "linux/fbdev.h"
#include "linux/oshide.h"
#include "plugin_lib.h"
+#include "pl_gun_ts.h"
#include "omap.h"
#include "omap.h"
-#include "p
andora
.h"
+#include "p
lat
.h"
static struct vout_fbdev *main_fb;
static struct vout_fbdev *main_fb;
@@
-28,7
+29,7
@@
int g_layer_w = 640, g_layer_h = 480;
struct vout_fbdev *layer_fb;
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, };
{
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");
}
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) {
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)
{
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,
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)
}
void plat_video_menu_enter(int is_rom_loaded)
@@
-134,7
+138,7
@@
void plat_init(void)
exit(1);
}
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");
close(fd);
if (ret != 0) {
fprintf(stderr, "failed to set up layer, exiting.\n");
@@
-170,7
+174,7
@@
void plat_init(void)
g_menubg_ptr = temp_frame;
// hmh
g_menubg_ptr = temp_frame;
// hmh
- p
andora
_rescan_inputs();
+ p
lat
_rescan_inputs();
return;
return;