--- sys/dev/aac.orig/aac.c	Mon Jan 30 00:00:00 2006
+++ sys/dev/aac/aac.c	Fri Sep 22 12:51:24 2006
@@ -33,7 +33,7 @@
 /*
  * Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
  */
-#define AAC_DRIVER_VERSION		0x02000000
+#define AAC_DRIVER_VERSION		0x02000001
 #define AAC_DRIVERNAME			"aac"
 
 #include "opt_aac.h"
@@ -1668,14 +1668,12 @@
 	sc->aac_max_sectors = 128;				/* 64KB */
 	if (sc->flags & AAC_FLAGS_SG_64BIT)
 		sc->aac_sg_tablesize = (AAC_FIB_DATASIZE
-		 - sizeof(struct aac_blockwrite64)
-		 + sizeof(struct aac_sg_table64))
-		 / sizeof(struct aac_sg_table64);
+		 - sizeof(struct aac_blockwrite64))
+		 / sizeof(struct aac_sg_entry64);
 	else
 		sc->aac_sg_tablesize = (AAC_FIB_DATASIZE
-		 - sizeof(struct aac_blockwrite)
-		 + sizeof(struct aac_sg_table))
-		 / sizeof(struct aac_sg_table);
+		 - sizeof(struct aac_blockwrite))
+		 / sizeof(struct aac_sg_entry);
 
 	if (!aac_sync_command(sc, AAC_MONKER_GETCOMMPREF, 0, 0, 0, 0, NULL)) {
 		options = AAC_GET_MAILBOX(sc, 1);
@@ -3220,7 +3218,7 @@
 	mtx_lock(&sc->aac_aifq_lock);
 	next = (sc->aac_aifq_head + 1) % AAC_AIFQ_LENGTH;
 	if (next != sc->aac_aifq_tail) {
-		bcopy(aif, &sc->aac_aifq[next], sizeof(struct aac_aif_command));
+		bcopy(fib, &sc->aac_aifq[next], sizeof(struct aac_fib));
 		sc->aac_aifq_head = next;
 
 		/* On the off chance that someone is sleeping for an aif... */
@@ -3327,7 +3325,7 @@
 
 	next = (sc->aac_aifq_tail + 1) % AAC_AIFQ_LENGTH;
 	error = copyout(&sc->aac_aifq[next], uptr,
-			sizeof(struct aac_aif_command));
+			sizeof(struct aac_fib));
 	if (error)
 		device_printf(sc->aac_dev,
 		    "aac_return_aif: copyout returned %d\n", error);
--- sys/dev/aac.orig/aac_pci.c	Thu Jun 22 09:01:00 2006
+++ sys/dev/aac/aac_pci.c	Fri Sep 22 12:52:45 2006
@@ -126,13 +126,13 @@
 	{0x9005, 0x0285, 0x9005, 0x0286, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
 	 AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2120S"},
 	{0x9005, 0x0285, 0x9005, 0x0290, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
-	 "Adaptec SATA RAID 2410SA"},
+	 "Adaptec SCSI RAID 2410SA"},
 	{0x9005, 0x0285, 0x1028, 0x0291, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
 	 "Dell CERC SATA RAID 2"},
 	{0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
-	 "Adaptec SATA RAID 2810SA"},
+	 "Adaptec SCSI RAID 2810SA"},
 	{0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
-	 "Adaptec SATA RAID 21610SA"},
+	 "Adaptec SCSI RAID 21610SA"},
 	{0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
 	 "HP ML110 G2 (Adaptec 2610SA)"},
 	{0x9005, 0x0286, 0x9005, 0x028c, AAC_HWIF_RKT, 0,
@@ -161,19 +161,19 @@
 	{0x9005, 0x0286, 0x9005, 0x029d, AAC_HWIF_RKT, 0,
 	 "Adaptec SATA RAID 2420SA"},
 	{0x9005, 0x0286, 0x9005, 0x029e, AAC_HWIF_RKT, 0,
-	 "ICP ICP9024RO SCSI RAID"},
+	 "ICP9024RO SATA RAID"},
 	{0x9005, 0x0286, 0x9005, 0x029f, AAC_HWIF_RKT, 0,
-	 "ICP ICP9014RO SCSI RAID"},
+	 "ICP9014RO SATA RAID"},
 	{0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0,
 	 "Adaptec SATA RAID 2026ZCR"},
