regen

2 files changed, 195 insertions, 15 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index a15602e074a..da1865cf409 100644
--- a/sys/dev/pci/pcidevs.h
+++ b/sys/dev/pci/pcidevs.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1373 2008/06/01 21:13:54 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1374 2008/06/02 03:45:52 brad Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
 
@@ -1584,11 +1584,40 @@
 #define	PCI_PRODUCT_ELSA_QS1PCI	0x1000		/* QuickStep 1000 ISDN */
 
 /* Emulex products */
-#define	PCI_PRODUCT_EMULEX_LPPFC	0x10df		/* Light Pulse FibreChannel */
+#define	PCI_PRODUCT_EMULEX_LPFC	0x10df		/* Light Pulse FibreChannel */
+#define	PCI_PRODUCT_EMULEX_LP6000	0x1ae5		/* Light Pulse 6000 */
+#define	PCI_PRODUCT_EMULEX_LPE121	0xf011		/* Light Pulse e 121 */
+#define	PCI_PRODUCT_EMULEX_LPE1250	0xf015		/* Light Pulse e 1250 */
+#define	PCI_PRODUCT_EMULEX_LP952	0xf095		/* Light Pulse 952 */
 #define	PCI_PRODUCT_EMULEX_LP982	0xf098		/* Light Pulse 982 */
+#define	PCI_PRODUCT_EMULEX_LP101	0xf0a1		/* Light Pulse 101 */
+#define	PCI_PRODUCT_EMULEX_LP1050	0xf0a5		/* Light Pulse 1050 */
+#define	PCI_PRODUCT_EMULEX_LP111	0xf0d1		/* Light Pulse 111 */
+#define	PCI_PRODUCT_EMULEX_LP1150	0xf0d5		/* Light Pulse 1150 */
+#define	PCI_PRODUCT_EMULEX_LPE111	0xf0e1		/* Light Pulse e 111 */
+#define	PCI_PRODUCT_EMULEX_LPE1150	0xf0e5		/* Light Pulse e 1150 */
+#define	PCI_PRODUCT_EMULEX_LPE1000	0xf0f5		/* Light Pulse e 1000 */
+#define	PCI_PRODUCT_EMULEX_LPE1000_SP	0xf0f6		/* Light Pulse e 1000-SP */
+#define	PCI_PRODUCT_EMULEX_LPE1002_SP	0xf0f7		/* Light Pulse e 1002-SP */
+#define	PCI_PRODUCT_EMULEX_LPE12000	0xf100		/* Light Pulse e 12000 */
+#define	PCI_PRODUCT_EMULEX_LPE12000_SP	0xf111		/* Light Pulse e 12000-SP */
+#define	PCI_PRODUCT_EMULEX_LPE12002_SP	0xf112		/* Light Pulse e 12002-SP */
+#define	PCI_PRODUCT_EMULEX_LP7000	0xf700		/* Light Pulse 7000 */
 #define	PCI_PRODUCT_EMULEX_LP8000	0xf800		/* Light Pulse 8000 */
 #define	PCI_PRODUCT_EMULEX_LP9000	0xf900		/* Light Pulse 9000 */
+#define	PCI_PRODUCT_EMULEX_LP9802	0xf980		/* Light Pulse 9802 */
 #define	PCI_PRODUCT_EMULEX_LP10000	0xfa00		/* Light Pulse 10000 */
