d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Roll core minor version. Set ISP_MAX_LUNS to be off of new isp_maxluns

Browse Source 
tag in softc.
This commit is contained in:
mjacob 2000-06-18 04:45:51 +00:00
parent 9dcc007b30
commit 0e546ae817
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/isp/ispvar.h
View File

@ -58,7 +58,7 @@
#endif
#define ISP_CORE_VERSION_MAJOR 1
#define ISP_CORE_VERSION_MINOR 14
#define ISP_CORE_VERSION_MINOR 15
/*
* Vector for bus specific code to provide specific services.
@ -75,7 +75,7 @@ struct ispmdvec {
void (*dv_reset0) __P((struct ispsoftc *));
void (*dv_reset1) __P((struct ispsoftc *));
void (*dv_dregs) __P((struct ispsoftc *));
const u_int16_t *dv_ispfw; /* ptr to f/w */
const u_int16_t *dv_ispfw; /* ptr to f/w */
u_int16_t dv_fwlen; /* length of f/w */
u_int16_t dv_codeorg; /* code ORG for f/w */
u_int32_t dv_fwrev; /* f/w revision */
@ -94,15 +94,7 @@ struct ispmdvec {
#endif
#define ISP_MAX_TARGETS(isp) (IS_FC(isp)? MAX_FC_TARG : MAX_TARGETS)
#ifdef ISP2100_SCCLUN
#define _ISP_FC_LUN(isp) 65536
#else
#define _ISP_FC_LUN(isp) 16
#endif
#define _ISP_SCSI_LUN(isp) \
((ISP_FW_REVX(isp->isp_fwrev) >= ISP_FW_REV(7, 55, 0))? 32 : 8)
#define ISP_MAX_LUNS(isp) \
(IS_FC(isp)? _ISP_FC_LUN(isp) : _ISP_SCSI_LUN(isp))
#define ISP_MAX_LUNS(isp) (isp)->isp_maxluns
/*
@ -322,6 +314,7 @@ struct ispsoftc {
u_int16_t isp_maxcmds; /* max possible I/O cmds */
u_int8_t isp_type; /* HBA Chip Type */
u_int8_t isp_revision; /* HBA Chip H/W Revision */
u_int32_t isp_maxluns; /* maximum luns supported */
u_int32_t : 4,
isp_touched : 1, /* board ever seen? */