-	{0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0,
-	 "Adaptec SATA RAID 2610SA"},
 	{0x9005, 0x0285, 0x9005, 0x0296, AAC_HWIF_I960RX, 0,
 	 "Adaptec SCSI RAID 2240S"},
 	{0x9005, 0x0285, 0x9005, 0x0297, AAC_HWIF_I960RX, 0,
 	 "Adaptec SAS RAID 4005SAS"},
 	{0x9005, 0x0285, 0x1014, 0x02f2, AAC_HWIF_I960RX, 0,
 	 "IBM ServeRAID 8i"},
+	{0x9005, 0x0285, 0x1014, 0x0312, AAC_HWIF_I960RX, 0,
+	 "IBM ServeRAID 8i"},
 	{0x9005, 0x0285, 0x9005, 0x0298, AAC_HWIF_I960RX, 0,
 	 "Adaptec SAS RAID 4000SAS"},
 	{0x9005, 0x0285, 0x9005, 0x0299, AAC_HWIF_I960RX, 0,
@@ -185,45 +185,53 @@
 	{0x9005, 0x0285, 0x9005, 0x028f, AAC_HWIF_I960RX, 0,
 	 "Adaptec SATA RAID 2025SA ZCR"},
 	{0x9005, 0x0285, 0x9005, 0x02a4, AAC_HWIF_I960RX, 0,
-	 "ICP ICP9085LI SAS RAID"},
+	 "ICP 9085LI SAS RAID"},
 	{0x9005, 0x0285, 0x9005, 0x02a5, AAC_HWIF_I960RX, 0,
-	 "ICP ICP5085BR SAS RAID"},
+	 "ICP 5085BR SAS RAID"},
 	{0x9005, 0x0286, 0x9005, 0x02a0, AAC_HWIF_RKT, 0,
-	 "ICP ICP9047MA SATA RAID"},
+	 "ICP9047MA SATA RAID"},
 	{0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
-	 "ICP ICP9087MA SATA RAID"},
+	 "ICP9087MA SATA RAID"},
+	{0x9005, 0x0286, 0x9005, 0x02a2, AAC_HWIF_RKT, 0,
+	 "Adaptec SAS RAID 3800SAS"},
+	{0x9005, 0x0286, 0x9005, 0x02a3, AAC_HWIF_RKT, 0,
+	 "ICP5445AU SAS RAID"},
+	{0x9005, 0x0286, 0x9005, 0x02a6, AAC_HWIF_RKT, 0,
+	 "ICP9067MA SATA RAID"},
+	{0x9005, 0x0286, 0x9005, 0x02a7, AAC_HWIF_RKT, 0,
+	 "Adaptec SAS RAID 3805SAS"},
+	{0x9005, 0x0286, 0x9005, 0x02a9, AAC_HWIF_RKT, 0,
+	 "ICP5085AU SAS RAID"},
+	{0x9005, 0x0286, 0x9005, 0x02ac, AAC_HWIF_RKT, 0,
+	 "Adaptec SAS RAID 1800SAS"},
+	{0x9005, 0x0286, 0x1014, 0x9580, AAC_HWIF_RKT, 0,
+	 "IBM ServeRAID 8k"},
+	{0x9005, 0x0286, 0x1014, 0x9540, AAC_HWIF_RKT, 0,
+	 "IBM ServeRAID 8L"},
 	{0, 0, 0, 0, 0, 0, 0}
 };
 