+#define	PCI_PRODUCT_EMULEX_LPX10000	0xfb00		/* Light Pulse X 10000 */
+#define	PCI_PRODUCT_EMULEX_LP10000_S	0xfc00		/* Light Pulse 10000-S */
+#define	PCI_PRODUCT_EMULEX_LP11000_S	0xfc10		/* Light Pulse 11000-S */
+#define	PCI_PRODUCT_EMULEX_LPE11000_S	0xfc20		/* Light Pulse e 11000-S */
+#define	PCI_PRODUCT_EMULEX_LPE12000_S	0xfc40		/* Light Pulse e 12000-S */
+#define	PCI_PRODUCT_EMULEX_LP11000	0xfd00		/* Light Pulse 11000 */
+#define	PCI_PRODUCT_EMULEX_LP11000_SP	0xfd11		/* Light Pulse 11000-SP */
+#define	PCI_PRODUCT_EMULEX_LP11002_SP	0xfd12		/* Light Pulse 11002-SP */
+#define	PCI_PRODUCT_EMULEX_LPE11000	0xfe00		/* Light Pulse e 11000 */
+#define	PCI_PRODUCT_EMULEX_LPE11000_SP	0xfe11		/* Light Pulse e 11000-SP */
+#define	PCI_PRODUCT_EMULEX_LPE11002_SP	0xfe12		/* Light Pulse e 11002-SP */
 
 /* Endace Measurement Systems */
 #define	PCI_PRODUCT_ENDACE_DAG35	0x3500		/* Endace Dag3.5 */
@@ -3739,13 +3768,20 @@
 #define	PCI_PRODUCT_QLOGIC_ISP2322	0x2322		/* ISP2322 */
 #define	PCI_PRODUCT_QLOGIC_ISP2422	0x2422		/* ISP2422 */
 #define	PCI_PRODUCT_QLOGIC_ISP2432	0x2432		/* ISP2432 */
-#define	PCI_PRODUCT_QLOGIC_ISP6312	0x6312		/* ISP6312 */
-#define	PCI_PRODUCT_QLOGIC_ISP6322	0x6322		/* ISP6322 */
+#define	PCI_PRODUCT_QLOGIC_ISP2512	0x2512		/* ISP2512 */
+#define	PCI_PRODUCT_QLOGIC_ISP2522	0x2522		/* ISP2522 */
+#define	PCI_PRODUCT_QLOGIC_ISP2532	0x2532		/* ISP2532 */
 #define	PCI_PRODUCT_QLOGIC_ISP4010_TOE	0x3010		/* ISP4010 iSCSI TOE */
-#define	PCI_PRODUCT_QLOGIC_ISP4010_HBA	0x4010		/* ISP4010 iSCSI HBA */
 #define	PCI_PRODUCT_QLOGIC_ISP4022_TOE	0x3022		/* ISP4022 iSCSI TOE */
+#define	PCI_PRODUCT_QLOGIC_ISP4032_TOE	0x3032		/* ISP4032 iSCSI TOE */
+#define	PCI_PRODUCT_QLOGIC_ISP4010_HBA	0x4010		/* ISP4010 iSCSI HBA */
 #define	PCI_PRODUCT_QLOGIC_ISP4022_HBA	0x4022		/* ISP4022 iSCSI HBA */
+#define	PCI_PRODUCT_QLOGIC_ISP4032_HBA	0x4032		/* ISP4032 iSCSI HBA */
+#define	PCI_PRODUCT_QLOGIC_ISP5422	0x5422		/* ISP5422 */
+#define	PCI_PRODUCT_QLOGIC_ISP5432	0x5432		/* ISP5432 */
 #define	PCI_PRODUCT_QLOGIC_ISP6312	0x6312		/* ISP6312 */
+#define	PCI_PRODUCT_QLOGIC_ISP6322	0x6322		/* ISP6322 */
+#define	PCI_PRODUCT_QLOGIC_ISP8432	0x8432		/* ISP8432 */
 
 /* Quancom products */
 #define	PCI_PRODUCT_QUANCOM_PWDOG1	0x0010		/* PWDOG1 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index ab6886bec5c..b2ceb313d4b 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,7 +2,7 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.1373 2008/06/01 21:13:54 kettenis Exp 
+ *	OpenBSD: pcidevs,v 1.1374 2008/06/02 03:45:52 brad Exp 
  */
 
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $	*/
@@ -4352,14 +4352,82 @@ static const struct pci_known_product pci_known_products[] = {
 	    "QuickStep 1000 ISDN",
 	},
 	{
-	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPPFC,
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPFC,
 	    "Light Pulse FibreChannel",
 	},
 	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP6000,
