xserver: Branch 'pci-rework'

[Ian Romanick]

 hw/xfree86/os-support/bus/Pci.h      |    1 -
 hw/xfree86/os-support/bus/linuxPci.c |   21 ---------------------
 2 files changed, 22 deletions(-)

New commits:
diff-tree 8279444a54f38c5e2e5d4c2d936a10d74990e0be (from e32fa10a04a15ce1b15c6faa7a64e68ee3906d59)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Fri Jan 12 10:41:03 2007 -0800

    Eliminate unused pciAddrHostToBus infrastructure.

diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index 8c12e56..ff10708 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -321,7 +321,6 @@ extern void XF86SCANPCI_WRAPPER(scanpciW
  * (e.g. a primary PCI bus and all of its secondaries)
  */
 typedef struct pci_bus_funcs {
-	ADDRESS (*pciAddrHostToBus)(PCITAG, PciAddrType, ADDRESS);
 	ADDRESS (*pciAddrBusToHost)(PCITAG, PciAddrType, ADDRESS);
 	/*
 	 * The next three are optional.  If NULL, the corresponding function is
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 7f163f2..5fabf0e 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -63,15 +63,12 @@
 static ADDRESS linuxTransAddrBusToHost(PCITAG tag, PciAddrType type, ADDRESS addr);
 #if defined(__powerpc__)
 static ADDRESS linuxPpcBusAddrToHostAddr(PCITAG, PciAddrType, ADDRESS);
-static ADDRESS linuxPpcHostAddrToBusAddr(PCITAG, PciAddrType, ADDRESS);
 #endif
 
 static pciBusFuncs_t linuxFuncs0 = {
 #if defined(__powerpc__)
-/* pciAddrHostToBus */	linuxPpcHostAddrToBusAddr,
 /* pciAddrBusToHost */	linuxPpcBusAddrToHostAddr,
 #else
-/* pciAddrHostToBus */	pciAddrNOOP,
 /* linuxTransAddrBusToHost is busted on sparc64 but the PCI rework tree
  * makes it all moot, so we kludge it for now */
 #if defined(__sparc__)
@@ -236,24 +233,6 @@ linuxPpcBusAddrToHostAddr(PCITAG tag, Pc
     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__ */
 
 #ifndef INCLUDE_XF86_NO_DOMAIN