Adaption to new bus.h from NetBSD. Various driver has been updated to

NetBSD 961107 state.  Other has not, partly because sometimes the bus.h
changes was coupled with other changes.

1 files changed, 539 insertions, 65 deletions

diff --git a/sys/dev/pci/pcidevs_data.h b/sys/dev/pci/pcidevs_data.h
index db5461e9be9..ec726eee944 100644
--- a/sys/dev/pci/pcidevs_data.h
+++ b/sys/dev/pci/pcidevs_data.h
@@ -2,9 +2,9 @@
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: pcidevs,v 1.12 1996/10/14 09:00:53 deraadt Exp 
+ *	OpenBSD: pcidevs,v 1.13 1996/10/14 10:22:22 deraadt Exp 
  */
-/*	$NetBSD: pcidevs,v 1.8 1996/05/07 01:59:45 thorpej Exp $ */
+/*	$NetBSD: pcidevs,v 1.20 1996/10/19 13:01:49 jonathan Exp $	*/
 
 
 struct pci_knowndev pci_knowndevs[] = {
@@ -15,82 +15,100 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "3c590 10Mbps",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595TX,
 	    0,
 	    "3Com",
 	    "3c595 100Base-TX",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595T,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595T4,
 	    0,
 	    "3Com",
 	    "3c595 100Base-T4",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595TM,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C595MII,
 	    0,
 	    "3Com",
-	    "3c595 100Base-T/MII",
+	    "3c595 10Mbps-MII",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900TPO,
 	    0,
 	    "3Com",
 	    "3c900 10Base-T",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900T,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C900COMBO,
 	    0,
 	    "3Com",
 	    "3c900 10Mbps-Combo",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905TX,
 	    0,
 	    "3Com",
 	    "3c905 100Base-TX",
 	},
 	{
-	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905T,
+	    PCI_VENDOR_3COM, PCI_PRODUCT_3COM_3C905T4,
 	    0,
 	    "3Com",
 	    "3c905 100Base-T4",
 	},
 	{
-	    PCI_VENDOR_ACER, PCI_PRODUCT_ACER_M1435,
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1445,
 	    0,
-	    "Acer",
-	    "M1435",
+	    "Acer Labs",
+	    "M1445",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_3940U,
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1449,
+	    0,
+	    "Acer Labs",
+	    "M1449",
+	},
+	{
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M1451,
+	    0,
+	    "Acer Labs",
+	    "M1451",
+	},
+	{
+	    PCI_VENDOR_ALI, PCI_PRODUCT_ALI_M4803,
+	    0,
+	    "Acer Labs",
+	    "M4803",
+	},
+	{
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7850,
 	    0,
 	    "Adaptec",
-	    "AHA-3940 Ultra",
+	    "AIC-7850",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2944U,
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7855,
 	    0,
 	    "Adaptec",
-	    "AHA-2944 Ultra",
+	    "AIC-7855",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2940U,
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7860,
 	    0,
 	    "Adaptec",
-	    "AHA-2940 Ultra",
+	    "AIC-7860",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_3940,
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2940AU,
 	    0,
 	    "Adaptec",
-	    "AHA-3940",
+	    "AHA-2940A Ultra",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2944,
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7870,
 	    0,
 	    "Adaptec",
-	    "AHA-2944",
+	    "AIC-7870",
 	},
 	{
 	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2940,
@@ -99,28 +117,64 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "AHA-2940",
 	},
 	{
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_3940,
+	    0,
+	    "Adaptec",
+	    "AHA-3940",
+	},
+	{
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2944,
+	    0,
+	    "Adaptec",
+	    "AHA-2944",
+	},
+	{
 	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7880,
 	    0,
 	    "Adaptec",
 	    "AIC-7880 Ultra",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7870,
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2940U,
 	    0,
 	    "Adaptec",
-	    "AIC-7870",
+	    "AHA-2940 Ultra",
 	},
 	{
-	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_AIC7850,
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_3940U,
 	    0,
 	    "Adaptec",
-	    "AIC-7850",
+	    "AHA-3940 Ultra",
+	},
+	{
+	    PCI_VENDOR_ADP, PCI_PRODUCT_ADP_2944U,
+	    0,
+	    "Adaptec",
+	    "AHA-2944 Ultra",
 	},
 	{
 	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCNET_PCI,
 	    0,
 	    "AMD",
-	    "PCnet-PCI Ethernet",
+	    "79c970 PCnet-PCI LANCE Ethernet",
+	},
+	{
+	    PCI_VENDOR_AMD, PCI_PRODUCT_AMD_PCSCSI_PCI,
+	    0,
+	    "AMD",
+	    "53c974 PCscsi-PCI SCSI",
+	},
+	{
+	    PCI_VENDOR_ARK, PCI_PRODUCT_ARK_1000PV,
+	    0,
+	    "Ark Logic (or Arc? or Hercules?)",
+	    "1000PV",
+	},
+	{
+	    PCI_VENDOR_ARK, PCI_PRODUCT_ARK_2000PV,
+	    0,
+	    "Ark Logic (or Arc? or Hercules?)",
+	    "2000PV",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH32,
@@ -129,34 +183,118 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Mach32",
 	},
 	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_CT,
