summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-18 03:52:54 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2004-07-18 03:52:54 +0000
commitba9a3f57395d577d1006051f5b4a3d8a3947b18c (patch)
tree7312507a6b91ab47aae53ad0b117e16cdc7ea2a6
parentd4ab22509cc0a6b8a17fb869e0d09f3e10e7db5c (diff)
sync
-rw-r--r--sys/dev/pci/pcidevs.h50
-rw-r--r--sys/dev/pci/pcidevs_data.h50
2 files changed, 50 insertions, 50 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index aa55b8c4676..19d8c4fd322 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.747 2004/07/16 06:08:05 deraadt Exp
+ * OpenBSD: pcidevs,v 1.748 2004/07/18 03:52:43 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -145,7 +145,7 @@
#define PCI_VENDOR_SIGMA 0x1105 /* Sigma Designs */
#define PCI_VENDOR_VIATECH 0x1106 /* VIA */
#define PCI_VENDOR_COGENT 0x1109 /* Cogent Data */
-#define PCI_VENDOR_SIEMENS 0x110a /* Siemens AG / Siemens Nixdorf AG */
+#define PCI_VENDOR_SIEMENS 0x110a /* Siemens */
#define PCI_VENDOR_ACCTON 0x1113 /* Accton */
#define PCI_VENDOR_VORTEX 0x1119 /* Vortex */
#define PCI_VENDOR_EFFICIENTNETS 0x111a /* Efficent Networks */
@@ -170,7 +170,7 @@
#define PCI_VENDOR_V3 0x11b0 /* V3 Semiconductor */
#define PCI_VENDOR_PINNACLE 0x11bd /* Pinnacle Systems */
#define PCI_VENDOR_LUCENT 0x11c1 /* AT&T/Lucent */
-#define PCI_VENDOR_DOLPHIN 0x11c8 /* Dolphin Interconnect Solutions */
+#define PCI_VENDOR_DOLPHIN 0x11c8 /* Dolphin */
#define PCI_VENDOR_MRTMAGMA 0x11c9 /* Mesa Ridge (MAGMA) */
#define PCI_VENDOR_IRE 0x11d4 /* IRE */
#define PCI_VENDOR_ZORAN 0x11de /* Zoran */
@@ -267,7 +267,7 @@
#define PCI_VENDOR_ATRONICS 0x907f /* Atronics */
#define PCI_VENDOR_NETMOS 0x9710 /* NetMos */
#define PCI_VENDOR_TIGERJET 0xe159 /* TigerJet Network */
-#define PCI_VENDOR_ENDACE 0xeace /* Endace Measurement Systems */
+#define PCI_VENDOR_ENDACE 0xeace /* Endace */
#define PCI_VENDOR_ARC 0xedd8 /* ARC Logic */
#define PCI_VENDOR_INVALID 0xffff /* INVALID VENDOR ID */
@@ -286,7 +286,7 @@
/* 3Com Products */
#define PCI_PRODUCT_3COM_3C985 0x0001 /* 3c985 */
#define PCI_PRODUCT_3COM_3C996 0x0003 /* 3c996 */
-#define PCI_PRODUCT_3COM_3C_MPCI_MODEM 0x1007 /* Mini-PCI V.90 Modem */
+#define PCI_PRODUCT_3COM_3C_MPCI_MODEM 0x1007 /* V.90 Modem */
#define PCI_PRODUCT_3COM_3C940 0x1700 /* 3c940 */
#define PCI_PRODUCT_3COM_3C339 0x3390 /* 3c339 */
#define PCI_PRODUCT_3COM_3C359 0x3590 /* 3c359 */
@@ -543,8 +543,8 @@
#define PCI_PRODUCT_AMD_PBC768_ISA 0x7440 /* 768 ISA */
#define PCI_PRODUCT_AMD_PBC768_IDE 0x7441 /* 768 IDE */
#define PCI_PRODUCT_AMD_PBC768_PMC 0x7443 /* 768 Power Mgmt */
-#define PCI_PRODUCT_AMD_PBC768_ACA 0x7445 /* 768 AC97 Audio */
-#define PCI_PRODUCT_AMD_PBC768_MD 0x7446 /* 768 AC97 Modem */
+#define PCI_PRODUCT_AMD_PBC768_ACA 0x7445 /* 768 AC97 */
+#define PCI_PRODUCT_AMD_PBC768_MD 0x7446 /* 768 Modem */
#define PCI_PRODUCT_AMD_PBC768_PPB 0x7448 /* 768 PCI-PCI */
#define PCI_PRODUCT_AMD_PBC768_USB 0x7449 /* 768 USB */
#define PCI_PRODUCT_AMD_8131_PCIX 0x7450 /* 8131 PCIX */
@@ -557,7 +557,7 @@
#define PCI_PRODUCT_AMD_8111_IDE 0x7469 /* 8111 IDE */
#define PCI_PRODUCT_AMD_8111_SMB 0x746a /* 8111 SMBus */
#define PCI_PRODUCT_AMD_8111_ACPI 0x746b /* 8111 ACPI */
-#define PCI_PRODUCT_AMD_8111_ACA 0x746d /* 8111 AC97 Audio */
+#define PCI_PRODUCT_AMD_8111_ACA 0x746d /* 8111 AC97 */
/* AMI */
#define PCI_PRODUCT_AMI_MEGARAID 0x1960 /* MegaRAID */
@@ -1256,22 +1256,22 @@
#define PCI_PRODUCT_INTEL_82801AA_IDE 0x2411 /* 82801AA IDE */
#define PCI_PRODUCT_INTEL_82801AA_USB 0x2412 /* 82801AA USB */
#define PCI_PRODUCT_INTEL_82801AA_SMB 0x2413 /* 82801AA SMBus */
-#define PCI_PRODUCT_INTEL_82801AA_ACA 0x2415 /* 82801AA AC97 Audio */
-#define PCI_PRODUCT_INTEL_82801AA_ACM 0x2416 /* 82801AA AC97 Modem */
+#define PCI_PRODUCT_INTEL_82801AA_ACA 0x2415 /* 82801AA AC97 */
+#define PCI_PRODUCT_INTEL_82801AA_ACM 0x2416 /* 82801AA Modem */
#define PCI_PRODUCT_INTEL_82801AA_HPB 0x2418 /* 82801AA Hub-to-PCI */
#define PCI_PRODUCT_INTEL_82801AB_LPC 0x2420 /* 82801AB LPC */
#define PCI_PRODUCT_INTEL_82801AB_IDE 0x2421 /* 82801AB IDE */
#define PCI_PRODUCT_INTEL_82801AB_USB 0x2422 /* 82801AB USB */
#define PCI_PRODUCT_INTEL_82801AB_SMB 0x2423 /* 82801AB SMBus */
-#define PCI_PRODUCT_INTEL_82801AB_ACA 0x2425 /* 82801AB AC97 Audio */
-#define PCI_PRODUCT_INTEL_82801AB_ACM 0x2426 /* 82801AB AC97 Modem */
+#define PCI_PRODUCT_INTEL_82801AB_ACA 0x2425 /* 82801AB AC97 */
+#define PCI_PRODUCT_INTEL_82801AB_ACM 0x2426 /* 82801AB Modem */
#define PCI_PRODUCT_INTEL_82801AB_HPB 0x2428 /* 82801AB Hub-to-PCI */
#define PCI_PRODUCT_INTEL_82801BA_LPC 0x2440 /* 82801BA LPC */
#define PCI_PRODUCT_INTEL_82801BA_USB 0x2442 /* 82801BA USB */
#define PCI_PRODUCT_INTEL_82801BA_SMB 0x2443 /* 82801BA SMBus */
#define PCI_PRODUCT_INTEL_82801BA_USB2 0x2444 /* 82801BA USB2 */
-#define PCI_PRODUCT_INTEL_82801BA_ACA 0x2445 /* 82801BA AC97 Audio */
-#define PCI_PRODUCT_INTEL_82801BA_ACM 0x2446 /* 82801BA AC97 Modem */
+#define PCI_PRODUCT_INTEL_82801BA_ACA 0x2445 /* 82801BA AC97 */
+#define PCI_PRODUCT_INTEL_82801BA_ACM 0x2446 /* 82801BA Modem */
#define PCI_PRODUCT_INTEL_82801BAM_HPB 0x2448 /* 82801BAM Hub-to-PCI */
#define PCI_PRODUCT_INTEL_82562 0x2449 /* 82562 */
#define PCI_PRODUCT_INTEL_82801BAM_IDE 0x244a /* 82801BAM IDE */
@@ -1284,7 +1284,7 @@
#define PCI_PRODUCT_INTEL_82801CA_USB_1 0x2482 /* 82801CA/CAM USB */
#define PCI_PRODUCT_INTEL_82801CA_SMB 0x2483 /* 82801CA/CAM SMBus */
#define PCI_PRODUCT_INTEL_82801CA_USB_2 0x2484 /* 82801CA/CAM USB */
-#define PCI_PRODUCT_INTEL_82801CA_ACA 0x2485 /* 82801CA/CAM AC97 Audio */
+#define PCI_PRODUCT_INTEL_82801CA_ACA 0x2485 /* 82801CA/CAM AC97 */
#define PCI_PRODUCT_INTEL_82801CA_ACM 0x2486 /* 82801CA/CAM Modem */
#define PCI_PRODUCT_INTEL_82801CA_USB_3 0x2487 /* 82801CA/CAM USB */
#define PCI_PRODUCT_INTEL_82801CAM_IDE 0x248a /* 82801CAM IDE */
@@ -1294,7 +1294,7 @@
#define PCI_PRODUCT_INTEL_82801DB_USB_1 0x24c2 /* 82801DB USB */
#define PCI_PRODUCT_INTEL_82801DB_SMB 0x24c3 /* 82801DB SMBus */
#define PCI_PRODUCT_INTEL_82801DB_USB_2 0x24c4 /* 82801DB USB */
-#define PCI_PRODUCT_INTEL_82801DB_ACA 0x24c5 /* 82801DB AC97 Audio */
+#define PCI_PRODUCT_INTEL_82801DB_ACA 0x24c5 /* 82801DB AC97 */
#define PCI_PRODUCT_INTEL_82801DB_ACM 0x24c6 /* 82801DB Modem */
#define PCI_PRODUCT_INTEL_82801DB_USB_3 0x24c7 /* 82801DB USB */
#define PCI_PRODUCT_INTEL_82801DBM_IDE 0x24ca /* 82801DBM IDE */
@@ -1306,8 +1306,8 @@
#define PCI_PRODUCT_INTEL_82801EB_USB_1 0x24d2 /* 82801EB/ER USB */
#define PCI_PRODUCT_INTEL_82801EB_SMB 0x24d3 /* 82801EB/ER SMBus */
#define PCI_PRODUCT_INTEL_82801EB_USB_2 0x24d4 /* 82801EB/ER USB */
-#define PCI_PRODUCT_INTEL_82801EB_ACA 0x24d5 /* 82801EB/ER AC97 Audio */
-#define PCI_PRODUCT_INTEL_82801EB_MODEM 0x24d6 /* 82801EB/ER AC97 Modem */
+#define PCI_PRODUCT_INTEL_82801EB_ACA 0x24d5 /* 82801EB/ER AC97 */
+#define PCI_PRODUCT_INTEL_82801EB_MODEM 0x24d6 /* 82801EB/ER Modem */
#define PCI_PRODUCT_INTEL_82801EB_USB_3 0x24d7 /* 82801EB/ER USB */
#define PCI_PRODUCT_INTEL_82801EB_IDE 0x24db /* 82801EB/ER IDE */
#define PCI_PRODUCT_INTEL_82801EB_USB_5 0x24dd /* 82801EB/ER USB */
@@ -1400,8 +1400,8 @@
#define PCI_PRODUCT_INTEL_82443BX_AGP 0x7191 /* 82443BX AGP */
#define PCI_PRODUCT_INTEL_82443BX_NOAGP 0x7192 /* 82443BX */
#define PCI_PRODUCT_INTEL_82440MX 0x7194 /* 82440MX Host */
-#define PCI_PRODUCT_INTEL_82440MX_ACA 0x7195 /* 82440MX AC97 Audio */
-#define PCI_PRODUCT_INTEL_82440MX_ACM 0x7196 /* 82440MX AC97 Modem */
+#define PCI_PRODUCT_INTEL_82440MX_ACA 0x7195 /* 82440MX AC97 */
+#define PCI_PRODUCT_INTEL_82440MX_ACM 0x7196 /* 82440MX Modem */
#define PCI_PRODUCT_INTEL_82440MX_ISA 0x7198 /* 82440MX ISA */
#define PCI_PRODUCT_INTEL_82440MX_IDE 0x7199 /* 82440MX IDE */
#define PCI_PRODUCT_INTEL_82440MX_USB 0x719a /* 82440MX USB */
@@ -1431,7 +1431,7 @@
#define PCI_PRODUCT_INTERPHASE_5526 0x0004 /* 5526 FibreChannel */
/* Intersil products */
-#define PCI_PRODUCT_INTERSIL_MINI_PCI_WLAN 0x3873 /* PRISM2.5 Mini-PCI WLAN */
+#define PCI_PRODUCT_INTERSIL_MINI_PCI_WLAN 0x3873 /* PRISM2.5 */
/* Invertex */
#define PCI_PRODUCT_INVERTEX_AEON 0x0005 /* AEON */
@@ -2152,7 +2152,7 @@
#define PCI_PRODUCT_SIS_5597_USB 0x7001 /* 5597/5598 USB */
#define PCI_PRODUCT_SIS_7002 0x7002 /* 7002 USB */
#define PCI_PRODUCT_SIS_7007 0x7007 /* 7007 FireWire */
-#define PCI_PRODUCT_SIS_7012_ACA 0x7012 /* 7012 AC97 Audio */
+#define PCI_PRODUCT_SIS_7012_ACA 0x7012 /* 7012 AC97 */
#define PCI_PRODUCT_SIS_7013 0x7013 /* 7013 Modem */
#define PCI_PRODUCT_SIS_7016 0x7016 /* 7016 10/100BaseTX */
#define PCI_PRODUCT_SIS_7018 0x7018 /* 7018 Audio */
@@ -2432,10 +2432,10 @@
#define PCI_PRODUCT_VIATECH_VT82C596 0x3050 /* VT82C596 Power Mgmt */
#define PCI_PRODUCT_VIATECH_VT6105M 0x3053 /* VT6105M RhineIII */
#define PCI_PRODUCT_VIATECH_VT82C686A_SMB 0x3057 /* VT82C686 SMBus */
-#define PCI_PRODUCT_VIATECH_VT82C686A_AC97 0x3058 /* VT82C686 AC97 Audio */
-#define PCI_PRODUCT_VIATECH_VT8233_AC97 0x3059 /* VT8233 AC97 Audio */
+#define PCI_PRODUCT_VIATECH_VT82C686A_AC97 0x3058 /* VT82C686 AC97 */
+#define PCI_PRODUCT_VIATECH_VT8233_AC97 0x3059 /* VT8233 AC97 */
#define PCI_PRODUCT_VIATECH_RHINEII_2 0x3065 /* RhineII-2 */
-#define PCI_PRODUCT_VIATECH_VT82C686A_ACM 0x3068 /* VT82C686 AC97 Modem */
+#define PCI_PRODUCT_VIATECH_VT82C686A_ACM 0x3068 /* VT82C686 Modem */
#define PCI_PRODUCT_VIATECH_VT8366_ISA 0x3074 /* VT8366 ISA */
#define PCI_PRODUCT_VIATECH_VT8366 0x3099 /* VT8366 PCI */
#define PCI_PRODUCT_VIATECH_VT6202 0x3104 /* VT6202 USB 2.0 */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 55be25cecec..a172c865fcb 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.747 2004/07/16 06:08:05 deraadt Exp
+ * OpenBSD: pcidevs,v 1.748 2004/07/18 03:52:43 deraadt Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -72,7 +72,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C_MPCI_MODEM,
- "Mini-PCI V.90 Modem",
+ "V.90 Modem",
},
{
PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C940,
@@ -936,11 +936,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_ACA,
- "768 AC97 Audio",
+ "768 AC97",
},
{
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_MD,
- "768 AC97 Modem",
+ "768 Modem",
},
{
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PBC768_PPB,
@@ -992,7 +992,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_AMD, PCI_PRODUCT_AMD_8111_ACA,
- "8111 AC97 Audio",
+ "8111 AC97",
},
{
PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID,
@@ -3224,11 +3224,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_ACA,
- "82801AA AC97 Audio",
+ "82801AA AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_ACM,
- "82801AA AC97 Modem",
+ "82801AA Modem",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AA_HPB,
@@ -3252,11 +3252,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_ACA,
- "82801AB AC97 Audio",
+ "82801AB AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_ACM,
- "82801AB AC97 Modem",
+ "82801AB Modem",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801AB_HPB,
@@ -3280,11 +3280,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_ACA,
- "82801BA AC97 Audio",
+ "82801BA AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BA_ACM,
- "82801BA AC97 Modem",
+ "82801BA Modem",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801BAM_HPB,
@@ -3336,7 +3336,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801CA_ACA,
- "82801CA/CAM AC97 Audio",
+ "82801CA/CAM AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801CA_ACM,
@@ -3376,7 +3376,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DB_ACA,
- "82801DB AC97 Audio",
+ "82801DB AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801DB_ACM,
@@ -3424,11 +3424,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801EB_ACA,
- "82801EB/ER AC97 Audio",
+ "82801EB/ER AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801EB_MODEM,
- "82801EB/ER AC97 Modem",
+ "82801EB/ER Modem",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82801EB_USB_3,
@@ -3800,11 +3800,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_ACA,
- "82440MX AC97 Audio",
+ "82440MX AC97",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_ACM,
- "82440MX AC97 Modem",
+ "82440MX Modem",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82440MX_ISA,
@@ -3900,7 +3900,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_INTERSIL, PCI_PRODUCT_INTERSIL_MINI_PCI_WLAN,
- "PRISM2.5 Mini-PCI WLAN",
+ "PRISM2.5",
},
{
PCI_VENDOR_INVERTEX, PCI_PRODUCT_INVERTEX_AEON,
@@ -6200,7 +6200,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7012_ACA,
- "7012 AC97 Audio",
+ "7012 AC97",
},
{
PCI_VENDOR_SIS, PCI_PRODUCT_SIS_7013,
@@ -7072,11 +7072,11 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_AC97,
- "VT82C686 AC97 Audio",
+ "VT82C686 AC97",
},
{
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8233_AC97,
- "VT8233 AC97 Audio",
+ "VT8233 AC97",
},
{
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII_2,
@@ -7084,7 +7084,7 @@ static const struct pci_known_product pci_known_products[] = {
},
{
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ACM,
- "VT82C686 AC97 Modem",
+ "VT82C686 Modem",
},
{
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8366_ISA,
@@ -8060,7 +8060,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {
},
{
PCI_VENDOR_SIEMENS,
- "Siemens AG / Siemens Nixdorf AG",
+ "Siemens",
},
{
PCI_VENDOR_ACCTON,
@@ -8160,7 +8160,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {
},
{
PCI_VENDOR_DOLPHIN,
- "Dolphin Interconnect Solutions",
+ "Dolphin",
},
{
PCI_VENDOR_MRTMAGMA,
@@ -8548,7 +8548,7 @@ static const struct pci_known_vendor pci_known_vendors[] = {
},
{
PCI_VENDOR_ENDACE,
- "Endace Measurement Systems",
+ "Endace",
},
{
PCI_VENDOR_ARC,