frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

linux: Remove pre-2.6 PCI interface support 

If you haven't ported 2.6 to your architecture in the intervening seven
years, you can keep running older servers.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
This commit is contained in:
Adam Jackson 2009-10-16 16:09:56 -04:00 committed by Jeremy Huddleston
parent 769f583783
commit 95b6935637
1 changed files with 2 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
hw/xfree86/os-support/bus/linuxPci.c
View File

@ -63,47 +63,19 @@ linuxPciOpenFile(struct pci_device *dev, Bool write)
static struct pci_device *last_dev = NULL;
static int fd = -1,is_write = 0;
char file[64];
struct stat ignored;
static int is26 = -1;
if (dev == NULL) {
return -1;
}
if (is26 == -1) {
is26 = (stat("/sys/bus/pci", &ignored) < 0) ? 0 : 1;
}
if (fd == -1 || (write && (!is_write)) || (last_dev != dev)) {
if (fd != -1) {
close(fd);
fd = -1;
}
if (is26) {
sprintf(file,"/sys/bus/pci/devices/%04u:%02x:%02x.%01x/config",
dev->domain, dev->bus, dev->dev, dev->func);
} else {
if (dev->domain == 0) {
sprintf(file,"/proc/bus/pci/%02x", dev->bus);
if (stat(file, &ignored) < 0) {
sprintf(file, "/proc/bus/pci/0000:%02x/%02x.%1x",
dev->bus, dev->dev, dev->func);
} else {
sprintf(file, "/proc/bus/pci/%02x/%02x.%1x",
dev->bus, dev->dev, dev->func);
}
} else {
sprintf(file,"/proc/bus/pci/%02x%02x", dev->domain, dev->bus);
if (stat(file, &ignored) < 0) {
sprintf(file, "/proc/bus/pci/%04x:%04x/%02x.%1x",
dev->domain, dev->bus, dev->dev, dev->func);
} else {
sprintf(file, "/proc/bus/pci/%02x%02x/%02x.%1x",
dev->domain, dev->bus, dev->dev, dev->func);
}
}
}
sprintf(file,"/sys/bus/pci/devices/%04u:%02x:%02x.%01x/config",
dev->domain, dev->bus, dev->dev, dev->func);
if (write) {
fd = open(file,O_RDWR);