summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authormjacob <mjacob@NetBSD.org>2003-08-07 01:09:02 +0000
committermjacob <mjacob@NetBSD.org>2003-08-07 01:09:02 +0000
commita1c1589fcf00eb1465bf23f259dada4577f13d20 (patch)
tree72dcd93a881e19318c93a845f7494519e868f1da /sys/dev
parent03782491e6862f0a6ad689b9bd61bc8a51393f9d (diff)
Clean out the 'fw' variable part of a CTIO2- the f/w doesn't actually
pass us back anything interesting here.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/isp_inline.h17
1 files changed, 3 insertions, 14 deletions
diff --git a/sys/dev/ic/isp_inline.h b/sys/dev/ic/isp_inline.h
index 175313952f6..fbbe3007d07 100644
--- a/sys/dev/ic/isp_inline.h
+++ b/sys/dev/ic/isp_inline.h
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_inline.h,v 1.22 2002/10/18 23:32:08 mjacob Exp $ */
+/* $NetBSD: isp_inline.h,v 1.23 2003/08/07 01:09:02 mjacob Exp $ */
/*
* This driver, which is contained in NetBSD in the files:
*
@@ -1003,7 +1003,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);
@@ -1033,7 +1033,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);
@@ -1221,7 +1221,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);
@@ -1234,16 +1233,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