From 8259d0816f4bff58ffe19d7bbfd4c52012d46891 Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Tue, 11 May 1999 05:02:23 +0000
Subject: [PATCH] Roll core minor number. Re-layout a lot of SCSI fields to
 accomodate multiple bus adapters.

---
 sys/dev/isp/ispvar.h | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 71e28f2ddaba..dab5b32c1a30 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,5 +1,5 @@
-/* $Id: ispvar.h,v 1.12 1999/03/25 22:52:45 mjacob Exp $ */
-/* release_4_3_99 */
+/* $Id: ispvar.h,v 1.13 1999/04/04 01:26:08 mjacob Exp $ */
+/* release_5_11_99 */
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
@@ -48,7 +48,7 @@
 #endif
 
 #define	ISP_CORE_VERSION_MAJOR	1
-#define	ISP_CORE_VERSION_MINOR	7
+#define	ISP_CORE_VERSION_MINOR	8
 
 /*
  * Vector for bus specific code to provide specific services.
@@ -95,11 +95,12 @@ struct ispmdvec {
 	((in == out)? (qlen - 1) : ((in > out)? \
 		((qlen - 1) - (in - out)) : (out - in - 1)))
 /*
- * SCSI Specific Host Adapter Parameters
+ * SCSI Specific Host Adapter Parameters- per bus, per target
  */
 
 typedef struct {
-        u_int		isp_req_ack_active_neg	: 1,	
+	u_int		isp_gotdparms		: 1,
+        		isp_req_ack_active_neg	: 1,	
 	        	isp_data_line_active_neg: 1,
 			isp_cmd_dma_burst_enable: 1,
 			isp_data_dma_burst_enabl: 1,
@@ -107,20 +108,18 @@ typedef struct {
 			isp_ultramode		: 1,
 			isp_diffmode		: 1,
 			isp_lvdmode		: 1,
-			isp_fast_mttr		: 1,
+						: 1,
 			isp_initiator_id	: 4,
         		isp_async_data_setup	: 4;
         u_int16_t	isp_selection_timeout;
         u_int16_t	isp_max_queue_depth;
-	u_int16_t	isp_clock;
 	u_int8_t	isp_tag_aging;
        	u_int8_t	isp_bus_reset_delay;
         u_int8_t	isp_retry_count;
         u_int8_t	isp_retry_delay;
 	struct {
-		u_int
-			dev_enable	:	1,
-			dev_announced	:	1,
+		u_int	dev_enable	:	1,	/* ignored */
+					:	1,
 			dev_update	:	1,
 			dev_refresh	:	1,
 			exc_throttle	:	8,
@@ -131,7 +130,7 @@ typedef struct {
 		u_int16_t	dev_flags;	/* goal device flags */
 		u_int16_t	cur_dflags;	/* current device flags */
 	} isp_devparam[MAX_TARGETS];
-} sdparam;	/* scsi device parameters */
+} sdparam;
 
 /*
  * Device Flags
@@ -162,13 +161,15 @@ typedef struct {
  * Fibre Channel Specifics
  */
 typedef struct {
-	u_int64_t		isp_wwn;	/* WWN of adapter */
+	u_int8_t		isp_gotdparms;
+	u_int8_t		isp_reserved;
 	u_int8_t		isp_loopid;	/* hard loop id */
 	u_int8_t		isp_alpa;	/* ALPA */
 	u_int8_t		isp_execthrottle;
         u_int8_t		isp_retry_delay;
         u_int8_t		isp_retry_count;
 	u_int8_t		isp_fwstate;	/* ISP F/W state */
+	u_int64_t		isp_wwn;	/* WWN of adapter */
 	u_int16_t		isp_maxalloc;
 	u_int16_t		isp_maxfrmlen;
 	u_int16_t		isp_fwoptions;
@@ -246,15 +247,15 @@ struct ispsoftc {
 	struct ispmdvec *	isp_mdvec;
 
 	/*
-	 * Mostly nonvolatile state, debugging, etc..
+	 * Mostly nonvolatile state.
 	 */
 
-	u_int				: 8,
+	u_int		isp_clock	: 8,
 			isp_confopts	: 8,
-			isp_port	: 1,	/* for dual ported impls */
+			isp_fast_mttr	: 1,
+					: 1,
 			isp_used	: 1,
 			isp_dblev	: 3,
-			isp_gotdparms	: 1,
 			isp_dogactive	: 1,
 			isp_bustype	: 1,	/* BUS Implementation */
 			isp_type	: 8;	/* HBA Type and Revision */
@@ -268,11 +269,12 @@ struct ispsoftc {
 	 */
 
 	volatile u_int
-				:	19,
+				:	13,
 		isp_state	:	3,
-		isp_sendmarker	:	1,	/* send a marker entry */
-		isp_update	:	1,	/* update parameters */
-		isp_nactive	:	9;	/* how many commands active */
+				:	2,
+		isp_sendmarker	:	2,	/* send a marker entry */
+		isp_update	:	2,	/* update parameters */
+		isp_nactive	:	10;	/* how many commands active */
 
 	/*
 	 * Result and Request Queue indices.
@@ -339,7 +341,7 @@ struct ispsoftc {
 #define	ISP_CFG_NONVRAM		0x40	/* ignore NVRAM */
 
 #define	ISP_FW_REV(maj, min, mic)	((maj << 24) | (min << 16) | mic)
-#define	ISP_FW_REVX(xp)	((xp[0 ]<< 24) | (xp[1] << 16) | xp[2])
+#define	ISP_FW_REVX(xp)	((xp[0]<<24) | (xp[1] << 16) | xp[2])
 
  
 /*