Define PCI_TXT_IDS_DIR more cleanly
This commit is contained in:
parent
29e0e18072
commit
d808d653d1
|
@ -94,6 +94,4 @@ if LNXACPI
|
||||||
XORG_CFLAGS += -DHAVE_ACPI
|
XORG_CFLAGS += -DHAVE_ACPI
|
||||||
endif
|
endif
|
||||||
|
|
||||||
XORG_CFLAGS += -DPCITXTIDSPATH=\"$(PCI_TXT_IDS_PATH)\"
|
|
||||||
|
|
||||||
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
|
||||||
|
|
|
@ -347,9 +347,9 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
|
||||||
uint16_t vendor, chip;
|
uint16_t vendor, chip;
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
idsdir = opendir(PCITXTIDSPATH);
|
idsdir = opendir(PCI_TXT_IDS_PATH);
|
||||||
if (idsdir) {
|
if (idsdir) {
|
||||||
xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCITXTIDSPATH);
|
xf86Msg(X_INFO, "Scanning %s directory for additional PCI ID's supported by the drivers\n", PCI_TXT_IDS_PATH);
|
||||||
direntry = readdir(idsdir);
|
direntry = readdir(idsdir);
|
||||||
/* Read the directory */
|
/* Read the directory */
|
||||||
while (direntry) {
|
while (direntry) {
|
||||||
|
@ -361,7 +361,7 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
|
||||||
/* A tiny bit of sanity checking. We should probably do better */
|
/* A tiny bit of sanity checking. We should probably do better */
|
||||||
if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {
|
if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {
|
||||||
/* We need the full path name to open the file */
|
/* We need the full path name to open the file */
|
||||||
strncpy(path_name, PCITXTIDSPATH, 256);
|
strncpy(path_name, PCI_TXT_IDS_PATH, 256);
|
||||||
strncat(path_name, "/", 1);
|
strncat(path_name, "/", 1);
|
||||||
strncat(path_name, direntry->d_name, (256 - strlen(path_name) - 1));
|
strncat(path_name, direntry->d_name, (256 - strlen(path_name) - 1));
|
||||||
fp = fopen(path_name, "r");
|
fp = fopen(path_name, "r");
|
||||||
|
|
|
@ -115,4 +115,7 @@
|
||||||
/* Have execinfo.h */
|
/* Have execinfo.h */
|
||||||
#undef HAVE_EXECINFO_H
|
#undef HAVE_EXECINFO_H
|
||||||
|
|
||||||
|
/* Path to text files containing PCI IDs */
|
||||||
|
#undef PCI_TXT_IDS_PATH
|
||||||
|
|
||||||
#endif /* _XORG_CONFIG_H_ */
|
#endif /* _XORG_CONFIG_H_ */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user