src - OpenBSD base system

diff options


context:
space:
mode:

author	Theo de Raadt <deraadt@cvs.openbsd.org>	2005-07-30 22:43:22 +0000
committer	Theo de Raadt <deraadt@cvs.openbsd.org>	2005-07-30 22:43:22 +0000
commit	b7f168d48eb669e1dc6b533340690a064610414b (patch)
tree	e22d828e6a2df1d49783a4488c43b27b5653d684 /sys/dev
parent	f5977478ce443857218e3c995ff66a68e75c74c7 (diff)

sync

Diffstat (limited to 'sys/dev')

-rw-r--r--

sys/dev/pci/pcidevs.h

-rw-r--r--

sys/dev/pci/pcidevs_data.h

2 files changed, 38 insertions, 38 deletions

diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index 70e6b249f62..bca688071d1 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.898 2005/07/27 23:45:10 brad Exp

+ * OpenBSD: pcidevs,v 1.899 2005/07/30 22:43:10 deraadt Exp

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

@@ -673,7 +673,7 @@

#define PCI_PRODUCT_ATI_R200_BB 0x4242 /* Radeon 8500 BB */

#define PCI_PRODUCT_ATI_RADEON_IGP320M 0x4336 /* Radeon IGP 320M */

#define PCI_PRODUCT_ATI_MOBILITY_M6 0x4337 /* Mobility M6 */

-#define PCI_PRODUCT_ATI_IXP_AUDIO_200 0x4341 /* IXP200 AC'97 */

+#define PCI_PRODUCT_ATI_IXP_AUDIO_200 0x4341 /* IXP200 AC97 */

#define PCI_PRODUCT_ATI_SB200_PPB 0x4342 /* SB200 PCI-PCI */

#define PCI_PRODUCT_ATI_SB200_EHCI 0x4345 /* SB200 USB2 */

#define PCI_PRODUCT_ATI_SB200_OHCI_1 0x4347 /* SB200 USB */

@@ -682,8 +682,8 @@

#define PCI_PRODUCT_ATI_SB200_SMB 0x4353 /* SB200 SMBus */

#define PCI_PRODUCT_ATI_MACH64_CT 0x4354 /* Mach64 CT */

#define PCI_PRODUCT_ATI_MACH64_CX 0x4358 /* Mach64 CX */

-#define PCI_PRODUCT_ATI_IXP_AUDIO_300 0x4361 /* IXP300 AC'97 */

-#define PCI_PRODUCT_ATI_IXP_AUDIO_400 0x4370 /* IXP400 AC'97 */

+#define PCI_PRODUCT_ATI_IXP_AUDIO_300 0x4361 /* IXP300 AC97 */

+#define PCI_PRODUCT_ATI_IXP_AUDIO_400 0x4370 /* IXP400 AC97 */

#define PCI_PRODUCT_ATI_IXP_PCI_400 0x4371 /* IXP400 PCI */

#define PCI_PRODUCT_ATI_IXP_SMBUS_400 0x4372 /* IXP400 SMBus */

#define PCI_PRODUCT_ATI_IXP_EHCI_400 0x4373 /* IXP400 USB2 */

@@ -957,10 +957,10 @@

#define PCI_PRODUCT_CIRRUS_CL_GD7542 0x1200 /* CL-GD7542 */

#define PCI_PRODUCT_CIRRUS_CL_GD7543 0x1202 /* CL-GD7543 */

#define PCI_PRODUCT_CIRRUS_CL_GD7541 0x1204 /* CL-GD7541 */

-#define PCI_PRODUCT_CIRRUS_CS4610 0x6001 /* CS4610 SoundFusion Audio */

+#define PCI_PRODUCT_CIRRUS_CS4610 0x6001 /* CS4610 SoundFusion */

#define PCI_PRODUCT_CIRRUS_CS4615 0x6004 /* CS4615 */

-#define PCI_PRODUCT_CIRRUS_CS4280 0x6003 /* CS4280/46xx CrystalClear Audio */

-#define PCI_PRODUCT_CIRRUS_CS4281 0x6005 /* CS4281 CrystalClear Audio */

+#define PCI_PRODUCT_CIRRUS_CS4280 0x6003 /* CS4280/46xx CrystalClear */