+	    0,
+	    "ATI Technologies",
+	    "Mach64 CT",
+	},
+	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_CX,
 	    0,
 	    "ATI Technologies",
-	    "Mach64-CX",
+	    "Mach64 CX",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_ET,
+	    0,
+	    "ATI Technologies",
+	    "Mach64 ET",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_VT,
+	    0,
+	    "ATI Technologies",
+	    "Mach64 VT",
+	},
+	{
+	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GT,
+	    0,
+	    "ATI Technologies",
+	    "Mach64 GT",
 	},
 	{
 	    PCI_VENDOR_ATI, PCI_PRODUCT_ATI_MACH64_GX,
 	    0,
 	    "ATI Technologies",
-	    "Mach64-GX",
+	    "Mach64 GX",
+	},
+	{
+	    PCI_VENDOR_ATRONICS, PCI_PRODUCT_ATRONICS_IDE_2015PL,
+	    0,
+	    "Atronics",
+	    "IDE-2015PL",
+	},
+	{
+	    PCI_VENDOR_AVANCE, PCI_PRODUCT_AVANCE_ALG2301,
+	    0,
+	    "Avance Logic",
+	    "ALG2301",
 	},
 	{
 	    PCI_VENDOR_BUSLOGIC, PCI_PRODUCT_BUSLOGIC_OLD946C,
 	    0,
 	    "BusLogic",
-	    "946C",
+	    "946C 01",
 	},
 	{
 	    PCI_VENDOR_BUSLOGIC, PCI_PRODUCT_BUSLOGIC_946C,
 	    0,
 	    "BusLogic",
-	    "946C",
+	    "946C 10",
+	},
+	{
+	    PCI_VENDOR_CHIPS, PCI_PRODUCT_CHIPS_65545,
+	    0,
+	    "Chips and Technologies",
+	    "65545",
 	},
 	{
-	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_5434,
+	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_GD_5430,
 	    0,
 	    "Cirrus Logic",
-	    "5434",
+	    "GD 5430",
+	},
+	{
+	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_GD_5434_4,
+	    0,
+	    "Cirrus Logic",
+	    "GD 5434-4",
+	},
+	{
+	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_GD_5434_8,
+	    0,
+	    "Cirrus Logic",
+	    "GD 5434-8",
+	},
+	{
+	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_GD_5436,
+	    0,
+	    "Cirrus Logic",
+	    "GD 5436",
+	},
+	{
+	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_6729,
+	    0,
+	    "Cirrus Logic",
+	    "CL 6729",
+	},
+	{
+	    PCI_VENDOR_CIRRUS, PCI_PRODUCT_CIRRUS_CL_7542,
+	    0,
+	    "Cirrus Logic",
+	    "CL 7542",
+	},
+	{
+	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_640A,
+	    0,
+	    "CMD Technology",
+	    "640A",
+	},
+	{
+	    PCI_VENDOR_CONTAQ, PCI_PRODUCT_CONTAQ_82C599,
+	    0,
+	    "Contaq Microsystems",
+	    "82C599",
 	},
 	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_21050,
@@ -195,6 +333,12 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "DECchip 21140 (\"FasterNet\")",
 	},
 	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_PBXGB,
