summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormjacob <mjacob@cvs.openbsd.org>2001-02-12 23:47:50 +0000
committermjacob <mjacob@cvs.openbsd.org>2001-02-12 23:47:50 +0000
commit3b916dd82a88ea7f5bfe7c57b0d3e1fc79241fdd (patch)
tree3913b7d05d3be6731cdc8cb7cbecdfd4f4ad1fd8 /sys
parent6ffdfbb907d76f5361da3e3664269ea10cd87d2d (diff)
Roll platform minor. Remove ISP2100_FABRIC defines (we don't care
anymore). Fix mailbox timeouts to correctly print out timing out command.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/isp_openbsd.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/sys/dev/ic/isp_openbsd.h b/sys/dev/ic/isp_openbsd.h
index 92311aa2167..018cdc6506c 100644
--- a/sys/dev/ic/isp_openbsd.h
+++ b/sys/dev/ic/isp_openbsd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_openbsd.h,v 1.11 2000/12/06 01:07:23 mjacob Exp $ */
+/* $OpenBSD: isp_openbsd.h,v 1.12 2001/02/12 23:47:49 mjacob Exp $ */
/*
* OpenBSD Specific definitions for the Qlogic ISP Host Adapter
*/
@@ -54,7 +54,7 @@
#define ISP_PLATFORM_VERSION_MAJOR 1
-#define ISP_PLATFORM_VERSION_MINOR 0
+#define ISP_PLATFORM_VERSION_MINOR 1
struct isposinfo {
struct device _dev;
@@ -90,7 +90,6 @@ struct isposinfo {
#define INLINE inline
-#define ISP2100_FABRIC 1
#define ISP2100_SCRLEN 0x400
#define MEMZERO bzero
@@ -345,7 +344,9 @@ isp_wait_complete(isp)
usecs += 500;
}
if (isp->isp_mboxbsy != 0) {
- isp_prt(isp, ISP_LOGWARN, "Mailbox Cmd (poll) Timeout");
+ isp_prt(isp, ISP_LOGWARN,
+ "Polled Mailbox Command (0x%x) Timeout",
+ isp->isp_lastmbxcmd);
}
} else {
int rv = 0;
@@ -365,7 +366,9 @@ isp_wait_complete(isp)
if (rv == EWOULDBLOCK) {
isp->isp_mboxbsy = 0;
isp->isp_osinfo.mboxwaiting = 0;
- isp_prt(isp, ISP_LOGWARN, "Mailbox Cmd (intr) Timeout");
+ isp_prt(isp, ISP_LOGWARN,
+ "Interrupting Mailbox Command (0x%x) Timeout",
+ isp->isp_lastmbxcmd);
}
}
}