diff options
author | Adam Jackson <ajax@redhat.com> | 2008-10-12 00:07:56 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2008-11-24 23:40:06 -0500 |
commit | 208f091bfc657e9ee57b988f035d3aac7e9e173a (patch) | |
tree | ce3ffd71681b348f222e36c0bc644a979c871c77 | |
parent | 47478aa10adb20b6e48335ac8c4ef31f3fdfe68c (diff) |
Remove xf86IODelay
-rw-r--r-- | hw/xfree86/loader/xf86sym.c | 1 | ||||
-rw-r--r-- | hw/xfree86/os-support/misc/IODelay.c | 24 | ||||
-rw-r--r-- | hw/xfree86/os-support/misc/Makefile.am | 2 | ||||
-rw-r--r-- | hw/xfree86/os-support/xf86_OSproc.h | 1 |
4 files changed, 1 insertions, 27 deletions
diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index 708af85fc..87dcb928e 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -251,7 +251,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86MapReadSideEffects) SYMFUNC(xf86MapDomainMemory) SYMFUNC(xf86UDelay) - SYMFUNC(xf86IODelay) SYMFUNC(xf86SlowBcopy) SYMFUNC(xf86SetReallySlowBcopy) #ifdef __alpha__ diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c deleted file mode 100644 index e4422f234..000000000 --- a/hw/xfree86/os-support/misc/IODelay.c +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - Stub for Alpha Linux -*******************************************************************************/ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include <X11/X.h> -#include "xf86.h" -#include "xf86Priv.h" -#include "xf86_OSlib.h" - -/* - * All we really need is a delay of about 40ns for I/O recovery for just - * about any occasion, but we'll be more conservative here: On a - * 100-MHz CPU, produce at least a delay of 1,000ns. - */ -_X_EXPORT void -xf86IODelay() -{ - xf86UDelay(1); -} - diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index 39066ecb0..3d4b8ff0e 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -1,7 +1,7 @@ noinst_LTLIBRARIES = libmisc.la -libmisc_la_SOURCES = Delay.c BUSmemcpy.c IODelay.c SlowBcopy.c +libmisc_la_SOURCES = Delay.c BUSmemcpy.c SlowBcopy.c #AM_LDFLAGS = -r diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index d44fceede..b4513d65f 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -151,7 +151,6 @@ extern void xf86SetRGBOut(void); extern void xf86OSRingBell(int, int, int); extern void xf86BusToMem(unsigned char *, unsigned char *, int); extern void xf86MemToBus(unsigned char *, unsigned char *, int); -extern void xf86IODelay(void); extern void xf86UDelay(long usec); extern void xf86SetReallySlowBcopy(void); extern void xf86SlowBcopy(unsigned char *, unsigned char *, int); |