src - OpenBSD base system

diff options


context:
space:
mode:

author	Brad Smith <brad@cvs.openbsd.org>	2005-05-29 07:54:55 +0000
committer	Brad Smith <brad@cvs.openbsd.org>	2005-05-29 07:54:55 +0000
commit	4dad8e4667226a86bd997bfc895db3040bffb563 (patch)
tree	73060aa15aa0488c3ce7304909e21346b8806307
parent	6499f465e3c063fcde93dccf4f9d239e99ce6207 (diff)

regen

Diffstat

-rw-r--r--

sys/dev/pci/pcidevs.h

-rw-r--r--

sys/dev/pci/pcidevs_data.h

106

2 files changed, 96 insertions, 76 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 6a14fb3b027..296781f357c 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.869 2005/05/26 05:01:07 fgsch Exp

+ * OpenBSD: pcidevs,v 1.870 2005/05/29 07:54:26 brad Exp

/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */

@@ -382,9 +382,10 @@

#define PCI_PRODUCT_TRIWARE_ESCALADE_ASIC 0x1001 /* Escalade IDE RAID */

/* Abocom products */

-#define PCI_PRODUCT_ABOCOM_FE2500 0xab02 /* FE2500 */

-#define PCI_PRODUCT_ABOCOM_PCM200 0xab03 /* PCM200 */

-#define PCI_PRODUCT_ABOCOM_TE100 0xab06 /* TE100 */

+#define PCI_PRODUCT_ABOCOM_FE2500 0xab02 /* FE2500 10/100 */

+#define PCI_PRODUCT_ABOCOM_PCM200 0xab03 /* PCM200 10/100 */

+#define PCI_PRODUCT_ABOCOM_FE2000VX 0xab06 /* FE2000VX 10/100 */

+#define PCI_PRODUCT_ABOCOM_FE2500MX 0xab08 /* FE2500MX 10/100 */

/* Aironet Products */

#define PCI_PRODUCT_AIRONET_PC4800_1 0x0001 /* PC4800 Wireless */

@@ -609,7 +610,7 @@

#define PCI_PRODUCT_AD_SP2141 0x2f44 /* SafeNet ADSP 2141 */

/* Antares Microsystems products */

-#define PCI_PRODUCT_ANTARES_TC9021 0x1021 /* Antares Gigabit */

+#define PCI_PRODUCT_ANTARES_TC9021 0x1021 /* Antares */

/* Apple products */

#define PCI_PRODUCT_APPLE_BANDIT 0x0001 /* Bandit */

@@ -634,7 +635,7 @@

#define PCI_PRODUCT_APPLE_UNINORTH2ETH 0x002f /* Uni-N2 Host */

#define PCI_PRODUCT_APPLE_PANGEA_FW 0x0030 /* Pangea FireWire */

#define PCI_PRODUCT_APPLE_UNINORTH_FW 0x0031 /* UniNorth Firewire */

-#define PCI_PRODUCT_APPLE_GMAC3 0x0032 /* GMAC Ethernet */

+#define PCI_PRODUCT_APPLE_GMAC3 0x0032 /* GMAC */

#define PCI_PRODUCT_APPLE_UNINORTH_ATA 0x0033 /* Uni-N ATA */

#define PCI_PRODUCT_APPLE_UNINORTH_AGP3 0x0034 /* UniNorth AGP */

#define PCI_PRODUCT_APPLE_UNINORTH5 0x0035 /* UniNorth PCI */

@@ -1020,7 +1021,7 @@

#define PCI_PRODUCT_COMPAQ_NF3P_BNC 0xf150 /* NetFlex 3/PB */

/* Compex */

-#define PCI_PRODUCT_COMPEX_COMPEXE 0x1401 /* Ethernet */

+#define PCI_PRODUCT_COMPEX_COMPEXE 0x1401 /* Compexe */

#define PCI_PRODUCT_COMPEX_RL100ATX 0x2011 /* RL100-ATX 10/100 */

#define PCI_PRODUCT_COMPEX_98713 0x9881 /* PMAC 98713 */

@@ -1333,28 +1334,28 @@

#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) */

+#define PCI_PRODUCT_INTEL_82543GC_FIBER 0x1001 /* PRO/1000F (82543GC) */

#define PCI_PRODUCT_INTEL_MODEM56 0x1002 /* 56k Modem */

-#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_82543GC_COPPER 0x1004 /* PRO/1000T (82543GC) */

+#define PCI_PRODUCT_INTEL_82544EI_COPPER 0x1008 /* PRO/1000XT (82544EI) */

+#define PCI_PRODUCT_INTEL_82544EI_FIBER 0x1009 /* PRO/1000XF (82544EI) */

