diff options
| author | Adam Jackson <ajax@redhat.com> | 2009-10-16 16:09:56 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2011-09-22 13:52:45 -0400 |
| commit | 3d6509bdb499ed58c2e4b1876849b327e32fbaac (patch) | |
| tree | 5e7fce0732681ee5d661bac63d13f4e102847073 | |
| parent | dc85e94743390290ad9e00c4a985d6c2f6ed80f1 (diff) | |
linux: Remove pre-2.6 PCI interface support
Tested-by: Jeremy Huddleston <jeremyhu@apple.com>
If you haven't ported 2.6 to your architecture in the intervening seven
years, you can keep running older servers.
Signed-off-by: Adam Jackson <ajax@redhat.com>
| -rw-r--r-- | hw/xfree86/os-support/bus/linuxPci.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 2778bba2e..8f314b5a1 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -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); |