diff options
author | mjacob <mjacob@FreeBSD.org> | 2004-02-07 03:43:27 +0000 |
---|---|---|
committer | mjacob <mjacob@FreeBSD.org> | 2004-02-07 03:43:27 +0000 |
commit | f7af3de4b86808c39d96cca95e501a689529818c (patch) | |
tree | 3af679ab17cb5f340445a77c3f70a14a61a75d12 /sys/dev/isp | |
parent | 3f8b850980fc23d07b46b10c03ca807e1ca77a9c (diff) | |
download | FreeBSD-src-f7af3de4b86808c39d96cca95e501a689529818c.zip FreeBSD-src-f7af3de4b86808c39d96cca95e501a689529818c.tar.gz |
Reverse role defines for initiator and target mode to better match the
class 3 service parameters we'd get.
Steal 8 bits out of the portid u_int32_t for role information (port ids
are 24 bits anyway).
MFC after: 1 week
Diffstat (limited to 'sys/dev/isp')
-rw-r--r-- | sys/dev/isp/isp_ioctl.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/isp/isp_ioctl.h b/sys/dev/isp/isp_ioctl.h index f4d3c15..93ccc53 100644 --- a/sys/dev/isp/isp_ioctl.h +++ b/sys/dev/isp/isp_ioctl.h @@ -63,8 +63,8 @@ #define ISP_SETROLE _IOWR(ISP_IOC, 4, int) #define ISP_ROLE_NONE 0x0 -#define ISP_ROLE_INITIATOR 0x1 -#define ISP_ROLE_TARGET 0x2 +#define ISP_ROLE_TARGET 0x1 +#define ISP_ROLE_INITIATOR 0x2 #define ISP_ROLE_BOTH (ISP_ROLE_TARGET|ISP_ROLE_INITIATOR) #ifndef ISP_DEFAULT_ROLES #define ISP_DEFAULT_ROLES ISP_ROLE_BOTH @@ -115,8 +115,10 @@ typedef struct { * only), 24 bit Port ID and Node and Port WWNs. */ struct isp_fc_device { - u_int32_t loopid; /* 0..255 */ - u_int32_t portid; /* 24 bit Port ID */ + u_int32_t loopid; /* 0..255 */ + u_int32_t : 6, + role : 2, + portid : 24; /* 24 bit Port ID */ u_int64_t node_wwn; u_int64_t port_wwn; }; |