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
frontend: avoid potential alignment fault
[pcsx_rearmed.git]
/
frontend
/
plugin_lib.c
diff --git
a/frontend/plugin_lib.c
b/frontend/plugin_lib.c
index
e79e523
..
2e954aa
100644
(file)
--- a/
frontend/plugin_lib.c
+++ b/
frontend/plugin_lib.c
@@
-21,7
+21,6
@@
#include "linux/fbdev.h"
#include "common/fonts.h"
#include "common/input.h"
#include "linux/fbdev.h"
#include "common/fonts.h"
#include "common/input.h"
-#include "omap.h"
#include "menu.h"
#include "main.h"
#include "plat.h"
#include "menu.h"
#include "main.h"
#include "plat.h"
@@
-37,9
+36,11
@@
int in_keystate, in_state_gun;
int in_enable_vibration;
void *tsdev;
void *pl_vout_buf;
int in_enable_vibration;
void *tsdev;
void *pl_vout_buf;
+int g_layer_x, g_layer_y, g_layer_w, g_layer_h;
static int pl_vout_w, pl_vout_h, pl_vout_bpp;
static int vsync_cnt;
static int pl_vout_w, pl_vout_h, pl_vout_bpp;
static int vsync_cnt;
-static int frame_interval, frame_interval1024, vsync_usec_time;
+static int is_pal, frame_interval, frame_interval1024;
+static int vsync_usec_time;
static __attribute__((noinline)) int get_cpu_ticks(void)
static __attribute__((noinline)) int get_cpu_ticks(void)
@@
-111,10
+112,9
@@
static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
}
}
}
}
-void pl_print_hud(int
w, int h, int
xborder)
+void pl_print_hud(int xborder)
{
{
- pl_vout_w = w; // used by pollux
- pl_vout_h = h;
+ int w = pl_vout_w, h = pl_vout_h;
if (g_opts & OPT_SHOWSPU)
draw_active_chans(w, h);
if (g_opts & OPT_SHOWSPU)
draw_active_chans(w, h);
@@
-143,58
+143,39
@@
static void *pl_vout_set_mode(int w, int h, int bpp)
pl_vout_h = h;
pl_vout_bpp = bpp;
pl_vout_h = h;
pl_vout_bpp = bpp;
-#if defined(VOUT_FBDEV)
- vout_fbdev_clear(layer_fb);
- pl_vout_buf = vout_fbdev_resize(layer_fb, w, h, bpp, 0, 0, 0, 0, 3);
-#elif defined(MAEMO)
- extern void *hildon_set_mode(int w, int h);
- pl_vout_buf = hildon_set_mode(w, h);
-#endif
-
+ pl_vout_buf = plat_gvideo_set_mode(&pl_vout_w, &pl_vout_h, &pl_vout_bpp);
if (pl_vout_buf == NULL)
fprintf(stderr, "failed to set mode\n");
if (pl_vout_buf == NULL)
fprintf(stderr, "failed to set mode\n");
- // menu decides on layer size, we commit it
menu_notify_mode_change(w, h, bpp);
menu_notify_mode_change(w, h, bpp);
- omap_enable_layer(1);
return pl_vout_buf;
}
return pl_vout_buf;
}
+// only used if raw flip is not defined
static void *pl_vout_flip(void)
{
pl_rearmed_cbs.flip_cnt++;
if (pl_vout_buf != NULL)
static void *pl_vout_flip(void)
{
pl_rearmed_cbs.flip_cnt++;
if (pl_vout_buf != NULL)
- pl_print_hud(
pl_vout_w, pl_vout_h,
0);
+ pl_print_hud(0);
// let's flip now
// let's flip now
-#if defined(VOUT_FBDEV)
- pl_vout_buf = vout_fbdev_flip(layer_fb);
-#elif defined(MAEMO)
- extern void *hildon_flip(void);
- pl_vout_buf = hildon_flip();
-#endif
+ pl_vout_buf = plat_gvideo_flip();
return pl_vout_buf;
}
static int pl_vout_open(void)
{
struct timeval now;
return pl_vout_buf;
}
static int pl_vout_open(void)
{
struct timeval now;
+ int h;
- omap_enable_layer(1);
-#if defined(VOUT_FBDEV)
// force mode update
// force mode update
-
int
h = pl_vout_h;
+ h = pl_vout_h;
pl_vout_h--;
pl_vout_buf = pl_vout_set_mode(pl_vout_w, h, pl_vout_bpp);
pl_vout_h--;
pl_vout_buf = pl_vout_set_mode(pl_vout_w, h, pl_vout_bpp);
- // try to align redraws to vsync
- vout_fbdev_wait_vsync(layer_fb);
-#elif defined(MAEMO)
- extern void *hildon_flip(void);
- pl_vout_buf = hildon_flip();
-#endif
+ plat_gvideo_open(is_pal);
gettimeofday(&now, 0);
vsync_usec_time = now.tv_usec;
gettimeofday(&now, 0);
vsync_usec_time = now.tv_usec;
@@
-206,20
+187,20
@@
static int pl_vout_open(void)
static void pl_vout_close(void)
{
static void pl_vout_close(void)
{
-
omap_enable_layer(0
);
+
plat_gvideo_close(
);
}
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
}
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
-#if defined(VOUT_FBDEV)
+ void *ret = plat_prepare_screenshot(w, h, bpp);
+ if (ret != NULL)
+ return ret;
+
*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
}
#ifndef MAEMO
}
#ifndef MAEMO
@@
-384,12
+365,13
@@
void pl_frame_limit(void)
pcnt_start(PCNT_ALL);
}
pcnt_start(PCNT_ALL);
}
-void pl_timing_prepare(int is_pal)
+void pl_timing_prepare(int is_pal
_
)
{
pl_rearmed_cbs.fskip_advice = 0;
pl_rearmed_cbs.flips_per_sec = 0;
pl_rearmed_cbs.cpu_usage = 0;
{
pl_rearmed_cbs.fskip_advice = 0;
pl_rearmed_cbs.flips_per_sec = 0;
pl_rearmed_cbs.cpu_usage = 0;
+ is_pal = is_pal_;
frame_interval = is_pal ? 20000 : 16667;
frame_interval1024 = is_pal ? 20000*1024 : 17066667;
frame_interval = is_pal ? 20000 : 16667;
frame_interval1024 = is_pal ? 20000*1024 : 17066667;