+#define PCI_PRODUCT_CIRRUS_CS4281 0x6005 /* CS4281 CrystalClear */

/* CMD Technology products -- info gleaned from www.cmd.com */

#define PCI_PRODUCT_CMDTECH_640 0x0640 /* PCI0640 */

@@ -1199,7 +1199,7 @@

#define PCI_PRODUCT_ENSONIQ_CT5880 0x5880 /* CT5880 */

/* ESS Technology products */

-#define PCI_PRODUCT_ESSTECH_ES336H 0x0000 /* ES366H Fax/Modem (early) */

+#define PCI_PRODUCT_ESSTECH_ES336H 0x0000 /* ES366H Modem */

#define PCI_PRODUCT_ESSTECH_MAESTROII 0x1968 /* Maestro II */

#define PCI_PRODUCT_ESSTECH_SOLO1 0x1969 /* SOLO-1 AudioDrive */

#define PCI_PRODUCT_ESSTECH_MAESTRO2E 0x1978 /* Maestro 2E */

@@ -2081,7 +2081,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE4_SATA2 0x0055 /* nForce4 SATA 2 */

#define PCI_PRODUCT_NVIDIA_CK804_LAN1 0x0056 /* CK804 LAN */

#define PCI_PRODUCT_NVIDIA_CK804_LAN2 0x0057 /* CK804 LAN */

-#define PCI_PRODUCT_NVIDIA_NFORCE4_AC 0x0059 /* nForce4 AC-97 */

+#define PCI_PRODUCT_NVIDIA_NFORCE4_AC 0x0059 /* nForce4 AC97 */

#define PCI_PRODUCT_NVIDIA_NFORCE4_USB 0x005a /* nForce4 USB */

#define PCI_PRODUCT_NVIDIA_NFORCE4_USB2 0x005b /* nForce4 USB */

#define PCI_PRODUCT_NVIDIA_NFORCE4_PPB 0x005c /* nForce4 PCI-PCI */

@@ -2093,7 +2093,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE2_LAN 0x0066 /* nForce2 LAN */

#define PCI_PRODUCT_NVIDIA_NFORCE2_USB 0x0067 /* nForce2 USB */

#define PCI_PRODUCT_NVIDIA_NFORCE2_USB2 0x0068 /* nForce2 USB */

-#define PCI_PRODUCT_NVIDIA_NFORCE2_ACA 0x006a /* nForce2 AC-97 Audio */

+#define PCI_PRODUCT_NVIDIA_NFORCE2_ACA 0x006a /* nForce2 AC97 */

#define PCI_PRODUCT_NVIDIA_NFORCE2_APU 0x006b /* nForce2 Audio */

#define PCI_PRODUCT_NVIDIA_NFORCE2_PPB 0x006c /* nForce2 PCI-PCI */

#define PCI_PRODUCT_NVIDIA_NFORCE2_PPB2 0x006d /* nForce2 PCI-PCI */

@@ -2104,7 +2104,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 0x0086 /* nForce3 LAN */

#define PCI_PRODUCT_NVIDIA_NFORCE2_400_USB 0x0087 /* nForce2 400 USB */

#define PCI_PRODUCT_NVIDIA_NFORCE2_400_USB2 0x0088 /* nForce2 400 USB2 */

-#define PCI_PRODUCT_NVIDIA_NFORCE2_400_ACA 0x008a /* nForce2 400 AC-97 Audio */

+#define PCI_PRODUCT_NVIDIA_NFORCE2_400_ACA 0x008a /* nForce2 400 AC97 */

#define PCI_PRODUCT_NVIDIA_NFORCE2_400_PPB 0x008b /* nForce2 400 PCI-PCI */

#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 0x008c /* nForce3 LAN */

#define PCI_PRODUCT_NVIDIA_NFORCE2_400_SATA 0x008e /* nForce2 400 SATA */

@@ -2117,7 +2117,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN1 0x00d6 /* nForce3 LAN */

#define PCI_PRODUCT_NVIDIA_NFORCE3_USB 0x00d7 /* nForce3 USB */

#define PCI_PRODUCT_NVIDIA_NFORCE3_USB2 0x00d8 /* nForce3 USB */

-#define PCI_PRODUCT_NVIDIA_NFORCE3_ACA 0x00da /* nForce3 AC-97 Audio */

