Module Name: src
Committed By: jdolecek
Date: Sun Mar 4 13:24:17 UTC 2018
Modified Files:
src/sys/arch/x86/pci: pcib.c
src/sys/dev/pci: pcidevs viaenv.c
Log Message:
according to VT82C686A chip specs, the VIA Technologies device 0x3057
is more a Power Management controller, rename the pcidevs entry and device
macro
PR kern/31963 by Nicolas Joly
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/pci/pcib.c
cvs rdiff -u -r1.1318 -r1.1319 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/viaenv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/pcib.c
diff -u src/sys/arch/x86/pci/pcib.c:1.15 src/sys/arch/x86/pci/pcib.c:1.16
--- src/sys/arch/x86/pci/pcib.c:1.15 Fri Apr 6 20:38:52 2012
+++ src/sys/arch/x86/pci/pcib.c Sun Mar 4 13:24:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcib.c,v 1.15 2012/04/06 20:38:52 plunky Exp $ */
+/* $NetBSD: pcib.c,v 1.16 2018/03/04 13:24:17 jdolecek Exp $ */
/*-
* Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.15 2012/04/06 20:38:52 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.16 2018/03/04 13:24:17 jdolecek Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -143,10 +143,10 @@ pcibmatch(device_t parent, cfdata_t matc
break;
case PCI_VENDOR_VIATECH:
switch (PCI_PRODUCT(pa->pa_id)) {
- case PCI_PRODUCT_VIATECH_VT82C686A_SMB:
+ case PCI_PRODUCT_VIATECH_VT82C686A_PWR:
/*
- * The VIA VT82C686A SMBus Controller itself as
- * ISA bridge, but it's wrong !
+ * The VIA VT82C686A Power Management Controller
+ * identifies itself as ISA bridge, but it's wrong !
*/
return (0);
}
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1318 src/sys/dev/pci/pcidevs:1.1319
--- src/sys/dev/pci/pcidevs:1.1318 Sun Mar 4 13:11:51 2018
+++ src/sys/dev/pci/pcidevs Sun Mar 4 13:24:17 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1318 2018/03/04 13:11:51 jdolecek Exp $
+$NetBSD: pcidevs,v 1.1319 2018/03/04 13:24:17 jdolecek Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -7072,7 +7072,7 @@ product VIATECH VT82C586_PWR 0x3040 VT82
product VIATECH VT3043 0x3043 VT3043 (Rhine) 10/100 Ethernet
product VIATECH VT6306 0x3044 VT6306 IEEE 1394 Host Controller
product VIATECH VT6105M 0x3053 VT6105M (Rhine III) 10/100 Ethernet
-product VIATECH VT82C686A_SMB 0x3057 VT82C686A SMBus Controller
+product VIATECH VT82C686A_PWR 0x3057 VT82C686A Power Management Controller
product VIATECH VT82C686A_AC97 0x3058 VT82C686A AC-97 Audio Controller
product VIATECH VT8233_AC97 0x3059 VT8233/VT8235 AC-97 Audio Controller
product VIATECH VT6102 0x3065 VT6102 (Rhine II) 10/100 Ethernet
Index: src/sys/dev/pci/viaenv.c
diff -u src/sys/dev/pci/viaenv.c:1.33 src/sys/dev/pci/viaenv.c:1.34
--- src/sys/dev/pci/viaenv.c:1.33 Mon Aug 11 06:02:38 2014
+++ src/sys/dev/pci/viaenv.c Sun Mar 4 13:24:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.33 2014/08/11 06:02:38 ozaki-r Exp $ */
+/* $NetBSD: viaenv.c,v 1.34 2018/03/04 13:24:17 jdolecek Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.33 2014/08/11 06:02:38 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.34 2018/03/04 13:24:17 jdolecek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,7 +99,7 @@ viaenv_match(device_t parent, cfdata_t m
return 0;
switch (PCI_PRODUCT(pa->pa_id)) {
- case PCI_PRODUCT_VIATECH_VT82C686A_SMB:
+ case PCI_PRODUCT_VIATECH_VT82C686A_PWR:
case PCI_PRODUCT_VIATECH_VT8231_PWR:
return 1;
default:
@@ -284,7 +284,7 @@ viaenv_attach(device_t parent, device_t
aprint_naive("\n");
aprint_normal(": VIA Technologies ");
switch (PCI_PRODUCT(pa->pa_id)) {
- case PCI_PRODUCT_VIATECH_VT82C686A_SMB:
+ case PCI_PRODUCT_VIATECH_VT82C686A_PWR:
aprint_normal("VT82C686A Hardware Monitor\n");
break;
case PCI_PRODUCT_VIATECH_VT8231_PWR:
