summaryrefslogtreecommitdiffstats
path: root/sys/dev/isp
diff options
context:
space:
mode:
authormjacob <mjacob@FreeBSD.org>2003-09-13 01:57:31 +0000
committermjacob <mjacob@FreeBSD.org>2003-09-13 01:57:31 +0000
commitbed4d9c166fed8b431ae7ee49d7671250c7ad5ff (patch)
treeb33f5be428a27f78393c3ada7dbd7510e8f423e3 /sys/dev/isp
parent26a6cfd5fd83df5eb7fc7faac64e445654067c95 (diff)
downloadFreeBSD-src-bed4d9c166fed8b431ae7ee49d7671250c7ad5ff.zip
FreeBSD-src-bed4d9c166fed8b431ae7ee49d7671250c7ad5ff.tar.gz
Some canonicalization function cleanups based upon some target mode
structure cleanups.
Diffstat (limited to 'sys/dev/isp')
-rw-r--r--sys/dev/isp/isp_inline.h15
1 files changed, 2 insertions, 13 deletions
diff --git a/sys/dev/isp/isp_inline.h b/sys/dev/isp/isp_inline.h
index c2d9366..17ac1d0 100644
--- a/sys/dev/isp/isp_inline.h
+++ b/sys/dev/isp/isp_inline.h
@@ -975,7 +975,7 @@ isp_put_atio2(struct ispsoftc *isp, at2_entry_t *atsrc, at2_entry_t *atdst)
ISP_IOXPUT_16(isp, atsrc->at_rxid, &atdst->at_rxid);
ISP_IOXPUT_16(isp, atsrc->at_flags, &atdst->at_flags);
ISP_IOXPUT_16(isp, atsrc->at_status, &atdst->at_status);
- ISP_IOXPUT_8(isp, atsrc->at_reserved1, &atdst->at_reserved1);
+ ISP_IOXPUT_8(isp, atsrc->at_crn, &atdst->at_crn);
ISP_IOXPUT_8(isp, atsrc->at_taskcodes, &atdst->at_taskcodes);
ISP_IOXPUT_8(isp, atsrc->at_taskflags, &atdst->at_taskflags);
ISP_IOXPUT_8(isp, atsrc->at_execodes, &atdst->at_execodes);
@@ -1005,7 +1005,7 @@ isp_get_atio2(struct ispsoftc *isp, at2_entry_t *atsrc, at2_entry_t *atdst)
ISP_IOXGET_16(isp, &atsrc->at_rxid, atdst->at_rxid);
ISP_IOXGET_16(isp, &atsrc->at_flags, atdst->at_flags);
ISP_IOXGET_16(isp, &atsrc->at_status, atdst->at_status);
- ISP_IOXGET_8(isp, &atsrc->at_reserved1, atdst->at_reserved1);
+ ISP_IOXGET_8(isp, &atsrc->at_crn, atdst->at_crn);
ISP_IOXGET_8(isp, &atsrc->at_taskcodes, atdst->at_taskcodes);
ISP_IOXGET_8(isp, &atsrc->at_taskflags, atdst->at_taskflags);
ISP_IOXGET_8(isp, &atsrc->at_execodes, atdst->at_execodes);
@@ -1193,7 +1193,6 @@ isp_put_ctio2(struct ispsoftc *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst)
static INLINE void
isp_get_ctio2(struct ispsoftc *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst)
{
- int i;
isp_copy_in_hdr(isp, &ctsrc->ct_header, &ctdst->ct_header);
ISP_IOXGET_16(isp, &ctsrc->ct_reserved, ctdst->ct_reserved);
ISP_IOXGET_16(isp, &ctsrc->ct_fwhandle, ctdst->ct_fwhandle);
@@ -1206,16 +1205,6 @@ isp_get_ctio2(struct ispsoftc *isp, ct2_entry_t *ctsrc, ct2_entry_t *ctdst)
ISP_IOXGET_16(isp, &ctsrc->ct_seg_count, ctdst->ct_seg_count);
ISP_IOXGET_32(isp, &ctsrc->ct_reloff, ctdst->ct_reloff);
ISP_IOXGET_32(isp, &ctsrc->ct_resid, ctdst->ct_resid);
- for (i = 0; i < 4; i++) {
- ISP_IOXGET_32(isp, &ctsrc->rsp.fw._reserved[i],
- ctdst->rsp.fw._reserved[i]);
- }
- ISP_IOXGET_16(isp, &ctsrc->rsp.fw.ct_scsi_status,
- ctdst->rsp.fw.ct_scsi_status);
- for (i = 0; i < QLTM_SENSELEN; i++) {
- ISP_IOXGET_8(isp, &ctsrc->rsp.fw.ct_sense[i],
- ctdst->rsp.fw.ct_sense[i]);
- }
}
static INLINE void
OpenPOWER on IntegriCloud