aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/loader
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/hw/xfree86/loader')
-rw-r--r--xorg-server/hw/xfree86/loader/Makefile.am12
-rw-r--r--xorg-server/hw/xfree86/loader/Makefile.in129
-rw-r--r--xorg-server/hw/xfree86/loader/SparcMulDiv.S87
-rw-r--r--xorg-server/hw/xfree86/loader/dixsym.c76
-rw-r--r--xorg-server/hw/xfree86/loader/dlloader.c9
-rw-r--r--xorg-server/hw/xfree86/loader/fontsym.c109
-rw-r--r--xorg-server/hw/xfree86/loader/loader.c21
-rw-r--r--xorg-server/hw/xfree86/loader/loader.h3
-rw-r--r--xorg-server/hw/xfree86/loader/loaderProcs.h2
-rw-r--r--xorg-server/hw/xfree86/loader/loadfont.c81
-rw-r--r--xorg-server/hw/xfree86/loader/loadmod.c39
-rw-r--r--xorg-server/hw/xfree86/loader/misym.c177
-rw-r--r--xorg-server/hw/xfree86/loader/os.c6
-rw-r--r--xorg-server/hw/xfree86/loader/xf86sym.c131
14 files changed, 145 insertions, 737 deletions
diff --git a/xorg-server/hw/xfree86/loader/Makefile.am b/xorg-server/hw/xfree86/loader/Makefile.am
index ef9ab9ab3..fa9dbfe5d 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.am
+++ b/xorg-server/hw/xfree86/loader/Makefile.am
@@ -8,28 +8,20 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \
#AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER $(DIX_CFLAGS) $(XORG_CFLAGS)
-if XORG_LOADER_SPARC
-SPARC_SOURCES = SparcMulDiv.S
-endif
-
EXTRA_DIST = \
dlloader.h \
loader.h \
- loaderProcs.h \
- SparcMulDiv.S
+ loaderProcs.h
libloader_a_SOURCES = \
loader.c \
loaderProcs.h \
loadext.c \
loadmod.c \
- loadfont.c \
dlloader.c \
os.c \
dixsym.c \
extsym.c \
- fontsym.c \
misym.c \
xf86sym.c \
- sym.h \
- $(SPARC_SOURCES)
+ sym.h
diff --git a/xorg-server/hw/xfree86/loader/Makefile.in b/xorg-server/hw/xfree86/loader/Makefile.in
index 82161d088..cc12b39f8 100644
--- a/xorg-server/hw/xfree86/loader/Makefile.in
+++ b/xorg-server/hw/xfree86/loader/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -43,7 +43,6 @@ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/include/do-not-use-config.h \
$(top_builddir)/include/xorg-server.h \
$(top_builddir)/include/dix-config.h \
- $(top_builddir)/include/xgl-config.h \
$(top_builddir)/include/xorg-config.h \
$(top_builddir)/include/xkb-config.h \
$(top_builddir)/include/xwin-config.h \
@@ -53,35 +52,22 @@ LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
libloader_a_AR = $(AR) $(ARFLAGS)
libloader_a_LIBADD =
-am__libloader_a_SOURCES_DIST = loader.c loaderProcs.h loadext.c \
- loadmod.c loadfont.c dlloader.c os.c dixsym.c extsym.c \
- fontsym.c misym.c xf86sym.c sym.h SparcMulDiv.S
-@XORG_LOADER_SPARC_TRUE@am__objects_1 = SparcMulDiv.$(OBJEXT)
am_libloader_a_OBJECTS = loader.$(OBJEXT) loadext.$(OBJEXT) \
- loadmod.$(OBJEXT) loadfont.$(OBJEXT) dlloader.$(OBJEXT) \
- os.$(OBJEXT) dixsym.$(OBJEXT) extsym.$(OBJEXT) \
- fontsym.$(OBJEXT) misym.$(OBJEXT) xf86sym.$(OBJEXT) \
- $(am__objects_1)
+ loadmod.$(OBJEXT) dlloader.$(OBJEXT) os.$(OBJEXT) \
+ dixsym.$(OBJEXT) extsym.$(OBJEXT) misym.$(OBJEXT) \
+ xf86sym.$(OBJEXT)
libloader_a_OBJECTS = $(am_libloader_a_OBJECTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
-CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
-LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS)
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libloader_a_SOURCES)
-DIST_SOURCES = $(am__libloader_a_SOURCES_DIST)
+DIST_SOURCES = $(libloader_a_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -90,8 +76,9 @@ ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
-APPDEFAULTDIR = @APPDEFAULTDIR@
APPLE_APPLICATIONS_DIR = @APPLE_APPLICATIONS_DIR@
+APPLE_APPLICATION_ID = @APPLE_APPLICATION_ID@
+APPLE_APPLICATION_NAME = @APPLE_APPLICATION_NAME@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@@ -112,10 +99,6 @@ CFLAGS = @CFLAGS@
COMPILEDDEFAULTFONTPATH = @COMPILEDDEFAULTFONTPATH@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DARWIN_LIBS = @DARWIN_LIBS@
DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -137,6 +120,7 @@ DMXXIEXAMPLES_DEP_CFLAGS = @DMXXIEXAMPLES_DEP_CFLAGS@
DMXXIEXAMPLES_DEP_LIBS = @DMXXIEXAMPLES_DEP_LIBS@
DMXXMUEXAMPLES_DEP_CFLAGS = @DMXXMUEXAMPLES_DEP_CFLAGS@
DMXXMUEXAMPLES_DEP_LIBS = @DMXXMUEXAMPLES_DEP_LIBS@
+DOLT_BASH = @DOLT_BASH@
DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@
DRI2PROTO_LIBS = @DRI2PROTO_LIBS@
DRIPROTO_CFLAGS = @DRIPROTO_CFLAGS@
@@ -146,18 +130,15 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DRI_DRIVER_PATH = @DRI_DRIVER_PATH@
DSYMUTIL = @DSYMUTIL@
DTRACE = @DTRACE@
-ECHO = @ECHO@
+DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
+FGREP = @FGREP@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
-FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
-FREETYPE_LIBS = @FREETYPE_LIBS@
GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
GLX_DEFINES = @GLX_DEFINES@
GL_CFLAGS = @GL_CFLAGS@
@@ -176,7 +157,7 @@ KDRIVE_LIBS = @KDRIVE_LIBS@
KDRIVE_LOCAL_LIBS = @KDRIVE_LOCAL_LIBS@
KDRIVE_PURE_INCS = @KDRIVE_PURE_INCS@
KDRIVE_PURE_LIBS = @KDRIVE_PURE_LIBS@
-LAUNCHD = @LAUNCHD@
+LD = @LD@
LDFLAGS = @LDFLAGS@
LD_EXPORT_SYMBOLS_FLAG = @LD_EXPORT_SYMBOLS_FLAG@
LEX = @LEX@
@@ -190,7 +171,10 @@ LIBTOOL = @LIBTOOL@
LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LINUXDOC = @LINUXDOC@
+LIPO = @LIPO@
LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -202,8 +186,7 @@ MESA_SOURCE = @MESA_SOURCE@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
-MKFONTDIR = @MKFONTDIR@
-MKFONTSCALE = @MKFONTSCALE@
+NM = @NM@
NMEDIT = @NMEDIT@
OBJC = @OBJC@
OBJCCLD = @OBJCCLD@
@@ -212,8 +195,8 @@ OBJCFLAGS = @OBJCFLAGS@
OBJCLINK = @OBJCLINK@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
-OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -246,7 +229,6 @@ VENDOR_NAME = @VENDOR_NAME@
VENDOR_NAME_SHORT = @VENDOR_NAME_SHORT@
VENDOR_RELEASE = @VENDOR_RELEASE@
VERSION = @VERSION@
-X11APP_ARCHS = @X11APP_ARCHS@
X11EXAMPLES_DEP_CFLAGS = @X11EXAMPLES_DEP_CFLAGS@
X11EXAMPLES_DEP_LIBS = @X11EXAMPLES_DEP_LIBS@
XDMCP_CFLAGS = @XDMCP_CFLAGS@
@@ -256,27 +238,12 @@ XDMXCONFIG_DEP_LIBS = @XDMXCONFIG_DEP_LIBS@
XDMX_CFLAGS = @XDMX_CFLAGS@
XDMX_LIBS = @XDMX_LIBS@
XDMX_SYS_LIBS = @XDMX_SYS_LIBS@
-XEGLMODULES_CFLAGS = @XEGLMODULES_CFLAGS@
-XEGL_LIBS = @XEGL_LIBS@
-XEGL_SYS_LIBS = @XEGL_SYS_LIBS@
XEPHYR_CFLAGS = @XEPHYR_CFLAGS@
-XEPHYR_DRI_LIBS = @XEPHYR_DRI_LIBS@
XEPHYR_INCS = @XEPHYR_INCS@
XEPHYR_LIBS = @XEPHYR_LIBS@
XF86CONFIGFILE = @XF86CONFIGFILE@
-XF86MISC_CFLAGS = @XF86MISC_CFLAGS@
-XF86MISC_LIBS = @XF86MISC_LIBS@
XF86VIDMODE_CFLAGS = @XF86VIDMODE_CFLAGS@
XF86VIDMODE_LIBS = @XF86VIDMODE_LIBS@
-XGLMODULES_CFLAGS = @XGLMODULES_CFLAGS@
-XGLMODULES_LIBS = @XGLMODULES_LIBS@
-XGLXMODULES_CFLAGS = @XGLXMODULES_CFLAGS@
-XGLXMODULES_LIBS = @XGLXMODULES_LIBS@
-XGLX_LIBS = @XGLX_LIBS@
-XGLX_SYS_LIBS = @XGLX_SYS_LIBS@
-XGL_LIBS = @XGL_LIBS@
-XGL_MODULE_PATH = @XGL_MODULE_PATH@
-XGL_SYS_LIBS = @XGL_SYS_LIBS@
XKB_BASE_DIRECTORY = @XKB_BASE_DIRECTORY@
XKB_BIN_DIRECTORY = @XKB_BIN_DIRECTORY@
XKB_COMPILED_DIR = @XKB_COMPILED_DIR@
@@ -287,10 +254,6 @@ XNESTMODULES_CFLAGS = @XNESTMODULES_CFLAGS@
XNESTMODULES_LIBS = @XNESTMODULES_LIBS@
XNEST_LIBS = @XNEST_LIBS@
XNEST_SYS_LIBS = @XNEST_SYS_LIBS@
-XORGCFG_DEP_CFLAGS = @XORGCFG_DEP_CFLAGS@
-XORGCFG_DEP_LIBS = @XORGCFG_DEP_LIBS@
-XORGCONFIG_DEP_CFLAGS = @XORGCONFIG_DEP_CFLAGS@
-XORGCONFIG_DEP_LIBS = @XORGCONFIG_DEP_LIBS@
XORG_CFLAGS = @XORG_CFLAGS@
XORG_INCS = @XORG_INCS@
XORG_LIBS = @XORG_LIBS@
@@ -299,13 +262,8 @@ XORG_MODULES_LIBS = @XORG_MODULES_LIBS@
XORG_OS = @XORG_OS@
XORG_OS_SUBDIR = @XORG_OS_SUBDIR@
XORG_SYS_LIBS = @XORG_SYS_LIBS@
-XPRINTMODULES_CFLAGS = @XPRINTMODULES_CFLAGS@
-XPRINTMODULES_LIBS = @XPRINTMODULES_LIBS@
-XPRINTPROTO_CFLAGS = @XPRINTPROTO_CFLAGS@
-XPRINTPROTO_LIBS = @XPRINTPROTO_LIBS@
-XPRINT_CFLAGS = @XPRINT_CFLAGS@
-XPRINT_LIBS = @XPRINT_LIBS@
-XPRINT_SYS_LIBS = @XPRINT_SYS_LIBS@
+XPBPROXY_CFLAGS = @XPBPROXY_CFLAGS@
+XPBPROXY_LIBS = @XPBPROXY_LIBS@
XRESEXAMPLES_DEP_CFLAGS = @XRESEXAMPLES_DEP_CFLAGS@
XRESEXAMPLES_DEP_LIBS = @XRESEXAMPLES_DEP_LIBS@
XSDL_INCS = @XSDL_INCS@
@@ -338,8 +296,7 @@ abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -359,7 +316,6 @@ driverdir = @driverdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
extdir = @extdir@
-ft_config = @ft_config@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -369,12 +325,12 @@ htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
-launchagentsdir = @launchagentsdir@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
logdir = @logdir@
+lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
moduledir = @moduledir@
@@ -392,8 +348,6 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-xglmoduledir = @xglmoduledir@
-xpconfigdir = @xpconfigdir@
noinst_LIBRARIES = libloader.a
INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \
-I$(srcdir)/../vbe -I$(top_srcdir)/miext/cw -I$(srcdir)/../int10 \
@@ -403,39 +357,34 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \
#AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER $(DIX_CFLAGS) $(XORG_CFLAGS)
-@XORG_LOADER_SPARC_TRUE@SPARC_SOURCES = SparcMulDiv.S
EXTRA_DIST = \
dlloader.h \
loader.h \
- loaderProcs.h \
- SparcMulDiv.S
+ loaderProcs.h
libloader_a_SOURCES = \
loader.c \
loaderProcs.h \
loadext.c \
loadmod.c \
- loadfont.c \
dlloader.c \
os.c \
dixsym.c \
extsym.c \
- fontsym.c \
misym.c \
xf86sym.c \
- sym.h \
- $(SPARC_SOURCES)
+ sym.h
all: all-am
.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .obj
+.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+ && { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
@@ -473,40 +422,16 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/SparcMulDiv.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dixsym.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dlloader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extsym.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fontsym.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadext.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadfont.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/loadmod.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misym.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/os.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xf86sym.Po@am__quote@
-.S.o:
-@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $<
-
-.S.obj:
-@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.S.lo:
-@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCCAS_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $<
-
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@@ -539,7 +464,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
- $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in files) print i; }; }'`; \
mkid -fID $$unique
tags: TAGS
diff --git a/xorg-server/hw/xfree86/loader/SparcMulDiv.S b/xorg-server/hw/xfree86/loader/SparcMulDiv.S
deleted file mode 100644
index 11139d192..000000000
--- a/xorg-server/hw/xfree86/loader/SparcMulDiv.S
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Hardware integer division and multiplication routines for SPARC v8 and higher.
- *
- * Copyright (C) 1996 David S. Miller (davem@redhat.com)
- * Copyright (C) 1999 Jakub Jelinek (jj@ultra.linux.cz)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SparcMulDiv.S,v 1.1 1999/07/10 07:24:51 dawes Exp $ */
-
- .globl urem_sparcv89, umul_sparcv89, udiv_sparcv89
- .globl rem_sparcv89, mul_sparcv89, div_sparcv89
-
- .align 32
-urem_sparcv89:
- wr %g0, 0x0, %y
- nop
- nop
- nop
- udiv %o0, %o1, %o2
- umul %o2, %o1, %o2
- retl
- sub %o0, %o2, %o0
-
- .align 32
-umul_sparcv89:
- umul %o0, %o1, %o0
- retl
- rd %y, %o1
-
- .align 32
-udiv_sparcv89:
- wr %g0, 0x0, %y
- nop
- nop
- retl
- udiv %o0, %o1, %o0
-
- .align 32
-rem_sparcv89:
- sra %o0, 0x1f, %o4
- wr %o4, 0x0, %y
- nop
- nop
- nop
- sdivcc %o0, %o1, %o2
- bvs,a 1f
- xnor %o2, %g0, %o2
-1: smul %o2, %o1, %o2
- retl
- sub %o0, %o2, %o0
-
- .align 32
-mul_sparcv89:
- smul %o0, %o1, %o0
- retl
- rd %y, %o1
- nop
-
- .align 32
-div_sparcv89:
- sra %o0, 0x1f, %o2
- wr %o2, 0x0, %y
- nop
- nop
- nop
- sdivcc %o0, %o1, %o0
- bvs,a 1f
- xnor %o0, %g0, %o0
-1: retl
- nop
diff --git a/xorg-server/hw/xfree86/loader/dixsym.c b/xorg-server/hw/xfree86/loader/dixsym.c
index a8bde756b..19b93c5f0 100644
--- a/xorg-server/hw/xfree86/loader/dixsym.c
+++ b/xorg-server/hw/xfree86/loader/dixsym.c
@@ -57,7 +57,6 @@
#include "cursorstr.h"
#include "dix.h"
#include "dixevents.h"
-#include "dixfont.h"
#include "dixstruct.h"
#include "misc.h"
#include "globals.h"
@@ -99,6 +98,7 @@ _X_HIDDEN void *dixLookupTab[] = {
/* dix */
/* atom.c */
SYMFUNC(MakeAtom)
+ SYMFUNC(NameForAtom)
SYMFUNC(ValidAtom)
/* colormap.c */
SYMFUNC(AllocColor)
@@ -138,7 +138,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(SendMappingNotify)
SYMFUNC(InitPointerDeviceStruct)
/* dispatch.c */
- SYMFUNC(SetInputCheck)
SYMFUNC(SendErrorToClient)
SYMFUNC(UpdateCurrentTime)
SYMFUNC(UpdateCurrentTimeIf)
@@ -147,11 +146,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(isItTimeToYield)
SYMVAR(ClientStateCallback)
SYMVAR(ServerGrabCallback)
- /* dixfonts.c */
- SYMFUNC(CloseFont)
- SYMFUNC(FontToXError)
- SYMFUNC(LoadGlyphs)
- SYMVAR(fpe_functions)
/* dixutils.c */
SYMFUNC(AddCallback)
SYMFUNC(ClientSleep)
@@ -179,7 +173,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(GetSpritePosition)
SYMFUNC(GetSpriteWindow)
SYMFUNC(GetSpriteCursor)
- SYMFUNC(WindowsRestructured)
SYMVAR(DeviceEventCallback)
SYMVAR(EventCallback)
SYMVAR(inputInfo)
@@ -200,10 +193,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(CheckExtension)
SYMFUNC(MinorOpcodeOfRequest)
SYMFUNC(StandardMinorOpcode)
-#ifdef XEVIE
- SYMVAR(xeviehot)
- SYMVAR(xeviewin)
-#endif
/* gc.c */
SYMFUNC(CopyGC)
SYMFUNC(CreateGC)
@@ -214,10 +203,8 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(FreeGC)
SYMFUNC(FreeScratchGC)
SYMFUNC(GetScratchGC)
- SYMFUNC(SetClipRects)
SYMFUNC(ValidateGC)
SYMFUNC(VerifyRectOrder)
- SYMFUNC(SetDashes)
/* globals.c */
SYMVAR(ScreenSaverTime)
#ifdef DPMSExtension
@@ -229,10 +216,7 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(DPMSSuspendTime)
SYMVAR(DPMSEnabledSwitch)
SYMVAR(DPMSDisabledSwitch)
- SYMVAR(defaultDPMSEnabled)
#endif
- /* bigreq */
- SYMVAR(maxBigRequestSize)
#ifdef XV
/* XXX These are exported from the DDX, not DIX. */
SYMVAR(XvScreenInitProc)
@@ -280,8 +264,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(FakeClientID)
SYMFUNC(FreeResource)
SYMFUNC(FreeResourceByType)
- SYMFUNC(GetXIDList)
- SYMFUNC(GetXIDRange)
SYMFUNC(LegalNewID)
SYMFUNC(FindClientResourcesByType)
SYMFUNC(FindAllClientResources)
@@ -308,8 +290,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(SwapColorItem)
/* tables.c */
SYMVAR(EventSwapVector)
- SYMVAR(ReplySwapVector)
- SYMVAR(ProcVector)
/* window.c */
SYMFUNC(ChangeWindowAttributes)
SYMFUNC(CheckWindowOptionalNeed)
@@ -319,19 +299,12 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(GravityTranslate)
SYMFUNC(MakeWindowOptional)
SYMFUNC(MapWindow)
- SYMFUNC(MoveWindowInStack)
SYMFUNC(NotClippedByChildren)
- SYMFUNC(ResizeChildrenWinSize)
SYMFUNC(SaveScreens)
SYMFUNC(dixSaveScreens)
- SYMFUNC(SendVisibilityNotify)
- SYMFUNC(SetWinSize)
- SYMFUNC(SetBorderSize)
SYMFUNC(TraverseTree)
SYMFUNC(UnmapWindow)
SYMFUNC(WalkTree)
- SYMVAR(deltaSaveUndersViewable)
- SYMVAR(numSaveUndersViewable)
SYMVAR(savedScreenInfo)
SYMVAR(screenIsSaved)
@@ -341,14 +314,10 @@ _X_HIDDEN void *dixLookupTab[] = {
/* utils.c */
SYMFUNC(Xstrdup)
SYMFUNC(XNFstrdup)
- SYMVAR(Must_have_memory)
SYMFUNC(AdjustWaitForDelay)
SYMVAR(noTestExtensions)
SYMFUNC(GiveUp)
-#ifdef BIGREQS
- SYMVAR(noBigReqExtension)
-#endif
#ifdef COMPOSITE
SYMVAR(noCompositeExtension)
#endif
@@ -361,12 +330,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef DPMSExtension
SYMVAR(noDPMSExtension)
#endif
-#ifdef EVI
- SYMVAR(noEVIExtension)
-#endif
-#ifdef FONTCACHE
- SYMVAR(noFontCacheExtension)
-#endif
#ifdef GLXEXT
SYMVAR(noGlxExtension)
#endif
@@ -376,9 +339,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef MITSHM
SYMVAR(noMITShmExtension)
#endif
-#ifdef MITMISC
- SYMVAR(noMITMiscExtension)
-#endif
#ifdef MULTIBUFFER
SYMVAR(noMultibufferExtension)
#endif
@@ -388,30 +348,12 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef RENDER
SYMVAR(noRenderExtension)
#endif
-#ifdef SHAPE
- SYMVAR(noShapeExtension)
-#endif
#ifdef XCSECURITY
SYMVAR(noSecurityExtension)
#endif
-#ifdef XSYNC
- SYMVAR(noSyncExtension)
-#endif
-#ifdef TOGCUP
- SYMVAR(noXcupExtension)
-#endif
#ifdef RES
SYMVAR(noResExtension)
#endif
-#ifdef XAPPGROUP
- SYMVAR(noXagExtension)
-#endif
-#ifdef XCMISC
- SYMVAR(noXCMiscExtension)
-#endif
-#ifdef XEVIE
- SYMVAR(noXevieExtension)
-#endif
#ifdef XF86BIGFONT
SYMVAR(noXFree86BigfontExtension)
#endif
@@ -421,9 +363,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef XF86DRI
SYMVAR(noXFree86DRIExtension)
#endif
-#ifdef XF86MISC
- SYMVAR(noXFree86MiscExtension)
-#endif
#ifdef XF86VIDMODE
SYMVAR(noXFree86VidModeExtension)
#endif
@@ -437,12 +376,6 @@ _X_HIDDEN void *dixLookupTab[] = {
#ifdef PANORAMIX
SYMVAR(noPanoramiXExtension)
#endif
-#ifdef XINPUT
- SYMVAR(noXInputExtension)
-#endif
-#ifdef XIDLE
- SYMVAR(noXIdleExtension)
-#endif
#ifdef XSELINUX
SYMVAR(noSELinuxExtension)
#endif
@@ -477,15 +410,12 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMFUNC(SetCriticalOutputPending)
SYMVAR(FlushCallback)
SYMVAR(ReplyCallback)
- SYMVAR(SkippedRequestsCallback)
SYMFUNC(ResetCurrentRequest)
/* connection.c */
SYMFUNC(IgnoreClient)
SYMFUNC(AttendClient)
SYMFUNC(AddEnabledDevice)
SYMFUNC(RemoveEnabledDevice)
- SYMFUNC(MakeClientGrabPervious)
- SYMFUNC(MakeClientGrabImpervious)
SYMVAR(GrabInProgress)
#ifdef XKB
@@ -496,14 +426,10 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(XkbDfltRepeatInterval)
#endif
-#ifdef XINPUT
/* Xi */
/* exevents.c */
SYMFUNC(InitValuatorAxisStruct)
SYMFUNC(InitProximityClassDeviceStruct)
- /* extinit.c */
- SYMFUNC(AssignTypeAndName)
-#endif
/* xf86DGA.c */
/* XXX This is exported from the DDX, not DIX. */
diff --git a/xorg-server/hw/xfree86/loader/dlloader.c b/xorg-server/hw/xfree86/loader/dlloader.c
index 4caefd071..18dcb76c6 100644
--- a/xorg-server/hw/xfree86/loader/dlloader.c
+++ b/xorg-server/hw/xfree86/loader/dlloader.c
@@ -87,16 +87,15 @@ DLFindSymbolLocal(pointer module, const char *name)
static const char symPrefix[] = DLSYM_PREFIX;
- if (strlen(symPrefix)) {
+ if (sizeof(symPrefix) > 1) {
n = malloc(strlen(symPrefix) + strlen(name) + 1);
sprintf(n, "%s%s", symPrefix, name);
- } else {
- n = name;
+ name = n;
}
- p = dlsym(module, n);
+ p = dlsym(module, name);
- if (strlen(symPrefix))
+ if (sizeof(symPrefix) > 1)
free(n);
return p;
diff --git a/xorg-server/hw/xfree86/loader/fontsym.c b/xorg-server/hw/xfree86/loader/fontsym.c
deleted file mode 100644
index 82d4b1cf8..000000000
--- a/xorg-server/hw/xfree86/loader/fontsym.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 1998-2002 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <X11/fonts/font.h>
-#include "sym.h"
-#include <X11/fonts/fntfilst.h>
-#include <X11/fonts/fontenc.h>
-#ifdef FONTENC_COMPATIBILITY
-#include <X11/fonts/fontencc.h>
-#endif
-#include <X11/fonts/fntfilio.h>
-#include <X11/fonts/fntfil.h>
-#include <X11/fonts/fontutil.h>
-#include <X11/fonts/fontxlfd.h>
-#ifdef FONTCACHE
-#define _FONTCACHE_SERVER_
-#include "fontcache.h"
-#endif
-
-_X_HIDDEN void *fontLookupTab[] = {
-
- SYMFUNC(TwoByteSwap)
- SYMFUNC(FourByteSwap)
- SYMFUNC(FontCouldBeTerminal)
- SYMFUNC(BufFileRead)
- SYMFUNC(BufFileWrite)
- SYMFUNC(CheckFSFormat)
- SYMFUNC(FontFileOpen)
- SYMFUNC(FontFilePriorityRegisterRenderer)
- SYMFUNC(FontFileRegisterRenderer)
- SYMFUNC(FontParseXLFDName)
- SYMFUNC(FontFileCloseFont)
- SYMFUNC(FontFileOpenBitmap)
- SYMFUNC(FontFileCompleteXLFD)
- SYMFUNC(FontFileCountDashes)
- SYMFUNC(FontFileFindNameInDir)
- SYMFUNC(FontFileClose)
- SYMFUNC(FontComputeInfoAccelerators)
- SYMFUNC(FontDefaultFormat)
- SYMFUNC(NameForAtom)
- SYMFUNC(BitOrderInvert)
- SYMFUNC(FontFileMatchRenderer)
- SYMFUNC(RepadBitmap)
- SYMFUNC(FontEncName)
- SYMFUNC(FontEncRecode)
- SYMFUNC(FontEncFind)
- SYMFUNC(FontMapFind)
- SYMFUNC(FontEncMapFind)
- SYMFUNC(FontEncFromXLFD)
- SYMFUNC(FontEncDirectory)
- SYMFUNC(FontMapReverse)
- SYMFUNC(FontMapReverseFree)
- SYMFUNC(CreateFontRec)
- SYMFUNC(DestroyFontRec)
- SYMFUNC(GetGlyphs)
- SYMFUNC(QueryGlyphExtents)
-
- SYMVAR(FontFileBitmapSources)
-
-#ifdef FONTENC_COMPATIBILITY
- /* Obsolete backwards compatibility symbols -- fontencc.c */
- SYMFUNC(font_encoding_from_xlfd)
- SYMFUNC(font_encoding_find)
- SYMFUNC(font_encoding_recode)
- SYMFUNC(font_encoding_name)
- SYMFUNC(identifyEncodingFile)
-#endif
-
-#ifdef FONTCACHE
- /* fontcache.c */
- SYMFUNC(FontCacheGetSettings)
- SYMFUNC(FontCacheGetStatistics)
- SYMFUNC(FontCacheChangeSettings)
- SYMFUNC(FontCacheOpenCache)
- SYMFUNC(FontCacheCloseCache)
- SYMFUNC(FontCacheSearchEntry)
- SYMFUNC(FontCacheGetEntry)
- SYMFUNC(FontCacheInsertEntry)
- SYMFUNC(FontCacheGetBitmap)
-#endif
-};
diff --git a/xorg-server/hw/xfree86/loader/loader.c b/xorg-server/hw/xfree86/loader/loader.c
index a00269b70..fc0db2886 100644
--- a/xorg-server/hw/xfree86/loader/loader.c
+++ b/xorg-server/hw/xfree86/loader/loader.c
@@ -63,7 +63,7 @@
#include <string.h>
#if defined(linux) && \
(defined(__alpha__) || defined(__powerpc__) || defined(__ia64__) \
- || defined(__amd64__) || defined(__x86_64__))
+ || defined(__amd64__))
#include <malloc.h>
#endif
#include <stdarg.h>
@@ -76,11 +76,6 @@
#include "compiler.h"
#include "sym.h"
-#if defined(Lynx) && defined(sun)
-/* Cross build machine doesn;t have strerror() */
-#define strerror(err) "strerror unsupported"
-#endif
-
/*
* handles are used to identify files that are loaded. Even archives
* are counted as a single file.
@@ -113,8 +108,7 @@ LoaderInit(void)
xf86MsgVerb(X_INFO, 2, "Loader magic: %p\n", (void *)
((long)dixLookupTab ^ (long)extLookupTab
- ^ (long)fontLookupTab ^ (long)miLookupTab
- ^ (long)xfree86LookupTab));
+ ^ (long)miLookupTab ^ (long)xfree86LookupTab));
xf86MsgVerb(X_INFO, 2, "Module ABI versions:\n");
xf86ErrorFVerb(2, "\t%s: %d.%d\n", ABI_CLASS_ANSIC,
GET_ABI_MAJOR(LoaderVersionInfo.ansicVersion),
@@ -128,9 +122,6 @@ LoaderInit(void)
xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_EXTENSION,
GET_ABI_MAJOR(LoaderVersionInfo.extensionVersion),
GET_ABI_MINOR(LoaderVersionInfo.extensionVersion));
- xf86ErrorFVerb(2, "\t%s : %d.%d\n", ABI_CLASS_FONT,
- GET_ABI_MAJOR(LoaderVersionInfo.fontVersion),
- GET_ABI_MINOR(LoaderVersionInfo.fontVersion));
LoaderGetOS(&osname, NULL, NULL, NULL);
if (osname)
@@ -258,7 +249,7 @@ LoaderOpen(const char *module, const char *cname, int handle,
* Find a free handle.
*/
new_handle = 1;
- while (freeHandles[new_handle] && new_handle < MAX_HANDLE)
+ while (new_handle < MAX_HANDLE && freeHandles[new_handle])
new_handle++;
if (new_handle == MAX_HANDLE) {
@@ -363,6 +354,12 @@ LoaderSetOptions(unsigned long opts)
LoaderOptions |= opts;
}
+_X_EXPORT Bool
+LoaderShouldIgnoreABI(void)
+{
+ return (LoaderOptions & LDR_OPT_ABI_MISMATCH_NONFATAL) != 0;
+}
+
_X_EXPORT int
LoaderGetABIVersion(const char *abiclass)
{
diff --git a/xorg-server/hw/xfree86/loader/loader.h b/xorg-server/hw/xfree86/loader/loader.h
index 46d4c3ed3..ac5f99cf5 100644
--- a/xorg-server/hw/xfree86/loader/loader.h
+++ b/xorg-server/hw/xfree86/loader/loader.h
@@ -53,9 +53,6 @@
#ifndef _LOADER_H
#define _LOADER_H
-#if defined(Lynx) && defined(sun)
-#define const /**/
-#endif
#include <X11/Xosdefs.h>
#include <X11/Xfuncproto.h>
#include <X11/Xmd.h>
diff --git a/xorg-server/hw/xfree86/loader/loaderProcs.h b/xorg-server/hw/xfree86/loader/loaderProcs.h
index 9c73db3a6..a10f0b3a6 100644
--- a/xorg-server/hw/xfree86/loader/loaderProcs.h
+++ b/xorg-server/hw/xfree86/loader/loaderProcs.h
@@ -56,7 +56,6 @@
#undef IN_LOADER
#define IN_LOADER
#include "xf86Module.h"
-#include <X11/fonts/fontmod.h>
typedef struct module_desc {
struct module_desc *child;
@@ -87,7 +86,6 @@ ModuleDescPtr LoadSubModuleLocal(ModuleDescPtr, const char *,
pointer, const XF86ModReqInfo *,
int *, int *);
ModuleDescPtr DuplicateModule(ModuleDescPtr mod, ModuleDescPtr parent);
-void LoadFont(FontModule *);
void UnloadModule(ModuleDescPtr);
void UnloadSubModule(ModuleDescPtr);
void UnloadDriver(ModuleDescPtr);
diff --git a/xorg-server/hw/xfree86/loader/loadfont.c b/xorg-server/hw/xfree86/loader/loadfont.c
deleted file mode 100644
index 94d31d6c1..000000000
--- a/xorg-server/hw/xfree86/loader/loadfont.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 1998 by The XFree86 Project, Inc.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-/* Maybe this file belongs in lib/font/fontfile/module/ ? */
-
-#define LOADERDECLARATIONS
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "loaderProcs.h"
-#include "misc.h"
-#include "xf86.h"
-
-/* XXX this should be static, but xorgcfg needs it, nngh */
-FontModule *FontModuleList = NULL;
-static int numFontModules = 0;
-
-static FontModule *
-NewFontModule(void)
-{
- FontModule *save = FontModuleList;
- int n;
-
- /* Sanity check */
- if (!FontModuleList)
- numFontModules = 0;
-
- n = numFontModules + 1;
- FontModuleList = xrealloc(FontModuleList, (n + 1) * sizeof(FontModule));
- if (FontModuleList == NULL) {
- FontModuleList = save;
- return NULL;
- } else {
- numFontModules++;
- FontModuleList[numFontModules].name = NULL;
- return FontModuleList + (numFontModules - 1);
- }
-}
-
-_X_EXPORT void
-LoadFont(FontModule * f)
-{
- FontModule *newfont;
-
- if (f == NULL)
- return;
-
- if (!(newfont = NewFontModule()))
- return;
-
- xf86MsgVerb(X_INFO, 2, "Loading font %s\n", f->name);
-
- newfont->name = f->name;
- newfont->initFunc = f->initFunc;
- newfont->module = f->module;
-}
diff --git a/xorg-server/hw/xfree86/loader/loadmod.c b/xorg-server/hw/xfree86/loader/loadmod.c
index 7f3bbe49c..22b540c5d 100644
--- a/xorg-server/hw/xfree86/loader/loadmod.c
+++ b/xorg-server/hw/xfree86/loader/loadmod.c
@@ -59,9 +59,7 @@
#include "misc.h"
#include "xf86.h"
#include "xf86Priv.h"
-#ifdef XINPUT
#include "xf86Xinput.h"
-#endif
#include "loader.h"
#include "xf86Optrec.h"
@@ -200,7 +198,6 @@ LoaderSetPath(const char *path)
/* Standard set of module subdirectories to search, in order of preference */
static const char *stdSubdirs[] = {
"",
- "fonts/",
"input/",
"drivers/",
"multimedia/",
@@ -850,14 +847,7 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
char *m = NULL;
const char **cim;
- xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"\n", module);
-
- for (cim = compiled_in_modules; *cim; cim++)
- if (!strcmp (module, *cim))
- {
- xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", module);
- return (ModuleDescPtr) 1;
- }
+ xf86MsgVerb(X_INFO, 3, "LoadModule: \"%s\"", module);
patterns = InitPatterns(patternlist);
name = LoaderGetCanonicalName(module, patterns);
@@ -872,6 +862,15 @@ doLoadModule(const char *module, const char *path, const char **subdirlist,
xf86ErrorFVerb(3, "\n");
m = (char *)module;
}
+
+ for (cim = compiled_in_modules; *cim; cim++)
+ if (!strcmp (m, *cim))
+ {
+ xf86MsgVerb(X_INFO, 3, "Module \"%s\" already built-in\n", m);
+ ret = (ModuleDescPtr) 1;
+ goto LoadModule_exit;
+ }
+
if (!name) {
if (errmaj)
*errmaj = LDR_BADUSAGE;
@@ -1136,24 +1135,6 @@ UnloadSubModule(ModuleDescPtr mod)
}
static void
-FreeModuleDesc(ModuleDescPtr head)
-{
- ModuleDescPtr sibs, prev;
-
- if (head == (ModuleDescPtr) 1)
- return;
- if (head->child)
- FreeModuleDesc(head->child);
- sibs = head;
- while (sibs) {
- prev = sibs;
- sibs = sibs->sib;
- TestFree(prev->name);
- xfree(prev);
- }
-}
-
-static void
RemoveChild(ModuleDescPtr child)
{
ModuleDescPtr mdp;
diff --git a/xorg-server/hw/xfree86/loader/misym.c b/xorg-server/hw/xfree86/loader/misym.c
index aa712c03a..91f2529b0 100644
--- a/xorg-server/hw/xfree86/loader/misym.c
+++ b/xorg-server/hw/xfree86/loader/misym.c
@@ -84,127 +84,102 @@
extern miPointerSpriteFuncRec miSpritePointerFuncs;
_X_HIDDEN void *miLookupTab[] = {
+ SYMFUNC(miChangeClip)
+ SYMFUNC(miChangeGC)
+ SYMFUNC(miClearDrawable)
SYMFUNC(miClearToBackground)
- SYMFUNC(miSendGraphicsExpose)
+ SYMFUNC(miClearVisualTypes)
+ SYMFUNC(miClipSpans)
+ SYMFUNC(miComputeCompositeClip)
+ SYMFUNC(miCopyClip)
+ SYMFUNC(miCopyGC)
+ SYMFUNC(miCreateDefColormap)
+ SYMFUNC(miCreateScreenResources)
+ SYMFUNC(miDCInitialize)
+ SYMFUNC(miDestroyClip)
+ SYMFUNC(miDestroyGC)
+ SYMFUNC(miExpandDirectColors)
+ SYMFUNC(miFillArcSetup)
+ SYMFUNC(miFillArcSliceSetup)
+ SYMFUNC(miFillPolygon)
+ SYMFUNC(miGetDefaultVisualMask)
+ SYMFUNC(miHandleExposures)
+ SYMFUNC(miImageGlyphBlt)
+ SYMFUNC(miImageText16)
+ SYMFUNC(miImageText8)
+ SYMFUNC(miInitOverlay)
+ SYMFUNC(miInitVisuals)
+ SYMFUNC(miInitializeBackingStore)
+ SYMFUNC(miInitializeBanking)
+ SYMFUNC(miInitializeColormap)
+ SYMFUNC(miInstallColormap)
+ SYMFUNC(miIntersect)
+ SYMFUNC(miInverse)
+ SYMFUNC(miListInstalledColormaps)
SYMFUNC(miModifyPixmapHeader)
- SYMFUNC(miHandleValidateExposures)
- SYMFUNC(miSetShape)
- SYMFUNC(miChangeBorderWidth)
- SYMFUNC(miShapedWindowIn)
- SYMFUNC(miRectIn)
- SYMFUNC(miZeroClipLine)
- SYMFUNC(miZeroDashLine)
- SYMFUNC(miClearDrawable)
+ SYMFUNC(miOverlayCollectUnderlayRegions)
+ SYMFUNC(miOverlayComputeCompositeClip)
+ SYMFUNC(miOverlayCopyUnderlay)
+ SYMFUNC(miOverlayGetPrivateClips)
+ SYMFUNC(miOverlaySetRootClip)
+ SYMFUNC(miOverlaySetTransFunction)
+ SYMFUNC(miPointInRegion)
+ SYMFUNC(miPointerAbsoluteCursor)
+ SYMFUNC(miPointerCurrentScreen)
+ SYMFUNC(miPointerInitialize)
+ SYMFUNC(miPointerWarpCursor)
+ SYMFUNC(miPolyArc)
+ SYMFUNC(miPolyBuildEdge)
+ SYMFUNC(miPolyBuildPoly)
+ SYMFUNC(miPolyFillArc)
+ SYMFUNC(miPolyFillRect)
+ SYMFUNC(miPolyGlyphBlt)
SYMFUNC(miPolyPoint)
- SYMFUNC(miStepDash)
- SYMFUNC(miIntersect)
+ SYMFUNC(miPolyRectangle)
+ SYMFUNC(miPolySegment)
+ SYMFUNC(miPolyText16)
+ SYMFUNC(miPolyText8)
+ SYMFUNC(miRectAlloc)
+ SYMFUNC(miRectIn)
+ SYMFUNC(miRectsToRegion)
SYMFUNC(miRegionAppend)
SYMFUNC(miRegionCopy)
+ SYMFUNC(miRegionCreate)
SYMFUNC(miRegionDestroy)
SYMFUNC(miRegionEmpty)
+ SYMFUNC(miRegionEqual)
SYMFUNC(miRegionExtents)
SYMFUNC(miRegionInit)
SYMFUNC(miRegionNotEmpty)
- SYMFUNC(miRegionEqual)
SYMFUNC(miRegionReset)
SYMFUNC(miRegionUninit)
SYMFUNC(miRegionValidate)
- SYMFUNC(miTranslateRegion)
- SYMFUNC(miHandleExposures)
- SYMFUNC(miPolyFillRect)
- SYMFUNC(miPolyFillArc)
- SYMFUNC(miImageGlyphBlt)
- SYMFUNC(miPolyGlyphBlt)
- SYMFUNC(miFillPolygon)
- SYMFUNC(miFillConvexPoly)
- SYMFUNC(miPolySegment)
- SYMFUNC(miZeroLine)
- SYMFUNC(miWideLine)
- SYMFUNC(miWideDash)
- SYMFUNC(miZeroPolyArc)
- SYMFUNC(miPolyArc)
- SYMFUNC(miCreateGCOps)
- SYMFUNC(miDestroyGCOps)
- SYMFUNC(miComputeCompositeClip)
- SYMFUNC(miChangeGC)
- SYMFUNC(miCopyGC)
- SYMFUNC(miDestroyGC)
- SYMFUNC(miChangeClip)
- SYMFUNC(miDestroyClip)
- SYMFUNC(miCopyClip)
- SYMFUNC(miPolyRectangle)
- SYMFUNC(miPolyText8)
- SYMFUNC(miPolyText16)
- SYMFUNC(miImageText8)
- SYMFUNC(miImageText16)
- SYMFUNC(miRegionCreate)
- SYMFUNC(miPaintWindow)
- SYMFUNC(miZeroArcSetup)
- SYMFUNC(miFillArcSetup)
- SYMFUNC(miFillArcSliceSetup)
- SYMFUNC(miFindMaxBand)
- SYMFUNC(miClipSpans)
- SYMFUNC(miAllocateGCPrivateIndex)
- SYMFUNC(miScreenInit)
- SYMFUNC(miGetScreenPixmap)
- SYMFUNC(miSetScreenPixmap)
- SYMFUNC(miPointerCurrentScreen)
- SYMFUNC(miRectAlloc)
- SYMFUNC(miInitializeBackingStore)
- SYMFUNC(miInitializeBanking)
- SYMFUNC(miModifyBanking)
- SYMFUNC(miCopyPlane)
- SYMFUNC(miCopyArea)
- SYMFUNC(miCreateScreenResources)
- SYMFUNC(miGetImage)
- SYMFUNC(miPutImage)
- SYMFUNC(miPushPixels)
- SYMFUNC(miPointerInitialize)
- SYMFUNC(miPointerPosition)
- SYMFUNC(miRecolorCursor)
- SYMFUNC(miPointerWarpCursor)
- SYMFUNC(miDCInitialize)
- SYMFUNC(miRectsToRegion)
- SYMFUNC(miPointInRegion)
- SYMFUNC(miInverse)
- SYMFUNC(miSubtract)
- SYMFUNC(miUnion)
- SYMFUNC(miPolyBuildEdge)
- SYMFUNC(miPolyBuildPoly)
- SYMFUNC(miRoundJoinClip)
- SYMFUNC(miRoundCapClip)
- SYMFUNC(miSetZeroLineBias)
SYMFUNC(miResolveColor)
- SYMFUNC(miInitializeColormap)
- SYMFUNC(miInstallColormap)
- SYMFUNC(miUninstallColormap)
- SYMFUNC(miListInstalledColormaps)
- SYMFUNC(miExpandDirectColors)
- SYMFUNC(miCreateDefColormap)
- SYMFUNC(miClearVisualTypes)
+ SYMFUNC(miRoundCapClip)
+ SYMFUNC(miRoundJoinClip)
+ SYMFUNC(miScreenInit)
+ SYMFUNC(miSegregateChildren)
+ SYMFUNC(miSetPixmapDepths)
SYMFUNC(miSetVisualTypes)
SYMFUNC(miSetVisualTypesAndMasks)
- SYMFUNC(miGetDefaultVisualMask)
- SYMFUNC(miSetPixmapDepths)
- SYMFUNC(miInitVisuals)
+ SYMFUNC(miSetZeroLineBias)
+ SYMFUNC(miSubtract)
+ SYMFUNC(miTranslateRegion)
+ SYMFUNC(miUninstallColormap)
+ SYMFUNC(miUnion)
+ SYMFUNC(miWideDash)
+ SYMFUNC(miWideLine)
SYMFUNC(miWindowExposures)
- SYMFUNC(miSegregateChildren)
- SYMFUNC(miHookInitVisuals)
- SYMFUNC(miPointerAbsoluteCursor)
- SYMFUNC(miOverlayCopyUnderlay)
- SYMFUNC(miOverlaySetTransFunction)
- SYMFUNC(miOverlayCollectUnderlayRegions)
- SYMFUNC(miInitOverlay)
- SYMFUNC(miOverlayComputeCompositeClip)
- SYMFUNC(miOverlayGetPrivateClips)
- SYMFUNC(miOverlaySetRootClip)
+ SYMFUNC(miZeroArcSetup)
+ SYMFUNC(miZeroClipLine)
+ SYMFUNC(miZeroLine)
+ SYMFUNC(miZeroPolyArc)
SYMVAR(miEmptyBox)
SYMVAR(miEmptyData)
- SYMVAR(miZeroLineScreenKey)
- SYMVAR(miSpritePointerFuncs)
- SYMVAR(miPointerScreenKey)
SYMVAR(miInstalledMaps)
- SYMVAR(miInitVisualsProc)
+ SYMVAR(miPointerScreenKey)
+ SYMVAR(miSpritePointerFuncs)
+ SYMVAR(miZeroLineScreenKey)
#ifdef DAMAGE
SYMFUNC(DamageDamageRegion)
#endif
diff --git a/xorg-server/hw/xfree86/loader/os.c b/xorg-server/hw/xfree86/loader/os.c
index 12cf3d859..ef9ac38b4 100644
--- a/xorg-server/hw/xfree86/loader/os.c
+++ b/xorg-server/hw/xfree86/loader/os.c
@@ -48,16 +48,10 @@
#define OSNAME "netbsd"
#elif defined(__OpenBSD__)
#define OSNAME "openbsd"
-#elif defined(Lynx)
-#define OSNAME "lynxos"
#elif defined(__GNU__)
#define OSNAME "hurd"
#elif defined(__SCO__)
#define OSNAME "sco"
-#elif defined(DGUX)
-#define OSNAME "dgux"
-#elif defined(ISC)
-#define OSNAME "isc"
#elif defined(SVR4) && defined(sun)
#define OSNAME "solaris"
#elif defined(SVR5)
diff --git a/xorg-server/hw/xfree86/loader/xf86sym.c b/xorg-server/hw/xfree86/loader/xf86sym.c
index 24fc44c1b..6378948d4 100644
--- a/xorg-server/hw/xfree86/loader/xf86sym.c
+++ b/xorg-server/hw/xfree86/loader/xf86sym.c
@@ -64,10 +64,7 @@
#include "xf86_OSproc.h"
#include "xf86Parser.h"
#include "xf86Config.h"
-#ifdef XINPUT
-# include "xf86Xinput.h"
-#endif
-#include "xf86OSmouse.h"
+#include "xf86Xinput.h"
#ifdef XV
#include "xf86xv.h"
#include "xf86xvmc.h"
@@ -79,7 +76,6 @@
#include "dpmsproc.h"
#endif
#include "vidmodeproc.h"
-#include "xf86miscproc.h"
#include "loader.h"
#include "xisb.h"
#include "vbe.h"
@@ -100,6 +96,9 @@
#include "IBM.h"
#include "TI.h"
+#include "xf86RamDac.h"
+#include "BT.h"
+
#ifndef HAS_GLIBC_SIGSETJMP
#if defined(setjmp) && defined(__GNU_LIBRARY__) && \
(!defined(__GLIBC__) || (__GLIBC__ < 2) || \
@@ -188,7 +187,7 @@ extern long __umodsi3(long, long);
#include <sys/io.h>
#endif
-#if defined(__powerpc__) && (defined(Lynx) || defined(linux))
+#if defined(__powerpc__) && defined(linux)
void _restf14();
void _restf17();
void _restf18();
@@ -245,8 +244,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86ReadBIOS)
SYMFUNC(xf86EnableIO)
SYMFUNC(xf86DisableIO)
- SYMFUNC(xf86DisableInterrupts)
- SYMFUNC(xf86EnableInterrupts)
SYMFUNC(xf86LinearVidMem)
SYMFUNC(xf86CheckMTRR)
SYMFUNC(xf86MapVidMem)
@@ -254,7 +251,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86MapReadSideEffects)
SYMFUNC(xf86MapDomainMemory)
SYMFUNC(xf86UDelay)
- SYMFUNC(xf86IODelay)
SYMFUNC(xf86SlowBcopy)
SYMFUNC(xf86SetReallySlowBcopy)
#ifdef __alpha__
@@ -277,7 +273,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86SerialModemSetBits)
SYMFUNC(xf86SerialModemClearBits)
SYMFUNC(xf86LoadKernelModule)
- SYMFUNC(xf86OSMouseInit)
SYMFUNC(xf86AgpGARTSupported)
SYMFUNC(xf86GetAGPInfo)
SYMFUNC(xf86AcquireGART)
@@ -288,33 +283,24 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86UnbindGARTMemory)
SYMFUNC(xf86EnableAGP)
SYMFUNC(xf86GARTCloseScreen)
-#ifdef XINPUT
SYMFUNC(XisbNew)
SYMFUNC(XisbFree)
SYMFUNC(XisbRead)
SYMFUNC(XisbWrite)
SYMFUNC(XisbTrace)
SYMFUNC(XisbBlockDuration)
-#endif
/* xf86Bus.c */
SYMFUNC(xf86CheckPciSlot)
SYMFUNC(xf86ClaimPciSlot)
- SYMFUNC(xf86ClaimIsaSlot)
SYMFUNC(xf86ClaimFbSlot)
SYMFUNC(xf86ClaimNoSlot)
SYMFUNC(xf86ParsePciBusString)
SYMFUNC(xf86ComparePciBusString)
SYMFUNC(xf86FormatPciBusNumber)
- SYMFUNC(xf86ParseIsaBusString)
SYMFUNC(xf86EnableAccess)
SYMFUNC(xf86SetCurrentAccess)
SYMFUNC(xf86IsPrimaryPci)
- SYMFUNC(xf86IsPrimaryIsa)
- SYMFUNC(xf86PrintResList)
- SYMFUNC(xf86AddResToList)
- SYMFUNC(xf86JoinResLists)
- SYMFUNC(xf86DupResList)
SYMFUNC(xf86FreeResList)
SYMFUNC(xf86ClaimFixedResources)
SYMFUNC(xf86AddEntityToScreen)
@@ -324,19 +310,14 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86GetNumEntityInstances)
SYMFUNC(xf86GetDevFromEntity)
SYMFUNC(xf86GetPciInfoForEntity)
- SYMFUNC(xf86SetEntityFuncs)
- SYMFUNC(xf86DeallocateResourcesForEntity)
SYMFUNC(xf86RegisterResources)
SYMFUNC(xf86CheckPciMemBase)
SYMFUNC(xf86SetAccessFuncs)
SYMFUNC(xf86IsEntityPrimary)
SYMFUNC(xf86SetOperatingState)
- SYMFUNC(xf86EnterServerState)
- SYMFUNC(xf86ChkConflict)
SYMFUNC(xf86FindScreenForEntity)
SYMFUNC(xf86RegisterStateChangeNotificationCallback)
SYMFUNC(xf86DeregisterStateChangeNotificationCallback)
- SYMFUNC(xf86NoSharedResources)
/* Shared Accel Accessor Functions */
SYMFUNC(xf86GetLastScrnFlag)
SYMFUNC(xf86SetLastScrnFlag)
@@ -350,9 +331,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86AllocateEntityPrivateIndex)
SYMFUNC(xf86GetEntityPrivate)
- /* xf86Configure.c */
- SYMFUNC(xf86AddDeviceToConfigure)
-
/* xf86Cursor.c */
SYMFUNC(xf86GetPointerScreenFuncs)
@@ -427,7 +405,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86PrintChipsets)
SYMFUNC(xf86MatchDevice)
SYMFUNC(xf86MatchPciInstances)
- SYMFUNC(xf86MatchIsaInstances)
SYMFUNC(xf86GetVerbosity)
SYMFUNC(xf86GetVisualName)
SYMFUNC(xf86GetPix24)
@@ -446,11 +423,9 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86GetModInDevAllowNonLocal)
SYMFUNC(xf86GetModInDevEnabled)
SYMFUNC(xf86GetAllowMouseOpenFail)
- SYMFUNC(xf86CommonSpecialKey)
SYMFUNC(xf86IsPc98)
SYMFUNC(xf86DisableRandR)
SYMFUNC(xf86GetRotation)
- SYMFUNC(xf86GetVersion)
SYMFUNC(xf86GetModuleVersion)
SYMFUNC(xf86GetClocks)
SYMFUNC(xf86SetPriority)
@@ -469,12 +444,9 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86FindXvOptions)
SYMFUNC(xf86GetOS)
SYMFUNC(xf86ConfigPciEntity)
- SYMFUNC(xf86ConfigIsaEntity)
SYMFUNC(xf86ConfigFbEntity)
SYMFUNC(xf86ConfigActivePciEntity)
- SYMFUNC(xf86ConfigActiveIsaEntity)
SYMFUNC(xf86ConfigPciEntityInactive)
- SYMFUNC(xf86ConfigIsaEntityInactive)
SYMFUNC(xf86IsScreenPrimary)
SYMFUNC(xf86RegisterRootWindowProperty)
SYMFUNC(xf86IsUnblank)
@@ -645,32 +617,10 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(VidModeGetGammaRampSize)
#endif
- /* xf86Versions.c */
- SYMFUNC(xf86GetBuiltinInterfaceVersion)
- SYMFUNC(xf86RegisterBuiltinInterfaceVersion)
-
- /* xf86MiscExt.c */
-#ifdef XF86MISC
- SYMFUNC(MiscExtGetMouseSettings)
- SYMFUNC(MiscExtGetMouseValue)
- SYMFUNC(MiscExtSetMouseValue)
- SYMFUNC(MiscExtSetMouseDevice)
- SYMFUNC(MiscExtGetKbdSettings)
- SYMFUNC(MiscExtGetKbdValue)
- SYMFUNC(MiscExtSetKbdValue)
- SYMFUNC(MiscExtSetGrabKeysState)
- SYMFUNC(MiscExtCreateStruct)
- SYMFUNC(MiscExtDestroyStruct)
- SYMFUNC(MiscExtApply)
- SYMFUNC(MiscExtGetFilePaths)
- SYMFUNC(MiscExtPassMessage)
-#endif
-
/* Misc */
SYMFUNC(GetTimeInMillis)
/* xf86Xinput.c */
-#ifdef XINPUT
SYMFUNC(xf86ProcessCommonOptions)
SYMFUNC(xf86PostMotionEvent)
SYMFUNC(xf86PostProximityEvent)
@@ -681,24 +631,16 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86ActivateDevice)
SYMFUNC(xf86XInputSetScreen)
SYMFUNC(xf86ScaleAxis)
-#endif
+ SYMFUNC(NewInputDeviceRequest)
+ SYMFUNC(DeleteInputDeviceRequest)
#ifdef DPMSExtension
SYMFUNC(DPMSGet)
SYMFUNC(DPMSSet)
SYMFUNC(DPMSSupported)
#endif
-/* xf86Debug.c */
-#ifdef BUILDDEBUG
- SYMFUNC(xf86Break1)
- SYMFUNC(xf86Break2)
- SYMFUNC(xf86Break3)
- SYMFUNC(xf86SPTimestamp)
- SYMFUNC(xf86STimestamp)
-#endif
SYMFUNC(pciTag)
SYMFUNC(pciBusAddrToHostAddr)
- SYMFUNC(xf86scanpci)
/* Loader functions */
SYMFUNC(LoadSubModule)
@@ -706,7 +648,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(LoaderErrorMsg)
SYMFUNC(LoaderCheckUnresolved)
SYMFUNC(LoadExtension)
- SYMFUNC(LoadFont)
SYMFUNC(LoaderReqSymbols)
SYMFUNC(LoaderReqSymLists)
SYMFUNC(LoaderRefSymbols)
@@ -716,6 +657,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(LoaderListDirs)
SYMFUNC(LoaderFreeDirList)
SYMFUNC(LoaderGetOS)
+ SYMFUNC(LoaderShouldIgnoreABI)
SYMFUNC(LoaderGetABIVersion)
#ifdef XF86DRI
@@ -789,7 +731,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(outb)
SYMFUNC(outw)
SYMFUNC(outl)
-# if defined(NO_INLINE) || defined(Lynx)
+# if defined(NO_INLINE)
SYMFUNC(mem_barrier)
SYMFUNC(ldl_u)
SYMFUNC(eieio)
@@ -804,34 +746,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(stw_u)
SYMFUNC(write_mem_barrier)
# endif
-# if defined(Lynx)
- SYMFUNC(_restf14)
- SYMFUNC(_restf17)
- SYMFUNC(_restf18)
- SYMFUNC(_restf19)
- SYMFUNC(_restf20)
- SYMFUNC(_restf22)
- SYMFUNC(_restf23)
- SYMFUNC(_restf24)
- SYMFUNC(_restf25)
- SYMFUNC(_restf26)
- SYMFUNC(_restf27)
- SYMFUNC(_restf28)
- SYMFUNC(_restf29)
- SYMFUNC(_savef14)
- SYMFUNC(_savef17)
- SYMFUNC(_savef18)
- SYMFUNC(_savef19)
- SYMFUNC(_savef20)
- SYMFUNC(_savef22)
- SYMFUNC(_savef23)
- SYMFUNC(_savef24)
- SYMFUNC(_savef25)
- SYMFUNC(_savef26)
- SYMFUNC(_savef27)
- SYMFUNC(_savef28)
- SYMFUNC(_savef29)
-# endif
# if PPCIO_DEBUG
SYMFUNC(debug_inb)
SYMFUNC(debug_inw)
@@ -842,39 +756,23 @@ _X_HIDDEN void *xfree86LookupTab[] = {
# endif
#endif
#if defined(__GNUC__)
-#if !defined(Lynx)
SYMFUNC(__div64)
-#endif
-#if !defined(Lynx) /* FIXME: test on others than x86 and !3.1.0a/x86 */
SYMFUNC(__divdf3)
-#endif
SYMFUNC(__divdi3)
-#if !defined(Lynx)
SYMFUNC(__divsf3)
SYMFUNC(__divsi3)
-#endif
SYMFUNC(__moddi3)
-#if !defined(Lynx)
SYMFUNC(__modsi3)
-#endif
-#if !defined(Lynx)
SYMFUNC(__mul64)
-#endif
-#if !defined(Lynx)
SYMFUNC(__muldf3)
-#endif
SYMFUNC(__muldi3)
-#if !defined(Lynx)
SYMFUNC(__mulsf3)
SYMFUNC(__mulsi3)
SYMFUNC(__udivdi3)
SYMFUNC(__udivsi3)
-#endif
SYMFUNC(__umoddi3)
-#if !defined(Lynx)
SYMFUNC(__umodsi3)
#endif
-#endif
#if defined(__ia64__)
SYMFUNC(outw)
SYMFUNC(outb)
@@ -921,7 +819,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMVAR(res8514Exclusive)
SYMVAR(res8514Shared)
-#if defined(__powerpc__) && (!defined(NO_INLINE) || defined(Lynx))
+#if defined(__powerpc__) && !defined(NO_INLINE)
SYMVAR(ioBase)
#endif
@@ -931,9 +829,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
/* Globals from xf86Configure.c */
SYMVAR(ConfiguredMonitor)
- /* Pci.c */
- SYMVAR(pciNumBuses)
-
/* modes */
SYMVAR(xf86CrtcConfigPrivateIndex)
SYMFUNC(xf86CrtcConfigInit)
@@ -942,6 +837,7 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86CrtcDestroy)
SYMFUNC(xf86CrtcInUse)
SYMFUNC(xf86CrtcSetScreenSubpixelOrder)
+ SYMFUNC(xf86RotateFreeShadow)
SYMFUNC(xf86RotateCloseScreen)
SYMFUNC(xf86CrtcRotate)
SYMFUNC(xf86CrtcSetMode)
@@ -1004,13 +900,18 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86_hide_cursors)
SYMFUNC(xf86_cursors_fini)
SYMFUNC(xf86_crtc_clip_video_helper)
+ SYMFUNC(xf86_wrap_crtc_notify)
+ SYMFUNC(xf86_unwrap_crtc_notify)
+ SYMFUNC(xf86_crtc_notify)
SYMFUNC(xf86DoEDID_DDC1)
SYMFUNC(xf86DoEDID_DDC2)
SYMFUNC(xf86InterpretEDID)
SYMFUNC(xf86PrintEDID)
+ SYMFUNC(xf86DoEEDID)
SYMFUNC(xf86DDCMonitorSet)
SYMFUNC(xf86SetDDCproperties)
+ SYMFUNC(xf86MonitorIsHDMI)
SYMFUNC(xf86CreateI2CBusRec)
SYMFUNC(xf86CreateI2CDevRec)