diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-24 10:10:29 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-24 10:10:29 +0000 |
| commit | 84b35d18d0b84909f7216fc6a7487ffa72bd3f18 (patch) | |
| tree | a6a1cf67169f65d2b680c6d3f548d45901284aff /xorg-server/hw/xfree86/common/xf86Config.c | |
| parent | 6a14682c40a85bbfdb5023a3330e95a3a3c0ad03 (diff) | |
| download | vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.gz vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.tar.bz2 vcxsrv-84b35d18d0b84909f7216fc6a7487ffa72bd3f18.zip | |
xserver xkbcomp libxcb pixman git update 24/9/2010
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Config.c')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Config.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c index 0b1c767fb..3a8380121 100644 --- a/xorg-server/hw/xfree86/common/xf86Config.c +++ b/xorg-server/hw/xfree86/common/xf86Config.c @@ -60,7 +60,7 @@ #include "configProcs.h"
#include "globals.h"
#include "extension.h"
-#include "Pci.h"
+#include "xf86pciBus.h"
#include "xf86Xinput.h"
extern DeviceAssocRec mouse_assoc;
@@ -2535,18 +2535,11 @@ xf86HandleConfigFile(Bool autoconfig) scanptr = xf86ConfigLayout.screens->screen->device->busID;
}
if (scanptr) {
- int bus, device, func;
if (strncmp(scanptr, "PCI:", 4) != 0) {
xf86Msg(X_WARNING, "Bus types other than PCI not yet isolable.\n"
"\tIgnoring IsolateDevice option.\n");
- } else if (sscanf(scanptr, "PCI:%d:%d:%d", &bus, &device, &func) == 3) {
- xf86IsolateDevice.domain = PCI_DOM_FROM_BUS(bus);
- xf86IsolateDevice.bus = PCI_BUS_NO_DOMAIN(bus);
- xf86IsolateDevice.dev = device;
- xf86IsolateDevice.func = func;
- xf86Msg(X_INFO,
- "Isolating PCI bus \"%d:%d:%d\"\n", bus, device, func);
- }
+ } else
+ xf86PciIsolateDevice(scanptr);
}
/* Now process everything else */
|