Date: Fri, 8 Sep 2006 17:25:58 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 105847 for review Message-ID: <200609081725.k88HPwOt006440@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=105847 Change 105847 by mjacob@newisp on 2006/09/08 17:25:50 Fix to compile again in target mode. Affected files ... .. //depot/projects/newisp/dev/isp/isp_freebsd.c#5 edit Differences ... ==== //depot/projects/newisp/dev/isp/isp_freebsd.c#5 (text+ko) ==== @@ -1242,8 +1242,7 @@ { void *qe; struct ccb_scsiio *cso = &ccb->csio; - uint16_t *hp; - uint32_t nxti, optr, save_handle; + uint32_t nxti, optr, handle; uint8_t local[QENTRY_LEN]; @@ -1348,7 +1347,6 @@ atp->state = ATPD_STATE_CTIO; } cto->ct_timeout = 10; - hp = &cto->ct_syshandle; } else { ct_entry_t *cto = (ct_entry_t *) local; @@ -1384,10 +1382,9 @@ } ccb->ccb_h.flags &= ~CAM_SEND_SENSE; cto->ct_timeout = 10; - hp = &cto->ct_syshandle; } - if (isp_save_xs_tgt(isp, ccb, &save_handle)) { + if (isp_save_xs_tgt(isp, ccb, &handle)) { xpt_print_path(ccb->ccb_h.path); printf("No XFLIST pointers for isp_target_start_ctio\n"); XS_SETERR(ccb, CAM_REQUEUE_REQ); @@ -1404,7 +1401,13 @@ * format. */ - *hp = save_handle; + if (IS_FC(isp)) { + ct2_entry_t *cto = (ct2_entry_t *) local; + cto->ct_syshandle = handle; + } else { + ct_entry_t *cto = (ct_entry_t *) local; + cto->ct_syshandle = handle; + } switch (ISP_DMASETUP(isp, cso, (ispreq_t *) local, &nxti, optr)) { case CMD_QUEUED: @@ -1419,7 +1422,7 @@ default: break; } - isp_destroy_tgt_handle(isp, save_handle); + isp_destroy_tgt_handle(isp, handle); out: ISPLOCK_2_CAMLOCK(isp);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200609081725.k88HPwOt006440>