Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't forget to store bounds rectangle in raw mode

This commit is contained in:
macallan 2017-04-06 20:44:39 +00:00
parent 61671c0073
commit 07d3115680
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/dev/wscons/tpcalib.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tpcalib.c,v 1.11 2007/03/04 06:02:51 christos Exp $ */
/* $NetBSD: tpcalib.c,v 1.12 2017/04/06 20:44:39 macallan Exp $ */
/*
* Copyright (c) 1999-2003 TAKEMURA Shin All rights reserved.
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.11 2007/03/04 06:02:51 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: tpcalib.c,v 1.12 2017/04/06 20:44:39 macallan Exp $");
#ifdef _KERNEL_OPT
#include "opt_tpcalib.h"
@ -101,7 +101,8 @@ tpcalib_ioctl(struct tpcalib_softc *sc, u_long cmd, void *data,
d = (const struct wsmouse_calibcoords *)data;
if (d->samplelen == WSMOUSE_CALIBCOORDS_RESET) {
tpcalib_reset(sc);
} else
}
if (d->samplelen > 0) {
if (mra_Y_AX1_BX2_C(&d->samples[0].x, s,
&d->samples[0].rawx, s,
&d->samples[0].rawy, s,
@ -116,20 +117,21 @@ tpcalib_ioctl(struct tpcalib_softc *sc, u_long cmd, void *data,
tpcalib_reset(sc);
return (EINVAL);
} else {
sc->sc_minx = d->minx;
sc->sc_maxx = d->maxx;
sc->sc_miny = d->miny;
sc->sc_maxy = d->maxy;
sc->sc_saved = *d;
DPRINTF(("tpcalib: x=%d~%d y=%d~%d\n",
sc->sc_minx, sc->sc_maxx,
sc->sc_miny, sc->sc_maxy));
DPRINTF(("tpcalib: Ax=%d Bx=%d Cx=%d\n",
sc->sc_ax, sc->sc_bx, sc->sc_cx));
DPRINTF(("tpcalib: Ay=%d By=%d Cy=%d\n",
sc->sc_ay, sc->sc_by, sc->sc_cy));
}
}
sc->sc_minx = d->minx;
sc->sc_maxx = d->maxx;
sc->sc_miny = d->miny;
sc->sc_maxy = d->maxy;
sc->sc_saved = *d;
DPRINTF(("tpcalib: x=%d~%d y=%d~%d\n",
sc->sc_minx, sc->sc_maxx,
sc->sc_miny, sc->sc_maxy));
DPRINTF(("tpcalib: Ax=%d Bx=%d Cx=%d\n",
sc->sc_ax, sc->sc_bx, sc->sc_cx));
DPRINTF(("tpcalib: Ay=%d By=%d Cy=%d\n",
sc->sc_ay, sc->sc_by, sc->sc_cy));
break;
case WSMOUSEIO_GCALIBCOORDS: