Author: mav
Date: Fri Oct 23 21:30:18 2015
New Revision: 289855
URL: https://svnweb.freebsd.org/changeset/base/289855

Log:
  Minor additions to Status Type 0 IOCB.

Modified:
  head/sys/dev/isp/isp_library.c
  head/sys/dev/isp/ispmbox.h

Modified: head/sys/dev/isp/isp_library.c
==============================================================================
--- head/sys/dev/isp/isp_library.c      Fri Oct 23 21:29:37 2015        
(r289854)
+++ head/sys/dev/isp/isp_library.c      Fri Oct 23 21:30:18 2015        
(r289855)
@@ -1158,7 +1158,7 @@ isp_get_24xx_response(ispsoftc_t *isp, i
        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);

Modified: head/sys/dev/isp/ispmbox.h
==============================================================================
--- head/sys/dev/isp/ispmbox.h  Fri Oct 23 21:29:37 2015        (r289854)
+++ head/sys/dev/isp/ispmbox.h  Fri Oct 23 21:30:18 2015        (r289855)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to