1c1
< /* $FreeBSD: head/sys/dev/isp/isp_target.h 140652 2005-01-23 06:28:49Z mjacob $ */
---
> /* $FreeBSD: head/sys/dev/isp/isp_target.h 154704 2006-01-23 06:23:37Z mjacob $ */
10,12c10
< * Additional Copyright (c) 1999, 2000, 2001
< * Matthew Jacob
< * mjacob@feral.com
---
> * Additonal Copyright (c) 1997-2006 by Matthew Jacob
15d12
< *
30a28,29
> * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
122a122,132
> typedef struct {
> isphdr_t in_header;
> u_int32_t in_reserved;
> u_int16_t in_iid; /* initiator */
> u_int16_t in_scclun;
> u_int32_t in_reserved2;
> u_int16_t in_status;
> u_int16_t in_task_flags;
> u_int16_t in_seqid; /* sequence id */
> } in_fcentry_e_t;
>
207a218,231
>
> typedef struct {
> isphdr_t na_header;
> u_int32_t na_reserved;
> u_int16_t na_iid; /* initiator */
> u_int16_t na_scclun;
> u_int16_t na_flags;
> u_int16_t na_reserved2;
> u_int16_t na_status;
> u_int16_t na_task_flags;
> u_int16_t na_seqid; /* sequence id */
> u_int16_t na_reserved3[NA2_RSVDLEN];
> } na_fcentry_e_t;
>
257c281,282
< tid |= (inst << 25)
---
> tid |= (GET_BUS_VAL(aep->at_iid) << 25); \
> tid |= (inst << 26)
259c284
< #define CT_MAKE_TAGID(tid, inst, ct) \
---
> #define CT_MAKE_TAGID(tid, bus, inst, ct) \
265c290,291
< tid |= (inst << 25)
---
> tid |= ((bus & 0x1) << 25); \
> tid |= (inst << 26)
269c295,296
< #define AT_GET_INST(val) (((val) >> 25) & 0x7f)
---
> #define AT_GET_INST(val) (((val) >> 26) & 0x3f)
> #define AT_GET_BUS(val) (((val) >> 25) & 0x1)
276c303,304
< tid |= (inst << 25)
---
> tid |= (GET_BUS_VAL(inp->in_iid) << 25); \
> tid |= (inst << 26)
279,280c307,308
< tid &= ~(0x1ffffff); \
< tid |= (inst << 25)
---
> tid &= ~(0x3ffffff); \
> tid |= (inst << 26)
281a310,313
> #define TAG_INSERT_BUS(tid, bus) \
> tid &= ~(1 << 25); \
> tid |= (bus << 25)
>
306a339,357
> typedef struct {
> isphdr_t at_header;
> u_int32_t at_reserved;
> u_int16_t at_iid; /* initiator */
> u_int16_t at_rxid; /* response ID */
> u_int16_t at_flags;
> u_int16_t at_status; /* firmware status */
> u_int8_t at_crn; /* command reference number */
> u_int8_t at_taskcodes;
> u_int8_t at_taskflags;
> u_int8_t at_execodes;
> u_int8_t at_cdb[ATIO2_CDBLEN]; /* received CDB */
> u_int32_t at_datalen; /* allocated data len */
> u_int16_t at_scclun; /* SCC Lun or reserved */
> u_int16_t at_wwpn[4]; /* WWPN of initiator */
> u_int16_t at_reserved2[6];
> u_int16_t at_oxid;
> } at2e_entry_t;
>
334a386,390
> #define FC_HAS_TAG AT2_HAS_TAG
> #define FC_GET_TAG AT2_GET_TAG
> #define FC_GET_INST AT2_GET_INST
> #define FC_GET_HANDLE AT2_GET_HANDLE
>
384,385c440,441
< * do report IIDs between 129 && 255 (these represent devices that have
< * logged in across a SCSI fabric).
---
> * do report IIDs between 0x81 && 0xfe (or 0x7ff) which represent devices
> * that have logged in across a SCSI fabric.
432a489,490
> #define CT_SRR 0x45 /* SRR Received */
> #define CT_LUN_RESET 0x48 /* Lun Reset Received */
511a570,611
> typedef struct {
> isphdr_t ct_header;
> u_int16_t ct_reserved;
> u_int16_t ct_fwhandle; /* just to match CTIO */
> u_int16_t ct_iid; /* initiator id */
> u_int16_t ct_rxid; /* response ID */
> u_int16_t ct_flags;
> u_int16_t ct_status; /* isp status */
> u_int16_t ct_timeout;
> u_int16_t ct_seg_count;
> u_int32_t ct_reloff; /* relative offset */
> int32_t ct_resid; /* residual length */
> union {
> struct {
> u_int32_t _reserved;
> u_int16_t _reserved2;
> u_int16_t ct_scsi_status;
> u_int32_t ct_xfrlen;
> union {
> ispds_t ct_a[ISP_RQDSEG_T2]; /* CTIO2 */
> ispds64_t ct_b[ISP_RQDSEG_T3]; /* CTIO3 */
> ispdslist_t ct_c; /* CTIO4 */
> } _u;
> } m0;
> struct {
> u_int16_t _reserved;
> u_int16_t _reserved2;
> u_int16_t ct_senselen;
> u_int16_t ct_scsi_status;
> u_int16_t ct_resplen;
> u_int8_t ct_resp[MAXRESPLEN];
> } m1;
> struct {
> u_int32_t _reserved;
> u_int16_t _reserved2;
> u_int16_t _reserved3;
> u_int32_t ct_datalen;
> ispds_t ct_fcp_rsp_iudata;
> } m2;
> } rsp;
> } ct2e_entry_t;
>
559a660,665
> * This function externalizes the ability to acknowledge an Immediate Notify
> * request.
> */
> void isp_notify_ack(struct ispsoftc *, void *);
>
> /*
592d697
<
593a699
>