Module Name: src
Committed By: jakllsch
Date: Sat Sep 10 18:38:20 UTC 2011
Modified Files:
src/sys/dev/pckbport: synaptics.c synapticsreg.h synapticsvar.h
Log Message:
Correct and improve some comments. Collect unused variables. Add a define.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pckbport/synaptics.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pckbport/synapticsreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/pckbport/synapticsvar.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.27 src/sys/dev/pckbport/synaptics.c:1.28
--- src/sys/dev/pckbport/synaptics.c:1.27 Fri Sep 9 14:29:47 2011
+++ src/sys/dev/pckbport/synaptics.c Sat Sep 10 18:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.27 2011/09/09 14:29:47 jakllsch Exp $ */
+/* $NetBSD: synaptics.c,v 1.28 2011/09/10 18:38:20 jakllsch 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.27 2011/09/09 14:29:47 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.28 2011/09/10 18:38:20 jakllsch Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -93,7 +93,7 @@
static void pms_sysctl_synaptics(struct sysctllog **);
static int pms_sysctl_synaptics_verify(SYSCTLFN_ARGS);
-/* Controled by sysctl. */
+/* Controlled by sysctl. */
static int synaptics_up_down_emul = 2;
static int synaptics_up_down_motion_delta = 1;
static int synaptics_gesture_move = 200;
@@ -136,7 +136,7 @@
{
struct pms_softc *psc = vsc;
struct synaptics_softc *sc = &psc->u.synaptics;
- u_char cmd[2], resp[3];
+ u_char cmd[1], resp[3];
int res, ver_minor, ver_major;
struct sysctllog *clog = NULL;
@@ -724,7 +724,7 @@
struct timeval diff;
if (!psc->sc_enabled) {
- /* Interrupts are not expected. Discard the byte. */
+ /* Interrupts are not expected. Discard the byte. */
return;
}
@@ -775,7 +775,7 @@
if ((psc->packet[0] & 0xfc) == 0x84 &&
(psc->packet[3] & 0xcc) == 0xc4) {
- /* PS/2 passthrough */
+ /* W = SYNAPTICS_WIDTH_PASSTHROUGH, PS/2 passthrough */
pms_synaptics_passthrough(psc);
} else {
pms_synaptics_parse(psc);
Index: src/sys/dev/pckbport/synapticsreg.h
diff -u src/sys/dev/pckbport/synapticsreg.h:1.6 src/sys/dev/pckbport/synapticsreg.h:1.7
--- src/sys/dev/pckbport/synapticsreg.h:1.6 Sun Mar 21 19:53:52 2010
+++ src/sys/dev/pckbport/synapticsreg.h Sat Sep 10 18:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsreg.h,v 1.6 2010/03/21 19:53:52 plunky Exp $ */
+/* $NetBSD: synapticsreg.h,v 1.7 2011/09/10 18:38:20 jakllsch Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -95,6 +95,8 @@
#define SYNAPTICS_WIDTH_TWO_FINGERS 0
#define SYNAPTICS_WIDTH_THREE_OR_MORE 1
#define SYNAPTICS_WIDTH_PEN 2
+#define SYNAPTICS_WIDTH_ADVANCEDGESTURE 2
+#define SYNAPTICS_WIDTH_PASSTHROUGH 3
#define SYNAPTICS_WIDTH_FINGER_MIN 4
#define SYNAPTICS_WIDTH_FINGER_NORMAL 5
#define SYNAPTICS_WIDTH_FINGER_MAX 7
Index: src/sys/dev/pckbport/synapticsvar.h
diff -u src/sys/dev/pckbport/synapticsvar.h:1.4 src/sys/dev/pckbport/synapticsvar.h:1.5
--- src/sys/dev/pckbport/synapticsvar.h:1.4 Sun Dec 11 12:23:22 2005
+++ src/sys/dev/pckbport/synapticsvar.h Sat Sep 10 18:38:20 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synapticsvar.h,v 1.4 2005/12/11 12:23:22 christos Exp $ */
+/* $NetBSD: synapticsvar.h,v 1.5 2011/09/10 18:38:20 jakllsch Exp $ */
/*
* Copyright (c) 2005, Steve C. Woodford
@@ -39,14 +39,13 @@
#define _DEV_PCKBCPORT_SYNAPTICSVAR_H_
struct synaptics_softc {
- struct proc *syn_thread;
int caps;
int flags;
#define SYN_FLAG_HAS_MIDDLE_BUTTON (1 << 0)
#define SYN_FLAG_HAS_BUTTONS_4_5 (1 << 1)
#define SYN_FLAG_HAS_UP_DOWN_BUTTONS (1 << 2)
-#define SYN_FLAG_HAS_PASSTHROUGH (1 << 3) /* Not yet supported */
+#define SYN_FLAG_HAS_PASSTHROUGH (1 << 3)
#define SYN_FLAG_HAS_PALM_DETECT (1 << 4)
#define SYN_FLAG_HAS_MULTI_FINGER (1 << 5)
