#include "menu.h"
#include "main.h"
#include "pcnt.h"
+#include "pl_gun_ts.h"
#include "../libpcsxcore/new_dynarec/new_dynarec.h"
#include "../libpcsxcore/psemu_plugin_defs.h"
void *pl_fbdev_buf;
int pl_frame_interval;
-int in_type, in_keystate, in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
+int in_type1, in_type2;
+int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
+int in_keystate, in_state_gun;
+static void *ts;
static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
static float vsps_cur;
-static int plugin_skip_advice;
-// P.E.Op.S.
-extern int UseFrameSkip;
-extern float fps_skip;
+static int vsync_usec_time;
-static int get_cpu_ticks(void)
+
+static __attribute__((noinline)) int get_cpu_ticks(void)
{
static unsigned long last_utime;
static int fd;
pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
}
+// draw 192x8 status of 24 sound channels
+static __attribute__((noinline)) void draw_active_chans(void)
+{
+ 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;
+
+ static const unsigned short colors[2] = { 0x1fe3, 0x0700 };
+ unsigned short *dest = (unsigned short *)pl_fbdev_buf +
+ pl_fbdev_w * (pl_fbdev_h - 10) + pl_fbdev_w / 2 - 192/2;
+ unsigned short *d, p;
+ int c, x, y;
+
+ if (pl_fbdev_bpp != 16)
+ return;
+
+ spu_get_debug_info(&live_chans, &fmod_chans, &noise_chans);
+
+ for (c = 0; c < 24; c++) {
+ d = dest + c * 8;
+ p = !(live_chans & (1<<c)) ? 0 :
+ (fmod_chans & (1<<c)) ? 0xf000 :
+ (noise_chans & (1<<c)) ? 0x001f :
+ colors[c & 1];
+ for (y = 0; y < 8; y++, d += pl_fbdev_w)
+ for (x = 0; x < 8; x++)
+ d[x] = p;
+ }
+}
+
void *pl_fbdev_set_mode(int w, int h, int bpp)
{
void *ret;
flip_cnt++;
if (pl_fbdev_buf != NULL) {
+ if (g_opts & OPT_SHOWSPU)
+ draw_active_chans();
+
if (hud_msg[0] != 0)
print_hud();
else if (g_opts & OPT_SHOWFPS)
int pl_fbdev_open(void)
{
+ struct timeval now;
+
pl_fbdev_buf = vout_fbdev_flip(layer_fb);
omap_enable_layer(1);
+
+ // try to align redraws to vsync
+ vout_fbdev_wait_vsync(layer_fb);
+ gettimeofday(&now, 0);
+ vsync_usec_time = now.tv_usec;
+ while (vsync_usec_time >= pl_frame_interval)
+ vsync_usec_time -= pl_frame_interval;
+
return 0;
}
unsigned int emu_act;
in_update(actions);
- if (in_type == PSE_PAD_TYPE_ANALOGPAD)
+ if (in_type1 == PSE_PAD_TYPE_ANALOGPAD)
in_update_analogs();
emu_act = actions[IN_BINDTYPE_EMU];
+ in_state_gun = (emu_act & SACTION_GUN_MASK) >> SACTION_GUN_TRIGGER;
+
+ emu_act &= ~SACTION_GUN_MASK;
if (emu_act) {
int which = 0;
for (; !(emu_act & 1); emu_act >>= 1, which++)
in_keystate = actions[IN_BINDTYPE_PLAYER12];
#ifdef X11
- extern int x11_update_keys(void);
- in_keystate |= x11_update_keys();
+ extern int x11_update_keys(unsigned int *action);
+ in_keystate |= x11_update_keys(&emu_act);
+ emu_set_action(emu_act);
#endif
}
+void pl_update_gun(int *xn, int *xres, int *y, int *in)
+{
+ if (ts)
+ pl_gun_ts_update(ts, xn, y, in);
+
+ *xres = pl_fbdev_w;
+ *y = *y * pl_fbdev_h >> 10;
+}
+
#define MAX_LAG_FRAMES 3
#define tvdiff(tv, tv_old) \
static struct timeval tv_old, tv_expect;
static int vsync_cnt_prev;
struct timeval now;
- int diff;
+ int diff, usadj;
vsync_cnt++;
//printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
tv_expect = now;
diff = 0;
+ // try to align with vsync
+ usadj = vsync_usec_time;
+ while (usadj < tv_expect.tv_usec - pl_frame_interval)
+ usadj += pl_frame_interval;
+ tv_expect.tv_usec = usadj;
}
if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {
usleep(diff - pl_frame_interval / 2);
}
- if (UseFrameSkip) {
- if (diff < -pl_frame_interval) {
- // P.E.Op.S. makes skip decision based on this
- fps_skip = 1.0f;
- plugin_skip_advice = 1;
- }
- else if (diff >= 0) {
- fps_skip = 100.0f;
- plugin_skip_advice = 0;
- }
+ if (pl_rearmed_cbs.frameskip) {
+ if (diff < -pl_frame_interval)
+ pl_rearmed_cbs.fskip_advice = 1;
+ else if (diff >= 0)
+ pl_rearmed_cbs.fskip_advice = 0;
}
pcnt_start(PCNT_ALL);
*h = g_layer_h;
}
-const struct rearmed_cbs pl_rearmed_cbs = {
+struct rearmed_cbs pl_rearmed_cbs = {
pl_get_layer_pos,
pl_fbdev_open,
pl_fbdev_set_mode,
pl_fbdev_flip,
pl_fbdev_close,
- &plugin_skip_advice,
};
/* watchdog */
fprintf(stderr, "could not start watchdog: %d\n", ret);
}
+void pl_init(void)
+{
+ ts = pl_gun_ts_init();
+}