+	    "Light Pulse 6000",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE121,
+	    "Light Pulse e 121",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1250,
+	    "Light Pulse e 1250",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP952,
+	    "Light Pulse 952",
+	},
+	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP982,
 	    "Light Pulse 982",
 	},
 	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP101,
+	    "Light Pulse 101",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP1050,
+	    "Light Pulse 1050",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP111,
+	    "Light Pulse 111",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP1150,
+	    "Light Pulse 1150",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE111,
+	    "Light Pulse e 111",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1150,
+	    "Light Pulse e 1150",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1000,
+	    "Light Pulse e 1000",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1000_SP,
+	    "Light Pulse e 1000-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE1002_SP,
+	    "Light Pulse e 1002-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12000,
+	    "Light Pulse e 12000",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12000_SP,
+	    "Light Pulse e 12000-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12002_SP,
+	    "Light Pulse e 12002-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP7000,
+	    "Light Pulse 7000",
+	},
+	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP8000,
 	    "Light Pulse 8000",
 	},
@@ -4368,10 +4436,58 @@ static const struct pci_known_product pci_known_products[] = {
 	    "Light Pulse 9000",
 	},
 	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP9802,
+	    "Light Pulse 9802",
+	},
+	{
 	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP10000,
 	    "Light Pulse 10000",
 	},
 	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPX10000,
+	    "Light Pulse X 10000",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP10000_S,
+	    "Light Pulse 10000-S",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11000_S,
+	    "Light Pulse 11000-S",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11000_S,
+	    "Light Pulse e 11000-S",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE12000_S,
+	    "Light Pulse e 12000-S",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11000,
+	    "Light Pulse 11000",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11000_SP,
+	    "Light Pulse 11000-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LP11002_SP,
+	    "Light Pulse 11002-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11000,
+	    "Light Pulse e 11000",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11000_SP,
+	    "Light Pulse e 11000-SP",
+	},
+	{
+	    PCI_VENDOR_EMULEX, PCI_PRODUCT_EMULEX_LPE11002_SP,
+	    "Light Pulse e 11002-SP",
+	},
+	{
 	    PCI_VENDOR_ENDACE, PCI_PRODUCT_ENDACE_DAG35,
 	    "Endace Dag3.5",
 	},
@@ -12052,34 +12168,62 @@ static const struct pci_known_product pci_known_products[] = {
 	    "ISP2432",
 	},
 	{
-	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP6312,
-	    "ISP6312",
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP2512,
+	    "ISP2512",
 	},
 	{
-	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP6322,
-	    "ISP6322",
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP2522,
+	    "ISP2522",
 	},
 	{
-	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4010_TOE,
-	    "ISP4010 iSCSI TOE",
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP2532,
+	    "ISP2532",
 	},
 	{
-	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4010_HBA,
-	    "ISP4010 iSCSI HBA",
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4010_TOE,
+	    "ISP4010 iSCSI TOE",
 	},
 	{
 	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4022_TOE,
 	    "ISP4022 iSCSI TOE",
 	},
 	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4032_TOE,
+	    "ISP4032 iSCSI TOE",
+	},
+	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4010_HBA,
+	    "ISP4010 iSCSI HBA",
+	},
+	{
 	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4022_HBA,
 	    "ISP4022 iSCSI HBA",
 	},
 	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP4032_HBA,
+	    "ISP4032 iSCSI HBA",
+	},
+	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP5422,
+	    "ISP5422",
+	},
+	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP5432,
+	    "ISP5432",
+	},
+	{
 	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP6312,
 	    "ISP6312",
 	},
 	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP6322,
+	    "ISP6322",
+	},
+	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP8432,
+	    "ISP8432",
+	},
+	{
 	    PCI_VENDOR_QUANCOM, PCI_PRODUCT_QUANCOM_PWDOG1,
 	    "PWDOG1",
 	},