X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fscsi%2Fmegaraid%2Fmegaraid_sas.h;fp=drivers%2Fscsi%2Fmegaraid%2Fmegaraid_sas.h;h=89639f0c38ef2e3683f012328a763dd4755f6123;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=3531a14222a737780f8574eae0e010a71c6fd137;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h
index 3531a1422..89639f0c3 100644
--- a/drivers/scsi/megaraid/megaraid_sas.h
+++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -18,16 +18,9 @@
 /**
  * MegaRAID SAS Driver meta data
  */
-#define MEGASAS_VERSION				"00.00.03.01"
-#define MEGASAS_RELDATE				"May 14, 2006"
-#define MEGASAS_EXT_VERSION			"Sun May 14 22:49:52 PDT 2006"
-
-/*
- * Device IDs
- */
-#define	PCI_DEVICE_ID_LSI_SAS1078R		0x0060
-#define	PCI_DEVICE_ID_LSI_VERDE_ZCR		0x0413
-
+#define MEGASAS_VERSION				"00.00.02.04"
+#define MEGASAS_RELDATE				"Feb 03, 2006"
+#define MEGASAS_EXT_VERSION			"Fri Feb 03 14:31:44 PST 2006"
 /*
  * =====================================
  * MegaRAID SAS MFI firmware definitions
@@ -561,11 +554,7 @@ struct megasas_ctrl_info {
 #define MFI_POLL_TIMEOUT_SECS			10
 
 #define MFI_REPLY_1078_MESSAGE_INTERRUPT	0x80000000
-
-/*
-* register set for both 1068 and 1078 controllers
-* structure extended for 1078 registers
-*/
+#define PCI_DEVICE_ID_LSI_SAS1078R		0x00000060
  
 struct megasas_register_set {
 	u32 	reserved_0[4];			/*0000h*/
@@ -1088,8 +1077,9 @@ struct megasas_instance {
 	struct pci_dev *pdev;
 	u32 unique_id;
 
-	atomic_t fw_outstanding;
+	u32 fw_outstanding;
 	u32 hw_crit_error;
+	spinlock_t instance_lock;
 
 	struct megasas_instance_template *instancet;
 };
@@ -1161,10 +1151,10 @@ struct compat_megasas_iocpacket {
 	struct compat_iovec sgl[MAX_IOCTL_SGE];
 } __attribute__ ((packed));
 
-#define MEGASAS_IOC_FIRMWARE32	_IOWR('M', 1, struct compat_megasas_iocpacket)
 #endif
 
 #define MEGASAS_IOC_FIRMWARE	_IOWR('M', 1, struct megasas_iocpacket)
+#define MEGASAS_IOC_FIRMWARE32	_IOWR('M', 1, struct compat_megasas_iocpacket)
 #define MEGASAS_IOC_GET_AEN	_IOW('M', 3, struct megasas_aen)
 
 struct megasas_mgmt_info {