X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin_lib.c;h=e93c12f949c368d6bee5049136524ec420058021;hp=8d5605ffda3f0d548294da4e2c32cbb6461c6f73;hb=24de2dd4dbdd50e44c91c40ebbc7d59ee1c0ac9b;hpb=90f1d26c2e771993c1a563f4c0ea81432bd9fc5e

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 8d5605ff..e93c12f9 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -24,19 +24,25 @@
 #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 "../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 };
-static int pl_fbdev_w, pl_fbdev_h, pl_fbdev_bpp;
-static int flip_cnt, vsync_cnt, flips_per_sec, tick_per_sec;
+int in_type1, in_type2;
+int in_a1[2] = { 127, 127 }, in_a2[2] = { 127, 127 };
+int in_keystate, in_state_gun;
+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 vsync_usec_time;
+static int frame_interval, frame_interval1024, 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;
@@ -56,138 +62,178 @@ static int get_cpu_ticks(void)
 	return ret;
 }
 
-static void print_hud(void)
+static void print_msg(int h, int border)
 {
-	if (pl_fbdev_bpp == 16)
-		pl_text_out16(2, pl_fbdev_h - 10, "%s", hud_msg);
+	if (pl_vout_bpp == 16)
+		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_fbdev_bpp == 16)
-		pl_text_out16(2, pl_fbdev_h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
+	if (pl_vout_bpp == 16)
+		pl_text_out16(border + 2, h - 10, "%2d %4.1f", flips_per_sec, vsps_cur);
 }
 
-static void print_cpu_usage(void)
+static void print_cpu_usage(int w, int h, int border)
 {
-	if (pl_fbdev_bpp == 16)
-		pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
+	if (pl_vout_bpp == 16)
+		pl_text_out16(w - border - 28, h - 10, "%3d", tick_per_sec);
 }
 
 // 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_fbdev_buf +
-		pl_fbdev_w * (pl_fbdev_h - 10) + pl_fbdev_w / 2 - 192/2;
+	unsigned short *dest = (unsigned short *)pl_vout_buf +
+		vout_w * (vout_h - 10) + vout_w / 2 - 192/2;
 	unsigned short *d, p;
 	int c, x, y;
 
-	if (pl_fbdev_bpp != 16)
+	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_fbdev_w)
+		for (y = 0; y < 8; y++, d += vout_w)
 			for (x = 0; x < 8; x++)
 				d[x] = p;
 	}
 }
 
-void *pl_fbdev_set_mode(int w, int h, int bpp)
+void pl_print_hud(int w, int h, int xborder)
 {
-	void *ret;
+	pl_vout_w = w; // used by pollux
+	pl_vout_h = h;
+
+	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 (w == pl_fbdev_w && h == pl_fbdev_h && bpp == pl_fbdev_bpp)
-		return pl_fbdev_buf;
+	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
+	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;
 
-	pl_fbdev_w = w;
-	pl_fbdev_h = h;
-	pl_fbdev_bpp = bpp;
+	if (w == pl_vout_w && h == pl_vout_h && bpp == pl_vout_bpp)
+		return pl_vout_buf;
 
+	pl_vout_w = w;
+	pl_vout_h = h;
+	pl_vout_bpp = bpp;
+
+#if defined(VOUT_FBDEV)
 	vout_fbdev_clear(layer_fb);
-	ret = vout_fbdev_resize(layer_fb, w, h, bpp, 0, 0, 0, 0, 3);
-	if (ret == NULL)
+	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
+
+	if (pl_vout_buf == NULL)
 		fprintf(stderr, "failed to set mode\n");
-	else
-		pl_fbdev_buf = ret;
 
+	// menu decides on layer size, we commit it
 	menu_notify_mode_change(w, h, bpp);
+	omap_enable_layer(1);
 
-	return pl_fbdev_buf;
+	return pl_vout_buf;
 }
 
-void *pl_fbdev_flip(void)
+static void *pl_vout_flip(void)
 {
-	flip_cnt++;
-
-	if (pl_fbdev_buf != NULL) {
-		if (g_opts & OPT_SHOWSPU)
-			draw_active_chans();
+	pl_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(pl_vout_w, pl_vout_h, 0);
 
 	// let's flip now
-	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
-	return pl_fbdev_buf;
+#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
+	return pl_vout_buf;
 }
 
-int pl_fbdev_open(void)
+static int pl_vout_open(void)
 {
 	struct timeval now;
 
-	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
 	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
+
 	gettimeofday(&now, 0);
 	vsync_usec_time = now.tv_usec;
-	while (vsync_usec_time >= pl_frame_interval)
-		vsync_usec_time -= pl_frame_interval;
+	while (vsync_usec_time >= frame_interval)
+		vsync_usec_time -= frame_interval;
 
 	return 0;
 }
 
-void pl_fbdev_close(void)
+static void pl_vout_close(void)
 {
 	omap_enable_layer(0);
 }
 
 void *pl_prepare_screenshot(int *w, int *h, int *bpp)
 {
-	*w = pl_fbdev_w;
-	*h = pl_fbdev_h;
-	*bpp = pl_fbdev_bpp;
-
-	return pl_fbdev_buf;
+#if defined(VOUT_FBDEV)
+	*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
 }
 
 static void update_input(void)
 {
+#ifndef MAEMO
 	int actions[IN_BINDTYPE_COUNT] = { 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++)
@@ -197,7 +243,7 @@ static void update_input(void)
 	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);
@@ -205,24 +251,25 @@ static void update_input(void)
 #endif
 }
 