+	    0,
+	    "Digital Equipment",
+	    "TGA2",
+	},
+	{
 	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DEFPA,
 	    0,
 	    "Digital Equipment",
@@ -207,16 +351,22 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "DECchip 21041 (\"Tulip Pass 3\")",
 	},
 	{
+	    PCI_VENDOR_DEC, PCI_PRODUCT_DEC_DGLPB,
+	    0,
+	    "Digital Equipment",
+	    "DGLPB (\"OPPO\")",
+	},
+	{
 	    PCI_VENDOR_DIAMOND, PCI_PRODUCT_DIAMOND_vIPER,
 	    0,
 	    "Diamond Computer Systems",
 	    "Viper/PCI",
 	},
 	{
-	    PCI_VENDOR_CMDTECH, PCI_PRODUCT_CMDTECH_PCI0640,
+	    PCI_VENDOR_DPT, PCI_PRODUCT_DPT_SC_RAID,
 	    0,
-	    "CMD Technology",
-	    "UNSUPP PCI to IDE Controller",
+	    "Distributed Processing Technology",
+	    "SmartCache/Raid",
 	},
 	{
 	    PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200,
@@ -225,10 +375,40 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "ATM PCA-200",
 	},
 	{
+	    PCI_VENDOR_FORE, PCI_PRODUCT_FORE_PCA200E,
+	    0,
+	    "FORE Systems",
+	    "ATM PCA-200e",
+	},
+	{
+	    PCI_VENDOR_FUTUREDOMAIN, PCI_PRODUCT_FUTUREDOMAIN_TMC_18C30,
+	    0,
+	    "Future Domain",
+	    "TMC-18C30 (36C70)",
+	},
+	{
 	    PCI_VENDOR_EFFICIENTNETS, PCI_PRODUCT_EFFICIENTNETS_ENI155P,
 	    0,
 	    "Efficent Networks",
-	    "ENI-155P ATM",
+	    "155P-MF1 ATM",
+	},
+	{
+	    PCI_VENDOR_HP, PCI_PRODUCT_HP_J2585A,
+	    0,
+	    "Hewlett-Packard",
+	    "J2585A",
+	},
+	{
+	    PCI_VENDOR_IBM, PCI_PRODUCT_IBM_82351,
+	    0,
+	    "IBM",
+	    "82351 PCI-PCI Bridge",
+	},
+	{
+	    PCI_VENDOR_IMS, PCI_PRODUCT_IMS_8849,
+	    0,
+	    "Integrated Micro Solutions",
+	    "8849",
 	},
 	{
 	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_PCEB,
@@ -261,12 +441,72 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82434LX PCI, Cache, and Memory Controller",
 	},
 	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_SAA7116,
+	    0,
+	    "Intel",
+	    "SAA7116",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82437,
+	    0,
+	    "Intel",
+	    "82437 Triton",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82471,
+	    0,
+	    "Intel",
+	    "82471 Triton",
+	},
+	{
+	    PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82438,
+	    0,
+	    "Intel",
+	    "82438",
+	},
+	{
+	    PCI_VENDOR_ITT, PCI_PRODUCT_ITT_AGX016,
+	    0,
+	    "I. T. T. (or X technology?)",
+	    "AGX016",
+	},
+	{
+	    PCI_VENDOR_LEADTEK, PCI_PRODUCT_LEADTEK_S3_805,
+	    0,
+	    "LeadTek Research",
+	    "S3 805",
+	},
+	{
+	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_ATLAS,
+	    0,
+	    "Matrox",
+	    "MGA-2 Atlas PX2085",
+	},
+	{
+	    PCI_VENDOR_MATROX, PCI_PRODUCT_MATROX_IMPRESSION,
+	    0,
+	    "Matrox",
+	    "MGA Impression",
+	},
+	{
 	    PCI_VENDOR_MYLEX, PCI_PRODUCT_MYLEX_960P,
 	    0,
 	    "Mylex",
 	    "RAID controller",
 	},
 	{
+	    PCI_VENDOR_MUTECH, PCI_PRODUCT_MUTECH_MV1000,
+	    0,
+	    "Mutech",
+	    "MV1000",
+	},
+	{
+	    PCI_VENDOR_NS, PCI_PRODUCT_NS_87410,
+	    0,
+	    "National Semiconductor",
+	    "87410",
+	},
+	{
 	    PCI_VENDOR_OLDNCR, PCI_PRODUCT_OLDNCR_810,
 	    0,
 	    "NCR",
@@ -315,10 +555,16 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "Imagine-128",
 	},
 	{
-	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C822,
+	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C557,
 	    0,
 	    "Opti",
-	    "82C822",
+	    "82C557",
+	},
+	{
+	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C558,
+	    0,
+	    "Opti",
+	    "82C558",
 	},
 	{
 	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C621,
@@ -327,16 +573,52 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "82C621",
 	},
 	{
+	    PCI_VENDOR_OPTI, PCI_PRODUCT_OPTI_82C822,
+	    0,
+	    "Opti",
+	    "82C822",
+	},
+	{
+	    PCI_VENDOR_PROMISE, PCI_PRODUCT_PROMISE_DC5030,
+	    0,
+	    "Promise Technology",
+	    "DC5030",
+	},
+	{
 	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP1020,
 	    0,
 	    "Q Logic",
 	    "ISP1020",
 	},
 	{
+	    PCI_VENDOR_QLOGIC, PCI_PRODUCT_QLOGIC_ISP1022,
+	    0,
+	    "Q Logic",
+	    "ISP1022",
+	},
+	{
+	    PCI_VENDOR_QUANTUMDESIGNS, PCI_PRODUCT_QUANTUMDESIGNS_8500,
+	    0,
+	    "Quantum Designs (or Vision?)",
+	    "8500",
+	},
+	{
+	    PCI_VENDOR_QUANTUMDESIGNS, PCI_PRODUCT_QUANTUMDESIGNS_8580,
+	    0,
+	    "Quantum Designs (or Vision?)",
+	    "8580",
+	},
+	{
+	    PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8029,
+	    0,
+	    "Realtek Semiconductor",
+	    "Ethernet",
+	},
+	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_TRIO64,
 	    0,
 	    "S3",
