Module Name: src
Committed By: snj
Date: Sat Jan 30 19:49:05 UTC 2010
Modified Files:
src/sys/dev/pckbport [netbsd-5]: pckbd.c pms.c
Log Message:
Pull up following revision(s) (requested by hubertf in ticket #1282):
sys/dev/pckbport/pckbd.c: revision 1.26
sys/dev/pckbport/pms.c: revision 1.28
use aprint_error
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.6.1 src/sys/dev/pckbport/pckbd.c
cvs rdiff -u -r1.26.14.1 -r1.26.14.2 src/sys/dev/pckbport/pms.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/pckbd.c
diff -u src/sys/dev/pckbport/pckbd.c:1.25 src/sys/dev/pckbport/pckbd.c:1.25.6.1
--- src/sys/dev/pckbport/pckbd.c:1.25 Wed Jun 11 17:35:02 2008
+++ src/sys/dev/pckbport/pckbd.c Sat Jan 30 19:49:05 2010
@@ -1,7 +1,7 @@
-/* $NetBSD: pckbd.c,v 1.25 2008/06/11 17:35:02 drochner Exp $ */
+/* $NetBSD: pckbd.c,v 1.25.6.1 2010/01/30 19:49:05 snj Exp $ */
/*-
- * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * Copyright (c) 1998, 2009 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.25 2008/06/11 17:35:02 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbd.c,v 1.25.6.1 2010/01/30 19:49:05 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -204,9 +204,7 @@
res = pckbport_poll_cmd(kbctag, kbcslot, cmd, 2, 0, 0, 0);
if (res) {
u_char cmdb[1];
-#ifdef DEBUG
- printf("pckbd: error setting scanset 2\n");
-#endif
+ aprint_debug("pckbd: error setting scanset 2\n");
/*
* XXX at least one keyboard is reported to lock up
* if a "set table" is attempted, thus the "reset".
@@ -223,10 +221,8 @@
cmd[0] = KBC_SETTABLE;
cmd[1] = 1;
res = pckbport_poll_cmd(kbctag, kbcslot, cmd, 2, 0, 0, 0);
-#ifdef DEBUG
if (res)
- printf("pckbd: error setting scanset 1\n");
-#endif
+ aprint_debug("pckbd: error setting scanset 1\n");
}
return res;
}
@@ -275,10 +271,8 @@
cmd[0] = KBC_RESET;
res = pckbport_poll_cmd(sc->id->t_kbctag,
sc->id->t_kbcslot, cmd, 1, 1, resp, 1);
-#ifdef DEBUG
if (res)
- printf("pckbdprobe: reset error %d\n", res);
-#endif
+ aprint_debug("pckbdprobe: reset error %d\n", res);
if (resp[0] != KBR_RSTDONE)
printf("pckbdprobe: reset response 0x%x\n",
resp[0]);
@@ -317,9 +311,7 @@
cmd[0] = KBC_RESET;
res = pckbport_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 1, resp, 1);
if (res) {
-#ifdef DEBUG
- printf("pckbdprobe: reset error %d\n", res);
-#endif
+ aprint_debug("pckbdprobe: reset error %d\n", res);
/*
* There is probably no keyboard connected.
* Let the probe succeed if the keyboard is used
@@ -414,9 +406,7 @@
if (on) {
if (sc->sc_enabled) {
-#ifdef DIAGNOSTIC
- printf("pckbd_enable: bad enable\n");
-#endif
+ aprint_debug("pckbd_enable: bad enable\n");
return EBUSY;
}
Index: src/sys/dev/pckbport/pms.c
diff -u src/sys/dev/pckbport/pms.c:1.26.14.1 src/sys/dev/pckbport/pms.c:1.26.14.2
--- src/sys/dev/pckbport/pms.c:1.26.14.1 Sun Sep 13 22:07:47 2009
+++ src/sys/dev/pckbport/pms.c Sat Jan 30 19:49:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pms.c,v 1.26.14.1 2009/09/13 22:07:47 snj Exp $ */
+/* $NetBSD: pms.c,v 1.26.14.2 2010/01/30 19:49:05 snj Exp $ */
/*-
* Copyright (c) 2004 Kentaro Kurahone.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.26.14.1 2009/09/13 22:07:47 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pms.c,v 1.26.14.2 2010/01/30 19:49:05 snj Exp $");
#include "opt_pms.h"
@@ -149,9 +149,7 @@
cmd[0] = PMS_RESET;
res = pckbport_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 2, resp, 1);
if (res) {
-#ifdef DEBUG
- printf("pmsprobe: reset error %d\n", res);
-#endif
+ aprint_debug("pmsprobe: reset error %d\n", res);
return 0;
}
if (resp[0] != PMS_RSTDONE) {
@@ -161,9 +159,7 @@
/* get type number (0 = mouse) */
if (resp[1] != 0) {
-#ifdef DEBUG
- printf("pmsprobe: type 0x%x\n", resp[1]);
-#endif
+ aprint_debug("pmsprobe: type 0x%x\n", resp[1]);
return 0;
}
@@ -192,12 +188,10 @@
/* reset the device */
cmd[0] = PMS_RESET;
res = pckbport_poll_cmd(pa->pa_tag, pa->pa_slot, cmd, 1, 2, resp, 1);
-#ifdef DEBUG
if (res || resp[0] != PMS_RSTDONE || resp[1] != 0) {
- aprint_error("pmsattach: reset error\n");
+ aprint_debug("pmsattach: reset error\n");
return;
}
-#endif
sc->inputstate = 0;
sc->buttons = 0;
sc->protocol = PMS_UNKNOWN;
