From owner-p4-projects@FreeBSD.ORG  Fri Sep  8 17:26:00 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F070C16A4FF; Fri,  8 Sep 2006 17:25:59 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B28A016A4E1
	for <perforce@freebsd.org>; Fri,  8 Sep 2006 17:25:59 +0000 (UTC)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0693C43D49
	for <perforce@freebsd.org>; Fri,  8 Sep 2006 17:25:59 +0000 (GMT)
	(envelope-from mjacob@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k88HPwxj006443
	for <perforce@freebsd.org>; Fri, 8 Sep 2006 17:25:58 GMT
	(envelope-from mjacob@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k88HPwOt006440
	for perforce@freebsd.org; Fri, 8 Sep 2006 17:25:58 GMT
	(envelope-from mjacob@freebsd.org)
Date: Fri, 8 Sep 2006 17:25:58 GMT
Message-Id: <200609081725.k88HPwOt006440@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	mjacob@freebsd.org using -f
From: Matt Jacob <mjacob@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105847 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Sep 2006 17:26:00 -0000

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);