From owner-svn-src-all@FreeBSD.ORG  Mon Aug 20 18:27:03 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 169681065724;
	Mon, 20 Aug 2012 18:27:03 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F27938FC15;
	Mon, 20 Aug 2012 18:27:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7KIR2TK075106;
	Mon, 20 Aug 2012 18:27:02 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7KIR2Ue075104;
	Mon, 20 Aug 2012 18:27:02 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201208201827.q7KIR2Ue075104@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 20 Aug 2012 18:27:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239460 - releng/9.1/sys/dev/hptiop
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Aug 2012 18:27:03 -0000

Author: delphij
Date: Mon Aug 20 18:27:02 2012
New Revision: 239460
URL: http://svn.freebsd.org/changeset/base/239460

Log:
  MFC r239084
  
  Add PCI IDs for various new High Point RocketRAID 43xx and 3xxx devices.
  
  Obtained from:	FreeNAS
  Approved by:	re (kib)

Modified:
  releng/9.1/sys/dev/hptiop/hptiop.c
Directory Properties:
  releng/9.1/sys/   (props changed)
  releng/9.1/sys/dev/   (props changed)

Modified: releng/9.1/sys/dev/hptiop/hptiop.c
==============================================================================
--- releng/9.1/sys/dev/hptiop/hptiop.c	Mon Aug 20 18:26:16 2012	(r239459)
+++ releng/9.1/sys/dev/hptiop/hptiop.c	Mon Aug 20 18:27:02 2012	(r239460)
@@ -1284,9 +1284,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:
@@ -1296,12 +1300,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: