Replace BSD custom PCI code with a stub implementation thanks to pciaccess.

Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.

While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
This commit is contained in:
Eric Anholt
2007-08-28 10:08:38 -07:00
parent 3fe67d23ed
commit adf46b57ce
8 changed files with 103 additions and 382 deletions

View File

@@ -43,14 +43,13 @@
/* Avoid Imakefile changes */
#include "bus/Pci.h"
#ifdef USESTDRES
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
defined(__DragonFly__)
#define xf86StdAccResFromOS xf86AccResFromOS
_X_EXPORT resRange PciAvoid[] = {_PCI_AVOID_PC_STYLE, _END};
#endif
#ifdef INCLUDE_XF86_NO_DOMAIN
resPtr
xf86StdAccResFromOS(resPtr ret)
{
@@ -117,5 +116,3 @@ xf86StdAccResFromOS(resPtr ret)
/* XXX add others */
return ret;
}
#endif /* INCLUDE_XF86_NO_DOMAIN */