2 files changed, 139 insertions, 1 deletions

diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 9597f133c247..36c436960b49 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD$
-.Dd August 23, 2007
+.Dd November 29, 2007
 .Dt AAC 4
 .Os
 .Sh NAME
@@ -113,6 +113,30 @@ driver include:
 .It
 Adaptec AAC-364
 .It
+Adaptec RAID 3085
+.It
+Adaptec RAID 31205
+.It
+Adaptec RAID 31605
+.It
+Adaptec RAID 5085
+.It
+Adaptec RAID 51205
+.It
+Adaptec RAID 51245
+.It
+Adaptec RAID 51605
+.It
+Adaptec RAID 51645
+.It
+Adaptec RAID 52445
+.It
+Adaptec RAID 5405
+.It
+Adaptec RAID 5445
+.It
+Adaptec RAID 5805
+.It
 Adaptec SAS RAID 3405
 .It
 Adaptec SAS RAID 3805
@@ -187,12 +211,36 @@ IBM ServeRAID 8i
 .It
 IBM ServeRAID 8k
 .It
+IBM ServeRAID 8s
+.It
+ICP RAID ICP5045BL
+.It
+ICP RAID ICP5085BL
+.It
+ICP RAID ICP5085SL
+.It
+ICP RAID ICP5125BR
+.It
+ICP RAID ICP5125SL
+.It
+ICP RAID ICP5165BR
+.It
+ICP RAID ICP5165SL
+.It
+ICP RAID ICP5445SL
+.It
+ICP RAID ICP5805BL
+.It
+ICP RAID ICP5805SL
+.It
 ICP ICP5085BR SAS RAID
 .It
 ICP ICP9085LI SAS RAID
 .It
 ICP ICP9047MA SATA RAID
 .It
+ICP ICP9067MA SATA RAID
+.It
 ICP ICP9087MA SATA RAID
 .It
 ICP ICP9014RO SCSI RAID
@@ -202,6 +250,26 @@ ICP ICP9024RO SCSI RAID
 Legend S220
 .It
 Legend S230
+.It
+Sun STK RAID REM
+.It
+Sun STK RAID EM
+.It
+SG-XPCIESAS-R-IN
+.It
+SG-XPCIESAS-R-EX
+.It
+AOC-USAS-S4i
+.It
+AOC-USAS-S8i
+.It
+AOC-USAS-S4iR
+.It
+AOC-USAS-S8iR
+.It
+AOC-USAS-S8i-LP
+.It
+AOC-USAS-S8iR-LP
 .El
 .Sh FILES
 .Bl -tag -width /boot/kernel/aac.ko -compact
diff --git a/sys/dev/aac/aac_pci.c b/sys/dev/aac/aac_pci.c
index dfbdbc8f7835..a16917fc606c 100644
--- a/sys/dev/aac/aac_pci.c
+++ b/sys/dev/aac/aac_pci.c
@@ -176,6 +176,8 @@ struct aac_ident
 	 "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,
@@ -194,12 +196,80 @@ struct aac_ident
 	 "ICP ICP9047MA SATA RAID"},
 	{0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
 	 "ICP ICP9087MA SATA RAID"},
