summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorHenric Jungheim <henric@cvs.openbsd.org>2004-05-04 06:00:19 +0000
committerHenric Jungheim <henric@cvs.openbsd.org>2004-05-04 06:00:19 +0000
commit477434a6e537c27f1d314f27b53778bd081032c5 (patch)
treee1bd6a9d28cd8d541f9dfa9a07003d287dfacfe2 /sys/dev/pci
parent1616d79f2d28bd2df8b64dfb53f30441272e852e (diff)
Sync.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/pcidevs.h66
-rw-r--r--sys/dev/pci/pcidevs_data.h84
2 files changed, 75 insertions, 75 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 43f3f463a12..0dd6a465dca 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.724 2004/04/17 17:52:03 deraadt Exp
+ * OpenBSD: pcidevs,v 1.725 2004/05/04 05:59:35 henric Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -1133,31 +1133,31 @@
#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 (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/1000XF (PWLA8490XF) */
-#define PCI_PRODUCT_INTEL_82544GC 0x100c /* PRO/1000T (PWLA8390T) */
-#define PCI_PRODUCT_INTEL_82544GC_LOM 0x100d /* PRO/1000T LOM */
-#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_82541EI 0x1013 /* PRO/1000 (82541EI) */
-#define PCI_PRODUCT_INTEL_82541ER2 0x1014 /* PRO/1000 (82541ER) */
-#define PCI_PRODUCT_INTEL_82540EM_LOM 0x1015 /* PRO/1000MT (LOM) */
-#define PCI_PRODUCT_INTEL_82540EP_LOM 0x1016 /* PRO/1000 (82540EP LOM) */
-#define PCI_PRODUCT_INTEL_82540EP 0x1017 /* PRO/1000 (82540EP) */
-#define PCI_PRODUCT_INTEL_82541EP 0x1018 /* PRO/1000 (82541EP) */
-#define PCI_PRODUCT_INTEL_82547EI 0x1019 /* PRO/1000 (82547EI) */
-#define PCI_PRODUCT_INTEL_82547EI_LOM 0x101a /* PRO/1000 (82547EI LOM) */
-#define PCI_PRODUCT_INTEL_82546EB_QUAD 0x101d /* PRO/1000 (82546EB_QUAD) */
-#define PCI_PRODUCT_INTEL_82540EP_LP 0x101e /* PRO/1000 (82540EP LP) */
-#define PCI_PRODUCT_INTEL_82545GM_COPPER 0x1026 /* PRO/1000 (82545GM) */
-#define PCI_PRODUCT_INTEL_82545GM_FIBER 0x1027 /* PRO/1000 (82545GM) */
-#define PCI_PRODUCT_INTEL_82545GM_SERDES 0x1028 /* PRO/1000 (82545GM) */
+#define PCI_PRODUCT_INTEL_82542 0x1000 /* PRO/1000 (82542) */
+#define PCI_PRODUCT_INTEL_82543GC_SC 0x1001 /* PRO/1000F (82543GC) */
+#define PCI_PRODUCT_INTEL_82543GC 0x1004 /* PRO/1000T (82543GC) */
+#define PCI_PRODUCT_INTEL_82544EI 0x1008 /* PRO/1000XT (82544EI) */
+#define PCI_PRODUCT_INTEL_82544EI_SC 0x1009 /* PRO/1000XF (82544EI) */
+#define PCI_PRODUCT_INTEL_82544GC 0x100c /* PRO/1000T (82544GC) */
+#define PCI_PRODUCT_INTEL_82544GC_LOM 0x100d /* PRO/1000XT (82544GC) */
+#define PCI_PRODUCT_INTEL_82540EM 0x100e /* PRO/1000MT (82540EM) */
+#define PCI_PRODUCT_INTEL_82545EM 0x100f /* PRO/1000MT (82545EM) */
+#define PCI_PRODUCT_INTEL_82546EB 0x1010 /* PRO/1000MT Dual Port (82546EB) */
+#define PCI_PRODUCT_INTEL_82545EM_SC 0x1011 /* PRO/1000MF (82545EM) */
+#define PCI_PRODUCT_INTEL_82546EB_SC 0x1012 /* PRO/1000MF Dual Port (82546EB) */
+#define PCI_PRODUCT_INTEL_82541EI 0x1013 /* PRO/1000MT (82541EI) */
+#define PCI_PRODUCT_INTEL_82541EI_NC 0x1014 /* PRO/1000MT (82541EI) */
+#define PCI_PRODUCT_INTEL_82540EM_LOM 0x1015 /* PRO/1000MT Mobile (82540EM) */
+#define PCI_PRODUCT_INTEL_82540EP_LOM 0x1016 /* PRO/1000MT (82540EP) */
+#define PCI_PRODUCT_INTEL_82540EP 0x1017 /* PRO/1000MT (82540EP) */
+#define PCI_PRODUCT_INTEL_82541EP 0x1018 /* PRO/1000MT Mobile (82541EP) */
+#define PCI_PRODUCT_INTEL_82547EI 0x1019 /* PRO/1000CT (82547EI) */
+#define PCI_PRODUCT_INTEL_82547EI_MOB 0x101a /* PRO/1000CT Mobile (82547EI) */
+#define PCI_PRODUCT_INTEL_82546EB_QUAD 0x101d /* PRO/1000MF Quad Port (82546EB) */
+#define PCI_PRODUCT_INTEL_82540EP_LP 0x101e /* PRO/1000MT Mobile (82540EP) */
+#define PCI_PRODUCT_INTEL_82545GM_COPPER 0x1026 /* PRO/1000MT (82545GM) */
+#define PCI_PRODUCT_INTEL_82545GM_FIBER 0x1027 /* PRO/1000MF (82545GM) */
+#define PCI_PRODUCT_INTEL_82545GM_SERDES 0x1028 /* PRO/1000MB (82545GM) */
#define PCI_PRODUCT_INTEL_PRO_100 0x1029 /* PRO/100 */
#define PCI_PRODUCT_INTEL_82559 0x1030 /* 82559 */
#define PCI_PRODUCT_INTEL_PRO_100_VE_0 0x1031 /* PRO/100 VE */
@@ -1179,13 +1179,13 @@
#define PCI_PRODUCT_INTEL_PRO_100_VE_5 0x1050 /* PRO/100 VE */
#define PCI_PRODUCT_INTEL_PRO_100_VE_6 0x1051 /* PRO/100 VE */
#define PCI_PRODUCT_INTEL_PRO_100_M 0x1059 /* PRO/100 M */
-#define PCI_PRODUCT_INTEL_82547GI 0x1075 /* PRO/1000MT (82547GI) */
-#define PCI_PRODUCT_INTEL_82541GI 0x1076 /* PRO/1000MT (82541GI) */
-#define PCI_PRODUCT_INTEL_82541GI_MOBILE 0x1077 /* PRO/1000MT (82541GI) */
-#define PCI_PRODUCT_INTEL_82541ER 0x1078 /* PRO/1000MT (82541ER) */
-#define PCI_PRODUCT_INTEL_82546GB_COPPER 0x1079 /* PRO/1000MT (82546GB) */
-#define PCI_PRODUCT_INTEL_82546GB_FIBER 0x107A /* PRO/1000MT (82546GB) */
-#define PCI_PRODUCT_INTEL_82546GB_SERDES 0x107B /* PRO/1000MT (82546GB) */
+#define PCI_PRODUCT_INTEL_82547EI_CT 0x1075 /* PRO/1000CT (82547EI) */
+#define PCI_PRODUCT_INTEL_82541EI_MT 0x1076 /* PRO/1000MT (82541EI) */
+#define PCI_PRODUCT_INTEL_82541EI_MOB 0x1077 /* PRO/1000MT Mobile (82541EI) */
+#define PCI_PRODUCT_INTEL_82541EI_MT2 0x1078 /* PRO/1000MT (82541EI) */
+#define PCI_PRODUCT_INTEL_82546EB_COPPER 0x1079 /* PRO/1000MT Dual Port (82546EB) */
+#define PCI_PRODUCT_INTEL_82546EB_FIBER 0x107A /* PRO/1000MF Dual Port (82546EB) */
+#define PCI_PRODUCT_INTEL_82546EB_SERDES 0x107B /* PRO/1000MB Dual Port (82546EB) */
#define PCI_PRODUCT_INTEL_82815_DC100_HUB 0x1100 /* 82815 Hub */
#define PCI_PRODUCT_INTEL_82815_DC100_AGP 0x1101 /* 82815 AGP */
#define PCI_PRODUCT_INTEL_82815_DC100_GRAPH 0x1102 /* 82815 Graphics */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 228b5a33fb7..e7c51f8a33e 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.724 2004/04/17 17:52:03 deraadt Exp
+ * OpenBSD: pcidevs,v 1.725 2004/05/04 05:59:35 henric Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -2748,103 +2748,103 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82542,
- "PRO/1000 (PWLA8490)",
+ "PRO/1000 (82542)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_SC,
- "PRO/1000F (PWLA8490SX)",
+ "PRO/1000F (82543GC)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC,
- "PRO/1000T (PWLA8490T)",
+ "PRO/1000T (82543GC)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI,
- "PRO/1000XT (PWLA8490XT)",
+ "PRO/1000XT (82544EI)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_SC,
- "PRO/1000XF (PWLA8490XF)",
+ "PRO/1000XF (82544EI)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC,
- "PRO/1000T (PWLA8390T)",
+ "PRO/1000T (82544GC)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_LOM,
- "PRO/1000T LOM",
+ "PRO/1000XT (82544GC)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM,
- "PRO/1000MT (PWLA8390MT)",
+ "PRO/1000MT (82540EM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM,
- "PRO/1000MT (PWLA8490MT)",
+ "PRO/1000MT (82545EM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB,
- "PRO/1000MT (PWLA8492MT)",
+ "PRO/1000MT Dual Port (82546EB)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_SC,
- "PRO/1000MF (PWLA8490MF)",
+ "PRO/1000MF (82545EM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SC,
- "PRO/1000MF (PWLA8492MF)",
+ "PRO/1000MF Dual Port (82546EB)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI,
- "PRO/1000 (82541EI)",
+ "PRO/1000MT (82541EI)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER2,
- "PRO/1000 (82541ER)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_NC,
+ "PRO/1000MT (82541EI)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM,
- "PRO/1000MT (LOM)",
+ "PRO/1000MT Mobile (82540EM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM,
- "PRO/1000 (82540EP LOM)",
+ "PRO/1000MT (82540EP)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP,
- "PRO/1000 (82540EP)",
+ "PRO/1000MT (82540EP)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EP,
- "PRO/1000 (82541EP)",
+ "PRO/1000MT Mobile (82541EP)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI,
- "PRO/1000 (82547EI)",
+ "PRO/1000CT (82547EI)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_LOM,
- "PRO/1000 (82547EI LOM)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOB,
+ "PRO/1000CT Mobile (82547EI)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD,
- "PRO/1000 (82546EB_QUAD)",
+ "PRO/1000MF Quad Port (82546EB)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP,
- "PRO/1000 (82540EP LP)",
+ "PRO/1000MT Mobile (82540EP)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER,
- "PRO/1000 (82545GM)",
+ "PRO/1000MT (82545GM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_FIBER,
- "PRO/1000 (82545GM)",
+ "PRO/1000MF (82545GM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_SERDES,
- "PRO/1000 (82545GM)",
+ "PRO/1000MB (82545GM)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_100,
@@ -2931,32 +2931,32 @@ static const struct pci_known_product pci_known_products[] = {
"PRO/100 M",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI,
- "PRO/1000MT (82547GI)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_CT,
+ "PRO/1000CT (82547EI)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI,
- "PRO/1000MT (82541GI)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT,
+ "PRO/1000MT (82541EI)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE,
- "PRO/1000MT (82541GI)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOB,
+ "PRO/1000MT Mobile (82541EI)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER,
- "PRO/1000MT (82541ER)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT2,
+ "PRO/1000MT (82541EI)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER,
- "PRO/1000MT (82546GB)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER,
+ "PRO/1000MT Dual Port (82546EB)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER,
- "PRO/1000MT (82546GB)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER,
+ "PRO/1000MF Dual Port (82546EB)",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES,
- "PRO/1000MT (82546GB)",
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SERDES,
+ "PRO/1000MB Dual Port (82546EB)",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_HUB,