+#define PCI_PRODUCT_INTEL_82544GC_COPPER 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 DP (82546EB) */

-#define PCI_PRODUCT_INTEL_82545EM_SC 0x1011 /* PRO/1000MF (82545EM) */

-#define PCI_PRODUCT_INTEL_82546EB_SC 0x1012 /* PRO/1000MF DP (82546EB) */

+#define PCI_PRODUCT_INTEL_82545EM_COPPER 0x100f /* PRO/1000MT (82545EM) */

+#define PCI_PRODUCT_INTEL_82546EB_COPPER 0x1010 /* PRO/1000MT (82546EB) */

+#define PCI_PRODUCT_INTEL_82545EM_FIBER 0x1011 /* PRO/1000MF (82545EM) */

+#define PCI_PRODUCT_INTEL_82546EB_FIBER 0x1012 /* PRO/1000MF (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_82541ER_LOM 0x1014 /* PRO/1000MT (82541EI) */

+#define PCI_PRODUCT_INTEL_82540EM_LOM 0x1015 /* PRO/1000MT (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_82541EI_MOBILE 0x1018 /* PRO/1000MT Mobile (82541EI) */

#define PCI_PRODUCT_INTEL_82547EI 0x1019 /* PRO/1000CT (82547EI) */

-#define PCI_PRODUCT_INTEL_82547EI_MOB 0x101a /* PRO/1000CT Mobile (82547EI) */

-#define PCI_PRODUCT_INTEL_82546GB_QUAD 0x101d /* PRO/1000MT QP (82546GB) */

-#define PCI_PRODUCT_INTEL_82540EP_LP 0x101e /* PRO/1000MT Mobile (82540EP) */

+#define PCI_PRODUCT_INTEL_82547EI_MOBILE 0x101a /* PRO/1000CT Mobile (82547EI) */

+#define PCI_PRODUCT_INTEL_82546EB_QUAD_COPPER 0x101d /* PRO/1000MT QP (82546EB) */

+#define PCI_PRODUCT_INTEL_82540EP_LP 0x101e /* PRO/1000MT (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) */

@@ -1382,15 +1383,18 @@

#define PCI_PRODUCT_INTEL_PRO_100_M 0x1059 /* PRO/100 M */

#define PCI_PRODUCT_INTEL_PRO_100_VE_7 0x1064 /* PRO/100 VE (82562EZ) */

#define PCI_PRODUCT_INTEL_PRO_100_VE_8 0x1068 /* PRO/100 VE (82801FBM) */

-#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 DP (82546EB) */

-#define PCI_PRODUCT_INTEL_82546EB_FIBER 0x107A /* PRO/1000MF DP (82546EB) */

-#define PCI_PRODUCT_INTEL_82546EB_SERDES 0x107B /* PRO/1000MB DP (82546EB) */

-#define PCI_PRODUCT_INTEL_PRO_1000_GT 0x107C /* PRO/1000GT */

-#define PCI_PRODUCT_INTEL_82546GB 0x108A /* PRO/1000MT DP (82546GB) */

+#define PCI_PRODUCT_INTEL_82547GI 0x1075 /* PRO/1000CT (82547GI) */

+#define PCI_PRODUCT_INTEL_82541GI 0x1076 /* PRO/1000MT (82541GI) */

+#define PCI_PRODUCT_INTEL_82541GI_MOBILE 0x1077 /* PRO/1000MT Mobile (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/1000MF (82546GB) */

+#define PCI_PRODUCT_INTEL_82546GB_SERDES 0x107B /* PRO/1000MB (82546GB) */

+#define PCI_PRODUCT_INTEL_82541GI_LF 0x107C /* PRO/1000GT (82541GI) */

+#define PCI_PRODUCT_INTEL_82546GB_PCIE 0x108A /* PRO/1000MT (82546GB) */

+#define PCI_PRODUCT_INTEL_82573E 0x108B /* PRO/1000MT (82573E) */

+#define PCI_PRODUCT_INTEL_82573E_IAMT 0x108C /* PRO/1000MT (82573E) */

+#define PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER 0x1099 /* PRO/1000MT QP (82546GB) */

#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 0aeb049ccf1..62959c5ca7d 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.869 2005/05/26 05:01:07 fgsch Exp

+ * OpenBSD: pcidevs,v 1.870 2005/05/29 07:54:26 brad Exp

/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */

@@ -360,15 +360,19 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500,

- "FE2500",

+ "FE2500 10/100",

{

PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_PCM200,

- "PCM200",

+ "PCM200 10/100",

+ },

