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

Eliminate unused pciAddrHostToBus infrastructure.

This commit is contained in:
Ian Romanick 2007-01-12 10:41:03 -08:00
parent e32fa10a04
commit 8279444a54
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/os-support/bus/Pci.h
View File

@ -321,7 +321,6 @@ extern void XF86SCANPCI_WRAPPER(scanpciWrapperOpt flags);
* (e.g. a primary PCI bus and all of its secondaries) * (e.g. a primary PCI bus and all of its secondaries)
*/ */
typedef struct pci_bus_funcs { typedef struct pci_bus_funcs {
ADDRESS (*pciAddrHostToBus)(PCITAG, PciAddrType, ADDRESS);
ADDRESS (*pciAddrBusToHost)(PCITAG, PciAddrType, ADDRESS); ADDRESS (*pciAddrBusToHost)(PCITAG, PciAddrType, ADDRESS);
/* /*
* The next three are optional. If NULL, the corresponding function is * The next three are optional. If NULL, the corresponding function is

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

@ -63,15 +63,12 @@
static ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr); static ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr);
#if defined(__powerpc__) #if defined(__powerpc__)
static ADDRESS linuxPpcBusAddrToHostAddr(PCITAG, PciAddrType, ADDRESS); static ADDRESS linuxPpcBusAddrToHostAddr(PCITAG, PciAddrType, ADDRESS);
static ADDRESS linuxPpcHostAddrToBusAddr(PCITAG, PciAddrType, ADDRESS);
#endif #endif
static pciBusFuncs_t linuxFuncs0 = { static pciBusFuncs_t linuxFuncs0 = {
#if defined(__powerpc__) #if defined(__powerpc__)
/* pciAddrHostToBus */ linuxPpcHostAddrToBusAddr,
/* pciAddrBusToHost */ linuxPpcBusAddrToHostAddr, /* pciAddrBusToHost */ linuxPpcBusAddrToHostAddr,
#else #else
/* pciAddrHostToBus */ pciAddrNOOP,
/* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree /* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree
* makes it all moot, so we kludge it for now */ * makes it all moot, so we kludge it for now */
#if defined(__sparc__) #if defined(__sparc__)
@ -236,24 +233,6 @@ linuxPpcBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
else return addr; else return addr;
} }
static ADDRESS
linuxPpcHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
{
if (type == PCI_MEM)
{
ADDRESS membase = syscall(__NR_pciconfig_iobase, 1,
PCI_BUS_FROM_TAG(tag), PCI_DFN_FROM_TAG(tag));
return (addr - membase);
}
else if (type == PCI_IO)
{
ADDRESS iobase = syscall(__NR_pciconfig_iobase, 2,
PCI_BUS_FROM_TAG(tag), PCI_DFN_FROM_TAG(tag));
return (addr - iobase);
}
else return addr;
}
#endif /* __powerpc__ */ #endif /* __powerpc__ */
#ifndef INCLUDE_XF86_NO_DOMAIN #ifndef INCLUDE_XF86_NO_DOMAIN