CVS commit: [netbsd-7-nhusb] src/sys/dev/usb

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Fri Mar 31 10:30:58 UTC 2017

Modified Files:
        src/sys/dev/usb [netbsd-7-nhusb]: uep.c


To generate a diff of this commit:
cvs rdiff -u -r1.19.10.1 -r1.19.10.2 src/sys/dev/usb/uep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/usb/uep.c
diff -u src/sys/dev/usb/uep.c:1.19.10.1 src/sys/dev/usb/uep.c:1.19.10.2
--- src/sys/dev/usb/uep.c:1.19.10.1	Tue Sep  6 20:33:09 2016
+++ src/sys/dev/usb/uep.c	Fri Mar 31 10:30:58 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: uep.c,v 1.19.10.1 2016/09/06 20:33:09 skrll Exp $	*/
+/*	$NetBSD: uep.c,v 1.19.10.2 2017/03/31 10:30:58 skrll Exp $	*/
 
 /*
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
  *  eGalax USB touchpanel controller driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.19.10.1 2016/09/06 20:33:09 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.19.10.2 2017/03/31 10:30:58 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,6 +54,14 @@ __KERNEL_RCSID(0, "$NetBSD: uep.c,v 1.19
 #include <dev/wscons/tpcalibvar.h>
 
 #define UIDSTR	"eGalax USB SN000000"
+/* calibration - integer values, perhaps sysctls?  */
+#define X_RATIO   293 
+#define X_OFFSET  -28
+#define Y_RATIO   -348
+#define Y_OFFSET  537
+/* an X_RATIO of ``312''  means : reduce by a factor 3.12 x axis amplitude */
+/* an Y_RATIO of ``-157'' means : reduce by a factor 1.57 y axis amplitude,
+ * and reverse y motion */
 
 struct uep_softc {
 	device_t sc_dev;
@@ -358,6 +366,17 @@ uep_ioctl(void *v, u_long cmd, void *dat
 	return EPASSTHROUGH;
 }
 
+static int
+uep_adjust(int v, int off, int rat)
+{
+	int num = 100 * v;
+	int quot = num / rat;
+	int rem = num % rat;
+	if (num >= 0 && rem < 0)
+		quot++;
+	return quot + off;
+}
+
 void
 uep_intr(struct usbd_xfer *xfer, void *addr, usbd_status status)
 {
@@ -429,8 +448,8 @@ uep_intr(struct usbd_xfer *xfer, void *a
 		default:
 			msk = 0x0f;	/* H=0, L=0 */
 		}
-		x = ((p[3] & msk) << 7) | p[4];
-		y = ((p[1] & msk) << 7) | p[2];
+		x = uep_adjust(((p[3] & msk) << 7) | p[4], X_OFFSET, X_RATIO);
+		y = uep_adjust(((p[1] & msk) << 7) | p[2], Y_OFFSET, Y_RATIO);
 
 		tpcalib_trans(&sc->sc_tpcalib, x, y, &x, &y);