-	    "Trio32/64/64V+",
+	    "Trio32/64",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_868,
@@ -354,19 +636,25 @@ struct pci_knowndev pci_knowndevs[] = {
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_864_0,
 	    0,
 	    "S3",
-	    "Vision 864-0",
+	    "864-0",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_864_1,
 	    0,
 	    "S3",
-	    "Vision 864-1",
+	    "864-1",
+	},
+	{
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964_0,
+	    0,
+	    "S3",
+	    "964-0",
 	},
 	{
-	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964,
+	    PCI_VENDOR_S3, PCI_PRODUCT_S3_964_1,
 	    0,
 	    "S3",
-	    "964",
+	    "964-1",
 	},
 	{
 	    PCI_VENDOR_S3, PCI_PRODUCT_S3_968,
@@ -375,24 +663,132 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "968",
 	},
 	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C201,
+	    0,
+	    "Silicon Integrated System",
+	    "86C201",
+	},
+	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C202,
+	    0,
+	    "Silicon Integrated System",
+	    "86C202",
+	},
+	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_86C205,
+	    0,
+	    "Silicon Integrated System",
+	    "86C205",
+	},
+	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C503,
+	    0,
+	    "Silicon Integrated System",
+	    "85C503",
+	},
+	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C501,
+	    0,
+	    "Silicon Integrated System",
+	    "85C501",
+	},
+	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C496,
+	    0,
+	    "Silicon Integrated System",
+	    "85C496",
+	},
+	{
+	    PCI_VENDOR_SIS, PCI_PRODUCT_SIS_85C601,
+	    0,
+	    "Silicon Integrated System",
+	    "85C601",
+	},
+	{
 	    PCI_VENDOR_SMC, PCI_PRODUCT_SMC_37C665,
 	    0,
 	    "Standard Microsystems",
-	    "37C665",
+	    "FDC 37C665",
+	},
+	{
+	    PCI_VENDOR_SYMPHONY, PCI_PRODUCT_SYMPHONY_82C101,
+	    0,
+	    "Symphony Labs",
+	    "82C101",
+	},
+	{
+	    PCI_VENDOR_TEKRAM, PCI_PRODUCT_TEKRAM_DC290,
+	    0,
+	    "Tekram Technology",
+	    "DC290",
+	},
+	{
+	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9320,
+	    0,
+	    "Trident Microsystems",
+	    "TGUI 9320",
+	},
+	{
+	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9420,
+	    0,
+	    "Trident Microsystems",
+	    "TGUI 9420",
+	},
+	{
+	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9440,
+	    0,
+	    "Trident Microsystems",
+	    "TGUI 9440",
+	},
+	{
+	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9660,
+	    0,
+	    "Trident Microsystems",
+	    "TGUI 9660",
+	},
+	{
+	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9680,
+	    0,
+	    "Trident Microsystems",
+	    "TGUI 9680",
+	},
+	{
+	    PCI_VENDOR_TRIDENT, PCI_PRODUCT_TRIDENT_TGUI_9682,
+	    0,
+	    "Trident Microsystems",
+	    "TGUI 9682",
 	},
 	{
-	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_W32P_A,
+	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_ET4000_W32P_A,
 	    0,
 	    "Tseng Labs",
 	    "ET4000w32p rev A",
 	},
 	{
-	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_W32P_D,
+	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_ET4000_W32P_B,
+	    0,
+	    "Tseng Labs",
+	    "ET4000w32p rev B",
+	},
+	{
+	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_ET4000_W32P_C,
+	    0,
+	    "Tseng Labs",
+	    "ET4000w32p rev C",
+	},
+	{
+	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_ET4000_W32P_D,
 	    0,
 	    "Tseng Labs",
 	    "ET4000w32p rev D",
 	},
 	{
+	    PCI_VENDOR_TSENG, PCI_PRODUCT_TSENG_ET6000,
+	    0,
+	    "Tseng Labs",
+	    "ET6000",
+	},
+	{
 	    PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8673F,
 	    0,
 	    "United Microelectronics",
@@ -411,6 +807,90 @@ struct pci_knowndev pci_knowndevs[] = {
 	    "UM8886F PCI-ISA bridge",
 	},
 	{
+	    PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8886A,
+	    0,
+	    "United Microelectronics",
+	    "UM8886A",
+	},
+	{
+	    PCI_VENDOR_UMC, PCI_PRODUCT_UMC_UM8891A,
+	    0,
+	    "United Microelectronics",
+	    "UM8891A",
+	},
+	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_82C505,
+	    0,
+	    "VIA Technologies",
+	    "82C505",
+	},
+	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_ALT_82C505,
+	    0,
+	    "VIA Technologies",
+	    "82C505",
+	},
+	{
+	    PCI_VENDOR_VIATECH, PCI_PRODUCT_VIATECH_82C576,
+	    0,
+	    "VIA Technologies",
+	    "82C576 3V",
+	},
+	{
+	    PCI_VENDOR_VORTEX, PCI_PRODUCT_VORTEX_GDT_6000B,
+	    0,
+	    "Vortex Computer Systems",
+	    "GDT 6000b",
+	},
+	{
+	    PCI_VENDOR_VLSI, PCI_PRODUCT_VLSI_82C592_FC1,
+	    0,
+	    "VLSI Technology",
+	    "82C592-FC1",
+	},
+	{
+	    PCI_VENDOR_VLSI, PCI_PRODUCT_VLSI_82C593_FC1,
+	    0,
+	    "VLSI Technology",
+	    "82C593-FC1",
+	},
+	{
+	    PCI_VENDOR_WEITEK, PCI_PRODUCT_WEITEK_P9000,
+	    0,
+	    "Weitek",
+	    "P9000",
+	},
+	{
+	    PCI_VENDOR_WEITEK, PCI_PRODUCT_WEITEK_P9100,
+	    0,
+	    "Weitek",
+	    "P9100",
+	},
+	{
+	    PCI_VENDOR_WINBOND, PCI_PRODUCT_WINBOND_W83769F,
+	    0,
+	    "Winbond Electronics",
+	    "W83769F",
+	},
+	{
+	    PCI_VENDOR_ZEINET, PCI_PRODUCT_ZEINET_1221,
+	    0,
+	    "Zeinet",
+	    "1221",
+	},
+	{
+	    PCI_VENDOR_CYCLADES, PCI_PRODUCT_CYCLADES_CYCLOMY_1,
+	    0,
+	    "Cyclades",
+	    "Cyclom-Y below 1M",
+	},
+	{
+	    PCI_VENDOR_CYCLADES, PCI_PRODUCT_CYCLADES_CYCLOMY_2,
+	    0,
+	    "Cyclades",
+	    "Cyclom-Y above 1M",
+	},
+	{
 	    PCI_VENDOR_CYCLADES, PCI_PRODUCT_CYCLADES_CYCLOMY_1,
 	    0,
 	    "Cyclades",
@@ -1401,12 +1881,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_SYMPHONY, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Symphony Labs (or Winbond?)",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_CORNERSTONE, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Cornerstone Technology",
@@ -1713,12 +2187,6 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_TEKRAM, 0,
-	    PCI_KNOWNDEV_NOPROD,
-	    "Tekram Technology",
-	    NULL,
-	},
-	{
 	    PCI_VENDOR_APTIX, 0,
 	    PCI_KNOWNDEV_NOPROD,
 	    "Aptix Corporation",
@@ -1937,7 +2405,7 @@ struct pci_knowndev pci_knowndevs[] = {
 	{
 	    PCI_VENDOR_VIATECH, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Via Technologies",
+	    "VIA Technologies",
 	    NULL,
 	},
 	{
@@ -2547,15 +3015,21 @@ struct pci_knowndev pci_knowndevs[] = {
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_SYMPHONY2, 0,
+	    PCI_VENDOR_ZEINET, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Symphony (duplicate? see 0x10ad)",
+	    "Zeinet",
 	    NULL,
 	},
 	{
-	    PCI_VENDOR_TEKRAM2, 0,
+	    PCI_VENDOR_SYMPHONY, 0,
 	    PCI_KNOWNDEV_NOPROD,
-	    "Tekram (mistyped? see 0x10e1)",
+	    "Symphony Labs",
+	    NULL,
+	},
+	{
+	    PCI_VENDOR_TEKRAM, 0,
+	    PCI_KNOWNDEV_NOPROD,
+	    "Tekram Technology",
 	    NULL,
 	},
 	{