+void pl_update_gun(int *xn, int *xres, int *y, int *in)
+{
+	if (tsdev)
+		pl_gun_ts_update(tsdev, xn, y, in);
+
+	*xres = pl_vout_w;
+	*y = *y * pl_vout_h >> 10;
+}
+
 #define MAX_LAG_FRAMES 3
 
 #define tvdiff(tv, tv_old) \
 	((tv.tv_sec - tv_old.tv_sec) * 1000000 + tv.tv_usec - tv_old.tv_usec)
-// assumes us < 1000000
-#define tvadd(tv, us) { \
-	tv.tv_usec += us; \
-	if (tv.tv_usec >= 1000000) { \
-		tv.tv_usec -= 1000000; \
-		tv.tv_sec++; \
-	} \
-}
 
 /* called on every vsync */
 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;
 
@@ -241,8 +288,8 @@ void pl_frame_limit(void)
 		if (0 < diff && diff < 2000000)
 			vsps_cur = 1000000.0f * (vsync_cnt - vsync_cnt_prev) / diff;
 		vsync_cnt_prev = vsync_cnt;
-		flips_per_sec = flip_cnt;
-		flip_cnt = 0;
+		flips_per_sec = pl_flip_cnt;
+		pl_flip_cnt = 0;
 		tv_old = now;
 		if (g_opts & OPT_SHOWCPU)
 			tick_per_sec = get_cpu_ticks();
@@ -261,39 +308,69 @@ void pl_frame_limit(void)
 	}
 #endif
 
-	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 uses usec*1024 units instead of usecs for better accuracy
+	tv_expect.tv_usec += frame_interval1024;
+	if (tv_expect.tv_usec >= (1000000 << 10)) {
+		tv_expect.tv_usec -= (1000000 << 10);
+		tv_expect.tv_sec++;
+	}
+	diff = (tv_expect.tv_sec - now.tv_sec) * 1000000 + (tv_expect.tv_usec >> 10) - now.tv_usec;
+
+	if (diff > MAX_LAG_FRAMES * frame_interval || diff < -MAX_LAG_FRAMES * frame_interval) {
+		//printf("pl_frame_limit reset, diff=%d, iv %d\n", diff, 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;
+		while (usadj < tv_expect.tv_usec - frame_interval)
+			usadj += frame_interval;
+		tv_expect.tv_usec = usadj << 10;
 	}
 
-	if (!(g_opts & OPT_NO_FRAMELIM) && diff > pl_frame_interval) {
+	if (!(g_opts & OPT_NO_FRAMELIM) && diff > frame_interval) {
 		// yay for working usleep on pandora!
-		//printf("usleep %d\n", diff - pl_frame_interval / 2);
-		usleep(diff - pl_frame_interval / 2);
+		//printf("usleep %d\n", diff - frame_interval / 2);
+		usleep(diff - frame_interval);
 	}
 
 	if (pl_rearmed_cbs.frameskip) {
-		if (diff < -pl_frame_interval)
+		if (diff < -frame_interval)
 			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)
+{
+	pl_rearmed_cbs.fskip_advice = 0;
+
+	frame_interval = is_pal ? 20000 : 16667;
+	frame_interval1024 = is_pal ? 20000*1024 : 17066667;
+
+	// used by P.E.Op.S. frameskip code
+	pl_rearmed_cbs.gpu_peops.fFrameRateHz = is_pal ? 50.0f : 59.94f;
+	pl_rearmed_cbs.gpu_peops.dwFrameRateTicks =
+		(100000*100 / (unsigned long)(pl_rearmed_cbs.gpu_peops.fFrameRateHz*100));
+}
+
 static void pl_text_out16_(int x, int y, const char *text)
 {
-	int i, l, len = strlen(text), w = pl_fbdev_w;
-	unsigned short *screen = (unsigned short *)pl_fbdev_buf + x + y * w;
+	int i, l, len = strlen(text), w = pl_vout_w;
+	unsigned short *screen = (unsigned short *)pl_vout_buf + x + y * w;
 	unsigned short val = 0xffff;
 
 	for (i = 0; i < len; i++, screen += 8)
@@ -336,10 +413,10 @@ static void pl_get_layer_pos(int *x, int *y, int *w, int *h)
 
 struct rearmed_cbs pl_rearmed_cbs = {
 	pl_get_layer_pos,
-	pl_fbdev_open,
-	pl_fbdev_set_mode,
-	pl_fbdev_flip,
-	pl_fbdev_close,
+	pl_vout_open,
+	pl_vout_set_mode,
+	pl_vout_flip,
+	pl_vout_close,
 };
 
 /* watchdog */
@@ -349,7 +426,7 @@ static void *watchdog_thread(void *unused)
 	int seen_dead = 0;
 	int sleep_time = 5;
 
-#ifndef NDEBUG
+#if !defined(NDEBUG) || defined(DRC_DBG)
 	// don't interfere with debug
 	return NULL;
 #endif
@@ -396,3 +473,14 @@ void pl_start_watchdog(void)
 		fprintf(stderr, "could not start watchdog: %d\n", ret);
 }
 
+void pl_init(void)
+{
+	extern unsigned int hSyncCount; // from psxcounters
+
+	pl_vout_w = pl_vout_h = 256;
+	pl_vout_bpp = 16;
+
+	tsdev = pl_gun_ts_init();
+
+	pl_rearmed_cbs.gpu_hcnt = &hSyncCount;
+}