X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fin_tsbutton.c;h=b3e415831855f35d58272cd6fa20bf230689b2b3;hp=4e2cef027ba4e2bac10ce0df2a64a98e8c7b7c22;hb=bcfc48e326fd502e77654330ce4b902e7db8c2dc;hpb=faf2b2aae80c811f778f7cfa9a320dd7ade01dac

diff --git a/frontend/in_tsbutton.c b/frontend/in_tsbutton.c
index 4e2cef02..b3e41583 100644
--- a/frontend/in_tsbutton.c
+++ b/frontend/in_tsbutton.c
@@ -11,7 +11,8 @@
 #include <stdio.h>
 #include <tslib.h>
 
-#include "common/input.h"
+#include "libpicofe/input.h"
+#include "pl_gun_ts.h"
 #include "in_tsbutton.h"
 
 #define IN_TSBUTTON_PREFIX "tsbutton:"
@@ -24,14 +25,12 @@ static int last_tsbutton_id;
 
 // HACK: stealing this from plugin_lib
 extern void *tsdev;
-extern int (*pts_read)(struct tsdev *dev, struct ts_sample *sample, int nr);
-extern int (*pts_fd)(struct tsdev *dev);
 
 static const char * const in_tsbutton_keys[IN_TSBUTTON_COUNT] = {
 	"TS1", "TS2", "TS3", "TS4",
 };
 
-static void in_tsbutton_probe(void)
+static void in_tsbutton_probe(const in_drv_t *drv)
 {
 	struct tsdev *dev = tsdev;
 	if (dev == NULL) {
@@ -40,11 +39,11 @@ static void in_tsbutton_probe(void)
 	}
 
 	in_register(IN_TSBUTTON_PREFIX "touchscreen as buttons",
-		pts_fd(dev), NULL, IN_TSBUTTON_COUNT, in_tsbutton_keys, 0);
+		pl_gun_ts_get_fd(dev), NULL, IN_TSBUTTON_COUNT, in_tsbutton_keys, 0);
 }
 
 static const char * const *
-in_tsbutton_get_key_names(int *count)
+in_tsbutton_get_key_names(const in_drv_t *drv, int *count)
 {
 	*count = IN_TSBUTTON_COUNT;
 	return in_tsbutton_keys;
@@ -53,20 +52,12 @@ in_tsbutton_get_key_names(int *count)
 static int update_button(void)
 {
 	struct tsdev *dev = tsdev;
-	struct ts_sample sample;
-	int sx = 0, sy = 0, sp = 0, updated = 0;
+	int sx = 0, sy = 0, sp = 0;
 
 	if (dev == NULL)
 		return -1;
 
-	while (pts_read(dev, &sample, 1) > 0) {
-		sx = sample.x;
-		sy = sample.y;
-		sp = sample.pressure;
-		updated = 1;
-	}
-
-	if (updated) {
+	if (pl_gun_ts_update_raw(dev, &sx, &sy, &sp)) {
 		if (sp == 0)
 			tsbutton_down_id = -1;
 		else {
@@ -142,6 +133,6 @@ static const in_drv_t in_tsbutton_drv = {
 void in_tsbutton_init(void)
 {
 	tsbutton_down_id = last_tsbutton_id = -1;
-	in_register_driver(&in_tsbutton_drv);
+	in_register_driver(&in_tsbutton_drv, NULL, NULL);
 }