#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 "pcnt.h"
#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
int in_type1, in_type2;
int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
+int in_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }};
int in_keystate, in_state_gun;
-static void *ts;
+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 flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
-static float vsps_cur;
-static int frame_interval, frame_interval1024, vsync_usec_time;
+static int vsync_cnt;
+static int is_pal, frame_interval, frame_interval1024;
+static int vsync_usec_time;
static __attribute__((noinline)) int get_cpu_ticks(void)
return ret;
}
-static void print_hud(void)
+static void print_msg(int h, int border)
{
if (pl_vout_bpp == 16)
- pl_text_out16(2, pl_vout_h - 10, "%s", hud_msg);
+ pl_text_out16(border + 2, h - 10, "%s", hud_msg);
}
-static void print_fps(void)
+static void print_fps(int h, int border)
{
if (pl_vout_bpp == 16)
- pl_text_out16(2, pl_vout_h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
+ pl_text_out16(border + 2, h - 10, "%2d %4.1f",
+ pl_rearmed_cbs.flips_per_sec, pl_rearmed_cbs.vsps_cur);
}
-static void print_cpu_usage(void)
+static void print_cpu_usage(int w, int h, int border)
{
if (pl_vout_bpp == 16)
- pl_text_out16(pl_vout_w - 28, pl_vout_h - 10, "%3d", tick_per_sec);
+ pl_text_out16(w - border - 28, h - 10, "%3d", pl_rearmed_cbs.cpu_usage);
}
// draw 192x8 status of 24 sound channels
-static __attribute__((noinline)) void draw_active_chans(void)
+static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
{
- extern void spu_get_debug_info(int *chans_out, int *fmod_chans_out, int *noise_chans_out); // hack
- int live_chans, fmod_chans, noise_chans;
+ extern void spu_get_debug_info(int *chans_out, int *run_chans,
+ int *fmod_chans_out, int *noise_chans_out); // hack
+ int live_chans, run_chans, fmod_chans, noise_chans;
static const unsigned short colors[2] = { 0x1fe3, 0x0700 };
unsigned short *dest = (unsigned short *)pl_vout_buf +
- pl_vout_w * (pl_vout_h - 10) + pl_vout_w / 2 - 192/2;
+ vout_w * (vout_h - 10) + vout_w / 2 - 192/2;
unsigned short *d, p;
int c, x, y;
if (pl_vout_bpp != 16)
return;
- spu_get_debug_info(&live_chans, &fmod_chans, &noise_chans);
+ spu_get_debug_info(&live_chans, &run_chans, &fmod_chans, &noise_chans);
for (c = 0; c < 24; c++) {
d = dest + c * 8;
- p = !(live_chans & (1<<c)) ? 0 :
+ p = !(live_chans & (1<<c)) ? (run_chans & (1<<c) ? 0x01c0 : 0) :
(fmod_chans & (1<<c)) ? 0xf000 :
(noise_chans & (1<<c)) ? 0x001f :
colors[c & 1];
- for (y = 0; y < 8; y++, d += pl_vout_w)
+ for (y = 0; y < 8; y++, d += vout_w)
for (x = 0; x < 8; x++)
d[x] = p;
}
}
+void pl_print_hud(int xborder)
+{
+ int w = pl_vout_w, h = pl_vout_h;
+
+ if (h < 16)
+ return;
+
+ if (g_opts & OPT_SHOWSPU)
+ draw_active_chans(w, h);
+
+ if (hud_msg[0] != 0)
+ print_msg(h, xborder);
+ else if (g_opts & OPT_SHOWFPS)
+ print_fps(h, xborder);
+
+ if (g_opts & OPT_SHOWCPU)
+ print_cpu_usage(w, h, xborder);
+}
+
static void *pl_vout_set_mode(int w, int h, int bpp)
{
// special h handling, Wipeout likes to change it by 1-6
- h = (h + 7) & ~7;
+ static int vsync_cnt_ms_prev;
+ if ((unsigned int)(vsync_cnt - vsync_cnt_ms_prev) < 5*60)
+ h = (h + 7) & ~7;
+ vsync_cnt_ms_prev = vsync_cnt;
if (w == pl_vout_w && h == pl_vout_h && bpp == pl_vout_bpp)
return pl_vout_buf;
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");
- // menu decides on layer size, we commit it
menu_notify_mode_change(w, h, bpp);
- omap_enable_layer(1);
return pl_vout_buf;
}
+// only used if raw flip is not defined
static void *pl_vout_flip(void)
{
- flip_cnt++;
-
- if (pl_vout_buf != NULL) {
- if (g_opts & OPT_SHOWSPU)
- draw_active_chans();
+ pl_rearmed_cbs.flip_cnt++;
- if (hud_msg[0] != 0)
- print_hud();
- else if (g_opts & OPT_SHOWFPS)
- print_fps();
-
- if (g_opts & OPT_SHOWCPU)
- print_cpu_usage();
- }
+ if (pl_vout_buf != NULL)
+ pl_print_hud(0);
// 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;
+ int h;
- omap_enable_layer(1);
-#if defined(VOUT_FBDEV)
- pl_vout_buf = vout_fbdev_flip(layer_fb);
+ // force mode update
+ h = pl_vout_h;
+ 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;
static void pl_vout_close(void)
{
- omap_enable_layer(0);
+ plat_gvideo_close();
}
void *pl_prepare_screenshot(int *w, int *h, int *bpp)
{
+ 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;
}
+#ifndef MAEMO
+static void update_analogs(void)
+{
+ int *nubp[2] = { in_a1, in_a2 };
+ int i, a, v, ret;
+
+ for (i = 0; i < 2; i++)
+ {
+ if (in_adev[i] < 0)
+ continue;
+
+ for (a = 0; a < 2; a++) {
+ nubp[i][a] = 127;
+
+ ret = in_update_analog(in_adev[i], in_adev_axis[i][a], &v);
+ if (ret == 0) {
+ v = v / (IN_ABS_RANGE / 128) + 127;
+ nubp[i][a] = v < 0 ? 0 : v;
+ }
+ }
+ }
+ //printf("%4d %4d %4d %4d\n", in_a1[0], in_a1[1], in_a2[0], in_a2[1]);
+}
+
static void update_input(void)
{
-#ifndef MAEMO
int actions[IN_BINDTYPE_COUNT] = { 0, };
unsigned int emu_act;
in_update(actions);
if (in_type1 == PSE_PAD_TYPE_ANALOGPAD)
- in_update_analogs();
+ update_analogs();
emu_act = actions[IN_BINDTYPE_EMU];
in_state_gun = (emu_act & SACTION_GUN_MASK) >> SACTION_GUN_TRIGGER;
emu_set_action(emu_act);
in_keystate = actions[IN_BINDTYPE_PLAYER12];
-#endif
#ifdef X11
extern int x11_update_keys(unsigned int *action);
in_keystate |= x11_update_keys(&emu_act);
emu_set_action(emu_act);
#endif
}
+#else /* MAEMO */
+static void update_input(void)
+{
+}
+#endif
void pl_update_gun(int *xn, int *xres, int *y, int *in)
{
- if (ts)
- pl_gun_ts_update(ts, xn, y, in);
+ if (tsdev)
+ pl_gun_ts_update(tsdev, xn, y, in);
*xres = pl_vout_w;
*y = *y * pl_vout_h >> 10;
void pl_frame_limit(void)
{
static struct timeval tv_old, tv_expect;
- static int vsync_cnt_prev;
+ static int vsync_cnt_prev, drc_active_vsyncs;
struct timeval now;
int diff, usadj;
if (now.tv_sec != tv_old.tv_sec) {
diff = tvdiff(now, tv_old);
- vsps_cur = 0.0f;
+ pl_rearmed_cbs.vsps_cur = 0.0f;
if (0 < diff && diff < 2000000)
- vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff;
+ pl_rearmed_cbs.vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff;
vsync_cnt_prev = vsync_cnt;
- flips_per_sec = flip_cnt;
- flip_cnt = 0;
- tv_old = now;
+
+ if (g_opts & OPT_SHOWFPS)
+ pl_rearmed_cbs.flips_per_sec = pl_rearmed_cbs.flip_cnt;
+ pl_rearmed_cbs.flip_cnt = 0;
if (g_opts & OPT_SHOWCPU)
- tick_per_sec = get_cpu_ticks();
+ pl_rearmed_cbs.cpu_usage = get_cpu_ticks();
if (hud_new_msg > 0) {
hud_new_msg--;
if (hud_new_msg == 0)
hud_msg[0] = 0;
}
+ tv_old = now;
}
#ifdef PCNT
static int ya_vsync_count;
if (++ya_vsync_count == PCNT_FRAMES) {
- pcnt_print(vsps_cur);
+ pcnt_print(pl_rearmed_cbs.vsps_cur);
ya_vsync_count = 0;
}
#endif
pl_rearmed_cbs.fskip_advice = 1;
else if (diff >= 0)
pl_rearmed_cbs.fskip_advice = 0;
+
+ // recompilation is not that fast and may cause frame skip on
+ // loading screens and such, resulting in flicker or glitches
+ if (new_dynarec_did_compile) {
+ if (drc_active_vsyncs < 32)
+ pl_rearmed_cbs.fskip_advice = 0;
+ drc_active_vsyncs++;
+ }
+ else
+ drc_active_vsyncs = 0;
+ new_dynarec_did_compile = 0;
}
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;
+ is_pal = is_pal_;
frame_interval = is_pal ? 20000 : 16667;
frame_interval1024 = is_pal ? 20000*1024 : 17066667;
int seen_dead = 0;
int sleep_time = 5;
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DRC_DBG)
// don't interfere with debug
return NULL;
#endif
void pl_init(void)
{
- ts = pl_gun_ts_init();
+ extern unsigned int hSyncCount; // from psxcounters
+ extern unsigned int frame_counter;
+
+ pl_vout_w = pl_vout_h = 256;
+ pl_vout_bpp = 16;
+
+ tsdev = pl_gun_ts_init();
+
+ pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
+ pl_rearmed_cbs.gpu_frame_count = &frame_counter;
}
notaz.gp2x.de / pcsx_rearmed.git / blobdiff