summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>2000-02-11 19:25:01 +0000
committermjacob <mjacob@FreeBSD.org>2000-02-11 19:25:01 +0000
commit7d5f5fd6a6ca2db6db398c95d6e0ad94491c7f09 (patch)
tree837947721eb963eb6338131d3499d39179ad2eb0 /sys/dev
parent320ecd9d1ab6fb98b2bc3f4c83de344a1c613b94 (diff)
downloadFreeBSD-src-7d5f5fd6a6ca2db6db398c95d6e0ad94491c7f09.zip
FreeBSD-src-7d5f5fd6a6ca2db6db398c95d6e0ad94491c7f09.tar.gz
Add 12160 (Ultra3) defines. Add config option flag for forcing point-to-point
instead of FC-AL (2200 only). Approved: jkh@freebsd.org
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isp/ispvar.h17
1 files changed, 12 insertions, 5 deletions
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 2c0f665..11221e7 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -372,6 +372,7 @@ struct ispsoftc {
#define ISP_CFG_NONVRAM 0x40 /* ignore NVRAM */
#define ISP_CFG_FULL_DUPLEX 0x01 /* Full Duplex (Fibre Channel only) */
#define ISP_CFG_OWNWWN 0x02 /* override NVRAM wwn */
+#define ISP_CFG_NPORT 0x04 /* try to force N- instead of L-Port */
#define ISP_FW_REV(maj, min, mic) ((maj << 24) | (min << 16) | mic)
#define ISP_FW_REVX(xp) ((xp[0]<<24) | (xp[1] << 16) | xp[2])
@@ -396,6 +397,7 @@ struct ispsoftc {
#define ISP_HA_SCSI_1240 0x8
#define ISP_HA_SCSI_1080 0x9
#define ISP_HA_SCSI_1280 0xa
+#define ISP_HA_SCSI_12160 0xb
#define ISP_HA_FC 0xf0
#define ISP_HA_FC_2100 0x10
#define ISP_HA_FC_2200 0x20
@@ -404,12 +406,17 @@ struct ispsoftc {
#define IS_1240(isp) (isp->isp_type == ISP_HA_SCSI_1240)
#define IS_1080(isp) (isp->isp_type == ISP_HA_SCSI_1080)
#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_12160(isp) (isp->isp_type == ISP_HA_SCSI_12160)
+
+#define IS_12X0(isp) (IS_1240(isp) || IS_1280(isp))
+#define IS_DUALBUS(isp) (IS_12X0(isp) || IS_12160(isp))
+#define IS_ULTRA2(isp) (IS_1080(isp) || IS_1280(isp) || IS_12160(isp))
+#define IS_ULTRA3(isp) (IS_12160(isp))
+
#define IS_FC(isp) (isp->isp_type & ISP_HA_FC)
+#define IS_2100(isp) (isp->isp_type == ISP_HA_FC_2100)
+#define IS_2200(isp) (isp->isp_type == ISP_HA_FC_2200)
+
/*
* Function Prototypes
OpenPOWER on IntegriCloud