summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormjacob <mjacob@cvs.openbsd.org>2000-10-16 22:45:03 +0000
committermjacob <mjacob@cvs.openbsd.org>2000-10-16 22:45:03 +0000
commitede64e0745ac643fe841179f8bc5632d29ba2876 (patch)
tree78f4978bce9894ac770507e96206acb6b595a199 /sys
parentf994382488ae1880699259e4c86ee049bf156332 (diff)
quiet these puppies down- this OpenBSD, not some callow system like NetBSD
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc/dev/isp_sbus.c9
-rw-r--r--sys/dev/ic/isp_openbsd.c4
-rw-r--r--sys/dev/pci/isp_pci.c11
3 files changed, 8 insertions, 16 deletions
diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index 410c3eb9b97..5a44c13425f 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_sbus.c,v 1.13 2000/10/16 01:01:57 mjacob Exp $ */
+/* $OpenBSD: isp_sbus.c,v 1.14 2000/10/16 22:45:02 mjacob Exp $ */
/*
* SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -219,15 +219,12 @@ isp_sbus_attach(parent, self, aux)
#ifdef ISP_LOGDEFAULT
isp->isp_dblev = ISP_LOGDEFAULT;
#else
- isp->isp_dblev = ISP_LOGCONFIG|ISP_LOGWARN|ISP_LOGERR;
+ isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR;
#ifdef SCSIDEBUG
isp->isp_dblev |= ISP_LOGDEBUG1|ISP_LOGDEBUG2;
#endif
#ifdef DEBUG
- isp->isp_dblev |= ISP_LOGDEBUG0;
-#endif
-#ifdef DIAGNOSTIC
- isp->isp_dblev |= ISP_LOGINFO;
+ isp->isp_dblev |= ISP_LOGDEBUG0|ISP_LOGCONFIG|ISP_LOGINFO;
#endif
#endif
diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c
index 914bafb0fcf..eaa7402c86a 100644
--- a/sys/dev/ic/isp_openbsd.c
+++ b/sys/dev/ic/isp_openbsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_openbsd.c,v 1.12 2000/10/16 01:02:00 mjacob Exp $ */
+/* $OpenBSD: isp_openbsd.c,v 1.13 2000/10/16 22:45:00 mjacob Exp $ */
/*
* Platform (OpenBSD) dependent common attachment code for Qlogic adapters.
*
@@ -143,8 +143,6 @@ isp_attach(isp)
/*
* wait for the bus to settle.
*/
- printf("%s: waiting 4 seconds for bus reset settling\n",
- isp->isp_name);
delay(4 * 1000000);
} else {
int defid;
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 36173fed7b2..62b97e9d44f 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_pci.c,v 1.13 2000/10/16 01:01:58 mjacob Exp $ */
+/* $OpenBSD: isp_pci.c,v 1.14 2000/10/16 22:45:01 mjacob Exp $ */
/*
* PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
*
@@ -539,15 +539,12 @@ isp_pci_attach(parent, self, aux)
#ifdef ISP_LOGDEFAULT
isp->isp_dblev = ISP_LOGDEFAULT;
#else
- isp->isp_dblev = ISP_LOGCONFIG|ISP_LOGWARN|ISP_LOGERR;
+ isp->isp_dblev = ISP_LOGWARN|ISP_LOGERR;
#ifdef SCSIDEBUG
isp->isp_dblev |= ISP_LOGDEBUG1|ISP_LOGDEBUG2;
#endif
#ifdef DEBUG
- isp->isp_dblev |= ISP_LOGDEBUG0;
-#endif
-#ifdef DIAGNOSTIC
- isp->isp_dblev |= ISP_LOGINFO;
+ isp->isp_dblev |= ISP_LOGDEBUG0|ISP_LOGCONFIG|ISP_LOGINFO;
#endif
#endif
@@ -577,7 +574,7 @@ isp_pci_attach(parent, self, aux)
free(isp->isp_param, M_DEVBUF);
return;
}
- printf("%s: interrupting at %s\n", isp->isp_name, intrstr);
+ isp_prt(isp, ISP_LOGCONFIG, "interrupting at %s", intrstr);
if (IS_FC(isp)) {
DEFAULT_NODEWWN(isp) = 0x400000007F000002;