summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>1999-11-21 03:15:11 +0000
committermjacob <mjacob@FreeBSD.org>1999-11-21 03:15:11 +0000
commit1a6884ad3f584d66a116f9c5cddd835db47113b4 (patch)
tree87362a571ed0516f2b476ca815ab9cd990043f74
parentcad8fd9aa62c7af34e65ee1eec5d3097467d18f2 (diff)
downloadFreeBSD-src-1a6884ad3f584d66a116f9c5cddd835db47113b4.zip
FreeBSD-src-1a6884ad3f584d66a116f9c5cddd835db47113b4.tar.gz
Add storage/access for a default WWN. A miscellaneous tweak or two.
-rw-r--r--sys/dev/isp/isp_freebsd.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h
index 5b8020f..d2a0c99 100644
--- a/sys/dev/isp/isp_freebsd.h
+++ b/sys/dev/isp/isp_freebsd.h
@@ -83,9 +83,9 @@
#define ISP_SCSI_XFER_T struct ccb_scsiio
struct isposinfo {
+ u_int64_t default_wwn;
char name[8];
int unit;
- int seed;
struct cam_sim *sim;
struct cam_path *path;
struct cam_sim *sim2;
@@ -210,7 +210,7 @@ extern void isp_uninit(struct ispsoftc *);
#define ISP_SWIZZLE_SNS_REQ(a, b)
#define ISP_UNSWIZZLE_SNS_RSP(a, b, c)
-#define IDPRINTF(lev, x) if (isp->isp_dblev >= lev) printf x
+#define IDPRINTF(lev, x) if (isp->isp_dblev >= (u_int8_t) lev) printf x
#define PRINTF printf
#define CFGPRINTF if (bootverbose || DFLT_DBLEVEL > 0) printf
@@ -218,7 +218,7 @@ extern void isp_uninit(struct ispsoftc *);
#define FC_FW_READY_DELAY (5 * 1000000)
#define DEFAULT_LOOPID(x) 109
-#define DEFAULT_WWN(x) (0x0000feeb00000000LL + (x)->isp_osinfo.seed)
+#define DEFAULT_WWN(x) (x)->isp_osinfo.default_wwn
#define INLINE __inline
#include <dev/isp/isp_inline.h>
OpenPOWER on IntegriCloud