diff options
Diffstat (limited to 'sys/dev/isp/ispvar.h')
-rw-r--r-- | sys/dev/isp/ispvar.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h index fa30e61..35c778a 100644 --- a/sys/dev/isp/ispvar.h +++ b/sys/dev/isp/ispvar.h @@ -469,6 +469,7 @@ typedef struct ispsoftc { #define ISP_HA_FC 0xf0 #define ISP_HA_FC_2100 0x10 #define ISP_HA_FC_2200 0x20 +#define ISP_HA_FC_2300 0x30 #define IS_SCSI(isp) (isp->isp_type & ISP_HA_SCSI) #define IS_1240(isp) (isp->isp_type == ISP_HA_SCSI_1240) @@ -481,9 +482,13 @@ typedef struct ispsoftc { #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) +#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) +#define IS_2300(isp) ((isp)->isp_type == ISP_HA_FC_2300) + +/* 2300 Support isn't ready yet */ +#define ISP_DISABLE_2300_SUPPORT 1 /* * DMA cookie macros @@ -628,6 +633,8 @@ typedef enum { ISPASYNC_BUS_RESET, /* Bus Was Reset */ ISPASYNC_LOOP_DOWN, /* FC Loop Down */ ISPASYNC_LOOP_UP, /* FC Loop Up */ + ISPASYNC_LIP, /* LIP Received */ + ISPASYNC_LOOP_RESET, /* Loop Reset Received */ ISPASYNC_CHANGE_NOTIFY, /* FC Change Notification */ ISPASYNC_FABRIC_DEV, /* FC Fabric Device Arrival */ ISPASYNC_PROMENADE, /* FC Objects coming && going */ @@ -780,7 +787,6 @@ void isp_prt(struct ispsoftc *, int level, const char *, ...); * ISP_SWIZZLE_SNS_REQ * ISP_UNSWIZZLE_SNS_RSP * ISP_SWIZZLE_NVRAM_WORD - * - * */ + #endif /* _ISPVAR_H */ |