[PATCH synaptics 08/11] Move some defines to where they belong.

Peter Hutterer peter.hutterer at who-t.net
Tue Jun 15 17:21:25 PDT 2010


These defines aren't used by anything but the ps2comm interface.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 include/synaptics.h |   12 ------------
 src/ps2comm.c       |   11 +++++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/synaptics.h b/include/synaptics.h
index 4d5a3f3..5b7764f 100644
--- a/include/synaptics.h
+++ b/include/synaptics.h
@@ -71,16 +71,4 @@ typedef struct _SynapticsSHM
 #define SBR_MIN 10
 #define SBR_MAX 1000
 
-/*
- * The x/y limits are taken from the Synaptics TouchPad interfacing Guide,
- * section 2.3.2, which says that they should be valid regardless of the
- * actual size of the sensor.
- */
-#define XMIN_NOMINAL 1472
-#define XMAX_NOMINAL 5472
-#define YMIN_NOMINAL 1408
-#define YMAX_NOMINAL 4448
-
-#define XMAX_VALID 6143
-
 #endif /* _SYNAPTICS_H_ */
diff --git a/src/ps2comm.c b/src/ps2comm.c
index 241f6a6..9d9e8a9 100644
--- a/src/ps2comm.c
+++ b/src/ps2comm.c
@@ -44,6 +44,17 @@
 #include <xf86.h>
 
 #define MAX_UNSYNC_PACKETS 10				/* i.e. 10 to 60 bytes */
+/*
+ * The x/y limits are taken from the Synaptics TouchPad interfacing Guide,
+ * section 2.3.2, which says that they should be valid regardless of the
+ * actual size of the sensor.
+ */
+#define XMIN_NOMINAL 1472
+#define XMAX_NOMINAL 5472
+#define YMIN_NOMINAL 1408
+#define YMAX_NOMINAL 4448
+
+#define XMAX_VALID 6143
 
 /* synaptics queries */
 #define SYN_QUE_IDENTIFY		0x00
-- 
1.7.0.1



More information about the xorg-devel mailing list