Author: mav
Date: Wed Mar 29 15:58:25 2017
New Revision: 316155
URL: https://svnweb.freebsd.org/changeset/base/316155
Log:
MFC r315485: Remove dead remnants of SPI target.
Modified:
stable/10/sys/dev/isp/isp.c
stable/10/sys/dev/isp/isp_library.c
stable/10/sys/dev/isp/isp_library.h
stable/10/sys/dev/isp/isp_target.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/isp/isp.c
==============================================================================
--- stable/10/sys/dev/isp/isp.c Wed Mar 29 15:57:50 2017 (r316154)
+++ stable/10/sys/dev/isp/isp.c Wed Mar 29 15:58:25 2017 (r316155)
@@ -5989,8 +5989,6 @@ isp_handle_other_response(ispsoftc_t *is
return (1);
case RQSTYPE_ATIO:
case RQSTYPE_CTIO:
- case RQSTYPE_ENABLE_LUN:
- case RQSTYPE_MODIFY_LUN:
case RQSTYPE_NOTIFY:
case RQSTYPE_NOTIFY_ACK:
case RQSTYPE_CTIO1:
Modified: stable/10/sys/dev/isp/isp_library.c
==============================================================================
--- stable/10/sys/dev/isp/isp_library.c Wed Mar 29 15:57:50 2017
(r316154)
+++ stable/10/sys/dev/isp/isp_library.c Wed Mar 29 15:58:25 2017
(r316155)
@@ -3055,78 +3055,6 @@ isp_get_ctio7(ispsoftc_t *isp, ct7_entry
}
void
-isp_put_enable_lun(ispsoftc_t *isp, lun_entry_t *lesrc, lun_entry_t *ledst)
-{
- int i;
- isp_put_hdr(isp, &lesrc->le_header, &ledst->le_header);
- ISP_IOXPUT_32(isp, lesrc->le_reserved, &ledst->le_reserved);
- if (ISP_IS_SBUS(isp)) {
- ISP_IOXPUT_8(isp, lesrc->le_lun, &ledst->le_rsvd);
- ISP_IOXPUT_8(isp, lesrc->le_rsvd, &ledst->le_lun);
- ISP_IOXPUT_8(isp, lesrc->le_ops, &ledst->le_tgt);
- ISP_IOXPUT_8(isp, lesrc->le_tgt, &ledst->le_ops);
- ISP_IOXPUT_8(isp, lesrc->le_status, &ledst->le_reserved2);
- ISP_IOXPUT_8(isp, lesrc->le_reserved2, &ledst->le_status);
- ISP_IOXPUT_8(isp, lesrc->le_cmd_count, &ledst->le_in_count);
- ISP_IOXPUT_8(isp, lesrc->le_in_count, &ledst->le_cmd_count);
- ISP_IOXPUT_8(isp, lesrc->le_cdb6len, &ledst->le_cdb7len);
- ISP_IOXPUT_8(isp, lesrc->le_cdb7len, &ledst->le_cdb6len);
- } else {
- ISP_IOXPUT_8(isp, lesrc->le_lun, &ledst->le_lun);
- ISP_IOXPUT_8(isp, lesrc->le_rsvd, &ledst->le_rsvd);
- ISP_IOXPUT_8(isp, lesrc->le_ops, &ledst->le_ops);
- ISP_IOXPUT_8(isp, lesrc->le_tgt, &ledst->le_tgt);
- ISP_IOXPUT_8(isp, lesrc->le_status, &ledst->le_status);
- ISP_IOXPUT_8(isp, lesrc->le_reserved2, &ledst->le_reserved2);
- ISP_IOXPUT_8(isp, lesrc->le_cmd_count, &ledst->le_cmd_count);
- ISP_IOXPUT_8(isp, lesrc->le_in_count, &ledst->le_in_count);
- ISP_IOXPUT_8(isp, lesrc->le_cdb6len, &ledst->le_cdb6len);
- ISP_IOXPUT_8(isp, lesrc->le_cdb7len, &ledst->le_cdb7len);
- }
- ISP_IOXPUT_32(isp, lesrc->le_flags, &ledst->le_flags);
- ISP_IOXPUT_16(isp, lesrc->le_timeout, &ledst->le_timeout);
- for (i = 0; i < 20; i++) {
- ISP_IOXPUT_8(isp, lesrc->le_reserved3[i],
&ledst->le_reserved3[i]);
- }
-}
-
-void
-isp_get_enable_lun(ispsoftc_t *isp, lun_entry_t *lesrc, lun_entry_t *ledst)
-{
- int i;
- isp_get_hdr(isp, &lesrc->le_header, &ledst->le_header);
- ISP_IOXGET_32(isp, &lesrc->le_reserved, ledst->le_reserved);
- if (ISP_IS_SBUS(isp)) {
- ISP_IOXGET_8(isp, &lesrc->le_lun, ledst->le_rsvd);
- ISP_IOXGET_8(isp, &lesrc->le_rsvd, ledst->le_lun);
- ISP_IOXGET_8(isp, &lesrc->le_ops, ledst->le_tgt);
- ISP_IOXGET_8(isp, &lesrc->le_tgt, ledst->le_ops);
- ISP_IOXGET_8(isp, &lesrc->le_status, ledst->le_reserved2);
- ISP_IOXGET_8(isp, &lesrc->le_reserved2, ledst->le_status);
- ISP_IOXGET_8(isp, &lesrc->le_cmd_count, ledst->le_in_count);
- ISP_IOXGET_8(isp, &lesrc->le_in_count, ledst->le_cmd_count);
- ISP_IOXGET_8(isp, &lesrc->le_cdb6len, ledst->le_cdb7len);
- ISP_IOXGET_8(isp, &lesrc->le_cdb7len, ledst->le_cdb6len);
- } else {
- ISP_IOXGET_8(isp, &lesrc->le_lun, ledst->le_lun);
- ISP_IOXGET_8(isp, &lesrc->le_rsvd, ledst->le_rsvd);
- ISP_IOXGET_8(isp, &lesrc->le_ops, ledst->le_ops);
- ISP_IOXGET_8(isp, &lesrc->le_tgt, ledst->le_tgt);
- ISP_IOXGET_8(isp, &lesrc->le_status, ledst->le_status);
- ISP_IOXGET_8(isp, &lesrc->le_reserved2, ledst->le_reserved2);
- ISP_IOXGET_8(isp, &lesrc->le_cmd_count, ledst->le_cmd_count);
- ISP_IOXGET_8(isp, &lesrc->le_in_count, ledst->le_in_count);
- ISP_IOXGET_8(isp, &lesrc->le_cdb6len, ledst->le_cdb6len);
- ISP_IOXGET_8(isp, &lesrc->le_cdb7len, ledst->le_cdb7len);
- }
- ISP_IOXGET_32(isp, &lesrc->le_flags, ledst->le_flags);
- ISP_IOXGET_16(isp, &lesrc->le_timeout, ledst->le_timeout);
- for (i = 0; i < 20; i++) {
- ISP_IOXGET_8(isp, &lesrc->le_reserved3[i],
ledst->le_reserved3[i]);
- }
-}
-
-void
isp_put_notify_fc(ispsoftc_t *isp, in_fcentry_t *src, in_fcentry_t *dst)
{
isp_put_hdr(isp, &src->in_header, &dst->in_header);
Modified: stable/10/sys/dev/isp/isp_library.h
==============================================================================
--- stable/10/sys/dev/isp/isp_library.h Wed Mar 29 15:57:50 2017
(r316154)
+++ stable/10/sys/dev/isp/isp_library.h Wed Mar 29 15:58:25 2017
(r316155)
@@ -181,8 +181,6 @@ void isp_put_ctio7(ispsoftc_t *, ct7_ent
void isp_get_ctio2(ispsoftc_t *, ct2_entry_t *, ct2_entry_t *);
void isp_get_ctio2e(ispsoftc_t *, ct2e_entry_t *, ct2e_entry_t *);
void isp_get_ctio7(ispsoftc_t *, ct7_entry_t *, ct7_entry_t *);
-void isp_put_enable_lun(ispsoftc_t *, lun_entry_t *, lun_entry_t *);
-void isp_get_enable_lun(ispsoftc_t *, lun_entry_t *, lun_entry_t *);
void isp_put_notify_fc(ispsoftc_t *, in_fcentry_t *, in_fcentry_t *);
void isp_put_notify_fc_e(ispsoftc_t *, in_fcentry_e_t *, in_fcentry_e_t *);
void isp_put_notify_24xx(ispsoftc_t *, in_fcentry_24xx_t *, in_fcentry_24xx_t
*);
Modified: stable/10/sys/dev/isp/isp_target.c
==============================================================================
--- stable/10/sys/dev/isp/isp_target.c Wed Mar 29 15:57:50 2017
(r316154)
+++ stable/10/sys/dev/isp/isp_target.c Wed Mar 29 15:58:25 2017
(r316155)
@@ -215,12 +215,6 @@ isp_target_notify(ispsoftc_t *isp, void
isp_handle_ctio7(isp, (ct7_entry_t *) local);
break;
- case RQSTYPE_ENABLE_LUN:
- case RQSTYPE_MODIFY_LUN:
- isp_get_enable_lun(isp, lunenp, (lun_entry_t *) local);
- isp_async(isp, ISPASYNC_TARGET_ACTION, local);
- break;
-
case RQSTYPE_NOTIFY:
bus = 0;
if (IS_24XX(isp)) {
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
