Minor additions to Status Type 0 IOCB.

diff --git a/sys/dev/isp/isp_library.c b/sys/dev/isp/isp_library.c
index 8d031b1f44da39516767fb035132626d1ac6150f..602a1ad6d991e1c7d9b7328079f7f4d643b60968 100644 (file)
--- 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 86b4987c8286e04e3a6f0b3f84c7b4ef07317782..27b65c7e5e97ae300a2b7041eb0921c108fd79e7 100644 (file)
--- 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