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/gte: fix dep list
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
084ff1e
..
9003ff8
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-24,6
+24,7
@@
#include "omap.h"
#include "menu.h"
#include "main.h"
#include "omap.h"
#include "menu.h"
#include "main.h"
+#include "plat.h"
#include "pcnt.h"
#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "pcnt.h"
#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
@@
-33,7
+34,7
@@
int in_type1, in_type2;
int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
int in_keystate, in_state_gun;
int pl_flip_cnt;
int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
int in_keystate, in_state_gun;
int pl_flip_cnt;
-
static void *ts
;
+
void *tsdev
;
void *pl_vout_buf;
static int pl_vout_w, pl_vout_h, pl_vout_bpp;
static int vsync_cnt, flips_per_sec, tick_per_sec;
void *pl_vout_buf;
static int pl_vout_w, pl_vout_h, pl_vout_bpp;
static int vsync_cnt, flips_per_sec, tick_per_sec;
@@
-209,11
+210,15
@@
static void pl_vout_close(void)
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
+#if defined(VOUT_FBDEV)
*w = pl_vout_w;
*h = pl_vout_h;
*bpp = pl_vout_bpp;
return pl_vout_buf;
*w = pl_vout_w;
*h = pl_vout_h;
*bpp = pl_vout_bpp;
return pl_vout_buf;
+#else
+ return plat_prepare_screenshot(w, h, bpp);
+#endif
}
static void update_input(void)
}
static void update_input(void)
@@
-248,8
+253,8
@@
static void update_input(void)
void pl_update_gun(int *xn, int *xres, int *y, int *in)
{
void pl_update_gun(int *xn, int *xres, int *y, int *in)
{
- if (ts)
- pl_gun_ts_update(ts, xn, y, in);
+ if (ts
dev
)
+ pl_gun_ts_update(ts
dev
, xn, y, in);
*xres = pl_vout_w;
*y = *y * pl_vout_h >> 10;
*xres = pl_vout_w;
*y = *y * pl_vout_h >> 10;
@@
-473,5
+478,5
@@
void pl_init(void)
pl_vout_w = pl_vout_h = 256;
pl_vout_bpp = 16;
pl_vout_w = pl_vout_h = 256;
pl_vout_bpp = 16;
- ts = pl_gun_ts_init();
+ ts
dev
= pl_gun_ts_init();
}
}