patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / message / fusion / mptctl.h

diff --git a/drivers/message/fusion/mptctl.h b/drivers/message/fusion/mptctl.h
index e751165..47ffd97 100644 (file)
--- a/drivers/message/fusion/mptctl.h
+++ b/drivers/message/fusion/mptctl.h
@@ -91,6 +91,7 @@
 
 #define MPTIOCINFO             _IOWR(MPT_MAGIC_NUMBER,17,struct mpt_ioctl_iocinfo)
 #define MPTIOCINFO1            _IOWR(MPT_MAGIC_NUMBER,17,struct mpt_ioctl_iocinfo_rev0)
+#define MPTIOCINFO2            _IOWR(MPT_MAGIC_NUMBER,17,struct mpt_ioctl_iocinfo_rev1)
 #define MPTTARGETINFO          _IOWR(MPT_MAGIC_NUMBER,18,struct mpt_ioctl_targetinfo)
 #define MPTTEST                        _IOWR(MPT_MAGIC_NUMBER,19,struct mpt_ioctl_test)
 #define MPTEVENTQUERY          _IOWR(MPT_MAGIC_NUMBER,21,struct mpt_ioctl_eventquery)
@@ -165,6 +166,18 @@ struct mpt_ioctl_pci_info {
        } u;
 };
 
+struct mpt_ioctl_pci_info2 {
+       union {
+               struct {
+                       unsigned int  deviceNumber   :  5;
+                       unsigned int  functionNumber :  3;
+                       unsigned int  busNumber      : 24;
+               } bits;
+               unsigned int  asUlong;
+       } u;
+  int segmentID;
+};
+
 /*
  *  Adapter Information Page
  *  Read only.
@@ -175,6 +188,24 @@ struct mpt_ioctl_pci_info {
 #define MPT_IOCTL_VERSION_LENGTH       (32)
 
 struct mpt_ioctl_iocinfo {
+       mpt_ioctl_header hdr;
+       int              adapterType;   /* SCSI or FCP */
+       int              port;          /* port number */
+       int              pciId;         /* PCI Id. */
+       int              hwRev;         /* hardware revision */
+       int              subSystemDevice;       /* PCI subsystem Device ID */
+       int              subSystemVendor;       /* PCI subsystem Vendor ID */
+       int              numDevices;            /* number of devices */
+       int              FWVersion;             /* FW Version (integer) */
+       int              BIOSVersion;           /* BIOS Version (integer) */
+       char             driverVersion[MPT_IOCTL_VERSION_LENGTH];       /* Driver Version (string) */
+       char             busChangeEvent;
+       char             hostId;
+       char             rsvd[2];
+       struct mpt_ioctl_pci_info2  pciInfo; /* Added Rev 2 */
+};
+
+struct mpt_ioctl_iocinfo_rev1 {
        mpt_ioctl_header hdr;
        int              adapterType;   /* SCSI or FCP */
        int              port;          /* port number */