From owner-p4-projects@FreeBSD.ORG  Sat Feb 19 04:02:14 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E06D616A4CE; Sat, 19 Feb 2005 04:02:13 +0000 (GMT)
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 B785C16A4CE
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 04:02:13 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 99BB743D41
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 04:02:13 +0000 (GMT)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j1J42DSr075669
	for <perforce@freebsd.org>; Sat, 19 Feb 2005 04:02:13 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j1J42D1x075666
	for perforce@freebsd.org; Sat, 19 Feb 2005 04:02:13 GMT
	(envelope-from scottl@freebsd.org)
Date: Sat, 19 Feb 2005 04:02:13 GMT
Message-Id: <200502190402.j1J42D1x075666@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 71287 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 19 Feb 2005 04:02:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=71287

Change 71287 by scottl@scottl-junior on 2005/02/19 04:01:15

	Finish the IFC of rev 1.147 of cam_xpt.c

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/cam/cam_probe.h#2 edit
.. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#13 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/cam/cam_probe.h#2 (text+ko) ====

@@ -124,10 +124,20 @@
 #define	CAM_QUIRK_NOLUNS	0x01
 #define	CAM_QUIRK_NOSERIAL	0x02
 #define	CAM_QUIRK_HILUNS	0x04
+#define	CAM_QUIRK_NOHILUNS	0x08
 	u_int mintags;
 	u_int maxtags;
 };
 #define	CAM_SCSI2_MAXLUN	8
+/*
+ * If we're not quirked to search <= the first 8 luns
+ * and we are either quirked to search above lun 8,
+ * or we're > SCSI-2, we can look for luns above lun 8.
+ */
+#define	CAN_SRCH_HI(dv)					\
+  (((dv->quirk->quirks & CAM_QUIRK_NOHILUNS) == 0) 	\
+  && ((dv->quirk->quirks & CAM_QUIRK_HILUNS)		\
+  || SID_ANSI_REV(&dv->inq_data) > SCSI_REV_2))
 
 void			xpt_scan_lun(struct cam_periph *periph,
 				     struct cam_path *path, cam_flags flags,

==== //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#13 (text+ko) ====

@@ -79,16 +79,6 @@
 /* number of high powered commands that can go through right now */
 static int num_highpower = CAM_MAX_HIGHPOWER;
 
-/*
- * If we're not quirked to search <= the first 8 luns
- * and we are either quirked to search above lun 8,
- * or we're > SCSI-2, we can look for luns above lun 8.
- */
-#define	CAN_SRCH_HI(dv)					\
-  (((dv->quirk->quirks & CAM_QUIRK_NOHILUNS) == 0) 	\
-  && ((dv->quirk->quirks & CAM_QUIRK_HILUNS)		\
-  || SID_ANSI_REV(&dv->inq_data) > SCSI_REV_2))
-
 typedef enum {
 	XPT_FLAG_OPEN		= 0x01
 } xpt_flags;