From b0a3ba7e2864c2767a73dbf91abd0a26a0e362d0 Mon Sep 17 00:00:00 2001 From: Matt Jacob Date: Tue, 27 Feb 2001 00:14:39 +0000 Subject: [PATCH] Fix at2_entry_t to reflect what the firmware actually writes (instead of just deriving from SCSI at_entry_t). In this case, there is no 'suggested sense' for FC cards. --- sys/dev/isp/isp_freebsd.c | 11 ++++------- sys/dev/isp/isp_target.h | 5 ++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c index d6f9c8b0064..891440c38c3 100644 --- a/sys/dev/isp/isp_freebsd.c +++ b/sys/dev/isp/isp_freebsd.c @@ -1149,13 +1149,10 @@ isp_handle_platform_atio2(struct ispsoftc *isp, at2_entry_t *aep) ((fcparam *)isp->isp_param)->isp_loopid; atiop->ccb_h.target_lun = lun; } - if (aep->at_status & QLTM_SVALID) { - size_t amt = imin(QLTM_SENSELEN, sizeof (atiop->sense_data)); - atiop->sense_len = amt; - MEMCPY(&atiop->sense_data, aep->at_sense, amt); - } else { - atiop->sense_len = 0; - } + /* + * We don't get 'suggested' sense data as we do with SCSI cards. + */ + atiop->sense_len = 0; atiop->init_id = aep->at_iid; atiop->cdb_len = ATIO2_CDBLEN; diff --git a/sys/dev/isp/isp_target.h b/sys/dev/isp/isp_target.h index 6dac18e823a..86000246c7a 100644 --- a/sys/dev/isp/isp_target.h +++ b/sys/dev/isp/isp_target.h @@ -262,9 +262,8 @@ typedef struct { 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_reserved2; - u_int16_t at_scsi_status; - u_int8_t at_sense[QLTM_SENSELEN]; + u_int16_t at_reserved2[10]; + u_int16_t at_oxid; } at2_entry_t; #define ATIO2_WWPN_OFFSET 0x2A