Bug #14091: Fix build (and runtime) on ia64.
This commit is contained in:
parent
5d7437c29e
commit
f7abe05b33
|
@ -27,18 +27,6 @@ if LINUX_ALPHA
|
|||
PCI_SOURCES += axpPci.c
|
||||
endif
|
||||
|
||||
if LINUX_IA64
|
||||
PLATFORM_PCI_SOURCES = \
|
||||
460gxPCI.c \
|
||||
460gxPCI.h \
|
||||
altixPCI.c \
|
||||
altixPCI.h \
|
||||
e8870PCI.c \
|
||||
e8870PCI.h \
|
||||
zx1PCI.c \
|
||||
zx1PCI.h
|
||||
endif
|
||||
|
||||
if XORG_BUS_SPARC
|
||||
PLATFORM_SOURCES = Sbus.c
|
||||
sdk_HEADERS += xf86Sbus.h
|
||||
|
|
|
@ -207,9 +207,8 @@
|
|||
# endif
|
||||
#elif defined(__ia64__)
|
||||
# if defined(linux)
|
||||
# define ARCH_PCI_INIT ia64linuxPciInit
|
||||
# define ARCH_PCI_INIT linuxPciInit
|
||||
# endif
|
||||
# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper
|
||||
#elif defined(__i386__) || defined(__i386)
|
||||
# if defined(linux)
|
||||
# define ARCH_PCI_INIT linuxPciInit
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
noinst_LTLIBRARIES = liblinux.la
|
||||
|
||||
if LINUX_IA64
|
||||
PLATFORM_PCI_SUPPORT = $(srcdir)/lnx_ia64.c $(srcdir)/../shared/ia64Pci.c
|
||||
PLATFORM_PCI_SUPPORT = $(srcdir)/../shared/ia64Pci.c
|
||||
PLATFORM_DEFINES = -DOS_PROBE_PCI_CHIPSET=lnxProbePciChipset
|
||||
PLATFORM_INCLUDES = -I$(srcdir)/../shared
|
||||
endif
|
||||
|
|
|
@ -42,12 +42,7 @@
|
|||
#include <linux/pci.h>
|
||||
|
||||
#include "compiler.h"
|
||||
#include "460gxPCI.h"
|
||||
#include "e8870PCI.h"
|
||||
#include "zx1PCI.h"
|
||||
#include "altixPCI.h"
|
||||
#include "Pci.h"
|
||||
#include "ia64Pci.h"
|
||||
|
||||
/*
|
||||
* We use special in/out routines here since Altix platforms require the
|
||||
|
@ -191,53 +186,3 @@ _X_EXPORT unsigned int inl(unsigned long port)
|
|||
return val;
|
||||
}
|
||||
|
||||
void
|
||||
ia64ScanPCIWrapper(scanpciWrapperOpt flags)
|
||||
{
|
||||
static IA64Chipset chipset = NONE_CHIPSET;
|
||||
|
||||
if (flags == SCANPCI_INIT) {
|
||||
|
||||
/* PCI configuration space probes should be done first */
|
||||
if (xorgProbe460GX(flags)) {
|
||||
chipset = I460GX_CHIPSET;
|
||||
xf86PreScan460GX();
|
||||
return;
|
||||
} else if (xorgProbeE8870(flags)) {
|
||||
chipset = E8870_CHIPSET;
|
||||
xf86PreScanE8870();
|
||||
return;
|
||||
}
|
||||
#ifdef OS_PROBE_PCI_CHIPSET
|
||||
chipset = OS_PROBE_PCI_CHIPSET(flags);
|
||||
switch (chipset) {
|
||||
case ZX1_CHIPSET:
|
||||
xf86PreScanZX1();
|
||||
return;
|
||||
case ALTIX_CHIPSET:
|
||||
xf86PreScanAltix();
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
} else /* if (flags == SCANPCI_TERM) */ {
|
||||
|
||||
switch (chipset) {
|
||||
case I460GX_CHIPSET:
|
||||
xf86PostScan460GX();
|
||||
return;
|
||||
case E8870_CHIPSET:
|
||||
xf86PostScanE8870();
|
||||
return;
|
||||
case ZX1_CHIPSET:
|
||||
xf86PostScanZX1();
|
||||
return;
|
||||
case ALTIX_CHIPSET:
|
||||
xf86PostScanAltix();
|
||||
return;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user