diff options
| author | mjacob <mjacob@NetBSD.org> | 2000-02-12 02:29:00 +0000 |
|---|---|---|
| committer | mjacob <mjacob@NetBSD.org> | 2000-02-12 02:29:00 +0000 |
| commit | 56e16448aded769e65367c9e89b4bcd9c074e846 (patch) | |
| tree | bf9165d87c84366a55dee4b6bd2441a1464417e3 /sys/dev | |
| parent | 9f63fdeefb5690df51f81e089f6ba8e36bec35a3 (diff) | |
add in 12160 (Ultra3) related definitions
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ic/ispvar.h | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/sys/dev/ic/ispvar.h b/sys/dev/ic/ispvar.h index 7577b55b5b3..58ac408a05e 100644 --- a/sys/dev/ic/ispvar.h +++ b/sys/dev/ic/ispvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: ispvar.h,v 1.28 2000/01/06 03:00:11 mjacob Exp $ */ +/* $NetBSD: ispvar.h,v 1.29 2000/02/12 02:29:00 mjacob Exp $ */ /* * Copyright (C) 1999 National Aeronautics & Space Administration * All rights reserved. @@ -37,18 +37,21 @@ #include <dev/ic/ispmbox.h> #ifdef ISP_TARGET_MODE #include <dev/ic/isp_target.h> +#include <dev/ic/isp_tpublic.h> #endif #endif #ifdef __FreeBSD__ #include <dev/isp/ispmbox.h> #ifdef ISP_TARGET_MODE #include <dev/isp/isp_target.h> +#include <dev/isp/isp_tpublic.h> #endif #endif #ifdef __linux__ #include "ispmbox.h" #ifdef ISP_TARGET_MODE #include "isp_target.h" +#include "isp_tpublic.h" #endif #endif @@ -367,6 +370,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]) @@ -391,6 +395,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 @@ -399,12 +404,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 |
