xserver: Branch 'pci-rework'

[Ian Romanick]

 hw/xfree86/loader/xf86sym.c         |    1 -
 hw/xfree86/os-support/bus/Pci.c     |   15 ---------------
 hw/xfree86/os-support/bus/xf86Pci.h |    1 -
 3 files changed, 17 deletions(-)

New commits:
diff-tree 7411f5c389db73a6731d853d603029b8cf0a66ba (from 60c5e023e8ddaae8e011f80736e7cc3e8c12583d)
Author: Ian Romanick <idr at us.ibm.com>
Date:   Fri Jan 12 10:32:04 2007 -0800

    Eliminate pciHostAddrToBusAddr from interface.
    
    pciHostAddrToBusAddr is no longer used anywhere in the tree.  Remove
    it with extreme prejudice.

diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c
index 744064a..dd0df69 100644
--- a/hw/xfree86/loader/xf86sym.c
+++ b/hw/xfree86/loader/xf86sym.c
@@ -703,7 +703,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
 
     SYMFUNC(pciTag)
     SYMFUNC(pciBusAddrToHostAddr)
-    SYMFUNC(pciHostAddrToBusAddr)
     SYMFUNC(xf86scanpci)
 
     /* Loader functions */
diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 3ecb851..1c5404b 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -19,7 +19,6 @@
  *	pciTag()               - Return tag for a given PCI bus, device, &
  *                               function
  *	pciBusAddrToHostAddr() - Convert a PCI address to a host address
- *	pciHostAddrToBusAddr() - Convert a host address to a PCI address
  *	xf86scanpci()          - Return info about all PCI devices
  *	xf86GetPciDomain()     - Return domain number from a PCITAG
  *	xf86MapDomainMemory()  - Like xf86MapPciMem() but can handle
@@ -262,20 +261,6 @@ pciBusAddrToHostAddr(PCITAG tag, PciAddr
 	  return(addr);
 }
 
-_X_EXPORT ADDRESS
-pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr)
-{
-  int bus = PCI_BUS_FROM_TAG(tag);
-
-  pciInit();
-
-  if ((bus >= 0) && (bus < pciNumBuses) && pciBusInfo[bus] &&
-	pciBusInfo[bus]->funcs->pciAddrHostToBus)
-	  return (*pciBusInfo[bus]->funcs->pciAddrHostToBus)(tag, type, addr);
-  else
-	  return(addr);
-}
-
 _X_EXPORT PCITAG
 pciTag(int busnum, int devnum, int funcnum)
 {
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index 2ecd8d7..458f0ce 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -251,7 +251,6 @@ typedef enum {
 
 /* Public PCI access functions */
 ADDRESS	      pciBusAddrToHostAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
-ADDRESS	      pciHostAddrToBusAddr(PCITAG tag, PciAddrType type, ADDRESS addr);
 PCITAG	      pciTag(int busnum, int devnum, int funcnum);
 int	      pciGetBaseSize(PCITAG tag, int indx, Bool destructive, Bool *min);
 Bool xf86scanpci(void);