svn commit: r287522 - head/usr.sbin/pciconf
Baptiste Daroussin
bapt at FreeBSD.org
Sun Sep 6 20:05:31 UTC 2015
Author: bapt
Date: Sun Sep 6 20:05:29 2015
New Revision: 287522
URL: https://svnweb.freebsd.org/changeset/base/287522
Log:
Prefer pciids database from ports if present
Given the pciids database on ports is updated more often than the one in base
prefer this version if present, otherwise read the one from base.
MFC after: 1 week
Relnotes: yes
Differential Revision: https://reviews.freebsd.org/D3391
Modified:
head/usr.sbin/pciconf/pathnames.h
head/usr.sbin/pciconf/pciconf.8
head/usr.sbin/pciconf/pciconf.c
Modified: head/usr.sbin/pciconf/pathnames.h
==============================================================================
--- head/usr.sbin/pciconf/pathnames.h Sun Sep 6 19:58:48 2015 (r287521)
+++ head/usr.sbin/pciconf/pathnames.h Sun Sep 6 20:05:29 2015 (r287522)
@@ -1,3 +1,4 @@
/* $FreeBSD$ */
#define _PATH_DEVPCI "/dev/pci"
#define _PATH_PCIVDB "/usr/share/misc/pci_vendors"
+#define _PATH_LPCIVDB "/usr/local/share/pciids/pci.ids"
Modified: head/usr.sbin/pciconf/pciconf.8
==============================================================================
--- head/usr.sbin/pciconf/pciconf.8 Sun Sep 6 19:58:48 2015 (r287521)
+++ head/usr.sbin/pciconf/pciconf.8 Sun Sep 6 20:05:29 2015 (r287522)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 20, 2014
+.Dd September 06, 2015
.Dt PCICONF 8
.Os
.Sh NAME
@@ -281,7 +281,9 @@ indicates a halfword (two-byte) operatio
The default is to read or
write a longword (four bytes).
.Sh ENVIRONMENT
-The PCI vendor/device information database is normally read from
+PCI vendor and device information is read from
+.Pa /usr/local/share/pciids/pci.ids .
+If that file is not present, it is read from
.Pa /usr/share/misc/pci_vendors .
This path can be overridden by setting the environment variable
.Ev PCICONF_VENDOR_DATABASE .
Modified: head/usr.sbin/pciconf/pciconf.c
==============================================================================
--- head/usr.sbin/pciconf/pciconf.c Sun Sep 6 19:58:48 2015 (r287521)
+++ head/usr.sbin/pciconf/pciconf.c Sun Sep 6 20:05:29 2015 (r287522)
@@ -549,9 +549,12 @@ load_vendors(void)
*/
TAILQ_INIT(&pci_vendors);
if ((dbf = getenv("PCICONF_VENDOR_DATABASE")) == NULL)
+ dbf = _PATH_LPCIVDB;
+ if ((db = fopen(dbf, "r")) == NULL) {
dbf = _PATH_PCIVDB;
- if ((db = fopen(dbf, "r")) == NULL)
- return(1);
+ if ((db = fopen(dbf, "r")) == NULL)
+ return(1);
+ }
cv = NULL;
cd = NULL;
error = 0;
More information about the svn-src-all
mailing list