summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-10-29 00:48:50 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-10-29 00:48:50 +0000
commit97013618ae31cec8290ee83fba27ec3461d4f973 (patch)
tree0ca6098e0b213485c2d6b6aa7d942b7ec39793e8
parent4a9b44dd88f5e973c436684fe003f66825017145 (diff)
sync
-rw-r--r--sys/dev/pci/pcidevs.h106
-rw-r--r--sys/dev/pci/pcidevs_data.h394
2 files changed, 377 insertions, 123 deletions
diff --git a/sys/dev/pci/pcidevs.h b/sys/dev/pci/pcidevs.h
index edf23bb243b..eb73a25497d 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.337 2000/10/26 13:39:28 deraadt Exp
+ * OpenBSD: pcidevs,v 1.338 2000/10/26 21:58:45 aaron Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -564,7 +564,8 @@
#define PCI_PRODUCT_2MICRO_OZ6832 0x6832 /* OZ6832 CardBus */
-/* 3COM Products */
+/* 3Com Products */
+#define PCI_PRODUCT_3COM_3C985 0x0001 /* 3c985 */
#define PCI_PRODUCT_3COM_3C339 0x3390 /* 3c339 */
#define PCI_PRODUCT_3COM_3C450 0x4500 /* 3c450 */
#define PCI_PRODUCT_3COM_3C590 0x5900 /* 3c590 10Mbps */
@@ -591,7 +592,6 @@
#define PCI_PRODUCT_3COM_3C980TX 0x9800 /* 3c980 100Base-TX */
#define PCI_PRODUCT_3COM_3C980CTX 0x9805 /* 3c980C 100Base-TX */
#define PCI_PRODUCT_3COM_3CR990 0x9903 /* 3cr990 TX-97 */
-#define PCI_PRODUCT_3COM_3C985 0x0001 /* 3c985 */
/* 3DFX Interactive */
#define PCI_PRODUCT_3DFX_VOODOO 0x0001 /* Voodoo */
@@ -600,13 +600,14 @@
#define PCI_PRODUCT_3DFX_VOODOO3 0x0005 /* Voodoo3 */
/* 3D Labs products */
-#define PCI_PRODUCT_3DLABS_300SX 0x0001 /* GLINT 300SX */
-#define PCI_PRODUCT_3DLABS_500TX 0x0002 /* GLINT 500TX */
-#define PCI_PRODUCT_3DLABS_DELTA 0x0003 /* GLINT Delta */
-#define PCI_PRODUCT_3DLABS_PERMEDIA 0x0004 /* GLINT Permedia */
-#define PCI_PRODUCT_3DLABS_500MX 0x0006 /* GLINT 500MX */
-#define PCI_PRODUCT_3DLABS_PERMEDIA2 0x0007 /* GLINT Permedia 2 */
+#define PCI_PRODUCT_3DLABS_300SX 0x0001 /* 300SX */
+#define PCI_PRODUCT_3DLABS_500TX 0x0002 /* 500TX */
+#define PCI_PRODUCT_3DLABS_DELTA 0x0003 /* Delta */
+#define PCI_PRODUCT_3DLABS_PERMEDIA 0x0004 /* Permedia */
+#define PCI_PRODUCT_3DLABS_500MX 0x0006 /* 500MX */
+#define PCI_PRODUCT_3DLABS_PERMEDIA2 0x0007 /* Permedia 2 */
#define PCI_PRODUCT_3DLABS_OXYGEN_GVX1_CPU 0x0008 /* Oxygen GVX1 */
+#define PCI_PRODUCT_3DLABS_PERMEDIA3 0x0009 /* Permedia 3 */
#define PCI_PRODUCT_3DLABS_OXYGEN_GVX1 0x000a /* Oxygen GVX1 */
/* 3Ware products */
@@ -765,6 +766,7 @@
#define PCI_PRODUCT_ATI_RAGEPRO 0x4742 /* Rage Pro */
#define PCI_PRODUCT_ATI_MACH64_GD 0x4744 /* Mach64 GD */
#define PCI_PRODUCT_ATI_MACH64_GI 0x4749 /* Mach64 GI */
+#define PCI_PRODUCT_ATI_MACH64_GM 0x474d /* Mach64 GM */
#define PCI_PRODUCT_ATI_MACH64_GP 0x4750 /* Mach64 GP */
#define PCI_PRODUCT_ATI_MACH64_GQ 0x4751 /* Mach64 GQ */
#define PCI_PRODUCT_ATI_MACH64_GT 0x4754 /* Mach64 GT */
@@ -780,11 +782,12 @@
#define PCI_PRODUCT_ATI_MACH64_LI 0x4c49 /* Mach64 LI */
#define PCI_PRODUCT_ATI_MOBILITY_1 0x4c4d /* Mobility 1 */
#define PCI_PRODUCT_ATI_MACH64_LP 0x4c50 /* Mach64 LP */
+#define PCI_PRODUCT_ATI_RAGE_FURY 0x5046 /* Rage Fury AGP4x */
#define PCI_PRODUCT_ATI_RAGE_MAGNUM 0x5246 /* Rage Magnum */
+#define PCI_PRODUCT_ATI_RAGE_128_VR_AGP 0x524c /* Rage 128 VR AGP */
#define PCI_PRODUCT_ATI_MACH64_VT 0x5654 /* Mach64 VT */
#define PCI_PRODUCT_ATI_MACH64_VU 0x5655 /* Mach64 VU */
#define PCI_PRODUCT_ATI_MACH64_VV 0x5656 /* Mach64 VV */
-#define PCI_PRODUCT_ATI_RAGE_FURY 0x5046 /* Rage Fury AGP4x */
/* Applied Micro Circuts products */
#define PCI_PRODUCT_AMCIRCUITS_S5933 0x4750 /* S5933 PCI Matchmaker */
@@ -802,7 +805,7 @@
#define PCI_PRODUCT_AVANCE_AVG2302 0x2302 /* AVG2302 */
#define PCI_PRODUCT_AVANCE2_ALG2301 0x2301 /* ALG2301 */
#define PCI_PRODUCT_AVANCE2_ALG2302 0x2302 /* ALG2302 */
-#define PCI_PRODUCT_AVANCE2_ALG4000 0x4000 /* ALG4000 */
+#define PCI_PRODUCT_AVANCE2_ALS4000 0x4000 /* ALS4000 */
/* Bit3 products */
#define PCI_PRODUCT_BIT3_PCIVME617 0x0001 /* PCI-VME Interface Mod. 617 */
@@ -853,9 +856,10 @@
#define PCI_PRODUCT_CIRRUS_CL_GD5446 0x00b8 /* CL-GD5446 */
#define PCI_PRODUCT_CIRRUS_CL_GD5480 0x00bc /* CL-GD5480 */
#define PCI_PRODUCT_CIRRUS_CL_GD5462 0x00d0 /* CL-GD5462 */
-#define PCI_PRODUCT_CIRRUS_CL_GD5464 0x00d4 /* CL-GD6464 */
+#define PCI_PRODUCT_CIRRUS_CL_GD5464 0x00d4 /* CL-GD5464 */
+#define PCI_PRODUCT_CIRRUS_CL_GD5465 0x00d6 /* CL-GD5465 */
#define PCI_PRODUCT_CIRRUS_CL_PD6729 0x1100 /* CL-PD6729 */
-#define PCI_PRODUCT_CIRRUS_CL_PD6832 0x1100 /* CL-PD6832 PCI-CardBus */
+#define PCI_PRODUCT_CIRRUS_CL_PD6832 0x1110 /* CL-PD6832 PCI-CardBus */
#define PCI_PRODUCT_CIRRUS_CL_PD6833 0x1113 /* CL-PD6833 PCI-CardBus */
#define PCI_PRODUCT_CIRRUS_CL_GD7542 0x1200 /* CL-GD7542 */
#define PCI_PRODUCT_CIRRUS_CL_GD7543 0x1202 /* CL-GD7543 */
@@ -895,12 +899,18 @@
#define PCI_PRODUCT_COMPAQ_USB 0x7020 /* USB */
#define PCI_PRODUCT_COMPAQ_FXP 0xa0f0 /* Netelligent ASMC */
#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE1 0xa0f3 /* PCI-ISA */
+#define PCI_PRODUCT_COMPAQ_OHCI 0xa0f8 /* USB OpenHost */
+#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE3 0xae29 /* PCI-ISA */
+#define PCI_PRODUCT_COMPAQ_PCI_ISAPNP 0xae2b /* PCI-ISAPnP */
#define PCI_PRODUCT_COMPAQ_N100TX 0xae32 /* Netelligent 10/100 TX */
#define PCI_PRODUCT_COMPAQ_IDE 0xae33 /* Netelligent IDE */
#define PCI_PRODUCT_COMPAQ_N10T 0xae34 /* Netelligent 10 T */
#define PCI_PRODUCT_COMPAQ_IntNF3P 0xae35 /* Integrated NetFlex 3/P */
#define PCI_PRODUCT_COMPAQ_DPNet100TX 0xae40 /* Dual Port Netelligent 10/100 TX */
#define PCI_PRODUCT_COMPAQ_IntPL100TX 0xae43 /* ProLiant Netelligent 10/100 TX */
+#define PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2 0xae69 /* PCI-ISA */
+#define PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE1 0xae6c /* Host-PCI */
+#define PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE2 0xae6d /* Host-PCI */
#define PCI_PRODUCT_COMPAQ_DP4000 0xb011 /* Embedded Netelligent 10/100 TX */
#define PCI_PRODUCT_COMPAQ_N10T2 0xb012 /* Netelligent 10 T/2 PCI */
#define PCI_PRODUCT_COMPAQ_N10_TX_UTP 0xb030 /* Netelligent 10/100 TX */
@@ -913,8 +923,9 @@
#define PCI_PRODUCT_COMPEX_98713 0x9881 /* PMAC 98713 */
/* Conexant products */
-#define PCI_PRODUCT_CONEXANT_SOFTK56_PCI 0x2443 /* SoftK56 PCI */
#define PCI_PRODUCT_CONEXANT_56K_WINMODEM 0x1033 /* 56k Winmodem */
+#define PCI_PRODUCT_CONEXANT_56K_WINMODEM2 0x1036 /* 56k Winmodem */
+#define PCI_PRODUCT_CONEXANT_SOFTK56_PCI 0x2443 /* SoftK56 PCI */
/* Contaq Microsystems products */
#define PCI_PRODUCT_CONTAQ_82C599 0x0600 /* 82C599 PCI-VLB */
@@ -998,6 +1009,7 @@
#define PCI_PRODUCT_ESSTECH_SOLO1 0x1969 /* SOLO-1 AudioDrive */
#define PCI_PRODUCT_ESSTECH_MAESTRO2E 0x1978 /* Maestro 2E */
#define PCI_PRODUCT_ESSTECH_MAESTRO3 0x1998 /* Maestro 3 */
+#define PCI_PRODUCT_ESSTECH_2898 0x2898 /* ES2898 Modem */
/* Essential Communications products */
#define PCI_PRODUCT_ESSENTIAL_RR_HIPPI 0x0001 /* RoadRunner HIPPI */
@@ -1023,6 +1035,7 @@
/* Hewlett-Packard products */
#define PCI_PRODUCT_HP_J2585A 0x1030 /* J2585A */
+#define PCI_PRODUCT_HP_J2585B 0x1031 /* J2585B */
/* XXX guess */
#define PCI_PRODUCT_HP_NETRAID_4M 0x10c2 /* NetRaid-4M */
@@ -1065,6 +1078,7 @@
#define PCI_PRODUCT_INTEL_SIO 0x0484 /* 82378IB PCI-ISA (System I/O) */
#define PCI_PRODUCT_INTEL_82426EX 0x0486 /* 82426EX PCI-to-ISA (PCIB) */
#define PCI_PRODUCT_INTEL_PCMC 0x04a3 /* 82434LX/NX (Mercury/Neptune) PCI/Cache/DRAM */
+#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_82452 0x1000 /* Pro/1000 */
@@ -1095,8 +1109,9 @@
#define PCI_PRODUCT_INTEL_82441FX 0x1237 /* 82441FX */
#define PCI_PRODUCT_INTEL_82380AB 0x123c /* 82380AB Mobile PCI-ISA */
#define PCI_PRODUCT_INTEL_82380FB 0x124b /* 82380FB Mobile PCI-PCI */
-#define PCI_PRODUCT_INTEL_82806AA 0x1360 /* 82806AA PCI64 */
#define PCI_PRODUCT_INTEL_82439HX 0x1250 /* 82439HX (Triton II) */
+#define PCI_PRODUCT_INTEL_82806AA 0x1360 /* 82806AA PCI64 */
+#define PCI_PRODUCT_INTEL_80960RP_ATU 0x1960 /* 80960RP ATU */
#define PCI_PRODUCT_INTEL_82840_HB 0x1a21 /* 82840 Host */
#define PCI_PRODUCT_INTEL_82840_AGP 0x1a23 /* 82840 AGP */
#define PCI_PRODUCT_INTEL_82840_PCI 0x1a24 /* 82840 PCI */
@@ -1238,6 +1253,7 @@
/* Macronix */
#define PCI_PRODUCT_MACRONIX_MX98713 0x0512 /* PMAC 98713 */
#define PCI_PRODUCT_MACRONIX_MX98715 0x0531 /* PMAC 98715 */
+#define PCI_PRODUCT_MACRONIX_MX86250 0x8625 /* MX86250 */
/* Madge Networks products */
#define PCI_PRODUCT_MADGE_COLLAGE25 0x1000 /* Collage 25 ATM adapter */
@@ -1259,6 +1275,7 @@
/* Motorola products */
#define PCI_PRODUCT_MOT_MPC106 0x0002 /* MPC106 Host-PCI */
+#define PCI_PRODUCT_MOT_SM56 0x5600 /* SM56 */
/* Mylex products */
#define PCI_PRODUCT_MYLEX_960P 0x0001 /* DAC960P RAID */
@@ -1284,6 +1301,7 @@
#define PCI_PRODUCT_NEOMAGIC_NM2160 0x0004 /* Magicgraph NM2160 */
#define PCI_PRODUCT_NEOMAGIC_NM2200 0x0005 /* Magicgraph NM2200 */
#define PCI_PRODUCT_NEOMAGIC_NM2360 0x0006 /* Magicgraph NM2360 */
+#define PCI_PRODUCT_NEOMAGIC_NM2230 0x0025 /* MagicMedia 256AV+ */
#define PCI_PRODUCT_NEOMAGIC_NM256XLP 0x0016 /* MagicMedia 256XL+ */
#define PCI_PRODUCT_NEOMAGIC_NM256AV 0x8005 /* MagicMedia 256AV */
#define PCI_PRODUCT_NEOMAGIC_NM256ZX 0x8006 /* MagicMedia 256ZX */
@@ -1351,14 +1369,14 @@
#define PCI_PRODUCT_SYMBIOS_815 0x0004 /* 53c815 */
#define PCI_PRODUCT_SYMBIOS_810AP 0x0005 /* 53c810AP */
#define PCI_PRODUCT_SYMBIOS_860 0x0006 /* 53c860 */
-#define PCI_PRODUCT_SYMBIOS_875 0x000f /* 53c875 */
-#define PCI_PRODUCT_SYMBIOS_875J 0x008f /* 53c875J */
-#define PCI_PRODUCT_SYMBIOS_885 0x000d /* 53c885 */
-#define PCI_PRODUCT_SYMBIOS_895 0x000c /* 53c895 */
-#define PCI_PRODUCT_SYMBIOS_895A 0x0012 /* 53c895A */
+#define PCI_PRODUCT_SYMBIOS_1510D 0x000a /* 53c1510D */
#define PCI_PRODUCT_SYMBIOS_896 0x000b /* 53c896 */
+#define PCI_PRODUCT_SYMBIOS_895 0x000c /* 53c89 */
+#define PCI_PRODUCT_SYMBIOS_885 0x000d /* 53c885 */
+#define PCI_PRODUCT_SYMBIOS_875 0x000f /* 53c875 */
#define PCI_PRODUCT_SYMBIOS_1510 0x0010 /* 53c1510 */
-#define PCI_PRODUCT_SYMBIOS_1510D 0x000a /* 53c1510D */
+#define PCI_PRODUCT_SYMBIOS_895A 0x0012 /* 53c895A */
+#define PCI_PRODUCT_SYMBIOS_875J 0x008f /* 53c875J */
/* Packet Engines products */
#define PCI_PRODUCT_SYMBIOS_PE_GNIC 0x0702 /* Packet Engines G-NIC */
@@ -1379,6 +1397,9 @@
#define PCI_PRODUCT_NVIDIA_DAC64 0x0009 /* DAC64 */
#define PCI_PRODUCT_NVIDIA_RIVA_TNT 0x0020 /* Riva TNT */
#define PCI_PRODUCT_NVIDIA_RIVA_TNT2 0x0028 /* Riva TNT2 */
+#define PCI_PRODUCT_NVIDIA_RIVA_TNT2_ULTRA 0x0029 /* Riva TNT2 Ultra */
+#define PCI_PRODUCT_NVIDIA_VANTA1 0x002c /* Vanta */
+#define PCI_PRODUCT_NVIDIA_VANTA2 0x002d /* Vanta */
#define PCI_PRODUCT_NVIDIA_GEFORCE256 0x0100 /* GeForce256 */
#define PCI_PRODUCT_NVIDIA_GEFORCE256_DDR 0x0101 /* GeForce256 DDR */
#define PCI_PRODUCT_NVIDIA_GEFORCE2GTS 0x0150 /* GeForce2 GTS */
@@ -1391,6 +1412,9 @@
#define PCI_PRODUCT_OLICOM_OC2325 0x0012 /* OC2325 */
#define PCI_PRODUCT_OLICOM_OC2326 0x0014 /* OC2326 */
+/* Omega Micro products */
+#define PCI_PRODUCT_OMEGA_82C092G 0x1221 /* 82C092G */
+
/* Opti products */
#define PCI_PRODUCT_OPTI_82C557 0xc557 /* 82C557 Host */
#define PCI_PRODUCT_OPTI_82C558 0xc558 /* 82C558 PCI-ISA */
@@ -1499,6 +1523,7 @@
#define PCI_PRODUCT_S3_TRIO3D_AGP 0x8904 /* Trio3D AGP */
#define PCI_PRODUCT_S3_VIRGE_DX_GX 0x8a01 /* ViRGE DX/GX */
#define PCI_PRODUCT_S3_VIRGE_GX2 0x8a10 /* ViRGE GX2 */
+#define PCI_PRODUCT_S3_TRIO3_DX2 0x8a13 /* Trio3 DX2 */
#define PCI_PRODUCT_S3_SAVAGE3D 0x8a20 /* Savage 3D */
#define PCI_PRODUCT_S3_SAVAGE3D_M 0x8a21 /* Savage 3DM */
#define PCI_PRODUCT_S3_SAVAGE4 0x8a22 /* Savage 4 */
@@ -1527,21 +1552,25 @@
/* Silicon Integrated System products */
#define PCI_PRODUCT_SIS_86C201 0x0001 /* 86C201 Host-AGP */
#define PCI_PRODUCT_SIS_86C202 0x0002 /* 86C202 VGA */
-#define PCI_PRODUCT_SIS_86C205 0x0005 /* 86C205 */
+#define PCI_PRODUCT_SIS_86C205_1 0x0005 /* 86C205 */
#define PCI_PRODUCT_SIS_85C503 0x0008 /* 85C503 ISA */
#define PCI_PRODUCT_SIS_5595 0x0009 /* 5595 PCI System I/O Chipset */
#define PCI_PRODUCT_SIS_5597VGA 0x0200 /* 5597/5598 VGA */
+#define PCI_PRODUCT_SIS_6215 0x0204 /* 6215 */
+#define PCI_PRODUCT_SIS_86C205_2 0x0205 /* 86C205 */
#define PCI_PRODUCT_SIS_85C501 0x0406 /* 85C501 */
#define PCI_PRODUCT_SIS_85C496 0x0496 /* 85C496 */
#define PCI_PRODUCT_SIS_85C596 0x0496 /* 85C596 */
#define PCI_PRODUCT_SIS_SiS530 0x0530 /* SiS530 Host-PCI */
#define PCI_PRODUCT_SIS_85C601 0x0601 /* 85C601 EIDE */
#define PCI_PRODUCT_SIS_620 0x0620 /* 620 Host-PCI */
+#define PCI_PRODUCT_SIS_630 0x0630 /* 630 Host-PCI */
#define PCI_PRODUCT_SIS_900 0x0900 /* 900 10/100BaseTX */
#define PCI_PRODUCT_SIS_7016 0x7016 /* 7016 10/100BaseTX */
#define PCI_PRODUCT_SIS_5511 0x5511 /* 5511 */
#define PCI_PRODUCT_SIS_5512 0x5512 /* 5512 */
#define PCI_PRODUCT_SIS_5513 0x5513 /* 5513 EIDE */
+#define PCI_PRODUCT_SIS_5571 0x5571 /* 5571 */
#define PCI_PRODUCT_SIS_5581 0x5581 /* 5581 */
#define PCI_PRODUCT_SIS_5582 0x5582 /* 5582 */
#define PCI_PRODUCT_SIS_5591 0x5591 /* 5591 Host-PCI */
@@ -1550,6 +1579,7 @@
#define PCI_PRODUCT_SIS_5598 0x5598 /* 5598 */
#define PCI_PRODUCT_SIS_6204 0x6204 /* 6204 */
#define PCI_PRODUCT_SIS_6205 0x6205 /* 6205 */
+#define PCI_PRODUCT_SIS_6300 0x6300 /* 6300 */
#define PCI_PRODUCT_SIS_530 0x6306 /* 530 VGA */
#define PCI_PRODUCT_SIS_6326 0x6326 /* 6326 AGP Video */
#define PCI_PRODUCT_SIS_5597_USB 0x7001 /* 5597/5598 USB */
@@ -1591,6 +1621,9 @@
/* Texas Instruments products */
#define PCI_PRODUCT_TI_TLAN 0x0500 /* TLAN */
+#define PCI_PRODUCT_TI_PERMEDIA 0x3d04 /* 3DLabs Permedia */
+#define PCI_PRODUCT_TI_PERMEDIA2 0x3d07 /* 3DLabs Permedia 2 */
+#define PCI_PRODUCT_TI_TSB12LV23 0x8019 /* TSB12LV23 FireWire */
#define PCI_PRODUCT_TI_PCI1130 0xac12 /* PCI1130 PCI-CardBus */
#define PCI_PRODUCT_TI_PCI1031 0xac13 /* PCI1031 PCI-pcmcia */
#define PCI_PRODUCT_TI_PCI1131 0xac15 /* PCI1131 PCI-CardBus */
@@ -1604,15 +1637,13 @@
#define PCI_PRODUCT_TI_PCI1251B 0xac1f /* PCI1251B PCI-CardBus */
#define PCI_PRODUCT_TI_PCI2030 0xac20 /* PCI2030 PCI-PCI */
#define PCI_PRODUCT_TI_PCI2031 0xac21 /* PCI2031 PCI-PCI */
+#define PCI_PRODUCT_TI_PCI1410 0xac50 /* PCI1410 PCI-CardBus */
#define PCI_PRODUCT_TI_PCI1420 0xac51 /* PCI1420 PCI-CardBus */
#define PCI_PRODUCT_TI_PCI1451 0xac52 /* PCI1451 PCI-CardBus */
-#define PCI_PRODUCT_TI_PERMEDIA 0x3d04 /* 3DLabs Permedia */
-#define PCI_PRODUCT_TI_PERMEDIA2 0x3d07 /* 3DLabs Permedia 2 */
-#define PCI_PRODUCT_TI_TSB12LV23 0x8019 /* TSB12LV23 FireWire */
/* Toshiba products */
-#define PCI_PRODUCT_TOSHIBA_R4X00 0x102f /* R4x00 Host-PCI */
#define PCI_PRODUCT_TOSHIBA_TC35856F 0x0020 /* TC35856F ATM (Meteor) */
+#define PCI_PRODUCT_TOSHIBA_R4X00 0x102f /* R4x00 Host-PCI */
/* Toshiba(2) products */
#define PCI_PRODUCT_TOSHIBA2_THB 0x0601 /* Host-PCI */
@@ -1626,6 +1657,7 @@
/* Trident products */
#define PCI_PRODUCT_TRIDENT_4DWAVE_DX 0x2000 /* 4DWAVE DX */
#define PCI_PRODUCT_TRIDENT_4DWAVE_NX 0x2001 /* 4DWAVE NX */
+#define PCI_PRODUCT_TRIDENT_CYBERBLADE_I7 0x8420 /* CyberBlade i7 */
#define PCI_PRODUCT_TRIDENT_TGUI_9320 0x9320 /* TGUI 9320 */
#define PCI_PRODUCT_TRIDENT_TGUI_9350 0x9350 /* TGUI 9350 */
#define PCI_PRODUCT_TRIDENT_TGUI_9360 0x9360 /* TGUI 9360 */
@@ -1638,8 +1670,9 @@
#define PCI_PRODUCT_TRIDENT_TGUI_9660 0x9660 /* TGUI 9660 */
#define PCI_PRODUCT_TRIDENT_TGUI_9680 0x9680 /* TGUI 9680 */
#define PCI_PRODUCT_TRIDENT_TGUI_9682 0x9682 /* TGUI 9682 */
-#define PCI_PRODUCT_TRIDENT_TGUI_9750 0x9750 /* TGUI 9750 (3D Image) */
-#define PCI_PRODUCT_TRIDENT_TGUI_9850 0x9850 /* TGUI 9850 */
+#define PCI_PRODUCT_TRIDENT_3DIMAGE_9750 0x9750 /* 3DImage 9750 */
+#define PCI_PRODUCT_TRIDENT_3DIMAGE_9850 0x9850 /* 3DImage 9850 */
+#define PCI_PRODUCT_TRIDENT_BLADE_3D 0x9880 /* Blade 3D */
/* Triones/HighPoint Technologies products */
#define PCI_PRODUCT_TRIONES_HPT343 0x0003 /* HPT343 EIDE */
@@ -1689,6 +1722,7 @@
/* VIA Technologies products */
#define PCI_PRODUCT_VIATECH_VT8363 0x0305 /* VT8363 (Apollo 133) Host */
#define PCI_PRODUCT_VIATECH_VT8371_HB 0x0391 /* VT8371 (Apollo 133) Host */
+#define PCI_PRODUCT_VIATECH_VT8501 0x0501 /* VT8501 (Apollo MVP4) */
#define PCI_PRODUCT_VIATECH_VT82C505 0x0505 /* VT82C505 (Pluto) */
#define PCI_PRODUCT_VIATECH_VT82C561 0x0561 /* VT82C561 */
#define PCI_PRODUCT_VIATECH_VT82C586A_IDE 0x0571 /* VT82C586A IDE */
@@ -1699,6 +1733,7 @@
#define PCI_PRODUCT_VIATECH_VT82C596A 0x0596 /* VT82C596A (Apollo Pro) PCI-ISA */
#define PCI_PRODUCT_VIATECH_VT82C597PCI 0x0597 /* VT82C597 (Apollo VP3) Host-PCI */
#define PCI_PRODUCT_VIATECH_VT82C598PCI 0x0598 /* VT82C598 (Apollo MVP3) Host-PCI */
+#define PCI_PRODUCT_VIATECH_VT8605 0x0605 /* VT8605 (ProSavage PM133) Host-PCI */
#define PCI_PRODUCT_VIATECH_VT82C686A_ISA 0x0686 /* VT82C686A (Apollo 133) PCI-ISA */
#define PCI_PRODUCT_VIATECH_VT82C691 0x0691 /* VT82C691 (Apollo Pro) Host-PCI */
#define PCI_PRODUCT_VIATECH_VT82C693 0x0693 /* VT82C693 (Apollo Pro Plus) Host-PCI */
@@ -1709,15 +1744,17 @@
#define PCI_PRODUCT_VIATECH_VT82C1595 0x1595 /* VT82C1595 (Apollo VP2) Host-PCI */
#define PCI_PRODUCT_VIATECH_VT83C572 0x3038 /* VT83C572 USB */
#define PCI_PRODUCT_VIATECH_VT82C586_PWR 0x3040 /* VT82C586 (Apollo VP) Power Management */
-#define PCI_PRODUCT_VIATECH_VT82C596 0x3050 /* VT82C596 Power Management */
#define PCI_PRODUCT_VIATECH_RHINE 0x3043 /* Rhine/RhineII */
-#define PCI_PRODUCT_VIATECH_RHINEII_2 0x3065 /* RhineII-2 */
+#define PCI_PRODUCT_VIATECH_VT82C596 0x3050 /* VT82C596 Power Management */
#define PCI_PRODUCT_VIATECH_VT82C686A_SMB 0x3057 /* VT82C686A (Apollo 133) SMBus */
#define PCI_PRODUCT_VIATECH_VT82C686A_AC97 0x3058 /* VT82C686A (Apollo 133) AC-97 Audio */
+#define PCI_PRODUCT_VIATECH_RHINEII_2 0x3065 /* RhineII-2 */
#define PCI_PRODUCT_VIATECH_VT8363_AGP 0x8305 /* VT8363 (Apollo 133) PCI-AGP */
#define PCI_PRODUCT_VIATECH_VT8371_PPB 0x8391 /* VT8371 (Apollo 133) PCI-PCI */
+#define PCI_PRODUCT_VIATECH_VT8501_AGP 0x8501 /* VT8501 (Apollo MVP4) PCI-AGP */
#define PCI_PRODUCT_VIATECH_VT82C597AGP 0x8597 /* VT82C597 (Apollo VP3) PCI-AGP */
#define PCI_PRODUCT_VIATECH_VT82C598AGP 0x8598 /* VT82C598 (Apollo MVP3) PCI-AGP */
+#define PCI_PRODUCT_VIATECH_VT8605_AGP 0x8605 /* VT8605 (ProSavage PM133) PCI-AGP */
#define PCI_PRODUCT_VIATECH_RHINEII 0x6100 /* RhineII */
/* Vortex Computer Systems products */
@@ -1824,15 +1861,15 @@
/* Yamaha products */
#define PCI_PRODUCT_YAMAHA_YMF724 0x0004 /* 724 */
-#define PCI_PRODUCT_YAMAHA_YMF724F 0x000d /* 724F */
#define PCI_PRODUCT_YAMAHA_YMF734 0x0005 /* 734 */
+#define PCI_PRODUCT_YAMAHA_YMF738_TEG 0x0006 /* 738 */
#define PCI_PRODUCT_YAMAHA_YMF737 0x0008 /* 737 */
-#define PCI_PRODUCT_YAMAHA_YMF738 0x0020 /* 738 */
#define PCI_PRODUCT_YAMAHA_YMF740 0x000a /* 740 */
#define PCI_PRODUCT_YAMAHA_YMF740C 0x000c /* 740C */
+#define PCI_PRODUCT_YAMAHA_YMF724F 0x000d /* 724F */
#define PCI_PRODUCT_YAMAHA_YMF744 0x0010 /* 744 */
#define PCI_PRODUCT_YAMAHA_YMF754 0x0012 /* 754 */
-#define PCI_PRODUCT_YAMAHA_YMF738_TEG 0x0006 /* 738 */
+#define PCI_PRODUCT_YAMAHA_YMF738 0x0020 /* 738 */
/* Zeinet products */
#define PCI_PRODUCT_ZEINET_1221 0x0001 /* 1221 */
@@ -1841,4 +1878,5 @@
#define PCI_PRODUCT_ZIATECH_ZT8905 0x8905 /* PCI-ST32 */
/* Zoran products */
-#define PCI_PRODUCT_ZORAN_ZR36120 0x6120 /* Video */
+#define PCI_PRODUCT_ZORAN_ZR36057 0x6057 /* TV */
+#define PCI_PRODUCT_ZORAN_ZR36120 0x6120 /* DVD */
diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index a93203f7e8b..6852f1239d0 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.337 2000/10/26 13:39:28 deraadt Exp
+ * OpenBSD: pcidevs,v 1.338 2000/10/26 21:58:45 aaron Exp
*/
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
@@ -45,6 +45,12 @@ struct pci_knowndev pci_knowndevs[] = {
"OZ6832 CardBus",
},
{
+ PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C985,
+ 0,
+ "3Com",
+ "3c985",
+ },
+ {
PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C339,
0,
"3Com",
@@ -201,12 +207,6 @@ struct pci_knowndev pci_knowndevs[] = {
"3cr990 TX-97",
},
{
- PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C985,
- 0,
- "3Com",
- "3c985",
- },
- {
PCI_VENDOR_3DFX, PCI_PRODUCT_3DFX_VOODOO,
0,
"3DFX Interactive",
@@ -234,37 +234,37 @@ struct pci_knowndev pci_knowndevs[] = {
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_300SX,
0,
"3D Labs",
- "GLINT 300SX",
+ "300SX",
},
{
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_500TX,
0,
"3D Labs",
- "GLINT 500TX",
+ "500TX",
},
{
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_DELTA,
0,
"3D Labs",
- "GLINT Delta",
+ "Delta",
},
{
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_PERMEDIA,
0,
"3D Labs",
- "GLINT Permedia",
+ "Permedia",
},
{
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_500MX,
0,
"3D Labs",
- "GLINT 500MX",
+ "500MX",
},
{
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_PERMEDIA2,
0,
"3D Labs",
- "GLINT Permedia 2",
+ "Permedia 2",
},
{
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_OXYGEN_GVX1_CPU,
@@ -273,6 +273,12 @@ struct pci_knowndev pci_knowndevs[] = {
"Oxygen GVX1",
},
{
+ PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_PERMEDIA3,
+ 0,
+ "3D Labs",
+ "Permedia 3",
+ },
+ {
PCI_VENDOR_3DLABS, PCI_PRODUCT_3DLABS_OXYGEN_GVX1,
0,
"3D Labs",
@@ -987,6 +993,12 @@ struct pci_knowndev pci_knowndevs[] = {
"Mach64 GI",
},
{
+ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GM,
+ 0,
+ "ATI",
+ "Mach64 GM",
+ },
+ {
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GP,
0,
"ATI",
@@ -1077,12 +1089,24 @@ struct pci_knowndev pci_knowndevs[] = {
"Mach64 LP",
},
{
+ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_FURY,
+ 0,
+ "ATI",
+ "Rage Fury AGP4x",
+ },
+ {
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_MAGNUM,
0,
"ATI",
"Rage Magnum",
},
{
+ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_128_VR_AGP,
+ 0,
+ "ATI",
+ "Rage 128 VR AGP",
+ },
+ {
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_VT,
0,
"ATI",
@@ -1101,12 +1125,6 @@ struct pci_knowndev pci_knowndevs[] = {
"Mach64 VV",
},
{
- PCI_VENDOR_ATI, PCI_PRODUCT_ATI_RAGE_FURY,
- 0,
- "ATI",
- "Rage Fury AGP4x",
- },
- {
PCI_VENDOR_AMCIRCUITS, PCI_PRODUCT_AMCIRCUITS_S5933,
0,
"Applied Micro Circuits",
@@ -1161,10 +1179,10 @@ struct pci_knowndev pci_knowndevs[] = {
"ALG2302",
},
{
- PCI_VENDOR_AVANCE2, PCI_PRODUCT_AVANCE2_ALG4000,
+ PCI_VENDOR_AVANCE2, PCI_PRODUCT_AVANCE2_ALS4000,
0,
"Avance Logic(2)",
- "ALG4000",
+ "ALS4000",
},
{
PCI_VENDOR_BIT3, PCI_PRODUCT_BIT3_PCIVME617,
@@ -1362,7 +1380,13 @@ struct pci_knowndev pci_knowndevs[] = {
PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_GD5464,
0,
"Cirrus Logic",
- "CL-GD6464",
+ "CL-GD5464",
+ },
+ {
+ PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_GD5465,
+ 0,
+ "Cirrus Logic",
+ "CL-GD5465",
},
{
PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_PD6729,
@@ -1563,6 +1587,24 @@ struct pci_knowndev pci_knowndevs[] = {
"PCI-ISA",
},
{
+ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_OHCI,
+ 0,
+ "Compaq",
+ "USB OpenHost",
+ },
+ {
+ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE3,
+ 0,
+ "Compaq",
+ "PCI-ISA",
+ },
+ {
+ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISAPNP,
+ 0,
+ "Compaq",
+ "PCI-ISAPnP",
+ },
+ {
PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_N100TX,
0,
"Compaq",
@@ -1599,6 +1641,24 @@ struct pci_knowndev pci_knowndevs[] = {
"ProLiant Netelligent 10/100 TX",
},
{
+ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_PCI_ISA_BRIDGE2,
+ 0,
+ "Compaq",
+ "PCI-ISA",
+ },
+ {
+ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE1,
+ 0,
+ "Compaq",
+ "Host-PCI",
+ },
+ {
+ PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_HOST_PCI_BRIDGE2,
+ 0,
+ "Compaq",
+ "Host-PCI",
+ },
+ {
PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_DP4000,
0,
"Compaq",
@@ -1647,18 +1707,24 @@ struct pci_knowndev pci_knowndevs[] = {
"PMAC 98713",
},
{
- PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_SOFTK56_PCI,
+ PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM,
0,
"Conexant",
- "SoftK56 PCI",
+ "56k Winmodem",
},
{
- PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM,
+ PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_56K_WINMODEM2,
0,
"Conexant",
"56k Winmodem",
},
{
+ PCI_VENDOR_CONEXANT, PCI_PRODUCT_CONEXANT_SOFTK56_PCI,
+ 0,
+ "Conexant",
+ "SoftK56 PCI",
+ },
+ {
PCI_VENDOR_CONTAQ, PCI_PRODUCT_CONTAQ_82C599,
0,
"Contaq Microsystems",
@@ -1953,6 +2019,12 @@ struct pci_knowndev pci_knowndevs[] = {
"Maestro 3",
},
{
+ PCI_VENDOR_ESSTECH, PCI_PRODUCT_ESSTECH_2898,
+ 0,
+ "ESS",
+ "ES2898 Modem",
+ },
+ {
PCI_VENDOR_ESSENTIAL, PCI_PRODUCT_ESSENTIAL_RR_HIPPI,
0,
"Essential Communications",
@@ -2019,6 +2091,12 @@ struct pci_knowndev pci_knowndevs[] = {
"J2585A",
},
{
+ PCI_VENDOR_HP, PCI_PRODUCT_HP_J2585B,
+ 0,
+ "Hewlett-Packard",
+ "J2585B",
+ },
+ {
PCI_VENDOR_HP, PCI_PRODUCT_HP_NETRAID_4M,
0,
"Hewlett-Packard",
@@ -2181,6 +2259,12 @@ struct pci_knowndev pci_knowndevs[] = {
"82434LX/NX (Mercury/Neptune) PCI/Cache/DRAM",
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RP,
+ 0,
+ "Intel",
+ "i960 RP PCI-PCI",
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RM,
0,
"Intel",
@@ -2361,16 +2445,22 @@ struct pci_knowndev pci_knowndevs[] = {
"82380FB Mobile PCI-PCI",
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439HX,
+ 0,
+ "Intel",
+ "82439HX (Triton II)",
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82806AA,
0,
"Intel",
"82806AA PCI64",
},
{
- PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82439HX,
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960RP_ATU,
0,
"Intel",
- "82439HX (Triton II)",
+ "80960RP ATU",
},
{
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82840_HB,
@@ -3063,6 +3153,12 @@ struct pci_knowndev pci_knowndevs[] = {
"PMAC 98715",
},
{
+ PCI_VENDOR_MACRONIX, PCI_PRODUCT_MACRONIX_MX86250,
+ 0,
+ "Macronix",
+ "MX86250",
+ },
+ {
PCI_VENDOR_MADGE, PCI_PRODUCT_MADGE_COLLAGE25,
0,
"Madge Networks",
@@ -3153,6 +3249,12 @@ struct pci_knowndev pci_knowndevs[] = {
"MPC106 Host-PCI",
},
{
+ PCI_VENDOR_MOT, PCI_PRODUCT_MOT_SM56,
+ 0,
+ "Motorola",
+ "SM56",
+ },
+ {
PCI_VENDOR_MYLEX, PCI_PRODUCT_MYLEX_960P,
0,
"Mylex",
@@ -3243,6 +3345,12 @@ struct pci_knowndev pci_knowndevs[] = {
"Magicgraph NM2360",
},
{
+ PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_NM2230,
+ 0,
+ "Neomagic",
+ "MagicMedia 256AV+",
+ },
+ {
PCI_VENDOR_NEOMAGIC, PCI_PRODUCT_NEOMAGIC_NM256XLP,
0,
"Neomagic",
@@ -3561,52 +3669,52 @@ struct pci_knowndev pci_knowndevs[] = {
"53c860",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_1510D,
0,
"Symbios Logic",
- "53c875",
+ "53c1510D",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875J,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_896,
0,
"Symbios Logic",
- "53c875J",
+ "53c896",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_885,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_895,
0,
"Symbios Logic",
- "53c885",
+ "53c89",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_895,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_885,
0,
"Symbios Logic",
- "53c895",
+ "53c885",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_895A,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875,
0,
"Symbios Logic",
- "53c895A",
+ "53c875",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_896,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_1510,
0,
"Symbios Logic",
- "53c896",
+ "53c1510",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_1510,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_895A,
0,
"Symbios Logic",
- "53c1510",
+ "53c895A",
},
{
- PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_1510D,
+ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_875J,
0,
"Symbios Logic",
- "53c1510D",
+ "53c875J",
},
{
PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_PE_GNIC,
@@ -3669,6 +3777,24 @@ struct pci_knowndev pci_knowndevs[] = {
"Riva TNT2",
},
{
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_RIVA_TNT2_ULTRA,
+ 0,
+ "Nvidia",
+ "Riva TNT2 Ultra",
+ },
+ {
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_VANTA1,
+ 0,
+ "Nvidia",
+ "Vanta",
+ },
+ {
+ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_VANTA2,
+ 0,
+ "Nvidia",
+ "Vanta",
+ },
+ {
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_GEFORCE256,
0,
"Nvidia",
@@ -3711,6 +3837,12 @@ struct pci_knowndev pci_knowndevs[] = {
"OC2326",
},
{
+ PCI_VENDOR_OMEGA, PCI_PRODUCT_OMEGA_82C092G,
+ 0,
+ "Omega Micro",
+ "82C092G",
+ },
+ {
PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C557,
0,
"Opti",
@@ -4197,6 +4329,12 @@ struct pci_knowndev pci_knowndevs[] = {
"ViRGE GX2",
},
{
+ PCI_VENDOR_S3, PCI_PRODUCT_S3_TRIO3_DX2,
+ 0,
+ "S3",
+ "Trio3 DX2",
+ },
+ {
PCI_VENDOR_S3, PCI_PRODUCT_S3_SAVAGE3D,
0,
"S3",
@@ -4305,7 +4443,7 @@ struct pci_knowndev pci_knowndevs[] = {
"86C202 VGA",
},
{
- PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C205,
+ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C205_1,
0,
"SIS",
"86C205",
@@ -4329,6 +4467,18 @@ struct pci_knowndev pci_knowndevs[] = {
"5597/5598 VGA",
},
{
+ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_6215,
+ 0,
+ "SIS",
+ "6215",
+ },
+ {
+ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C205_2,
+ 0,
+ "SIS",
+ "86C205",
+ },
+ {
PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C501,
0,
"SIS",
@@ -4365,6 +4515,12 @@ struct pci_knowndev pci_knowndevs[] = {
"620 Host-PCI",
},
{
+ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_630,
+ 0,
+ "SIS",
+ "630 Host-PCI",
+ },
+ {
PCI_VENDOR_SIS, PCI_PRODUCT_SIS_900,
0,
"SIS",
@@ -4395,6 +4551,12 @@ struct pci_knowndev pci_knowndevs[] = {
"5513 EIDE",
},
{
+ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5571,
+ 0,
+ "SIS",
+ "5571",
+ },
+ {
PCI_VENDOR_SIS, PCI_PRODUCT_SIS_5581,
0,
"SIS",
@@ -4443,6 +4605,12 @@ struct pci_knowndev pci_knowndevs[] = {
"6205",
},
{
+ PCI_VENDOR_SIS, PCI_PRODUCT_SIS_6300,
+ 0,
+ "SIS",
+ "6300",
+ },
+ {
PCI_VENDOR_SIS, PCI_PRODUCT_SIS_530,
0,
"SIS",
@@ -4569,6 +4737,24 @@ struct pci_knowndev pci_knowndevs[] = {
"TLAN",
},
{
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PERMEDIA,
+ 0,
+ "Texas Instruments",
+ "3DLabs Permedia",
+ },
+ {
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PERMEDIA2,
+ 0,
+ "Texas Instruments",
+ "3DLabs Permedia 2",
+ },
+ {
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_TSB12LV23,
+ 0,
+ "Texas Instruments",
+ "TSB12LV23 FireWire",
+ },
+ {
PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1130,
0,
"Texas Instruments",
@@ -4647,34 +4833,28 @@ struct pci_knowndev pci_knowndevs[] = {
"PCI2031 PCI-PCI",
},
{
- PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1420,
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1410,
0,
"Texas Instruments",
- "PCI1420 PCI-CardBus",
+ "PCI1410 PCI-CardBus",
},
{
- PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1451,
- 0,
- "Texas Instruments",
- "PCI1451 PCI-CardBus",
- },
- {
- PCI_VENDOR_TI, PCI_PRODUCT_TI_PERMEDIA,
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1420,
0,
"Texas Instruments",
- "3DLabs Permedia",
+ "PCI1420 PCI-CardBus",
},
{
- PCI_VENDOR_TI, PCI_PRODUCT_TI_PERMEDIA2,
+ PCI_VENDOR_TI, PCI_PRODUCT_TI_PCI1451,
0,
"Texas Instruments",
- "3DLabs Permedia 2",
+ "PCI1451 PCI-CardBus",
},
{
- PCI_VENDOR_TI, PCI_PRODUCT_TI_TSB12LV23,
+ PCI_VENDOR_TOSHIBA, PCI_PRODUCT_TOSHIBA_TC35856F,
0,
- "Texas Instruments",
- "TSB12LV23 FireWire",
+ "Toshiba",
+ "TC35856F ATM (Meteor)",
},
{
PCI_VENDOR_TOSHIBA, PCI_PRODUCT_TOSHIBA_R4X00,
@@ -4683,12 +4863,6 @@ struct pci_knowndev pci_knowndevs[] = {
"R4x00 Host-PCI",
},
{
- PCI_VENDOR_TOSHIBA, PCI_PRODUCT_TOSHIBA_TC35856F,
- 0,
- "Toshiba",
- "TC35856F ATM (Meteor)",
- },
- {
PCI_VENDOR_TOSHIBA2, PCI_PRODUCT_TOSHIBA2_THB,
0,
"Toshiba(2)",
@@ -4743,6 +4917,12 @@ struct pci_knowndev pci_knowndevs[] = {
"4DWAVE NX",
},
{
+ PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_CYBERBLADE_I7,
+ 0,
+ "Trident",
+ "CyberBlade i7",
+ },
+ {
PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9320,
0,
"Trident",
@@ -4815,16 +4995,22 @@ struct pci_knowndev pci_knowndevs[] = {
"TGUI 9682",
},
{
- PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9750,
+ PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_3DIMAGE_9750,
+ 0,
+ "Trident",
+ "3DImage 9750",
+ },
+ {
+ PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_3DIMAGE_9850,
0,
"Trident",
- "TGUI 9750 (3D Image)",
+ "3DImage 9850",
},
{
- PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9850,
+ PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_BLADE_3D,
0,
"Trident",
- "TGUI 9850",
+ "Blade 3D",
},
{
PCI_VENDOR_TRIONES, PCI_PRODUCT_TRIONES_HPT343,
@@ -5025,6 +5211,12 @@ struct pci_knowndev pci_knowndevs[] = {
"VT8371 (Apollo 133) Host",
},
{
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501,
+ 0,
+ "VIA",
+ "VT8501 (Apollo MVP4)",
+ },
+ {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C505,
0,
"VIA",
@@ -5085,6 +5277,12 @@ struct pci_knowndev pci_knowndevs[] = {
"VT82C598 (Apollo MVP3) Host-PCI",
},
{
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605,
+ 0,
+ "VIA",
+ "VT8605 (ProSavage PM133) Host-PCI",
+ },
+ {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_ISA,
0,
"VIA",
@@ -5145,22 +5343,16 @@ struct pci_knowndev pci_knowndevs[] = {
"VT82C586 (Apollo VP) Power Management",
},
{
- PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C596,
- 0,
- "VIA",
- "VT82C596 Power Management",
- },
- {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINE,
0,
"VIA",
"Rhine/RhineII",
},
{
- PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII_2,
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C596,
0,
"VIA",
- "RhineII-2",
+ "VT82C596 Power Management",
},
{
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C686A_SMB,
@@ -5175,6 +5367,12 @@ struct pci_knowndev pci_knowndevs[] = {
"VT82C686A (Apollo 133) AC-97 Audio",
},
{
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII_2,
+ 0,
+ "VIA",
+ "RhineII-2",
+ },
+ {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8363_AGP,
0,
"VIA",
@@ -5187,6 +5385,12 @@ struct pci_knowndev pci_knowndevs[] = {
"VT8371 (Apollo 133) PCI-PCI",
},
{
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8501_AGP,
+ 0,
+ "VIA",
+ "VT8501 (Apollo MVP4) PCI-AGP",
+ },
+ {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT82C597AGP,
0,
"VIA",
@@ -5199,6 +5403,12 @@ struct pci_knowndev pci_knowndevs[] = {
"VT82C598 (Apollo MVP3) PCI-AGP",
},
{
+ PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_VT8605_AGP,
+ 0,
+ "VIA",
+ "VT8605 (ProSavage PM133) PCI-AGP",
+ },
+ {
PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_RHINEII,
0,
"VIA",
@@ -5637,28 +5847,22 @@ struct pci_knowndev pci_knowndevs[] = {
"724",
},
{
- PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF724F,
- 0,
- "Yamaha",
- "724F",
- },
- {
PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF734,
0,
"Yamaha",
"734",
},
{
- PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF737,
+ PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF738_TEG,
0,
"Yamaha",
- "737",
+ "738",
},
{
- PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF738,
+ PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF737,
0,
"Yamaha",
- "738",
+ "737",
},
{
PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF740,
@@ -5673,6 +5877,12 @@ struct pci_knowndev pci_knowndevs[] = {
"740C",
},
{
+ PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF724F,
+ 0,
+ "Yamaha",
+ "724F",
+ },
+ {
PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF744,
0,
"Yamaha",
@@ -5685,7 +5895,7 @@ struct pci_knowndev pci_knowndevs[] = {
"754",
},
{
- PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF738_TEG,
+ PCI_VENDOR_YAMAHA, PCI_PRODUCT_YAMAHA_YMF738,
0,
"Yamaha",
"738",
@@ -5703,10 +5913,16 @@ struct pci_knowndev pci_knowndevs[] = {
"PCI-ST32",
},
{
+ PCI_VENDOR_ZORAN, PCI_PRODUCT_ZORAN_ZR36057,
+ 0,
+ "Zoran",
+ "TV",
+ },
+ {
PCI_VENDOR_ZORAN, PCI_PRODUCT_ZORAN_ZR36120,
0,
"Zoran",
- "Video",
+ "DVD",
},
{
PCI_VENDOR_MARTINMARIETTA, 0,