PERFORCE change 71287 for review

[Scott Long]

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

Change 71287 by scottl at 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;