+	{0x9005, 0x0286, 0x9005, 0x02a6, AAC_HWIF_RKT, 0,
+	 "ICP9067MA SATA RAID"},
+	{0x9005, 0x0285, 0x9005, 0x02b5, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 5445"},
+	{0x9005, 0x0285, 0x9005, 0x02b6, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 5805"},
+	{0x9005, 0x0285, 0x9005, 0x02b7, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 5085"},
+	{0x9005, 0x0285, 0x9005, 0x02b8, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5445SL"},
+	{0x9005, 0x0285, 0x9005, 0x02b9, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5085SL"},
+	{0x9005, 0x0285, 0x9005, 0x02ba, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5805SL"},
 	{0x9005, 0x0285, 0x9005, 0x02bb, AAC_HWIF_I960RX, 0,
 	 "Adaptec RAID 3405"},
 	{0x9005, 0x0285, 0x9005, 0x02bc, AAC_HWIF_I960RX, 0,
 	 "Adaptec RAID 3805"},
+	{0x9005, 0x0285, 0x9005, 0x02bd, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 31205"},
+	{0x9005, 0x0285, 0x9005, 0x02be, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 31605"},
+	{0x9005, 0x0285, 0x9005, 0x02bf, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5045BL"},
+	{0x9005, 0x0285, 0x9005, 0x02c0, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5085BL"},
+	{0x9005, 0x0285, 0x9005, 0x02c1, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5125BR"},
+	{0x9005, 0x0285, 0x9005, 0x02c2, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5165BR"},
+	{0x9005, 0x0285, 0x9005, 0x02c3, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 51205"},
+	{0x9005, 0x0285, 0x9005, 0x02c4, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 51605"},
+	{0x9005, 0x0285, 0x9005, 0x02c5, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5125SL"},
+	{0x9005, 0x0285, 0x9005, 0x02c6, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5165SL"},
+	{0x9005, 0x0285, 0x9005, 0x02c7, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 3085"},
+	{0x9005, 0x0285, 0x9005, 0x02c8, AAC_HWIF_I960RX, 0,
+	 "ICP RAID ICP5805BL"},
+	{0x9005, 0x0285, 0x9005, 0x02ce, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 51245"},
+	{0x9005, 0x0285, 0x9005, 0x02cf, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 51645"},
+	{0x9005, 0x0285, 0x9005, 0x02d0, AAC_HWIF_I960RX, 0,
+	 "Adaptec RAID 52445"},
+	{0x9005, 0x0285, 0x9005, 0x02d1, AAC_HWIF_I960RX, 0,
+        "Adaptec RAID 5405"},
 	{0x9005, 0x0286, 0x1014, 0x9580, AAC_HWIF_RKT, 0,
 	 "IBM ServeRAID-8k"},
+	{0x9005, 0x0285, 0x1014, 0x034d, AAC_HWIF_I960RX, 0,
+	 "IBM ServeRAID 8s"},
+	{0x9005, 0x0285, 0x108e, 0x7aac, AAC_HWIF_I960RX, 0,
+	 "Sun STK RAID REM"},
+	{0x9005, 0x0285, 0x108e, 0x7aae, AAC_HWIF_I960RX, 0,
+	 "Sun STK RAID EM"},
+	{0x9005, 0x0285, 0x108e, 0x286, AAC_HWIF_I960RX, 0,
+	 "SG-XPCIESAS-R-IN"},
+	{0x9005, 0x0285, 0x108e, 0x287, AAC_HWIF_I960RX, 0,
+	 "SG-XPCIESAS-R-EX"},
+	{0x9005, 0x0285, 0x15d9, 0x2b5, AAC_HWIF_I960RX, 0,
+	 "AOC-USAS-S4i"},
+	{0x9005, 0x0285, 0x15d9, 0x2b6, AAC_HWIF_I960RX, 0,
+	 "AOC-USAS-S8i"},
+	{0x9005, 0x0285, 0x15d9, 0x2c9, AAC_HWIF_I960RX, 0,
+	 "AOC-USAS-S4iR"},
+	{0x9005, 0x0285, 0x15d9, 0x2ca, AAC_HWIF_I960RX, 0,
+	 "AOC-USAS-S8iR"},
+	{0x9005, 0x0285, 0x15d9, 0x2d2, AAC_HWIF_I960RX, 0,
+	 "AOC-USAS-S8i-LP"},
+	{0x9005, 0x0285, 0x15d9, 0x2d3, AAC_HWIF_I960RX, 0,
+	 "AOC-USAS-S8iR-LP"},
 	{0, 0, 0, 0, 0, 0, 0}
 };