PCI: Always build domain support.
This commit is contained in:
parent
51e105ccc3
commit
a67360e79f
|
@ -184,14 +184,9 @@
|
|||
#endif
|
||||
|
||||
#if defined(linux)
|
||||
# define ARCH_PCI_INIT linuxPciInit
|
||||
# if defined(__m32r__)
|
||||
# define INCLUDE_XF86_MAP_PCI_MEM
|
||||
# define INCLUDE_XF86_NO_DOMAIN
|
||||
# endif
|
||||
#define ARCH_PCI_INIT linuxPciInit
|
||||
#endif /* defined(linux) */
|
||||
|
||||
|
||||
#if !defined(ARCH_PCI_INIT)
|
||||
#warning You really need to port to libpciaccess.
|
||||
#if defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64)
|
||||
|
|
|
@ -95,19 +95,15 @@ static const struct pci_id_match match_host_bridge = {
|
|||
0x0000ffff00, 0
|
||||
};
|
||||
|
||||
#ifndef INCLUDE_XF86_NO_DOMAIN
|
||||
#define MAX_DOMAINS 257
|
||||
static pointer DomainMmappedIO[MAX_DOMAINS];
|
||||
#endif
|
||||
|
||||
void
|
||||
linuxPciInit(void)
|
||||
{
|
||||
struct stat st;
|
||||
|
||||
#ifndef INCLUDE_XF86_NO_DOMAIN
|
||||
memset(DomainMmappedIO, 0, sizeof(DomainMmappedIO));
|
||||
#endif
|
||||
|
||||
if (-1 == stat("/proc/bus/pci", &st)) {
|
||||
/* when using this as default for all linux architectures,
|
||||
|
@ -237,7 +233,6 @@ linuxPpcBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
|
|||
|
||||
#endif /* __powerpc__ */
|
||||
|
||||
#ifndef INCLUDE_XF86_NO_DOMAIN
|
||||
|
||||
/*
|
||||
* Compiling the following simply requires the presence of <linux/pci.c>.
|
||||
|
@ -601,4 +596,3 @@ xf86AccResFromOS(resPtr pRes)
|
|||
return pRes;
|
||||
}
|
||||
|
||||
#endif /* !INCLUDE_XF86_NO_DOMAIN */
|
||||
|
|
|
@ -179,7 +179,6 @@ _alpha_iobase_query(unsigned flags, int hose, int bus, int devfn)
|
|||
*/
|
||||
_iobase = _alpha_iobase;
|
||||
|
||||
#ifndef INCLUDE_XF86_NO_DOMAIN
|
||||
/*
|
||||
* Only take over the inx/outx functions if this is a dense I/O
|
||||
* system *and* addressing domains are being used. The dense I/O
|
||||
|
@ -191,7 +190,6 @@ _alpha_iobase_query(unsigned flags, int hose, int bus, int devfn)
|
|||
_alpha_inb = _dense_inb;
|
||||
_alpha_inw = _dense_inw;
|
||||
_alpha_inl = _dense_inl;
|
||||
#endif /* !INCLUDE_XF86_NO_DOMAIN */
|
||||
} else _iobase = _alpha_iobase_legacy;
|
||||
|
||||
return _iobase(flags, hose, bus, devfn);
|
||||
|
|
|
@ -90,7 +90,6 @@ writeDense32(int Value, pointer Base, register unsigned long Offset)
|
|||
}
|
||||
|
||||
|
||||
#ifndef INCLUDE_XF86_NO_DOMAIN
|
||||
|
||||
void
|
||||
_dense_outb(char val, unsigned long port)
|
||||
|
@ -146,5 +145,4 @@ _dense_inl(unsigned long port)
|
|||
return *(volatile CARD32 *)port;
|
||||
}
|
||||
|
||||
#endif /* !INCLUDE_XF86_NO_DOMAIN */
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user