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

Elminiate ARCH_PCI_OS_INIT. 

Never, ever use the ix86Pci stuff on Linux.  This renders the whole
ARCH_PCI_OS_INIT mechanism useless.  Remove it.
This commit is contained in:
Ian Romanick 2007-01-22 09:13:59 -08:00
parent 7dfb3cea91
commit 844560a02f
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/xfree86/os-support/bus/Pci.c
View File

@ -238,11 +238,6 @@ pciInit(void)
#endif #endif
ARCH_PCI_INIT(); ARCH_PCI_INIT();
#if defined(ARCH_PCI_OS_INIT)
if (pciNumBuses <= 0) {
ARCH_PCI_OS_INIT();
}
#endif
} }
} }

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

@ -216,11 +216,12 @@
# endif # endif
# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper # define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
#elif defined(__i386__) || defined(i386) #elif defined(__i386__) || defined(i386)
# define ARCH_PCI_INIT ix86PciInit
# define INCLUDE_XF86_NO_DOMAIN
# if defined(linux) # if defined(linux)
# define ARCH_PCI_OS_INIT linuxPciInit # define ARCH_PCI_INIT linuxPciInit
# else
# define ARCH_PCI_INIT ix86PciInit
# endif # endif
# define INCLUDE_XF86_NO_DOMAIN
#elif defined(__mc68000__) #elif defined(__mc68000__)
# if defined(linux) # if defined(linux)
# define ARCH_PCI_INIT linuxPciInit # define ARCH_PCI_INIT linuxPciInit
@ -270,13 +271,12 @@
#elif defined(__amd64__) || defined(__amd64) #elif defined(__amd64__) || defined(__amd64)
# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
# define ARCH_PCI_INIT freebsdPciInit # define ARCH_PCI_INIT freebsdPciInit
# elif defined(linux)
# define ARCH_PCI_INIT linuxPciInit
# else # else
# define ARCH_PCI_INIT ix86PciInit # define ARCH_PCI_INIT ix86PciInit
# endif # endif
# define INCLUDE_XF86_NO_DOMAIN # define INCLUDE_XF86_NO_DOMAIN
# if defined(linux)
# define ARCH_PCI_OS_INIT linuxPciInit
# endif
#endif #endif
#ifndef ARCH_PCI_INIT #ifndef ARCH_PCI_INIT
@ -286,9 +286,6 @@
#undef INCLUDE_XF86_NO_DOMAIN #undef INCLUDE_XF86_NO_DOMAIN
extern void ARCH_PCI_INIT(void); extern void ARCH_PCI_INIT(void);
#if defined(ARCH_PCI_OS_INIT)
extern void ARCH_PCI_OS_INIT(void);
#endif
#if defined(XF86SCANPCI_WRAPPER) #if defined(XF86SCANPCI_WRAPPER)
typedef enum { typedef enum {

5
hw/xfree86/os-support/bus/ix86Pci.c
View File

@ -281,12 +281,7 @@ void ix86PciSelectCfgmech(void)
* We rely on xf86Info.pciFlags to tell which mechanisms to try.... * We rely on xf86Info.pciFlags to tell which mechanisms to try....
*/ */
switch (xf86Info.pciFlags) { switch (xf86Info.pciFlags) {
case PCIOsConfig: case PCIOsConfig:
#ifdef ARCH_PCI_OS_INIT
return;
#endif
case PCIProbe1: case PCIProbe1:
if (!xf86EnableIO()) if (!xf86EnableIO())
return; return;