-static struct aac_ident *
-aac_find_ident(device_t dev)
-{
-	struct aac_ident *m;
-
-	for (m = aac_identifiers; m->vendor != 0; m++) {
-		if ((m->vendor == pci_get_vendor(dev)) &&
-		    (m->device == pci_get_device(dev)) &&
-		    (m->subvendor == pci_get_subvendor(dev)) &&
-		    (m->subdevice == pci_get_subdevice(dev)))
-		return (m);
-	}
-
-	return (NULL);
-}
-
 /*
  * Determine whether this is one of our supported adapters.
  */
 static int
 aac_pci_probe(device_t dev)
 {
-	struct aac_ident *id;
+	struct aac_ident *m;
 
 	debug_called(1);
 
-	if ((id = aac_find_ident(dev)) != NULL) {
-		device_set_desc(dev, id->desc);
-		return(BUS_PROBE_DEFAULT);
+	for (m = aac_identifiers; m->vendor != 0; m++) {
+		if ((m->vendor == pci_get_vendor(dev)) &&
+		    (m->device == pci_get_device(dev)) &&
+		    ((m->subvendor == 0) || (m->subvendor ==
+					     pci_get_subvendor(dev))) &&
+		    ((m->subdevice == 0) || ((m->subdevice ==
+					      pci_get_subdevice(dev))))) {
+		
+			device_set_desc(dev, m->desc);
+			return(BUS_PROBE_SPECIFIC);
+		}
 	}
 	return(ENXIO);
 }
@@ -235,8 +243,7 @@
 aac_pci_attach(device_t dev)
 {
 	struct aac_softc *sc;
-	struct aac_ident *id;
-	int error;
+	int i, error;
 	u_int32_t command;
 
 	debug_called(1);
@@ -310,8 +317,12 @@
 	 * Detect the hardware interface version, set up the bus interface
 	 * indirection.
 	 */
-	id = aac_find_ident(dev);
-	sc->aac_hwif = id->hwif;
+	for (i = 0; aac_identifiers[i].vendor != 0; i++) {
+		if ((aac_identifiers[i].vendor == pci_get_vendor(dev)) &&
+		    (aac_identifiers[i].device == pci_get_device(dev)) &&
+		    (aac_identifiers[i].subvendor == pci_get_subvendor(dev)) &&
+		    (aac_identifiers[i].subdevice == pci_get_subdevice(dev))) {
+			sc->aac_hwif = aac_identifiers[i].hwif;
 	switch(sc->aac_hwif) {
 	case AAC_HWIF_I960RX:
 		debug(2, "set hardware up for i960Rx");
@@ -331,13 +342,21 @@
 		break;
 	default:
 		sc->aac_hwif = AAC_HWIF_UNKNOWN;
+				break;
+			}
+
+			/* Set up quirks */
+			sc->flags = aac_identifiers[i].quirks;
+
+			break;
+		}
+	}
+	if (sc->aac_hwif == AAC_HWIF_UNKNOWN) {
 		device_printf(sc->aac_dev, "unknown hardware type\n");
 		error = ENXIO;
 		goto out;
 	}
 
-	/* Set up quirks */
-	sc->flags = id->quirks;
 
 	/*
 	 * Do bus-independent initialisation.
--- sys/dev/aac.orig/aacvar.h	Sun Oct  9 00:00:00 2005
+++ sys/dev/aac/aacvar.h	Fri Sep 22 12:52:56 2006
@@ -356,7 +356,7 @@
 	/* management interface */
 	struct cdev *aac_dev_t;
 	struct mtx		aac_aifq_lock;
-	struct aac_aif_command	aac_aifq[AAC_AIFQ_LENGTH];
+	struct aac_fib	aac_aifq[AAC_AIFQ_LENGTH];
 	int			aac_aifq_head;
 	int			aac_aifq_tail;
 	struct selinfo		rcv_select;