From: Sascha Wildner <saw@online.de>
Date: Tue, 7 Aug 2012 01:03:31 +0000 (+0200)
Subject: hptiop(4): Add some more PCI IDs.
X-Git-Tag: v3.2.0~458
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/575f0cd005487f439d2785e30fa6150b10babc28

hptiop(4): Add some more PCI IDs.

The following adapters were added:

RocketRAID 4210
RocketRAID 4211
RocketRAID 4310
RocketRAID 4311
RocketRAID 3530
RocketRAID 3560

This commit also adds a cam(4) dependency.

Taken-from: FreeBSD
---

diff --git a/share/man/man4/hptiop.4 b/share/man/man4/hptiop.4
index cae64a358b..e499640144 100644
--- a/share/man/man4/hptiop.4
+++ b/share/man/man4/hptiop.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man4/hptiop.4,v 1.3 2011/08/01 21:12:41 delphij Exp $
 .\"
-.Dd August 21, 2011
+.Dd August 7, 2012
 .Dt HPTIOP 4
 .Os
 .Sh NAME
@@ -58,34 +58,46 @@ driver supports the following SAS and SATA RAID controllers:
 .Pp
 .Bl -bullet -compact
 .It
-HighPoint RocketRAID 4320
+HighPoint RocketRAID 4322
 .It
 HighPoint RocketRAID 4321
 .It
-HighPoint RocketRAID 4322
+HighPoint RocketRAID 4320
 .It
-HighPoint RocketRAID 3220
+HighPoint RocketRAID 4311
 .It
-HighPoint RocketRAID 3320
+HighPoint RocketRAID 4310
 .It
-HighPoint RocketRAID 3410
+HighPoint RocketRAID 4211
 .It
-HighPoint RocketRAID 3520
+HighPoint RocketRAID 4210
 .It
-HighPoint RocketRAID 3510
+HighPoint RocketRAID 3560
 .It
-HighPoint RocketRAID 3511
+HighPoint RocketRAID 3540
 .It
-HighPoint RocketRAID 3521
+HighPoint RocketRAID 3530
 .It
 HighPoint RocketRAID 3522
 .It
-HighPoint RocketRAID 3540
+HighPoint RocketRAID 3521
 .It
-HighPoint RocketRAID 3120
+HighPoint RocketRAID 3520
+.It
+HighPoint RocketRAID 3511
+.It
+HighPoint RocketRAID 3510
+.It
+HighPoint RocketRAID 3410
+.It
+HighPoint RocketRAID 3320
+.It
+HighPoint RocketRAID 3220
 .It
 HighPoint RocketRAID 3122
 .It
+HighPoint RocketRAID 3120
+.It
 HighPoint RocketRAID 3020
 .El
 .\".Sh NOTES
diff --git a/sys/dev/raid/hptiop/hptiop.c b/sys/dev/raid/hptiop/hptiop.c
index dd6de20aa5..14cb27bca7 100644
--- a/sys/dev/raid/hptiop/hptiop.c
+++ b/sys/dev/raid/hptiop/hptiop.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/hptiop/hptiop.c,v 1.11 2011/11/23 21:43:51 marius Exp $
+ * $FreeBSD: src/sys/dev/hptiop/hptiop.c,v 1.14 2012/08/06 05:27:26 delphij Exp $
  */
 
 #include <sys/param.h>
@@ -1229,6 +1229,7 @@ static driver_t hptiop_pci_driver = {
 };
 
 DRIVER_MODULE(hptiop, pci, hptiop_pci_driver, hptiop_devclass, NULL, NULL);
+MODULE_DEPEND(hptiop, cam, 1, 1, 1);
 MODULE_VERSION(hptiop, 1);
 
 static int hptiop_probe(device_t dev)
@@ -1245,9 +1246,13 @@ static int hptiop_probe(device_t dev)
 	id = pci_get_device(dev);
 
 	switch (id) {
-		case 0x4322:
-		case 0x4321:
+		case 0x4210:
+		case 0x4211:
+		case 0x4310:
+		case 0x4311:
 		case 0x4320:
+		case 0x4321:
+		case 0x4322:
 			sas = 1;
 		case 0x3220:
 		case 0x3320:
@@ -1257,12 +1262,14 @@ static int hptiop_probe(device_t dev)
 		case 0x3511:
 		case 0x3521:
 		case 0x3522:
+		case 0x3530:
 		case 0x3540:
+		case 0x3560:
 			ops = &hptiop_itl_ops;
 			break;
+		case 0x3020:
 		case 0x3120:
 		case 0x3122:
-		case 0x3020:
 			ops = &hptiop_mv_ops;
 			break;
 		default: