Module Name: src
Committed By: plunky
Date: Sun Mar 21 19:53:52 UTC 2010
Modified Files:
src/sys/dev/pckbport: synaptics.c synapticsreg.h
Log Message:
some definitions from the Linux driver (via PR kern/42853)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pckbport/synaptics.c
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/pckbport/synapticsreg.h
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/pckbport/synaptics.c
diff -u src/sys/dev/pckbport/synaptics.c:1.21 src/sys/dev/pckbport/synaptics.c:1.22
--- src/sys/dev/pckbport/synaptics.c:1.21 Wed Apr 30 14:07:14 2008
+++ src/sys/dev/pckbport/synaptics.c Sun Mar 21 19:53:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.21 2008/04/30 14:07:14 ad Exp $ */
+/* $NetBSD: synaptics.c,v 1.22 2010/03/21 19:53:52 plunky Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -48,7 +48,7 @@
#include "opt_pms.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.21 2008/04/30 14:07:14 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.22 2010/03/21 19:53:52 plunky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -286,7 +286,7 @@
res = pms_synaptics_send_command(psc->sc_kbctag, psc->sc_kbcslot,
SYNAPTICS_MODE_ABSOLUTE | SYNAPTICS_MODE_W | SYNAPTICS_MODE_RATE);
cmd[0] = PMS_SET_SAMPLE;
- cmd[1] = 0x14; /* doit */
+ cmd[1] = SYNAPTICS_CMD_SET_MODE2;
res |= pckbport_enqueue_cmd(psc->sc_kbctag, psc->sc_kbcslot, cmd, 2, 0,
1, NULL);
sc->up_down = 0;
Index: src/sys/dev/pckbport/synapticsreg.h
diff -u src/sys/dev/pckbport/synapticsreg.h:1.5 src/sys/dev/pckbport/synapticsreg.h:1.6
--- src/sys/dev/pckbport/synapticsreg.h:1.5 Wed Jan 17 23:14:03 2007
+++ src/sys/dev/pckbport/synapticsreg.h Sun Mar 21 19:53:52 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsreg.h,v 1.5 2007/01/17 23:14:03 uwe Exp $ */
+/* $NetBSD: synapticsreg.h,v 1.6 2010/03/21 19:53:52 plunky Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -45,6 +45,10 @@
#define SYNAPTICS_READ_MODEL_ID 0x3
#define SYNAPTICS_EXTENDED_QUERY 0x9
+/* Synaptics special commands */
+#define SYNAPTICS_CMD_SET_MODE2 0x14
+#define SYNAPTICS_CMD_CLIENT_CMD 0x28
+
/* Magic numbers. */
#define SYNAPTICS_MIN_VERSION 45 /* 4.5 */
#define SYNAPTICS_MAGIC_BYTE 0x47
@@ -64,6 +68,7 @@
#define SYNAPTICS_MODE_RATE (1 << 6)
#define SYNAPTICS_MODE_SLEEP (1 << 3)
#define SYNAPTICS_MODE_GEST (1 << 2)
+#define SYNAPTICS_MODE_4BYTE_CLIENT (1 << 1)
#define SYNAPTICS_MODE_W (1)
/* Extended mode button masks. */
