From 12b36e2d97573704aed4bbda51ba48a4a18b2b7c Mon Sep 17 00:00:00 2001
From: Matt Jacob <mjacob@FreeBSD.org>
Date: Sun, 4 Apr 1999 01:26:08 +0000
Subject: [PATCH] Change f/w revision to major,minor,micro version. Add in
 ISP1040C definition.

---
 sys/dev/isp/ispvar.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sys/dev/isp/ispvar.h b/sys/dev/isp/ispvar.h
index 82a1641d677e..71e28f2ddaba 100644
--- a/sys/dev/isp/ispvar.h
+++ b/sys/dev/isp/ispvar.h
@@ -1,5 +1,5 @@
-/* $Id: ispvar.h,v 1.11 1999/03/17 05:04:39 mjacob Exp $ */
-/* release_03_25_99 */
+/* $Id: ispvar.h,v 1.12 1999/03/25 22:52:45 mjacob Exp $ */
+/* release_4_3_99 */
 /*
  * Soft Definitions for for Qlogic ISP SCSI adapters.
  *
@@ -259,8 +259,8 @@ struct ispsoftc {
 			isp_bustype	: 1,	/* BUS Implementation */
 			isp_type	: 8;	/* HBA Type and Revision */
 
-	u_int16_t		isp_fwrev;	/* Running F/W revision */
-	u_int16_t		isp_romfw_rev;	/* 'ROM' F/W revision */
+	u_int16_t		isp_fwrev[3];	/* Running F/W revision */
+	u_int16_t		isp_romfw_rev[3]; /* 'ROM' F/W revision */
 	void * 			isp_param;
 
 	/*
@@ -338,8 +338,10 @@ struct ispsoftc {
 #define	ISP_CFG_NORELOAD	0x80	/* don't download f/w */
 #define	ISP_CFG_NONVRAM		0x40	/* ignore NVRAM */
 
-#define	ISP_FW_REV(maj, min)	((maj) << 10| (min))
+#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])
 
+ 
 /*
  * Bus (implementation) types
  */
@@ -356,6 +358,7 @@ struct ispsoftc {
 #define	ISP_HA_SCSI_1040	0x4
 #define	ISP_HA_SCSI_1040A	0x5
 #define	ISP_HA_SCSI_1040B	0x6
+#define	ISP_HA_SCSI_1040C	0x7
 #define	ISP_HA_SCSI_1080	0xd
 #define	ISP_HA_SCSI_12X0	0xe
 #define	ISP_HA_FC		0xf0