This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / scsi / aic7xxx / aic79xx_pci.c

diff --git a/drivers/scsi/aic7xxx/aic79xx_pci.c b/drivers/scsi/aic7xxx/aic79xx_pci.c
index 4c3bb7b..7e53509 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_pci.c
@@ -51,8 +51,6 @@
 #include <dev/aic7xxx/aic79xx_inline.h>
 #endif
 
-#include "aic79xx_pci.h"
-
 static __inline uint64_t
 ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
 {
@@ -66,6 +64,30 @@ ahd_compose_id(u_int device, u_int vendor, u_int subdevice, u_int subvendor)
        return (id);
 }
 
+#define ID_ALL_MASK                    0xFFFFFFFFFFFFFFFFull
+#define ID_ALL_IROC_MASK               0xFF7FFFFFFFFFFFFFull
+#define ID_DEV_VENDOR_MASK             0xFFFFFFFF00000000ull
+#define ID_9005_GENERIC_MASK           0xFFF0FFFF00000000ull
+#define ID_9005_GENERIC_IROC_MASK      0xFF70FFFF00000000ull
+
+#define ID_AIC7901                     0x800F9005FFFF9005ull
+#define ID_AHA_29320A                  0x8000900500609005ull
+#define ID_AHA_29320ALP                        0x8017900500449005ull
+
+#define ID_AIC7901A                    0x801E9005FFFF9005ull
+#define ID_AHA_29320                   0x8012900500429005ull
+#define ID_AHA_29320B                  0x8013900500439005ull
+#define ID_AHA_29320LP                 0x8014900500449005ull
+
+#define ID_AIC7902                     0x801F9005FFFF9005ull
+#define ID_AIC7902_B                   0x801D9005FFFF9005ull
+#define ID_AHA_39320                   0x8010900500409005ull
+#define ID_AHA_39320_B                 0x8015900500409005ull
+#define ID_AHA_39320A                  0x8016900500409005ull
+#define ID_AHA_39320D                  0x8011900500419005ull
+#define ID_AHA_39320D_B                        0x801C900500419005ull
+#define ID_AHA_39320D_HP               0x8011900500AC0E11ull
+#define ID_AHA_39320D_B_HP             0x801C900500AC0E11ull
 #define ID_AIC7902_PCI_REV_A4          0x3
 #define ID_AIC7902_PCI_REV_B0          0x10
 #define SUBID_HP                       0x0E11