From owner-freebsd-scsi  Sun Jun 24 20:49:18 2001
Delivered-To: freebsd-scsi@freebsd.org
Received: from beppo.feral.com (beppo.feral.com [192.67.166.79])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3E79237B401; Sun, 24 Jun 2001 20:49:15 -0700 (PDT)
	(envelope-from mjacob@feral.com)
Received: from beppo (mjacob@beppo [192.67.166.79])
	by beppo.feral.com (8.11.3/8.11.3) with ESMTP id f5P3n5g82841;
	Sun, 24 Jun 2001 20:49:05 -0700 (PDT)
	(envelope-from mjacob@feral.com)
Date: Sun, 24 Jun 2001 20:49:04 -0700 (PDT)
From: Matthew Jacob <mjacob@feral.com>
Reply-To: mjacob@feral.com
To: bishop@rr.iij4u.or.jp, Nick Hibma <n_hibma@freebsd.org>
Cc: scsi@freebsd.org
Subject: umass changes for CAM_NEW_TRAN_CODE
Message-ID: <Pine.BSF.4.21.0106242047580.82710-100000@beppo.feral.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: owner-freebsd-scsi@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-scsi.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20freebsd-scsi>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20freebsd-scsi>
X-Loop: FreeBSD.org


FWIW...  I can't test it (no h/w).

Index: umass.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/usb/umass.c,v
retrieving revision 1.41
diff -u -r1.41 umass.c
--- umass.c	2001/01/08 00:25:52	1.41
+++ umass.c	2001/06/25 03:47:54
@@ -2328,7 +2328,10 @@
 		cpi->bus_id = UMASS_SCSI_BUS;
 		if (sc)
 			cpi->base_transfer_speed = sc->transfer_speed;
-
+#ifdef	CAM_NEW_TRAN_CODE
+		cpi->transport = XPORT_SPI;
+		cpi->transport_version = 2;
+#endif
 		cpi->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;
@@ -2347,13 +2350,22 @@
 	{
 		struct ccb_trans_settings *cts = &ccb->cts;
 
-		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_GET_TRAN_SETTINGS:.\n",
-			USBDEVNAME(sc->sc_dev), cam_sim_path(umass_sim),
-			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
+#ifdef	CAM_NEW_TRAN_CODE
+		cts->protocol = PROTO_SCSI;
+		cts->protocol_version = SCSI_REV_2;
+		cts->transport = XPORT_SPI;
+		cts->transport_version = 2;
 
+		cts->proto_specific.scsi.valid = 0;
+		cts->xport_specific.spi.valid = 0;
+#else
 		cts->valid = 0;
 		cts->flags = 0;		/* no disconnection, tagging */
+#endif
 
+		DPRINTF(UDMASS_SCSI, ("%s:%d:%d:%d:XPT_GET_TRAN_SETTINGS:.\n",
+			USBDEVNAME(sc->sc_dev), cam_sim_path(umass_sim),
+			ccb->ccb_h.target_id, ccb->ccb_h.target_lun));
 		ccb->ccb_h.status = CAM_REQ_CMP;
 		xpt_done(ccb);
 		break;


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-scsi" in the body of the message