d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer pciids database from ports if present

Browse Source 
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
This commit is contained in:
Baptiste Daroussin 2015-09-06 20:05:29 +00:00
parent 949b0d9970
commit 1ed2002089
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.sbin/pciconf/pathnames.h
View File

@ -1,3 +1,4 @@
/* $FreeBSD$ */ /* $FreeBSD$ */
#define _PATH_DEVPCI "/dev/pci" #define _PATH_DEVPCI "/dev/pci"
#define _PATH_PCIVDB "/usr/share/misc/pci_vendors" #define _PATH_PCIVDB "/usr/share/misc/pci_vendors"
#define _PATH_LPCIVDB "/usr/local/share/pciids/pci.ids"

6
usr.sbin/pciconf/pciconf.8
View File

@ -25,7 +25,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd January 20, 2014 .Dd September 06, 2015
.Dt PCICONF 8 .Dt PCICONF 8
.Os .Os
.Sh NAME .Sh NAME
@ -281,7 +281,9 @@ indicates a halfword (two-byte) operation.
The default is to read or The default is to read or
write a longword (four bytes). write a longword (four bytes).
.Sh ENVIRONMENT .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 . .Pa /usr/share/misc/pci_vendors .
This path can be overridden by setting the environment variable This path can be overridden by setting the environment variable
.Ev PCICONF_VENDOR_DATABASE . .Ev PCICONF_VENDOR_DATABASE .

7
usr.sbin/pciconf/pciconf.c
View File

@ -549,9 +549,12 @@ load_vendors(void)
*/ */
TAILQ_INIT(&pci_vendors); TAILQ_INIT(&pci_vendors);
if ((dbf = getenv("PCICONF_VENDOR_DATABASE")) == NULL) if ((dbf = getenv("PCICONF_VENDOR_DATABASE")) == NULL)
dbf = _PATH_LPCIVDB;
if ((db = fopen(dbf, "r")) == NULL) {
dbf = _PATH_PCIVDB; dbf = _PATH_PCIVDB;
if ((db = fopen(dbf, "r")) == NULL) if ((db = fopen(dbf, "r")) == NULL)
return(1); return(1);
}
cv = NULL; cv = NULL;
cd = NULL; cd = NULL;
error = 0; error = 0;