Whoops. Disregard this one. Send the wrong version.
On Sun, Nov 1, 2009 at 3:02 PM, Matt Turner <[email protected]> wrote: > This code has been unused since the switch to libpciaccess. It > really should have been killed by fba700f1f6a8976. > > Pointed out by Michael Cree. > > Signed-off-by: Matt Turner <[email protected]> > --- > hw/xfree86/os-support/linux/lnx.h | 31 ----------- > hw/xfree86/os-support/linux/lnx_axp.c | 68 ----------------------- > hw/xfree86/os-support/linux/lnx_ev56.c | 90 > ------------------------------- > hw/xfree86/os-support/linux/lnx_video.c | 2 - > 4 files changed, 0 insertions(+), 191 deletions(-) > > diff --git a/hw/xfree86/os-support/linux/lnx.h > b/hw/xfree86/os-support/linux/lnx.h > index 085c942..e9b673c 100644 > --- a/hw/xfree86/os-support/linux/lnx.h > +++ b/hw/xfree86/os-support/linux/lnx.h > @@ -8,37 +8,6 @@ > extern unsigned long _bus_base __P ((void)) __attribute__ ((const)); > extern unsigned long _bus_base_sparse __P ((void)) __attribute__ ((const)); > extern int iopl __P ((int __level)); > - > -/* new pciconfig_iobase syscall added in 2.2.15 and 2.3.99 */ > -# include <linux/unistd.h> > -extern long (*_iobase)(unsigned, int, int, int); > - > -/* > - * _iobase deals with the case the __NR_pciconfig_iobase is either undefined > - * or unsupported by the kernel, but we need to make sure that the `which' > - * argument symbols are defined. > - */ > -# ifndef IOBASE_HOSE > -# define IOBASE_HOSE 0 > -# endif > -# ifndef IOBASE_SPARSE_MEM > -# define IOBASE_SPARSE_MEM 1 > -# endif > -# ifndef IOBASE_DENSE_MEM > -# define IOBASE_DENSE_MEM 2 > -# endif > -# ifndef IOBASE_SPARSE_IO > -# define IOBASE_SPARSE_IO 3 > -# endif > -# ifndef IOBASE_DENSE_IO > -# define IOBASE_DENSE_IO 4 > -# endif > -# ifndef IOBASE_ROOT_BUS > -# define IOBASE_ROOT_BUS 5 > -# endif > -# ifndef IOBASE_FROM_HOSE > -# define IOBASE_FROM_HOSE 0x10000 > -# endif > # endif /* __alpha__ */ > > # if defined(DO_OS_FONTRESTORE) > diff --git a/hw/xfree86/os-support/linux/lnx_axp.c > b/hw/xfree86/os-support/linux/lnx_axp.c > index 10b97b0..bc1a374 100644 > --- a/hw/xfree86/os-support/linux/lnx_axp.c > +++ b/hw/xfree86/os-support/linux/lnx_axp.c > @@ -103,13 +103,6 @@ lnxGetAXP(void) > } while (1); > } > > -/* > - * pciconfig_iobase wrappers and dynamic i/o selection > - */ > -#include "lnx.h" > -#include <unistd.h> > -#include <errno.h> > - > /* glibc versions (single hose only) */ > extern void _outb(char val, unsigned long port); > extern void _outw(short val, unsigned long port); > @@ -118,70 +111,9 @@ extern unsigned int _inb(unsigned long port); > extern unsigned int _inw(unsigned long port); > extern unsigned int _inl(unsigned long port); > > -extern void _dense_outb(char, unsigned long); > -extern void _dense_outw(short, unsigned long); > -extern void _dense_outl(int, unsigned long); > -extern unsigned int _dense_inb(unsigned long); > -extern unsigned int _dense_inw(unsigned long); > -extern unsigned int _dense_inl(unsigned long); > - > _X_EXPORT void (*_alpha_outb)(char, unsigned long) = _outb; > _X_EXPORT void (*_alpha_outw)(short, unsigned long) = _outw; > _X_EXPORT void (*_alpha_outl)(int, unsigned long) = _outl; > _X_EXPORT unsigned int (*_alpha_inb)(unsigned long) = _inb; > _X_EXPORT unsigned int (*_alpha_inw)(unsigned long) = _inw; > _X_EXPORT unsigned int (*_alpha_inl)(unsigned long) = _inl; > - > -static long _alpha_iobase_query(unsigned, int, int, int); > -long (*_iobase)(unsigned, int, int, int) = _alpha_iobase_query; > - > -static long > -_alpha_iobase(unsigned flags, int hose, int bus, int devfn) > -{ > - if (bus < 0) { > - bus = hose; > - flags |= IOBASE_FROM_HOSE; > - } > - > - return syscall(__NR_pciconfig_iobase, flags, bus, devfn); > -} > - > -static long > -_alpha_iobase_legacy(unsigned flags, int hose, int bus, int devfn) > -{ > - if (hose > 0) return -ENODEV; > - if (flags & IOBASE_DENSE_MEM) return _bus_base(); > - if (flags & IOBASE_SPARSE_MEM) return _bus_base_sparse(); > - return 0; > -} > - > -static long > -_alpha_iobase_query(unsigned flags, int hose, int bus, int devfn) > -{ > - /* > - * Only use iobase if the syscall is supported *and* it's > - * a dense io system > - */ > - if (_alpha_iobase(IOBASE_DENSE_IO, 0, 0, 0) > 0) { > - /* > - * The syscall worked and it's a dense io system - take over the > - * io subsystem > - */ > - _iobase = _alpha_iobase; > - > - /* > - * Only take over the inx/outx functions if this is a dense I/O > - * system *and* addressing domains are being used. The dense I/O > - * routines expect I/O to be mapped (as done in xf86MapLegacyIO) > - */ > - _alpha_outb = _dense_outb; > - _alpha_outw = _dense_outw; > - _alpha_outl = _dense_outl; > - _alpha_inb = _dense_inb; > - _alpha_inw = _dense_inw; > - _alpha_inl = _dense_inl; > - } else _iobase = _alpha_iobase_legacy; > - > - return _iobase(flags, hose, bus, devfn); > -} > - > diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c > b/hw/xfree86/os-support/linux/lnx_ev56.c > index c65e1cc..2c27e30 100644 > --- a/hw/xfree86/os-support/linux/lnx_ev56.c > +++ b/hw/xfree86/os-support/linux/lnx_ev56.c > @@ -3,32 +3,6 @@ > #include <xorg-config.h> > #endif > > -#include <X11/X.h> > -#include "input.h" > -#include "scrnintstr.h" > -#include "compiler.h" > - > -#include "xf86.h" > -#include "xf86Priv.h" > -#include "xf86_OSlib.h" > -#include "xf86OSpriv.h" > - > -int readDense8(pointer Base, register unsigned long Offset); > -int readDense16(pointer Base, register unsigned long Offset); > -int readDense32(pointer Base, register unsigned long Offset); > -void > -writeDenseNB8(int Value, pointer Base, register unsigned long Offset); > -void > -writeDenseNB16(int Value, pointer Base, register unsigned long Offset); > -void > -writeDenseNB32(int Value, pointer Base, register unsigned long Offset); > -void > -writeDense8(int Value, pointer Base, register unsigned long Offset); > -void > -writeDense16(int Value, pointer Base, register unsigned long Offset); > -void > -writeDense32(int Value, pointer Base, register unsigned long Offset); > - > int > readDense8(pointer Base, register unsigned long Offset) > { > @@ -88,67 +62,3 @@ writeDense32(int Value, pointer Base, register unsigned > long Offset) > write_mem_barrier(); > *(volatile CARD32 *)((unsigned long)Base+(Offset)) = Value; > } > - > - > - > -void > -_dense_outb(char val, unsigned long port) > -{ > - if ((port & ~0xffff) == 0) { > - _outb(val, port); > - } else { > - write_mem_barrier(); > - *(volatile CARD8 *)port = val; > - } > -} > - > -void > -_dense_outw(short val, unsigned long port) > -{ > - if ((port & ~0xffff) == 0) { > - _outw(val, port); > - } else { > - write_mem_barrier(); > - *(volatile CARD16 *)port = val; > - } > -} > - > -void > -_dense_outl(int val, unsigned long port) > -{ > - if ((port & ~0xffff) == 0) { > - _outl(val, port); > - } else { > - write_mem_barrier(); > - *(volatile CARD32 *)port = val; > - } > -} > - > -unsigned int > -_dense_inb(unsigned long port) > -{ > - if ((port & ~0xffff) == 0) return _inb(port); > - > - mem_barrier(); > - return *(volatile CARD8 *)port; > -} > - > -unsigned int > -_dense_inw(unsigned long port) > -{ > - if ((port & ~0xffff) == 0) return _inw(port); > - > - mem_barrier(); > - return *(volatile CARD16 *)port; > -} > - > -unsigned int > -_dense_inl(unsigned long port) > -{ > - if ((port & ~0xffff) == 0) return _inl(port); > - > - mem_barrier(); > - return *(volatile CARD32 *)port; > -} > - > - > diff --git a/hw/xfree86/os-support/linux/lnx_video.c > b/hw/xfree86/os-support/linux/lnx_video.c > index 09d1787..6ab9026 100644 > --- a/hw/xfree86/os-support/linux/lnx_video.c > +++ b/hw/xfree86/os-support/linux/lnx_video.c > @@ -100,7 +100,6 @@ static Bool needSparse; > static unsigned long hae_thresh; > static unsigned long hae_mask; > static unsigned long bus_base; > -static unsigned long sparse_size; > #endif > > #ifdef HAS_MTRR_SUPPORT > @@ -376,7 +375,6 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) > if ((needSparse = (_bus_base_sparse() > 0))) { > hae_thresh = xf86AXPParams[axpSystem].hae_thresh; > hae_mask = xf86AXPParams[axpSystem].hae_mask; > - sparse_size = xf86AXPParams[axpSystem].size; > } > bus_base = _bus_base(); > } > -- > 1.6.4.4 > > _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
