andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Define PCI_TXT_IDS_DIR more cleanly

Browse Source
This commit is contained in:
David Nusinow 2007-10-22 21:30:04 -04:00
parent 29e0e18072
commit d808d653d1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xfree86/common/Makefile.am
View File

@ -94,6 +94,4 @@ if LNXACPI
XORG_CFLAGS += -DHAVE_ACPI
endif
XORG_CFLAGS += -DPCITXTIDSPATH=\"$(PCI_TXT_IDS_PATH)\"
AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

6
hw/xfree86/common/xf86AutoConfig.c
View File

@ -347,9 +347,9 @@ matchDriverFromFiles (char** matches, uint16_t match_vendor, uint16_t match_chip
uint16_t vendor, chip;
int i, j;
idsdir = opendir(PCITXTIDSPATH);
idsdir = opendir(PCI_TXT_IDS_PATH);
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);
/* Read the directory */
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 */
if (strncmp(&(direntry->d_name[len-4]), ".ids", 4) == 0) {
/* 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, direntry->d_name, (256 - strlen(path_name) - 1));
fp = fopen(path_name, "r");

3
include/xorg-config.h.in
View File

@ -115,4 +115,7 @@
/* Have execinfo.h */
#undef HAVE_EXECINFO_H
/* Path to text files containing PCI IDs */
#undef PCI_TXT_IDS_PATH
#endif /* _XORG_CONFIG_H_ */