+ {

+ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2000VX,

+ "FE2000VX 10/100",

{

- PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_TE100,

- "TE100",

+ PCI_VENDOR_ABOCOM, PCI_PRODUCT_ABOCOM_FE2500MX,

+ "FE2500MX 10/100",

{

PCI_VENDOR_AIRONET, PCI_PRODUCT_AIRONET_PC4800_1,

@@ -1104,7 +1108,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ANTARES, PCI_PRODUCT_ANTARES_TC9021,

- "Antares Gigabit",

+ "Antares",

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_BANDIT,

@@ -1196,7 +1200,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_GMAC3,

- "GMAC Ethernet",

+ "GMAC",

{

PCI_VENDOR_APPLE, PCI_PRODUCT_APPLE_UNINORTH_ATA,

@@ -2504,7 +2508,7 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_COMPEX, PCI_PRODUCT_COMPEX_COMPEXE,

- "Ethernet",

+ "Compexe",

{

PCI_VENDOR_COMPEX, PCI_PRODUCT_COMPEX_RL100ATX,

@@ -3391,7 +3395,7 @@ static const struct pci_known_product pci_known_products[] = {

"PRO/1000 (82542)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_SC,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_FIBER,

"PRO/1000F (82543GC)",

{

@@ -3399,19 +3403,19 @@ static const struct pci_known_product pci_known_products[] = {

"56k Modem",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82543GC_COPPER,

"PRO/1000T (82543GC)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_COPPER,

"PRO/1000XT (82544EI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_SC,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544EI_FIBER,

"PRO/1000XF (82544EI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82544GC_COPPER,

"PRO/1000T (82544GC)",

{

@@ -3423,32 +3427,32 @@ static const struct pci_known_product pci_known_products[] = {

"PRO/1000MT (82540EM)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_COPPER,

"PRO/1000MT (82545EM)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB,

- "PRO/1000MT DP (82546EB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER,

+ "PRO/1000MT (82546EB)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_SC,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545EM_FIBER,

"PRO/1000MF (82545EM)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SC,

- "PRO/1000MF DP (82546EB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER,

+ "PRO/1000MF (82546EB)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI,

"PRO/1000MT (82541EI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_NC,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER_LOM,

"PRO/1000MT (82541EI)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EM_LOM,

- "PRO/1000MT Mobile (82540EM)",

+ "PRO/1000MT (82540EM)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LOM,

@@ -3459,24 +3463,24 @@ static const struct pci_known_product pci_known_products[] = {

"PRO/1000MT (82540EP)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EP,

- "PRO/1000MT Mobile (82541EP)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOBILE,

+ "PRO/1000MT Mobile (82541EI)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI,

"PRO/1000CT (82547EI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOB,

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_MOBILE,

"PRO/1000CT Mobile (82547EI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD,

- "PRO/1000MT QP (82546GB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_QUAD_COPPER,

+ "PRO/1000MT QP (82546EB)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82540EP_LP,

- "PRO/1000MT Mobile (82540EP)",

+ "PRO/1000MT (82540EP)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82545GM_COPPER,

@@ -3587,40 +3591,52 @@ static const struct pci_known_product pci_known_products[] = {

"PRO/100 VE (82801FBM)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547EI_CT,

- "PRO/1000CT (82547EI)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82547GI,

+ "PRO/1000CT (82547GI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT,

- "PRO/1000MT (82541EI)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI,

+ "PRO/1000MT (82541GI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MOB,

- "PRO/1000MT Mobile (82541EI)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_MOBILE,

+ "PRO/1000MT Mobile (82541GI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541EI_MT2,

- "PRO/1000MT (82541EI)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541ER,

+ "PRO/1000MT (82541ER)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_COPPER,

- "PRO/1000MT DP (82546EB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_COPPER,

+ "PRO/1000MT (82546GB)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_FIBER,

- "PRO/1000MF DP (82546EB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_FIBER,

+ "PRO/1000MF (82546GB)",

+ },

+ {

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_SERDES,

+ "PRO/1000MB (82546GB)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546EB_SERDES,

- "PRO/1000MB DP (82546EB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82541GI_LF,

+ "PRO/1000GT (82541GI)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PRO_1000_GT,

- "PRO/1000GT",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_PCIE,

+ "PRO/1000MT (82546GB)",

{

- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB,

- "PRO/1000MT DP (82546GB)",

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E,

+ "PRO/1000MT (82573E)",

+ },

+ {

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82573E_IAMT,

+ "PRO/1000MT (82573E)",

+ },

+ {

+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82546GB_QUAD_COPPER,

+ "PRO/1000MT QP (82546GB)",

{

PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82815_DC100_HUB,