xserver: Branch 'pci-rework' - 3 commits
Ian Romanick
idr at kemper.freedesktop.org
Fri Jan 12 22:35:34 EET 2007
hw/xfree86/common/xf86pciBus.c | 24 ++++++++++--------------
hw/xfree86/os-support/bus/Pci.h | 20 --------------------
hw/xfree86/os-support/bus/linuxPci.c | 4 ++--
3 files changed, 12 insertions(+), 36 deletions(-)
New commits:
diff-tree 1c326bf75fc0d2c39507834d159d031291eddac4 (from 3936caa00535d0b7543be5a4b315562111a6b3ab)
Author: Ian Romanick <idr at us.ibm.com>
Date: Fri Jan 12 12:07:19 2007 -0800
Eliminate unused INCLUDE_XF86_MAP_PCI_MEM define.
diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h
index ff10708..165439d 100644
--- a/hw/xfree86/os-support/bus/Pci.h
+++ b/hw/xfree86/os-support/bus/Pci.h
@@ -190,41 +190,33 @@
#if defined(__alpha__)
# if defined(linux)
# define ARCH_PCI_INIT axpPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# elif defined(__FreeBSD__) || defined(__OpenBSD__)
# define ARCH_PCI_INIT freebsdPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# elif defined(__NetBSD__)
# define ARCH_PCI_INIT netbsdPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__arm__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__hppa__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__ia64__)
# if defined(linux)
# define ARCH_PCI_INIT ia64linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# elif defined(FreeBSD)
# define ARCH_PCI_INIT freebsdPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
#elif defined(__i386__) || defined(i386)
# define ARCH_PCI_INIT ix86PciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# if defined(linux)
# define ARCH_PCI_OS_INIT linuxPciInit
@@ -232,55 +224,44 @@
#elif defined(__mc68000__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__mips__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__powerpc__) || defined(__powerpc64__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */
# elif defined(__FreeBSD__) || defined(__OpenBSD__)
# define ARCH_PCI_INIT freebsdPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# elif defined(__NetBSD__)
# define ARCH_PCI_INIT netbsdPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# else
# define ARCH_PCI_INIT ppcPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__s390__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__sh__)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
#elif defined(__sparc__) || defined(sparc)
# if defined(linux)
# define ARCH_PCI_INIT linuxPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# elif defined(sun)
# define ARCH_PCI_INIT sparcPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__)
# define ARCH_PCI_INIT freebsdPciInit
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# endif
# if !defined(__FreeBSD__)
@@ -292,7 +273,6 @@
# else
# define ARCH_PCI_INIT ix86PciInit
# endif
-# define INCLUDE_XF86_MAP_PCI_MEM
# define INCLUDE_XF86_NO_DOMAIN
# if defined(linux)
# define ARCH_PCI_OS_INIT linuxPciInit
diff-tree 3936caa00535d0b7543be5a4b315562111a6b3ab (from 1a493509e30412a0f6c6f8f8e47a446678dbbc1a)
Author: Ian Romanick <idr at us.ibm.com>
Date: Fri Jan 12 10:59:35 2007 -0800
Refactor pciTagConvertRange2Host and pciConvertRange2Host.
diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
index 11e9bc0..00aad15 100644
--- a/hw/xfree86/common/xf86pciBus.c
+++ b/hw/xfree86/common/xf86pciBus.c
@@ -1025,9 +1025,17 @@ xf86CheckPciSlot(const struct pci_device
}
-static void
-pciTagConvertRange2Host(PCITAG tag, resRange *pRange)
+void
+pciConvertRange2Host(int entityIndex, resRange *pRange)
{
+ struct pci_device *const pvp = xf86GetPciInfoForEntity(entityIndex);
+ const PCITAG tag = PCI_MAKE_TAG(PCI_MAKE_BUS(pvp->domain, pvp->bus),
+ pvp->dev, pvp->func);
+
+ if (pvp == NULL) {
+ return;
+ }
+
if (!(pRange->type & ResBus))
return;
@@ -1066,15 +1074,3 @@ pciTagConvertRange2Host(PCITAG tag, resR
pRange->type &= ~(ResDomain | ResBus);
pRange->type |= xf86GetPciDomain(tag) << 24;
}
-
-void
-pciConvertRange2Host(int entityIndex, resRange *pRange)
-{
- const struct pci_device * const pvp = xf86GetPciInfoForEntity(entityIndex);
-
- if ( pvp != NULL ) {
- const PCITAG tag = PCI_MAKE_TAG( PCI_MAKE_BUS( pvp->domain, pvp->bus ),
- pvp->dev, pvp->func );
- pciTagConvertRange2Host(tag, pRange);
- }
-}
diff-tree 1a493509e30412a0f6c6f8f8e47a446678dbbc1a (from 8279444a54f38c5e2e5d4c2d936a10d74990e0be)
Author: Ian Romanick <idr at us.ibm.com>
Date: Fri Jan 12 10:58:59 2007 -0800
Fix typos in conditionally compiled code.
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index 5fabf0e..9851651 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -538,7 +538,7 @@ xf86MapLegacyIO(struct pci_device *dev)
const PCITAG tag = PCI_MAKE_TAG(PCI_MAKE_BUS(dev->domain, dev->bus),
dev->dev, dev->func);
const int domain = xf86GetPciDomain(tag);
- const struct pci_device *bridge = xf86GetPciHostConfigFromTag(Tag);
+ const struct pci_device *bridge = xf86GetPciHostConfigFromTag(tag);
int fd;
if ((domain <= 0) || (domain >= MAX_DOMAINS))
@@ -550,7 +550,7 @@ xf86MapLegacyIO(struct pci_device *dev)
/* Permanently map all of I/O space */
if ((fd = linuxOpenLegacy(bridge, "legacy_io")) < 0) {
DomainMmappedIO[domain] = linuxMapPci(-1, VIDMEM_MMIO, bridge,
- 0, linuxGetIOSize(tag),
+ 0, linuxGetIOSize(bridge),
PCIIOC_MMAP_IS_IO);
/* ia64 can't mmap legacy IO port space */
if (!DomainMmappedIO[domain])
More information about the xorg-commit
mailing list