sync

2 files changed, 43 insertions, 28 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 00bc077b50f..64c8da5cbf9 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.547 2002/09/23 17:20:51 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.548 2002/09/24 03:50:17 nate Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -1328,16 +1328,19 @@
 #define	PCI_PRODUCT_INTEL_80960RP	0x0960		/* i960 RP PCI-PCI */
 #define	PCI_PRODUCT_INTEL_80960RM	0x0962		/* i960 RM PCI-PCI */
 #define	PCI_PRODUCT_INTEL_80960RN	0x0964		/* i960 RN PCI-PCI */
-#define	PCI_PRODUCT_INTEL_82542	0x1000		/* PRO 1000 (82542) */
-#define	PCI_PRODUCT_INTEL_82543GC_SC	0x1001		/* PRO 1000F (82543GC_SC) */
-#define	PCI_PRODUCT_INTEL_82543_SC	0x1003		/* PRO 1000F (82543_SC) */
-#define	PCI_PRODUCT_INTEL_82543GC_CU	0x1004		/* PRO 1000T (82543GC_CU) */
-#define	PCI_PRODUCT_INTEL_82544EI_CU	0x1008		/* PRO 1000XT (82544EI_CU) */
-#define	PCI_PRODUCT_INTEL_82544EI_SC	0x1009		/* PRO 1000XS (82544EI_SC) */
-#define	PCI_PRODUCT_INTEL_82544GC	0x100c		/* PRO 1000T (82544GC) */
-#define	PCI_PRODUCT_INTEL_82544GC_64	0x100d		/* PRO 1000T (82544GC_64) */
-#define	PCI_PRODUCT_INTEL_82540EM	0x100e		/* PRO 1000MT (82540EM) */
-#define	PCI_PRODUCT_INTEL_82546EB	0x1010		/* PRO 1000MT (82546EB) */
+#define	PCI_PRODUCT_INTEL_82542	0x1000		/* PRO/1000 (PWLA8490) */
+#define	PCI_PRODUCT_INTEL_82543GC_SC	0x1001		/* PRO/1000F (PWLA8490SX) */
+#define	PCI_PRODUCT_INTEL_82543GC	0x1004		/* PRO/1000T (PWLA8490T) */
+#define	PCI_PRODUCT_INTEL_82544EI	0x1008		/* PRO/1000XT (PWLA8490XT) */
+#define	PCI_PRODUCT_INTEL_82544EI_SC	0x1009		/* PRO/1000XS (PWLA8490XF) */
+#define	PCI_PRODUCT_INTEL_82544GC	0x100c		/* PRO/1000T (PWLA8390T) */
+#define	PCI_PRODUCT_INTEL_82544GC_LX	0x100d		/* PRO/1000XTL (PWLA8490XTL) */
+#define	PCI_PRODUCT_INTEL_82540EM	0x100e		/* PRO/1000MT (PWLA8390MT) */
+#define	PCI_PRODUCT_INTEL_82545EM	0x100f		/* PRO/1000MT (PWLA8490MT) */
+#define	PCI_PRODUCT_INTEL_82546EB	0x1010		/* PRO/1000MT (PWLA8492MT) */
+#define	PCI_PRODUCT_INTEL_82545EM_SC	0x1011		/* PRO/1000MF (PWLA8490MF) */
+#define	PCI_PRODUCT_INTEL_82546EB_SC	0x1012		/* PRO/1000MF (PWLA8492MF) */
+#define	PCI_PRODUCT_INTEL_82545EM_LX	0x1015		/* PRO/1000MT (PWLA8490LX) */
 #define	PCI_PRODUCT_INTEL_PRO_100_VE_0	0x1031		/* PRO/100 VE */
 #define	PCI_PRODUCT_INTEL_PRO_100_VE_1	0x1032		/* PRO/100 VE */
 #define	PCI_PRODUCT_INTEL_PRO_100_VM_0	0x1033		/* PRO/100 VM */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 5b520a0bd2d..e996110dfa4 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.547 2002/09/23 17:20:51 deraadt Exp 
+ *		OpenBSD: pcidevs,v 1.548 2002/09/24 03:50:17 nate Exp 
  */
 /*	$NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ 	*/
 
@@ -2292,43 +2292,55 @@ static const struct pci_known_product pci_known_products[] = {
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542,
-	    "PRO 1000 (82542)",
+	    "PRO/1000 (PWLA8490)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_SC,
-	    "PRO 1000F (82543GC_SC)",
+	    "PRO/1000F (PWLA8490SX)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543_SC,
-	    "PRO 1000F (82543_SC)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC,
+	    "PRO/1000T (PWLA8490T)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_CU,
-	    "PRO 1000T (82543GC_CU)",
-	},
-	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_CU,
-	    "PRO 1000XT (82544EI_CU)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI,
+	    "PRO/1000XT (PWLA8490XT)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_SC,
-	    "PRO 1000XS (82544EI_SC)",
+	    "PRO/1000XS (PWLA8490XF)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC,
-	    "PRO 1000T (82544GC)",
+	    "PRO/1000T (PWLA8390T)",
 	},
 	{
-	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_64,
-	    "PRO 1000T (82544GC_64)",
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LX,
+	    "PRO/1000XTL (PWLA8490XTL)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM,
-	    "PRO 1000MT (82540EM)",
+	    "PRO/1000MT (PWLA8390MT)",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM,
+	    "PRO/1000MT (PWLA8490MT)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB,
-	    "PRO 1000MT (82546EB)",
+	    "PRO/1000MT (PWLA8492MT)",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_SC,
+	    "PRO/1000MF (PWLA8490MF)",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SC,
+	    "PRO/1000MF (PWLA8492MF)",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_LX,
+	    "PRO/1000MT (PWLA8490LX)",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100_VE_0,