Module Name: src
Committed By: cegger
Date: Sat Jan 29 20:37:25 UTC 2011
Modified Files:
src/sys/dev/pckbport: synaptics.c
Log Message:
use aprint_debug_dev and get rid of SYNAPTICSDEBUG
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/pckbport/synaptics.c
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.25 src/sys/dev/pckbport/synaptics.c:1.26
--- src/sys/dev/pckbport/synaptics.c:1.25 Mon Nov 15 05:58:18 2010
+++ src/sys/dev/pckbport/synaptics.c Sat Jan 29 20:37:24 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: synaptics.c,v 1.25 2010/11/15 05:58:18 uebayasi Exp $ */
+/* $NetBSD: synaptics.c,v 1.26 2011/01/29 20:37:24 cegger 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.25 2010/11/15 05:58:18 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: synaptics.c,v 1.26 2011/01/29 20:37:24 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -147,10 +147,8 @@
res |= pckbport_poll_cmd(psc->sc_kbctag, psc->sc_kbcslot, cmd, 1, 3,
resp, 0);
if (res) {
-#ifdef SYNAPTICSDEBUG
- aprint_normal_dev(psc->sc_dev,
+ aprint_debug_dev(psc->sc_dev,
"synaptics_probe: Identify Touchpad error.\n");
-#endif
/*
* Reset device in case the probe confused it.
*/
@@ -162,10 +160,8 @@
}
if (resp[1] != SYNAPTICS_MAGIC_BYTE) {
-#ifdef SYNAPTICSDEBUG
- aprint_normal_dev(psc->sc_dev,
+ aprint_debug_dev(psc->sc_dev,
"synaptics_probe: Not synaptics.\n");
-#endif
res = 1;
goto doreset;
}
@@ -205,10 +201,8 @@
sc->flags |= SYN_FLAG_HAS_BUTTONS_4_5;
if (sc->caps & SYNAPTICS_CAP_EXTENDED) {
-#ifdef SYNAPTICSDEBUG
- aprint_normal_dev(psc->sc_dev,
+ aprint_debug_dev(psc->sc_dev,
"synaptics_probe: Capabilities 0x%04x.\n", sc->caps);
-#endif
if (sc->caps & SYNAPTICS_CAP_PASSTHROUGH)
sc->flags |= SYN_FLAG_HAS_PASSTHROUGH;
@@ -225,12 +219,10 @@
cmd[0] = PMS_SEND_DEV_STATUS;
res |= pckbport_poll_cmd(psc->sc_kbctag,
psc->sc_kbcslot, cmd, 1, 3, resp, 0);
-#ifdef SYNAPTICSDEBUG
if (res == 0)
- aprint_normal_dev(psc->sc_dev,
+ aprint_debug_dev(psc->sc_dev,
"synaptics_probe: Extended "
"Capabilities 0x%02x.\n", resp[1]);
-#endif
if (!res && (resp[1] >> 4) >= 2) {
/* Yes. */
sc->flags |= SYN_FLAG_HAS_UP_DOWN_BUTTONS;
@@ -790,20 +782,16 @@
switch (psc->inputstate) {
case 0:
if ((data & 0xc8) != 0x80) {
-#ifdef SYNAPTICSDEBUG
- aprint_normal_dev(psc->sc_dev,
+ aprint_debug_dev(psc->sc_dev,
"pms_input: 0x%02x out of sync\n", data);
-#endif
return; /* not in sync yet, discard input */
}
/*FALLTHROUGH*/
case 3:
if ((data & 8) == 8) {
-#ifdef SYNAPTICSDEBUG
- aprint_normal_dev(psc->sc_dev,
+ aprint_debug_dev(psc->sc_dev,
"pms_input: dropped in relative mode, reset\n");
-#endif
psc->inputstate = 0;
psc->sc_enabled = 0;
wakeup(&psc->sc_enabled);
