X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=a2fb49515a843c92aaeb7e3ed3baa740794f95ab;hp=248177943a11b6774b1df1e24242d537f5317b5c;hb=799b0b8773d6add1de99efd582c93701b82e970d;hpb=907b1e90dff65f404907aeff405742030b62671e

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 24817794..a2fb4951 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include <stdint.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -24,13 +25,15 @@
 #include "menu.h"
 #include "pcnt.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
+#include "../libpcsxcore/psemu_plugin_defs.h"
 
 void *pl_fbdev_buf;
 int pl_frame_interval;
-int keystate;
+int in_type, in_keystate, in_a1[2], in_a2[2];
 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;
@@ -123,13 +126,15 @@ static void update_input(void)
 	int actions[IN_BINDTYPE_COUNT] = { 0, };
 
 	in_update(actions);
+	if (in_type == PSE_PAD_TYPE_ANALOGPAD)
+		in_update_analogs();
 	if (actions[IN_BINDTYPE_EMU] & PEV_MENU)
 		stop = 1;
-	keystate = actions[IN_BINDTYPE_PLAYER12];
+	in_keystate = actions[IN_BINDTYPE_PLAYER12];
 
 #ifdef X11
 	extern int x11_update_keys(void);
-	keystate |= x11_update_keys();
+	in_keystate |= x11_update_keys();
 #endif
 }
 
@@ -183,22 +188,25 @@ void pl_frame_limit(void)
 	}
 #endif
 
-	if (!(g_opts & OPT_NO_FRAMELIM)) {
-		tvadd(tv_expect, pl_frame_interval);
-		diff = tvdiff(tv_expect, now);
-		if (diff > MAX_LAG_FRAMES * pl_frame_interval || diff < -MAX_LAG_FRAMES * pl_frame_interval) {
-			//printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
-			tv_expect = now;
-		}
-		else if (diff > pl_frame_interval) {
-			// yay for working usleep on pandora!
-			//printf("usleep %d\n", diff - pl_frame_interval / 2);
-			usleep(diff - pl_frame_interval / 2);
-		}
-		else if (diff < 0 && UseFrameSkip) {
-			// P.E.Op.S. makes skip decision based on this
-			fps_skip = 1000000.0f / (float)-diff;
-		}
+	tvadd(tv_expect, pl_frame_interval);
+	diff = tvdiff(tv_expect, now);
+	if (diff > MAX_LAG_FRAMES * pl_frame_interval || diff < -MAX_LAG_FRAMES * pl_frame_interval) {
+		//printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, pl_frame_interval);
+		tv_expect = now;
+		diff = 0;
+	}
+
+	if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {
+		// yay for working usleep on pandora!
+		//printf("usleep %d\n", diff - pl_frame_interval / 2);
+		usleep(diff - pl_frame_interval / 2);
+	}
+
+	plugin_skip_advice = 0;
+	if (UseFrameSkip && diff < -pl_frame_interval) {
+		// P.E.Op.S. makes skip decision based on this
+		fps_skip = 1.0f;
+		plugin_skip_advice = 1;
 	}
 
 	pcnt_start(PCNT_ALL);
@@ -248,15 +256,13 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
 	*h = g_layer_h;
 }
 
-extern int UseFrameSkip; // hmh
-
 const struct rearmed_cbs pl_rearmed_cbs = {
 	pl_get_layer_pos,
 	pl_fbdev_open,
 	pl_fbdev_set_mode,
 	pl_fbdev_flip,
 	pl_fbdev_close,
-	&UseFrameSkip,
+	&plugin_skip_advice,
 };
 
 /* watchdog */
@@ -266,6 +272,10 @@ static void *watchdog_thread(void *unused)
 	int seen_dead = 0;
 	int sleep_time = 5;
 
+#ifndef NDEBUG
+	// don't interfere with debug
+	return NULL;
+#endif
 	while (1)
 	{
 		sleep(sleep_time);