+#define PCI_PRODUCT_NVIDIA_NFORCE3_ACA 0x00da /* nForce3 AC97 */

#define PCI_PRODUCT_NVIDIA_NFORCE3_PPB 0x00dd /* nForce3 PCI-PCI */

#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN4 0x00df /* nForce3 LAN */

#define PCI_PRODUCT_NVIDIA_NFORCE3_250_ISA 0x00e0 /* nForce3 250 ISA */

@@ -2129,7 +2129,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN5 0x00e6 /* nForce3 LAN */

#define PCI_PRODUCT_NVIDIA_NFORCE3_250_USB 0x00e7 /* nForce3 250 USB */

#define PCI_PRODUCT_NVIDIA_NFORCE3_250_USB2 0x00e8 /* nForce3 250 USB2 */

-#define PCI_PRODUCT_NVIDIA_NFORCE3_250_ACA 0x00ea /* nForce3 250 AC-97 Audio */

+#define PCI_PRODUCT_NVIDIA_NFORCE3_250_ACA 0x00ea /* nForce3 250 AC97 */

#define PCI_PRODUCT_NVIDIA_NFORCE3_250_PPB 0x00ed /* nForce3 250 PCI-PCI */

#define PCI_PRODUCT_NVIDIA_GEFORCE6600GTAGP 0x00f1 /* GeForce 6600 GT AGP */

#define PCI_PRODUCT_NVIDIA_QUADROFX330 0x00fd /* Quadro FX 330 */

@@ -2157,9 +2157,9 @@

#define PCI_PRODUCT_NVIDIA_QUADRO4200 0x017a /* Quadro4 200/400NVS */

#define PCI_PRODUCT_NVIDIA_QUADRO4550XGL 0x017b /* Quadro4 550XGL */

#define PCI_PRODUCT_NVIDIA_QUADRO4500GOGL 0x017c /* Quadro4 GoGL */

-#define PCI_PRODUCT_NVIDIA_GEFORCE4MX440AGP8 0x0181 /* GeForce4 MX 440 AGP 8x */

-#define PCI_PRODUCT_NVIDIA_GEFORCE4MX440SEAGP8 0x0182 /* GeForce4 MX 440SE AGP 8x */

-#define PCI_PRODUCT_NVIDIA_GEFORCE4MX420AGP8 0x0183 /* GeForce 4 MX 420 AGP 8x */

+#define PCI_PRODUCT_NVIDIA_GEFORCE4MX440AGP8 0x0181 /* GeForce4 MX 440 AGP */

+#define PCI_PRODUCT_NVIDIA_GEFORCE4MX440SEAGP8 0x0182 /* GeForce4 MX 440SE AGP */

+#define PCI_PRODUCT_NVIDIA_GEFORCE4MX420AGP8 0x0183 /* GeForce 4 MX 420 AGP */

#define PCI_PRODUCT_NVIDIA_GEFORCE4MX4000 0x0185 /* GeForce4 MX 4000 */

#define PCI_PRODUCT_NVIDIA_QUADRO4_580XGL 0x0188 /* Quadro4 580 XGL */

#define PCI_PRODUCT_NVIDIA_QUADRO4NVS 0x018a /* Quadro4 NVS */

@@ -2171,7 +2171,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE_MEM 0x01ac /* nForce 220/420 */

#define PCI_PRODUCT_NVIDIA_NFORCE_MEM1 0x01ad /* nForce 220/420 */

#define PCI_PRODUCT_NVIDIA_NFORCE_APU 0x01b0 /* nForce APU */

-#define PCI_PRODUCT_NVIDIA_NFORCE_ACA 0x01b1 /* nForce AC-97 Audio */

+#define PCI_PRODUCT_NVIDIA_NFORCE_ACA 0x01b1 /* nForce AC97 */

#define PCI_PRODUCT_NVIDIA_NFORCE_ISA 0x01b2 /* nForce ISA */

#define PCI_PRODUCT_NVIDIA_NFORCE_SMB 0x01b4 /* nForce SMBus */

#define PCI_PRODUCT_NVIDIA_NFORCE_AGP 0x01b7 /* nForce AGP */

@@ -2187,7 +2187,7 @@

#define PCI_PRODUCT_NVIDIA_NFORCE2_MEM3 0x01ed /* nForce2 */

