summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authormjacob <mjacob@cvs.openbsd.org>1999-12-16 05:20:54 +0000
committermjacob <mjacob@cvs.openbsd.org>1999-12-16 05:20:54 +0000
commit1956c536b7599939843a71d73be938d4b6846609 (patch)
tree3210e4cb59340ae83034f63e87f173274bf536a2 /sys
parente0f7727276aef93c64677f6e91c3fd7fc2744543 (diff)
Add in dual LVD (1280) support. Reorganize the model codes slightly
and add in IS_DUALBUS and IS_ULTRA2 macros.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/ispvar.h15
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h
index 1ccc141de29..5dd0f3cc0ae 100644
--- a/sys/dev/ic/ispvar.h
+++ b/sys/dev/ic/ispvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ispvar.h,v 1.7 1999/11/22 12:50:53 mjacob Exp $ */
+/* $OpenBSD: ispvar.h,v 1.8 1999/12/16 05:20:53 mjacob Exp $ */
/*
* Soft Definitions for for Qlogic ISP SCSI adapters.
*
@@ -391,15 +391,22 @@ struct ispsoftc {
#define ISP_HA_SCSI_1040A 0x5
#define ISP_HA_SCSI_1040B 0x6
#define ISP_HA_SCSI_1040C 0x7
-#define ISP_HA_SCSI_1080 0xd
-#define ISP_HA_SCSI_12X0 0xe
+#define ISP_HA_SCSI_1240 0x8
+#define ISP_HA_SCSI_1080 0x9
+#define ISP_HA_SCSI_1280 0xa
#define ISP_HA_FC 0xf0
#define ISP_HA_FC_2100 0x10
#define ISP_HA_FC_2200 0x20
#define IS_SCSI(isp) (isp->isp_type & ISP_HA_SCSI)
+#define IS_1240(isp) (isp->isp_type == ISP_HA_SCSI_1240)
#define IS_1080(isp) (isp->isp_type == ISP_HA_SCSI_1080)
-#define IS_12X0(isp) (isp->isp_type == ISP_HA_SCSI_12X0)
+#define IS_1280(isp) (isp->isp_type == ISP_HA_SCSI_1280)
+#define IS_12X0(isp) \
+ (isp->isp_type == ISP_HA_SCSI_1240 || isp->isp_type == ISP_HA_SCSI_1280)
+#define IS_DUALBUS(isp) IS_12X0(isp)
+#define IS_ULTRA2(isp) \
+ (isp->isp_type == ISP_HA_SCSI_1080 || isp->isp_type == ISP_HA_SCSI_1280)
#define IS_FC(isp) (isp->isp_type & ISP_HA_FC)
/*