frontend: make analogs configurable

[pcsx_rearmed.git] / frontend / plugin_lib.c

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index c931518..ac911cc 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"


@@ -31,9 +32,11 @@
 
 int in_type1, in_type2;
 int 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_adev[2] = { -1, -1 }, in_adev_axis[2][2] = {{ 0, 1 }, { 0, 1 }};

 int in_keystate, in_state_gun;
 int in_keystate, in_state_gun;

+int in_enable_vibration;

 int pl_flip_cnt;
 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;


@@ -61,22 +64,22 @@ static __attribute__((noinline)) int get_cpu_ticks(void)
        return ret;
 }
 
        return ret;
 }
 

-static void print_msg(int h)
+static void print_msg(int h, int border)

 {
        if (pl_vout_bpp == 16)
 {
        if (pl_vout_bpp == 16)

-               pl_text_out16(2, h - 10, "%s", hud_msg);
+               pl_text_out16(border + 2, h - 10, "%s", hud_msg);

 }
 
 }
 

-static void print_fps(int h)
+static void print_fps(int h, int border)

 {
        if (pl_vout_bpp == 16)
 {
        if (pl_vout_bpp == 16)

-               pl_text_out16(2, h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
+               pl_text_out16(border + 2, h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);

 }
 
 }
 

-static void print_cpu_usage(int w, int h)
+static void print_cpu_usage(int w, int h, int border)

 {
        if (pl_vout_bpp == 16)
 {
        if (pl_vout_bpp == 16)

-               pl_text_out16(w - 28, h - 10, "%3d", tick_per_sec);
+               pl_text_out16(w - border - 28, h - 10, "%3d", tick_per_sec);

 }
 
 // draw 192x8 status of 24 sound channels
 }
 
 // draw 192x8 status of 24 sound channels


@@ -109,7 +112,7 @@ static __attribute__((noinline)) void draw_active_chans(int vout_w, int vout_h)
        }
 }
 
        }
 }
 

-void pl_print_hud(int w, int h)
+void pl_print_hud(int w, int h, int xborder)

 {
        pl_vout_w = w; // used by pollux
        pl_vout_h = h;
 {
        pl_vout_w = w; // used by pollux
        pl_vout_h = h;


@@ -118,12 +121,12 @@ void pl_print_hud(int w, int h)
                draw_active_chans(w, h);
 
        if (hud_msg[0] != 0)
                draw_active_chans(w, h);
 
        if (hud_msg[0] != 0)

-               print_msg(h);
+               print_msg(h, xborder);

        else if (g_opts & OPT_SHOWFPS)
        else if (g_opts & OPT_SHOWFPS)

-               print_fps(h);
+               print_fps(h, xborder);

 
        if (g_opts & OPT_SHOWCPU)
 
        if (g_opts & OPT_SHOWCPU)

-               print_cpu_usage(w, h);
+               print_cpu_usage(w, h, xborder);

 }
 
 static void *pl_vout_set_mode(int w, int h, int bpp)
 }
 
 static void *pl_vout_set_mode(int w, int h, int bpp)


@@ -164,7 +167,7 @@ static void *pl_vout_flip(void)
        pl_flip_cnt++;
 
        if (pl_vout_buf != NULL)
        pl_flip_cnt++;
 
        if (pl_vout_buf != NULL)

-               pl_print_hud(pl_vout_w, pl_vout_h);
+               pl_print_hud(pl_vout_w, pl_vout_h, 0);

 
        // let's flip now
 #if defined(VOUT_FBDEV)
 
        // let's flip now
 #if defined(VOUT_FBDEV)


@@ -209,22 +212,49 @@ 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
+}
+
+#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)
 {
 }
 
 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)
        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_act = actions[IN_BINDTYPE_EMU];
        in_state_gun = (emu_act & SACTION_GUN_MASK) >> SACTION_GUN_TRIGGER;
 


@@ -238,18 +268,22 @@ static void update_input(void)
        emu_set_action(emu_act);
 
        in_keystate = actions[IN_BINDTYPE_PLAYER12];
        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
 }
 #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)
 {
 
 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;
 
        *xres = pl_vout_w;
        *y = *y * pl_vout_h >> 10;


@@ -264,7 +298,7 @@ void pl_update_gun(int *xn, int *xres, int *y, int *in)
 void pl_frame_limit(void)
 {
        static struct timeval tv_old, tv_expect;
 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;
 
        struct timeval now;
        int diff, usadj;
 


@@ -333,6 +367,17 @@ void pl_frame_limit(void)
                        pl_rearmed_cbs.fskip_advice = 1;
                else if (diff >= 0)
                        pl_rearmed_cbs.fskip_advice = 0;
                        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);
        }
 
        pcnt_start(PCNT_ALL);


@@ -410,7 +455,7 @@ static void *watchdog_thread(void *unused)
        int seen_dead = 0;
        int sleep_time = 5;
 
        int seen_dead = 0;
        int sleep_time = 5;
 

-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DRC_DBG)

        // don't interfere with debug
        return NULL;
 #endif
        // don't interfere with debug
        return NULL;
 #endif


@@ -459,8 +504,14 @@ void pl_start_watchdog(void)
 
 void pl_init(void)
 {
 
 void pl_init(void)
 {

+       extern unsigned int hSyncCount; // from psxcounters
+       extern unsigned int frame_counter;
+

        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();
+       tsdev = pl_gun_ts_init();
+
+       pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
+       pl_rearmed_cbs.gpu_frame_count = &frame_counter;

 }
 }