#define PCI_PRODUCT_NVIDIA_NFORCE2_MEM4 0x01ee /* nForce2 */

#define PCI_PRODUCT_NVIDIA_NFORCE2_MEM5 0x01ef /* nForce2 */

-#define PCI_PRODUCT_NVIDIA_GEFORCE4MXNFORCE 0x01f0 /* GeForce4 MX - nForce GPU */

+#define PCI_PRODUCT_NVIDIA_GEFORCE4MXNFORCE 0x01f0 /* GeForce4 MX nForce GPU */

#define PCI_PRODUCT_NVIDIA_GEFORCE3 0x0200 /* GeForce3 */

#define PCI_PRODUCT_NVIDIA_GEFORCE3TI200 0x0201 /* GeForce3 Ti 200 */

#define PCI_PRODUCT_NVIDIA_GEFORCE3TI500 0x0202 /* GeForce3 Ti 500 */

@@ -2779,7 +2779,7 @@

#define PCI_PRODUCT_V3_V961PBC 0x0002 /* V961PBC i960 PCI */

#define PCI_PRODUCT_V3_V292PBC 0x0292 /* V292PBC AMD290x0 PCI */

#define PCI_PRODUCT_V3_V960PBC 0x0960 /* V960PBC i960 PCI */

-#define PCI_PRODUCT_V3_V96DPC 0xc960 /* V96DPC i960 (Dual) PCI */

+#define PCI_PRODUCT_V3_V96DPC 0xc960 /* V96DPC i960 PCI */

/* VIA Technologies products */

#define PCI_PRODUCT_VIATECH_K8HTB_0 0x0282 /* K8HTB Host */

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index 4908f15db4f..f8fdc446e4f 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.898 2005/07/27 23:45:10 brad Exp

+ * OpenBSD: pcidevs,v 1.899 2005/07/30 22:43:10 deraadt Exp

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

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

{

PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_200,

- "IXP200 AC'97",

+ "IXP200 AC97",

{

PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_PPB,

@@ -1348,11 +1348,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_300,

- "IXP300 AC'97",

+ "IXP300 AC97",

{

PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_400,

- "IXP400 AC'97",

+ "IXP400 AC97",

{

PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_PCI_400,

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

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4610,

- "CS4610 SoundFusion Audio",

+ "CS4610 SoundFusion",

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4615,

@@ -2312,11 +2312,11 @@ static const struct pci_known_product pci_known_products[] = {

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4280,

- "CS4280/46xx CrystalClear Audio",

+ "CS4280/46xx CrystalClear",

{

PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CS4281,

- "CS4281 CrystalClear Audio",

+ "CS4281 CrystalClear",

{

PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_640,

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

{

PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_ES336H,

- "ES366H Fax/Modem (early)",

+ "ES366H Modem",

{

PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_MAESTROII,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_AC,

- "nForce4 AC-97",

+ "nForce4 AC97",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE4_USB,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_ACA,

- "nForce2 AC-97 Audio",

+ "nForce2 AC97",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_APU,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_ACA,

- "nForce2 400 AC-97 Audio",

+ "nForce2 400 AC97",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE2_400_PPB,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_ACA,

- "nForce3 AC-97 Audio",

+ "nForce3 AC97",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_PPB,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_ACA,

- "nForce3 250 AC-97 Audio",

+ "nForce3 250 AC97",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE3_250_PPB,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE4MX440AGP8,

- "GeForce4 MX 440 AGP 8x",

+ "GeForce4 MX 440 AGP",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE4MX440SEAGP8,

- "GeForce4 MX 440SE AGP 8x",

+ "GeForce4 MX 440SE AGP",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE4MX420AGP8,

- "GeForce 4 MX 420 AGP 8x",

+ "GeForce 4 MX 420 AGP",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE4MX4000,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_ACA,

- "nForce AC-97 Audio",

+ "nForce AC97",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_NFORCE_ISA,

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

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE4MXNFORCE,

- "GeForce4 MX - nForce GPU",

+ "GeForce4 MX nForce GPU",

{

PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE3,

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

{

PCI_VENDOR_V3, PCI_PRODUCT_V3_V96DPC,

- "V96DPC i960 (Dual) PCI",

+ "V96DPC i960 PCI",

{

PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_K8HTB_0,