1c1
< /* $FreeBSD: head/sys/dev/isp/ispvar.h 146073 2005-05-11 00:22:17Z mjacob $ */
---
> /* $FreeBSD: head/sys/dev/isp/ispvar.h 154704 2006-01-23 06:23:37Z mjacob $ */
5c5
< * Copyright (c) 1997, 1998, 1999, 2000 by Matthew Jacob
---
> * Copyright (c) 1997-2006 by Matthew Jacob
28d27
< *
177d175
<
233d230
<
257,258c254,256
< u_int32_t isp_fwoptions : 16,
< isp_gbspeed : 2,
---
> u_int32_t : 13,
> isp_gbspeed : 3,
> : 2,
266,270c264,268
< u_int8_t isp_iid; /* 'initiator' id */
< u_int8_t isp_loopid; /* hard loop id */
< u_int8_t isp_alpa; /* ALPA */
< u_int32_t isp_portid;
< volatile u_int16_t isp_lipseq; /* LIP sequence # */
---
> u_int32_t : 8,
> isp_portid : 24; /* S_ID */
> u_int16_t isp_fwoptions;
> u_int16_t isp_iid; /* 'initiator' id */
> u_int16_t isp_loopid; /* hard loop id */
290,292c288,289
< u_int32_t
< port_type : 8,
< loopid : 8,
---
> u_int32_t loopid : 16,
> : 2,
295d291
< : 2,
301a298
> tvalid : 1,
303c300,301
< u_int32_t portid;
---
> u_int32_t port_type : 8,
> portid : 24;
417c415
< volatile u_int16_t isp_mboxtmp[MAX_MAILBOX];
---
> volatile u_int16_t isp_mboxtmp[MAILBOX_STORAGE];
556a555,557
> #define ISP_HA_FC_2322 0x50
> #define ISP_HA_FC_2400 0x60
> #define ISP_HA_FC_2422 0x61
576a578,579
> #define IS_2322(isp) ((isp)->isp_type == ISP_HA_FC_2322)
> #define IS_24XX(isp) ((isp)->isp_type >= ISP_HA_FC_2400)
745,747c748,749
< ISPASYNC_TARGET_MESSAGE, /* target message */
< ISPASYNC_TARGET_EVENT, /* target asynchronous event */
< ISPASYNC_TARGET_ACTION, /* other target command action */
---
> ISPASYNC_TARGET_NOTIFY, /* target asynchronous notification event */
> ISPASYNC_TARGET_ACTION, /* target action requested */