details: https://anonhg.NetBSD.org/src/rev/7af0d0d1a736
branches: netbsd-2-0
changeset: 561274:7af0d0d1a736
user: jmc <jmc%NetBSD.org@localhost>
date: Fri Jun 04 03:41:05 2004 +0000
description:
Pullup rev 1.52 (requested by thorpej in ticket #437)
Wrap a noisy probe message in FD_DEBUG.
diffstat:
sys/dev/isa/fd.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diffs (44 lines):
diff -r 2fec5d402ab3 -r 7af0d0d1a736 sys/dev/isa/fd.c
--- a/sys/dev/isa/fd.c Fri Jun 04 03:40:28 2004 +0000
+++ b/sys/dev/isa/fd.c Fri Jun 04 03:41:05 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.51 2003/12/04 13:57:30 keihan Exp $ */
+/* $NetBSD: fd.c,v 1.51.2.1 2004/06/04 03:41:05 jmc Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51 2003/12/04 13:57:30 keihan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.51.2.1 2004/06/04 03:41:05 jmc Exp $");
#include "rnd.h"
#include "opt_ddb.h"
@@ -427,8 +427,12 @@
out_fdc(iot, ioh, NE7CMD_RECAL);
out_fdc(iot, ioh, drive);
/* wait for recalibrate, up to 2s */
- if (tsleep(fdc, PWAIT, "fdprobe2", 2 * hz) != EWOULDBLOCK)
-/*XXX*/ printf("fdprobe: got intr\n");
+ if (tsleep(fdc, PWAIT, "fdprobe2", 2 * hz) != EWOULDBLOCK) {
+#ifdef FD_DEBUG
+ /* XXX */
+ printf("fdprobe: got intr\n");
+#endif
+ }
out_fdc(iot, ioh, NE7CMD_SENSEI);
n = fdcresult(fdc);
#ifdef FD_DEBUG
@@ -961,7 +965,9 @@
struct ne7_fd_formb *finfo = NULL;
if (fdc->sc_state == PROBING) {
-/*XXX*/ printf("got probe interrupt\n");
+#ifdef DEBUG
+ printf("fdcintr: got probe interrupt\n");
+#endif
wakeup(fdc);
return 1;
}