diff options
author | Alexander Motin <mav@FreeBSD.org> | 2015-10-23 21:30:18 +0000 |
---|---|---|
committer | Alexander Motin <mav@FreeBSD.org> | 2015-10-23 21:30:18 +0000 |
commit | 92b25384be7e4f1f74f8a6614135c8e29b4a8788 (patch) | |
tree | 4426d711649c3024dd3eb96a4ec53c45bb273052 /sys | |
parent | cce940d2f66fbf982a79aadd4c909393a8935758 (diff) | |
download | src-92b25384be7e4f1f74f8a6614135c8e29b4a8788.tar.gz src-92b25384be7e4f1f74f8a6614135c8e29b4a8788.zip |
Minor additions to Status Type 0 IOCB.
Notes
Notes:
svn path=/head/; revision=289855
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/isp/isp_library.c | 2 | ||||
-rw-r--r-- | sys/dev/isp/ispmbox.h | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c index 8d031b1f44da..602a1ad6d991 100644 --- a/sys/dev/isp/isp_library.c +++ b/sys/dev/isp/isp_library.c @@ -1158,7 +1158,7 @@ isp_get_24xx_response(ispsoftc_t *isp, isp24xx_statusreq_t *src, isp24xx_statusr ISP_IOXGET_32(isp, &src->req_resid, dst->req_resid); ISP_IOXGET_16(isp, &src->req_reserved0, dst->req_reserved0); ISP_IOXGET_16(isp, &src->req_state_flags, dst->req_state_flags); - ISP_IOXGET_16(isp, &src->req_reserved1, dst->req_reserved1); + ISP_IOXGET_16(isp, &src->req_retry_delay, dst->req_retry_delay); ISP_IOXGET_16(isp, &src->req_scsi_status, dst->req_scsi_status); ISP_IOXGET_32(isp, &src->req_fcp_residual, dst->req_fcp_residual); ISP_IOXGET_32(isp, &src->req_sense_len, dst->req_sense_len); diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h index 86b4987c8286..27b65c7e5e97 100644 --- a/sys/dev/isp/ispmbox.h +++ b/sys/dev/isp/ispmbox.h @@ -632,7 +632,7 @@ typedef struct { uint32_t req_resid; uint16_t req_reserved0; uint16_t req_state_flags; - uint16_t req_reserved1; + uint16_t req_retry_delay; /* aka Status Qualifier */ uint16_t req_scsi_status; uint32_t req_fcp_residual; uint32_t req_sense_len; @@ -644,11 +644,12 @@ typedef struct { * For Qlogic 2X00, the high order byte of SCSI status has * additional meaning. */ -#define RQCS_RU 0x800 /* Residual Under */ -#define RQCS_RO 0x400 /* Residual Over */ +#define RQCS_CR 0x1000 /* Confirmation Request */ +#define RQCS_RU 0x0800 /* Residual Under */ +#define RQCS_RO 0x0400 /* Residual Over */ #define RQCS_RESID (RQCS_RU|RQCS_RO) -#define RQCS_SV 0x200 /* Sense Length Valid */ -#define RQCS_RV 0x100 /* FCP Response Length Valid */ +#define RQCS_SV 0x0200 /* Sense Length Valid */ +#define RQCS_RV 0x0100 /* FCP Response Length Valid */ /* * CT Passthru IOCB |