Module Name: xsrc
Committed By: mrg
Date: Tue Aug 2 09:33:33 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: emumb.c ws.c
Log Message:
port to netbsd wscons
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/emumb.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.1.1.2 xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.2
--- xsrc/external/mit/xf86-input-ws/dist/src/emumb.c:1.1.1.2 Tue Aug 2 09:28:21 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/emumb.c Tue Aug 2 09:33:33 2011
@@ -36,6 +36,9 @@
#include "config.h"
#endif
+#include <sys/types.h>
+#include <sys/time.h>
+
#include <xorg-server.h>
#include <X11/Xatom.h>
#include <xf86.h>
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.4 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.5
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.4 Tue Aug 2 09:30:15 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Tue Aug 2 09:33:33 2011
@@ -892,17 +892,23 @@
priv->coords.maxx = priv->max_x;
priv->coords.miny = priv->min_y;
priv->coords.maxy = priv->max_y;
+#if 0
priv->coords.swapxy = priv->swap_axes;
+#endif
/* Update the kernel calibration table */
coords.minx = priv->min_x;
coords.maxx = priv->max_x;
coords.miny = priv->min_y;
coords.maxy = priv->max_y;
+#if 0
coords.swapxy = priv->swap_axes;
+#endif
coords.samplelen = priv->raw;
+#if 0
coords.resx = priv->coords.resx;
coords.resy = priv->coords.resy;
+#endif
if (ioctl(pInfo->fd, WSMOUSEIO_SCALIBCOORDS, &coords) != 0) {
xf86Msg(X_ERROR, "SCALIBCOORDS failed %s\n",
strerror(errno));
