#include "linux/fbdev.h"
#include "common/fonts.h"
#include "common/input.h"
-#include "omap.h"
#include "menu.h"
#include "main.h"
#include "plat.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;
int in_enable_vibration;
-int pl_flip_cnt;
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;
-static float vsps_cur;
-static int frame_interval, frame_interval1024, vsync_usec_time;
+int g_layer_x, g_layer_y, g_layer_w, g_layer_h;
+static int pl_vout_w, pl_vout_h, pl_vout_bpp; /* output display/layer */
+static int psx_w, psx_h, psx_bpp;
+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)
static void print_fps(int h, int border)
{
if (pl_vout_bpp == 16)
- pl_text_out16(border + 2, 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(int w, int h, int border)
{
if (pl_vout_bpp == 16)
- pl_text_out16(w - border - 28, 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
}
}
-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 (h < 16)
+ return;
if (g_opts & OPT_SHOWSPU)
draw_active_chans(w, h);
print_cpu_usage(w, h, xborder);
}
+/* update scaler target size according to user settings */
+static void update_layer_size(int w, int h)
+{
+ float mult;
+ int imult;
+
+ switch (g_scaler) {
+ case SCALE_1_1:
+ g_layer_w = w; g_layer_h = h;
+ break;
+
+ case SCALE_4_3v2:
+ if (h > g_menuscreen_h || (240 < h && h <= 360))
+ goto fractional_4_3;
+
+ // 4:3 that prefers integer scaling
+ imult = g_menuscreen_h / h;
+ g_layer_w = w * imult;
+ g_layer_h = h * imult;
+ mult = (float)g_layer_w / (float)g_layer_h;
+ if (mult < 1.25f || mult > 1.666f)
+ g_layer_w = 4.0f/3.0f * (float)g_layer_h;
+ printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+ break;
+
+ fractional_4_3:
+ case SCALE_4_3:
+ mult = 240.0f / (float)h * 4.0f / 3.0f;
+ if (h > 256)
+ mult *= 2.0f;
+ g_layer_w = mult * (float)g_menuscreen_h;
+ g_layer_h = g_menuscreen_h;
+ printf(" -> %dx%d %.1f\n", g_layer_w, g_layer_h, mult);
+ break;
+
+ case SCALE_FULLSCREEN:
+ g_layer_w = g_menuscreen_w;
+ g_layer_h = g_menuscreen_h;
+ break;
+
+ default:
+ break;
+ }
+
+ g_layer_x = g_menuscreen_w / 2 - g_layer_w / 2;
+ g_layer_y = g_menuscreen_h / 2 - g_layer_h / 2;
+ if (g_layer_x < 0) g_layer_x = 0;
+ if (g_layer_y < 0) g_layer_y = 0;
+ if (g_layer_w > g_menuscreen_w) g_layer_w = g_menuscreen_w;
+ if (g_layer_h > g_menuscreen_h) g_layer_h = g_menuscreen_h;
+}
+
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;
vsync_cnt_ms_prev = vsync_cnt;
- if (w == pl_vout_w && h == pl_vout_h && bpp == pl_vout_bpp)
+ if (w == psx_w && h == psx_h && bpp == psx_bpp)
return pl_vout_buf;
- pl_vout_w = w;
- pl_vout_h = h;
- pl_vout_bpp = bpp;
+ pl_vout_w = psx_w = w;
+ pl_vout_h = psx_h = h;
+ pl_vout_bpp = psx_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
+ update_layer_size(pl_vout_w, pl_vout_h);
- if (pl_vout_buf == NULL)
- fprintf(stderr, "failed to set mode\n");
+ pl_vout_buf = plat_gvideo_set_mode(&pl_vout_w, &pl_vout_h, &pl_vout_bpp);
+ if (pl_vout_buf == NULL && pl_rearmed_cbs.pl_vout_raw_flip == NULL)
+ fprintf(stderr, "failed to set mode %dx%d@%d\n",
+ psx_w, psx_h, psx_bpp);
- // menu decides on layer size, we commit it
- menu_notify_mode_change(w, h, bpp);
- omap_enable_layer(1);
+ menu_notify_mode_change(pl_vout_w, pl_vout_h, pl_vout_bpp);
return pl_vout_buf;
}
+// only used if raw flip is not defined
static void *pl_vout_flip(void)
{
- pl_flip_cnt++;
+ 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
-#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)
// force mode update
- int 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
+ h = psx_h;
+ psx_h--;
+ pl_vout_buf = pl_vout_set_mode(psx_w, h, psx_bpp);
+
+ 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)
{
-#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;
-#else
- return plat_prepare_screenshot(w, h, bpp);
-#endif
+}
+
+#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 (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 = pl_flip_cnt;
- pl_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
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;
extern unsigned int hSyncCount; // from psxcounters
extern unsigned int frame_counter;
- pl_vout_w = pl_vout_h = 256;
- pl_vout_bpp = 16;
+ psx_w = psx_h = pl_vout_w = pl_vout_h = 256;
+ psx_bpp = pl_vout_bpp = 16;
tsdev = pl_gun_ts_init();
notaz.gp2x.de / pcsx_rearmed.git / blobdiff