>Number:         15466
>Category:       kern
>Synopsis:       pcidevs cleanup for VIA chipsets
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sun Feb 03 00:04:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Lloyd Parkes
>Release:        NetBSD 1.5ZA
>Organization:
Must Have Coffee
>Environment:
System: NetBSD ophidian.must-have-coffee.gen.nz 1.5ZA NetBSD 1.5ZA (Ophidian) #7: Sun Feb 3 13:29:46 NZDT 2002 lloyd@ophidian.must-have-coffee.gen.nz:/vol/NetBSD/build/src/sys/arch/i386/compile/Ophidian i386
Architecture: i386
Machine: i386
>Description:

The pcidevs file lists various VIA chipset names against various VIA
PCI devices. VIA chipsets are identified by their North Bridge chip,
but some chipset names have been added to Shouth Bridge devices. This
is wrong because each individual South Bridge chip is used by multiple
chipsets.

The attached patch removes chipset names from all South Bridge devices
and adds them to all North Bridge devices (modulo the documentation I
have available).


>How-To-Repeat:
N/A
>Fix:
Index: pcidevs
===================================================================
RCS file: /vol/NetBSD/cvs-src/syssrc/sys/dev/pci/pcidevs,v
retrieving revision 1.397
diff -u -r1.397 pcidevs
--- pcidevs	2002/01/30 01:52:32	1.397
+++ pcidevs	2002/02/03 07:53:30
@@ -1949,29 +1949,29 @@
 
 /* VIA Technologies products, from http://www.via.com.tw/ */
 product VIATECH VT6305		0x0130	VT6305 OHCI IEEE 1394 Controller
-product VIATECH VT8363_HB	0x0305	VT8363 KT133 System Controller
+product VIATECH VT8363_HB	0x0305	VT8363 (Apollo KT133) System Controller
 product	VIATECH	VT8371_HB	0x0391	VT8371 (Apollo KX133) Host Bridge
-product VIATECH VT8501_MVP4	0x0501	VT8501 MVP4 System Controller
+product VIATECH VT8501_MVP4	0x0501	VT8501 (Apollo MVP4) System Controller
 product VIATECH VT82C505	0x0505	VT82C505 (Pluto) 
 product VIATECH VT82C561	0x0561	VT82C561
 product VIATECH VT82C586A_IDE	0x0571	VT82C586A IDE Controller
 product VIATECH VT82C576	0x0576	VT82C576 3V
 product VIATECH VT82C580VP	0x0585	VT82C580 (Apollo VP) Host-PCI Bridge
-product VIATECH VT82C586_ISA	0x0586	VT82C586 (Apollo VP) PCI-ISA Bridge
+product VIATECH VT82C586_ISA	0x0586	VT82C586 PCI-ISA Bridge
 product VIATECH VT82C595	0x0595	VT82C595 (Apollo VP2) Host-PCI Bridge
-product VIATECH VT82C596A	0x0596	VT82C596A (Apollo Pro) PCI-ISA Bridge
+product VIATECH VT82C596A	0x0596	VT82C596A PCI-ISA Bridge
 product VIATECH VT82C597	0x0597	VT82C597 (Apollo VP3) Host-PCI Bridge
 product VIATECH VT82C598PCI	0x0598	VT82C598 (Apollo MVP3) Host-PCI
-product VIATECH VT82C686A_ISA	0x0686	VT82C686A (Apollo KX133) PCI-ISA Bridge
+product VIATECH VT82C686A_ISA	0x0686	VT82C686A PCI-ISA Bridge
 product VIATECH VT82C691	0x0691	VT82C691 (Apollo Pro) Host-PCI
-product VIATECH VT82C693	0x0693	VT82C693 (Apollo Pro Plus) Host-PCI
+product VIATECH VT82C693	0x0693	VT82C693 (Apollo Pro+) Host-PCI
 product VIATECH VT86C926	0x0926	VT86C926 Amazon PCI-Ethernet Controller
 product VIATECH	VT82C570M	0x1000	VT82C570M (Apollo) Host-PCI Bridge
 product VIATECH VT82C570MV	0x1006	VT82C570M (Apollo) PCI-ISA Bridge
-product VIATECH VT82C586_IDE	0x1571	VT82C586 (Apollo VP) IDE Controller
+product VIATECH VT82C586_IDE	0x1571	VT82C586 IDE Controller
 product VIATECH VT82C595_2	0x1595	VT82C595 (Apollo VP2) Host-PCI Bridge
 product VIATECH VT83C572	0x3038	VT83C572 USB Controller
-product VIATECH VT82C586_PWR	0x3040	VT82C586 (Apollo VP) Power Management Controller
+product VIATECH VT82C586_PWR	0x3040	VT82C586 Power Management Controller
 product VIATECH VT3043		0x3043	VT3043 (Rhine) 10/100 Ethernet
 product VIATECH VT6306		0x3044	VT3606 OHCI IEEE 1394 Controller
 product VIATECH VT82C686A_SMB	0x3057	VT82C686A SMBus Controller
@@ -1982,12 +1982,12 @@
 product VIATECH VT8366		0x3099	VT8366 (Apollo KT266) CPU-PCI Bridge
 product VIATECH VT82C686A_MC97	0x3068	VT82C686A MC-97 Modem Controller
 product VIATECH VT86C100A	0x6100	VT86C100A (Rhine-II) 10/100 Ethernet
-product VIATECH VT8363_PPB	0x8305	VT8363 KT133 PCI to AGP Bridge
+product VIATECH VT8363_PPB	0x8305	VT8363 (Apollo KT133) PCI to AGP Bridge
 product	VIATECH	VT8371_PPB	0x8391	VT8371 (Apollo KX133) PCI-PCI Bridge
-product VIATECH VT8501AGP	0x8501	VT8501 PCI-AGP
+product VIATECH VT8501AGP	0x8501	VT8501 (Apollo MVP4) PCI-AGP
 product VIATECH VT82C597AGP	0x8597	VT82C597 (Apollo VP3) PCI-AGP
 product VIATECH VT82C598AGP	0x8598	VT82C598 (Apollo MVP3) PCI-AGP
-product VIATECH VT8366AGP	0xb099	VT8366 CPU-AGP
+product VIATECH VT8366AGP	0xb099	VT8366 (Apollo KT266) CPU-AGP
 
 /* Vortex Computer Systems products */
 product VORTEX GDT_60x0		0x0000	GDT6000/6020/6050
>Release-Note:
>Audit-Trail:
>Unformatted:
 Snapshot of approx Sun Feb  3 20:58:38 NZDT 2002