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

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 

Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
This commit is contained in:
Ian Romanick 2006-07-21 15:25:35 -07:00
parent 18624a9b7c 22db3fdb54
commit 07ad92d2c4
162 changed files with 385 additions and 1033 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GL/glx/Makefile.am
View File

@ -13,9 +13,7 @@ AM_CFLAGS = \
@DRIPROTO_CFLAGS@ \ @DRIPROTO_CFLAGS@ \
-I@MESA_SOURCE@/src/mesa/glapi \ -I@MESA_SOURCE@/src/mesa/glapi \
-I@MESA_SOURCE@/src/mesa/main \ -I@MESA_SOURCE@/src/mesa/main \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
-DNO_LIBCWRAPPER \ -DNO_LIBCWRAPPER \
@GLX_DEFINES@ @GLX_DEFINES@

4
GL/mesa/X/Makefile.am
View File

@ -20,9 +20,7 @@ INCLUDES = -I@MESA_SOURCE@/include \
# symbol means "being built in the server" # symbol means "being built in the server"
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ \ @GLX_DEFINES@ \
-DXFree86Server -DXFree86Server

4
GL/mesa/array_cache/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libac.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/glapi/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libglapi.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/main/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmain.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/math/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libmath.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/shader/Makefile.am
View File

@ -4,9 +4,7 @@ noinst_LTLIBRARIES = libshader.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/shader/grammar/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libgrammar.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/shader/slang/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libslang.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/swrast/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libswrast.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/swrast_setup/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libss.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

4
GL/mesa/tnl/Makefile.am
View File

@ -2,9 +2,7 @@ noinst_LTLIBRARIES = libtnl.la
AM_CFLAGS = \ AM_CFLAGS = \
$(DIX_CFLAGS) \ $(DIX_CFLAGS) \
@SERVER_DEFINES@ \ -DXFree86Server \
@MODULE_DEFINES@ \
@LOADER_DEFINES@ \
@GLX_DEFINES@ @GLX_DEFINES@
INCLUDES = -I@MESA_SOURCE@/include \ INCLUDES = -I@MESA_SOURCE@/include \

2
XTrap/Makefile.am
View File

@ -1,5 +1,5 @@
noinst_LTLIBRARIES = libxtrap.la noinst_LTLIBRARIES = libxtrap.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c

2
Xext/Makefile.am
View File

@ -12,7 +12,7 @@ endif
INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
if XORG if XORG
sdk_HEADERS = xvdix.h xvmcext.h sdk_HEADERS = xvdix.h xvmcext.h

24
Xext/xevie.c
View File

@ -59,7 +59,9 @@ of the copyright holder.
#define NoSuchEvent 0x80000000 #define NoSuchEvent 0x80000000
#ifdef XKB
extern Bool noXkbExtension; extern Bool noXkbExtension;
#endif
extern int xeviegrabState; extern int xeviegrabState;
static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client); static int ProcDispatch (register ClientPtr client), SProcDispatch (register ClientPtr client);
@ -201,12 +203,14 @@ int ProcStart (register ClientPtr client)
return BadAlloc; return BadAlloc;
} else } else
return BadAccess; return BadAccess;
#ifdef XKB
if (!noXkbExtension) { if (!noXkbExtension) {
if (!XevieStart()) { if (!XevieStart()) {
DeleteCallback(&ClientStateCallback,XevieClientStateCallback,NULL); DeleteCallback(&ClientStateCallback,XevieClientStateCallback,NULL);
return BadAlloc; return BadAlloc;
} }
} }
#endif
xevieModifiersOn = FALSE; xevieModifiersOn = FALSE;
@ -255,19 +259,23 @@ int ProcSend (register ClientPtr client)
case KeyPress: case KeyPress:
case KeyRelease: case KeyRelease:
xevieKBEventSent = 1; xevieKBEventSent = 1;
if(noXkbExtension) #ifdef XKB
CoreProcessKeyboardEvent (xE, xeviekb, 1); if(!noXkbExtension)
else
doSendEvent(xE, inputInfo.keyboard); doSendEvent(xE, inputInfo.keyboard);
else
#endif
CoreProcessKeyboardEvent (xE, xeviekb, 1);
break; break;
case ButtonPress: case ButtonPress:
case ButtonRelease: case ButtonRelease:
case MotionNotify: case MotionNotify:
xevieEventSent = 1; xevieEventSent = 1;
if(noXkbExtension) #ifdef XKB
CoreProcessPointerEvent(xE, xeviemouse, 1); if(!noXkbExtension)
else
doSendEvent(xE, inputInfo.pointer); doSendEvent(xE, inputInfo.pointer);
else
#endif
CoreProcessPointerEvent(xE, xeviemouse, 1);
break; break;
default: default:
break; break;
@ -464,6 +472,7 @@ XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count)
xE->u.keyButtonPointer.state = keyc->state | inputInfo.pointer->button->state; xE->u.keyButtonPointer.state = keyc->state | inputInfo.pointer->button->state;
/* fix bug: sequence lost in Xlib */ /* fix bug: sequence lost in Xlib */
xE->u.u.sequenceNumber = clients[xevieClientIndex]->sequence; xE->u.u.sequenceNumber = clients[xevieClientIndex]->sequence;
#ifdef XKB
/* fix for bug5092586 */ /* fix for bug5092586 */
if(!noXkbExtension) { if(!noXkbExtension) {
switch(xE->u.u.type) { switch(xE->u.u.type) {
@ -471,6 +480,7 @@ XevieKbdProcessInputProc(xEvent *xE, DeviceIntPtr dev, int count)
case KeyRelease: *kptr &= ~bit; break; case KeyRelease: *kptr &= ~bit; break;
} }
} }
#endif
keycq[keycqHead].time = xE->u.keyButtonPointer.time; keycq[keycqHead].time = xE->u.keyButtonPointer.time;
memcpy(keycq[keycqHead].keyc, keyc, sizeof(KeyClassRec) - sizeof(KeyClassPtr)); memcpy(keycq[keycqHead].keyc, keyc, sizeof(KeyClassRec) - sizeof(KeyClassPtr));
memcpy(keycq[keycqHead].keyc->xkbInfo, keyc->xkbInfo, sizeof(XkbSrvInfoRec)); memcpy(keycq[keycqHead].keyc->xkbInfo, keyc->xkbInfo, sizeof(XkbSrvInfoRec));
@ -525,6 +535,7 @@ XevieEnd(int clientIndex)
{ {
if (!clientIndex || clientIndex == xevieClientIndex) { if (!clientIndex || clientIndex == xevieClientIndex) {
#ifdef XKB
if(!noXkbExtension) { if(!noXkbExtension) {
XevieRemove(inputInfo.keyboard,NULL); XevieRemove(inputInfo.keyboard,NULL);
@ -540,6 +551,7 @@ XevieEnd(int clientIndex)
inputInfo.pointer->public.realInputProc = CoreProcessPointerEvent; inputInfo.pointer->public.realInputProc = CoreProcessPointerEvent;
XkbSetExtension(inputInfo.pointer,ProcessPointerEvent); XkbSetExtension(inputInfo.pointer,ProcessPointerEvent);
} }
#endif
xevieFlag = 0; xevieFlag = 0;
xevieClientIndex = 0; xevieClientIndex = 0;

2
Xi/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libXi.la noinst_LTLIBRARIES = libXi.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
libXi_la_SOURCES = \ libXi_la_SOURCES = \
allowev.c \ allowev.c \

2
afb/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libafb.la noinst_LTLIBRARIES = libafb.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c libafb_gen_sources = afbbltC.c afbbltX.c afbbltCI.c afbbltO.c afbbltG.c afbtileC.c afbtileG.c afbseg.c

2
cfb/Makefile.am
View File

@ -9,7 +9,7 @@ libcfb_la_SOURCES = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c \
libcfb_la_LIBADD = ../mfb/libmfb.la libcfb_la_LIBADD = ../mfb/libmfb.la
AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DPSZ=8 $(DIX_CFLAGS) $(PLATFORMDEFS)
INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common INCLUDES = $(CFB_INCLUDES) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common

2
cfb32/Makefile.am
View File

@ -6,4 +6,4 @@ libcfb32_la_SOURCES = $(libcfb_common_sources) $(libcfb_gen_sources)
INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common INCLUDES = $(CFB_INCLUDES) $(DIX_CFLAGS) -I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DPSZ=32 $(PLATFORMDEFS)

2
composite/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libcomposite.la noinst_LTLIBRARIES = libcomposite.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
libcomposite_la_SOURCES = \ libcomposite_la_SOURCES = \
compalloc.c \ compalloc.c \

17
configure.ac
View File

@ -469,7 +469,7 @@ AC_MSG_RESULT([$SETUID])
AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"]) AM_CONDITIONAL(INSTALL_SETUID, [test "x$SETUID" = "xyes"])
dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
dnl was not expanded, since libX11 with no transport types is rather useless. dnl was not expanded, since xorg-server with no transport types is rather useless.
dnl dnl
dnl If you're seeing an error here, be sure you installed the lib/xtrans module dnl If you're seeing an error here, be sure you installed the lib/xtrans module
dnl first and if it's not in the default location, that you set the ACLOCAL dnl first and if it's not in the default location, that you set the ACLOCAL
@ -865,11 +865,6 @@ dnl ---------------------------------------------------------------------------
dnl DDX section. dnl DDX section.
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl These are used to define Xorg module, loader and general server defines
MODULE_DEFINES=""
LOADER_DEFINES=""
SERVER_DEFINES=""
dnl DMX DDX dnl DMX DDX
AC_MSG_CHECKING([whether to build Xdmx DDX]) AC_MSG_CHECKING([whether to build Xdmx DDX])
@ -1247,11 +1242,6 @@ int main () {
AC_SUBST([XORG_CFLAGS]) AC_SUBST([XORG_CFLAGS])
AC_SUBST([LD_EXPORT_SYMBOLS_FLAG]) AC_SUBST([LD_EXPORT_SYMBOLS_FLAG])
dnl Module defines are used in the Xorg server and the drivers
MODULE_DEFINES="$MODULE_DEFINES -DIN_MODULE -DXFree86Module"
LOADER_DEFINES="$LOADER_DEFINES -DXFree86LOADER"
SERVER_DEFINES="$SERVER_DEFINES -DXFree86Server"
dnl these only go in xorg-config.h dnl these only go in xorg-config.h
XF86CONFIGFILE="xorg.conf" XF86CONFIGFILE="xorg.conf"
CONFIGFILE="$sysconfdir/$XF86CONFIGFILE" CONFIGFILE="$sysconfdir/$XF86CONFIGFILE"
@ -1259,6 +1249,7 @@ int main () {
AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) AC_DEFINE(XORG_SERVER, 1, [Building Xorg server])
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) AC_DEFINE(XORGSERVER, 1, [Building Xorg server])
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) AC_DEFINE(XFree86Server, 1, [Building XFree86 server])
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server])
AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version])
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
@ -1596,10 +1587,6 @@ AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes])
AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun])
AC_SUBST([MODULE_DEFINES])
AC_SUBST([LOADER_DEFINES])
AC_SUBST([SERVER_DEFINES])
CFLAGS="$XSERVER_CFLAGS $CFLAGS" CFLAGS="$XSERVER_CFLAGS $CFLAGS"
AC_SUBST([CFLAGS]) AC_SUBST([CFLAGS])

2
damageext/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdamageext.la noinst_LTLIBRARIES = libdamageext.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
libdamageext_la_SOURCES = \ libdamageext_la_SOURCES = \
damageext.c \ damageext.c \

2
dbe/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdbe.la noinst_LTLIBRARIES = libdbe.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
if XORG if XORG
sdk_HEADERS = dbestruct.h sdk_HEADERS = dbestruct.h

2
dix/Makefile.am
View File

@ -1,6 +1,6 @@
noinst_LTLIBRARIES = libdix.la libxpstubs.la noinst_LTLIBRARIES = libdix.la libxpstubs.la
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ \ AM_CFLAGS = $(DIX_CFLAGS) \
-DVENDOR_STRING=\""@VENDOR_STRING@"\" \ -DVENDOR_STRING=\""@VENDOR_STRING@"\" \
-DVENDOR_RELEASE="@VENDOR_RELEASE@" -DVENDOR_RELEASE="@VENDOR_RELEASE@"

2
dix/atom.c
View File

@ -54,6 +54,8 @@ SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <stdio.h>
#include <string.h>
#include "misc.h" #include "misc.h"
#include "resource.h" #include "resource.h"
#include "dix.h" #include "dix.h"

3
dix/colormap.c
View File

@ -56,6 +56,9 @@ SOFTWARE.
#include <X11/X.h> #include <X11/X.h>
#define NEED_EVENTS #define NEED_EVENTS
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include <stdio.h>
#include <string.h>
#include <strings.h>
#include "misc.h" #include "misc.h"
#include "dix.h" #include "dix.h"
#include "colormapst.h" #include "colormapst.h"

6
dix/events.c
View File

@ -3019,9 +3019,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
butc->buttonsDown++; butc->buttonsDown++;
butc->motionMask = ButtonMotionMask; butc->motionMask = ButtonMotionMask;
*kptr |= bit; *kptr |= bit;
#if !defined(XFree86Server) || !defined(XINPUT)
xE->u.u.detail = butc->map[key];
#endif
if (xE->u.u.detail == 0) if (xE->u.u.detail == 0)
return; return;
if (xE->u.u.detail <= 5) if (xE->u.u.detail <= 5)
@ -3038,9 +3035,6 @@ ProcessPointerEvent (register xEvent *xE, register DeviceIntPtr mouse, int count
if (!butc->buttonsDown) if (!butc->buttonsDown)
butc->motionMask = 0; butc->motionMask = 0;
*kptr &= ~bit; *kptr &= ~bit;
#if !defined(XFree86Server) || !defined(XINPUT)
xE->u.u.detail = butc->map[key];
#endif
if (xE->u.u.detail == 0) if (xE->u.u.detail == 0)
return; return;
if (xE->u.u.detail <= 5) if (xE->u.u.detail <= 5)

2
exa/Makefile.am
View File

@ -12,7 +12,7 @@ INCLUDES = \
$(XORG_INCS) \ $(XORG_INCS) \
-I$(srcdir)/../miext/cw -I$(srcdir)/../miext/cw
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ $(DIX_CFLAGS) AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
libexa_la_SOURCES = \ libexa_la_SOURCES = \
exa.c \ exa.c \

2
exa/exa.c
View File

@ -606,7 +606,9 @@ exaDriverInit (ScreenPtr pScreen,
} }
#endif #endif
#ifdef COMPOSITE
miDisableCompositeWrapper(pScreen); miDisableCompositeWrapper(pScreen);
#endif
/* /*
* Hookup offscreen pixmaps * Hookup offscreen pixmaps

2
fb/Makefile.am
View File

@ -4,7 +4,7 @@ INCLUDES = \
-I$(top_srcdir)/hw/xfree86/os-support \ -I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \ -I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/common
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(DIX_CFLAGS)
if XORG if XORG
sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h

3
fb/fb24_32.c
View File

@ -28,9 +28,6 @@
#endif #endif
#include <string.h> #include <string.h>
#ifdef XFree86LOADER
#include "xf86.h"
#endif
#include "fb.h" #include "fb.h"

5
hw/darwin/quartz/xpr/dri.c
View File

@ -35,13 +35,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#ifdef XFree86LOADER
#include "xf86.h"
#include "xf86_ansic.h"
#else
#include <sys/time.h> #include <sys/time.h>
#include <unistd.h> #include <unistd.h>
#endif
#define NEED_REPLIES #define NEED_REPLIES
#define NEED_EVENTS #define NEED_EVENTS

2
hw/dmx/Makefile.am
View File

@ -81,7 +81,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
config/libdmxconfig.a \ config/libdmxconfig.a \
@DMXMODULES_LIBS@ @DMXMODULES_LIBS@
Xdmx_CFLAGS = @SERVER_DEFINES@ \ Xdmx_CFLAGS = \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \
$(GLX_INCS) \ $(GLX_INCS) \
$(GLX_DEFS) \ $(GLX_DEFS) \

2
hw/dmx/config/Makefile.am
View File

@ -27,7 +27,7 @@ endif
AM_YFLAGS = -d AM_YFLAGS = -d
AM_CFLAGS = \ AM_CFLAGS = \
@SERVER_DEFINES@ \ \
-I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/dmx \
$(GLX_INCS) \ $(GLX_INCS) \
-DHAVE_DMX_CONFIG_H \ -DHAVE_DMX_CONFIG_H \

1
hw/dmx/dmx-config.h
View File

@ -93,6 +93,5 @@
#undef DAMAGE #undef DAMAGE
#undef COMPOSITE #undef COMPOSITE
#undef FONTCACHE #undef FONTCACHE
#undef XFree86LOADER
#endif /* DMX_CONFIG_H */ #endif /* DMX_CONFIG_H */

11
hw/dmx/dmxinit.c
View File

@ -1046,14 +1046,3 @@ void ddxUseMsg(void)
ErrorF(" Ctrl-Alt-q Quit (core devices only)\n"); ErrorF(" Ctrl-Alt-q Quit (core devices only)\n");
ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n"); ErrorF(" Ctrl-Alt-F* Switch to VC (local only)\n");
} }
#ifdef DDXTIME
/** Return wall-clock time in milliseconds. */
CARD32 GetTimeInMillis(void)
{
struct timeval tp;
gettimeofday(&tp, 0);
return tp.tv_sec * 1000 + tp.tv_usec / 1000;
}
#endif

4
hw/dmx/glxProxy/Makefile.am
View File

@ -31,8 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \
renderpixswap.c \ renderpixswap.c \
unpack.h unpack.h
AM_CFLAGS = @SERVER_DEFINES@ \ AM_CFLAGS = \
@MODULE_DEFINES@ \ \
-I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/dmx \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \

7
hw/dmx/glxProxy/glxcmds.c
View File

@ -59,7 +59,6 @@
#include "glxutil.h" #include "glxutil.h"
#include "glxext.h" #include "glxext.h"
#include "unpack.h" #include "unpack.h"
#include "GL/glx_ansic.h"
#include "GL/glxproto.h" #include "GL/glxproto.h"
#include "glxvendor.h" #include "glxvendor.h"
@ -158,7 +157,7 @@ static int CreateContext(__GLXclientState *cl,
if (!glxc) { if (!glxc) {
return BadAlloc; return BadAlloc;
} }
__glXMemset(glxc, 0, sizeof(__GLXcontext)); memset(glxc, 0, sizeof(__GLXcontext));
pScreen = screenInfo.screens[screen]; pScreen = screenInfo.screens[screen];
pGlxScreen = &__glXActiveScreens[screen]; pGlxScreen = &__glXActiveScreens[screen];
@ -610,7 +609,7 @@ static int AddCurrentContext(__GLXclientState *cl, __GLXcontext *glxc, DrawableP
cl->currentContexts = table; cl->currentContexts = table;
cl->numCurrentContexts++; cl->numCurrentContexts++;
__glXMemset(cl->be_currentCTag + num*screenInfo.numScreens, 0, memset(cl->be_currentCTag + num*screenInfo.numScreens, 0,
screenInfo.numScreens * sizeof(GLXContextTag)); screenInfo.numScreens * sizeof(GLXContextTag));
return num+1; return num+1;
@ -2589,7 +2588,7 @@ int __glXClientInfo(__GLXclientState *cl, GLbyte *pc)
cl->GLClientminorVersion = req->minor; cl->GLClientminorVersion = req->minor;
if (cl->GLClientextensions) __glXFree(cl->GLClientextensions); if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);
buf = (const char *)(req+1); buf = (const char *)(req+1);
cl->GLClientextensions = __glXStrdup(buf); cl->GLClientextensions = strdup(buf);
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;

7
hw/dmx/glxProxy/glxcmdsswap.c
View File

@ -44,7 +44,6 @@
#include <windowstr.h> #include <windowstr.h>
#include "unpack.h" #include "unpack.h"
#include "glxext.h" #include "glxext.h"
#include "GL/glx_ansic.h"
#include "glxvendor.h" #include "glxvendor.h"
extern int glxIsExtensionSupported( char *ext ); extern int glxIsExtensionSupported( char *ext );
@ -714,7 +713,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
} }
cl->largeCmdBufSize = hdr->length; cl->largeCmdBufSize = hdr->length;
} }
__glXMemcpy(cl->largeCmdBuf, pc, req->dataBytes); memcpy(cl->largeCmdBuf, pc, req->dataBytes);
cl->largeCmdBytesSoFar = req->dataBytes; cl->largeCmdBytesSoFar = req->dataBytes;
cl->largeCmdBytesTotal = hdr->length; cl->largeCmdBytesTotal = hdr->length;
@ -737,7 +736,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
return __glXBadLargeRequest; return __glXBadLargeRequest;
} }
__glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar,
pc, req->dataBytes); pc, req->dataBytes);
cl->largeCmdBytesSoFar += req->dataBytes; cl->largeCmdBytesSoFar += req->dataBytes;
@ -759,7 +758,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
return __glXBadLargeRequest; return __glXBadLargeRequest;
} }
__glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar,
pc, req->dataBytes); pc, req->dataBytes);
cl->largeCmdBytesSoFar += req->dataBytes; cl->largeCmdBytesSoFar += req->dataBytes;

12
hw/dmx/glxProxy/glxext.c
View File

@ -79,7 +79,7 @@ static void ResetClientState(int clientIndex)
} }
keep_be_displays = cl->be_displays; keep_be_displays = cl->be_displays;
__glXMemset(cl, 0, sizeof(__GLXclientState)); memset(cl, 0, sizeof(__GLXclientState));
cl->be_displays = keep_be_displays; cl->be_displays = keep_be_displays;
/* /*
@ -90,7 +90,7 @@ static void ResetClientState(int clientIndex)
cl->GLClientminorVersion = 0; cl->GLClientminorVersion = 0;
if (cl->GLClientextensions) __glXFree(cl->GLClientextensions); if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);
__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
} }
@ -414,14 +414,14 @@ static int __glXDispatch(ClientPtr client)
if (!cl) { if (!cl) {
return BadAlloc; return BadAlloc;
} }
__glXMemset(cl, 0, sizeof(__GLXclientState)); memset(cl, 0, sizeof(__GLXclientState));
cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) ); cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) );
if (!cl->be_displays) { if (!cl->be_displays) {
__glXFree( cl ); __glXFree( cl );
return BadAlloc; return BadAlloc;
} }
__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
} }
if (!cl->inUse) { if (!cl->inUse) {
@ -468,7 +468,7 @@ static int __glXSwapDispatch(ClientPtr client)
if (!cl) { if (!cl) {
return BadAlloc; return BadAlloc;
} }
__glXMemset(cl, 0, sizeof(__GLXclientState)); memset(cl, 0, sizeof(__GLXclientState));
cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) ); cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) );
if (!cl->be_displays) { if (!cl->be_displays) {
@ -476,7 +476,7 @@ static int __glXSwapDispatch(ClientPtr client)
return BadAlloc; return BadAlloc;
} }
__glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));
} }
if (!cl->inUse) { if (!cl->inUse) {

5
hw/dmx/glxProxy/glxscreens.c
View File

@ -48,12 +48,7 @@
#include "glxserver.h" #include "glxserver.h"
#ifdef IN_MODULE
#include <xf86_ansic.h> #include <xf86_ansic.h>
#else
#include <string.h>
#include <signal.h>
#endif
#include <windowstr.h> #include <windowstr.h>

1
hw/dmx/glxProxy/glxserver.h
View File

@ -46,7 +46,6 @@
#include <extnsionst.h> #include <extnsionst.h>
#include <resource.h> #include <resource.h>
#include <scrnintstr.h> #include <scrnintstr.h>
#include "GL/glx_ansic.h"
/* /*

3
hw/dmx/glxProxy/glxutil.c
View File

@ -41,7 +41,6 @@
#include <pixmapstr.h> #include <pixmapstr.h>
#include <windowstr.h> #include <windowstr.h>
#include "glxutil.h" #include "glxutil.h"
#include "GL/glx_ansic.h"
/************************************************************************/ /************************************************************************/
@ -82,7 +81,7 @@ __glXCalloc(size_t numElements, size_t elementSize)
/* XXX: handle out of memory error */ /* XXX: handle out of memory error */
return NULL; return NULL;
} }
__glXMemset(addr, 0, size); memset(addr, 0, size);
return addr; return addr;
} }

1
hw/dmx/glxProxy/glxvisuals.c
View File

@ -37,6 +37,7 @@
#include <dmx-config.h> #include <dmx-config.h>
#endif #endif
#include <assert.h>
#include "dmx.h" #include "dmx.h"
#include "glxserver.h" #include "glxserver.h"
#include "glxutil.h" #include "glxutil.h"

2
hw/dmx/input/Makefile.am
View File

@ -60,7 +60,7 @@ GLX_DEFS = @GL_CFLAGS@
GLX_INCS = -I@MESA_SOURCE@/include GLX_INCS = -I@MESA_SOURCE@/include
endif endif
AM_CFLAGS = @SERVER_DEFINES@ \ AM_CFLAGS = \
-I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/dmx \
-I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/hw/xfree86/common \
$(GLX_INCS) \ $(GLX_INCS) \

2
hw/kdrive/src/kxv.c
View File

@ -1814,7 +1814,7 @@ KdXVCopyPackedData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr,
src = src + top * srcDown + left * srcRight; src = src + top * srcDown + left * srcRight;
w >>= 1; w >>= 1;
srcRight >>= 1; /* srcRight >>= 1; */
srcNext = srcRight >> 1; srcNext = srcRight >> 1;
while (h--) { while (h--) {
CARD16 *s = (CARD16 *)src; CARD16 *s = (CARD16 *)src;

11
hw/vfb/InitOutput.c
View File

@ -450,17 +450,6 @@ ddxProcessArgument(int argc, char *argv[], int i)
return 0; return 0;
} }
#ifdef DDXTIME /* from ServerOSDefines */
CARD32
GetTimeInMillis()
{
struct timeval tp;
X_GETTIMEOFDAY(&tp);
return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
}
#endif
static ColormapPtr InstalledMaps[MAXSCREENS]; static ColormapPtr InstalledMaps[MAXSCREENS];
static int static int

2
hw/vfb/Makefile.am
View File

@ -21,7 +21,7 @@ Xvfb_LDFLAGS =
AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ AM_CFLAGS = -DHAVE_DIX_CONFIG_H \
-DNO_HW_ONLY_EXTS \ -DNO_HW_ONLY_EXTS \
-DNO_MODULE_EXTS \ -DNO_MODULE_EXTS \
@SERVER_DEFINES@ \ \
$(XVFBMODULES_CFLAGS) $(XVFBMODULES_CFLAGS)
# Man page # Man page

2
hw/xfree86/Makefile.am
View File

@ -16,7 +16,7 @@ DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \
bin_PROGRAMS = Xorg bin_PROGRAMS = Xorg
AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ INCLUDES = @XORG_INCS@
Xorg_SOURCES = xorg.c Xorg_SOURCES = xorg.c

2
hw/xfree86/common/Makefile.am
View File

@ -103,4 +103,4 @@ if LNXACPI
XORG_CFLAGS += -DHAVE_ACPI XORG_CFLAGS += -DHAVE_ACPI
endif endif
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)

4
hw/xfree86/common/compiler.h
View File

@ -1605,7 +1605,6 @@ extern void outl(unsigned int a, unsigned int l);
# endif # endif
# ifndef SCO325 # ifndef SCO325
# if defined(__UNIXWARE__) # if defined(__UNIXWARE__)
# if defined(IN_MODULE)
# /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */ # /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */
# define ushort unsigned short # define ushort unsigned short
# define ushort_t unsigned short # define ushort_t unsigned short
@ -1613,9 +1612,6 @@ extern void outl(unsigned int a, unsigned int l);
# define ulong_t unsigned long # define ulong_t unsigned long
# define uint_t unsigned int # define uint_t unsigned int
# define uchar_t unsigned char # define uchar_t unsigned char
# else
# include <sys/types.h>
# endif /* IN_MODULE */
# endif /* __UNIXWARE__ */ # endif /* __UNIXWARE__ */
# if !defined(sgi) && !defined(__SUNPRO_C) # if !defined(sgi) && !defined(__SUNPRO_C)
# include <sys/inline.h> # include <sys/inline.h>

2
hw/xfree86/common/xf86.h
View File

@ -347,10 +347,8 @@ int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type,
pointer value); pointer value);
Bool xf86IsUnblank(int mode); Bool xf86IsUnblank(int mode);
#ifdef XFree86LOADER
void xf86AddModuleInfo(ModuleInfoPtr info, pointer module); void xf86AddModuleInfo(ModuleInfoPtr info, pointer module);
void xf86DeleteModuleInfo(int idx); void xf86DeleteModuleInfo(int idx);
#endif
/* xf86Debug.c */ /* xf86Debug.c */
#ifdef BUILDDEBUG #ifdef BUILDDEBUG

36
hw/xfree86/common/xf86Config.c
View File

@ -513,7 +513,6 @@ fixup_video_driver_list(char **drivers)
static char ** static char **
GenerateDriverlist(char * dirname, char * drivernames) GenerateDriverlist(char * dirname, char * drivernames)
{ {
#ifdef XFree86LOADER
char **ret; char **ret;
const char *subdirs[] = { dirname, NULL }; const char *subdirs[] = { dirname, NULL };
static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL}; static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
@ -524,39 +523,6 @@ GenerateDriverlist(char * dirname, char * drivernames)
fixup_video_driver_list(ret); fixup_video_driver_list(ret);
return ret; return ret;
#else /* non-loadable server */
char *cp, **driverlist;
int count;
/* Count the number needed */
count = 0;
cp = drivernames;
while (*cp) {
while (*cp && isspace(*cp)) cp++;
if (!*cp) break;
count++;
while (*cp && !isspace(*cp)) cp++;
}
if (!count)
return NULL;
/* Now allocate the array of pointers to 0-terminated driver names */
driverlist = (char **)xnfalloc((count + 1) * sizeof(char *));
count = 0;
cp = drivernames;
while (*cp) {
while (*cp && isspace(*cp)) cp++;
if (!*cp) break;
driverlist[count++] = cp;
while (*cp && !isspace(*cp)) cp++;
if (!*cp) break;
*cp++ = 0;
}
driverlist[count] = NULL;
return driverlist;
#endif
} }
@ -732,7 +698,6 @@ configFiles(XF86ConfFilesPtr fileconf)
} }
#ifdef XFree86LOADER
/* ModulePath */ /* ModulePath */
if (fileconf) { if (fileconf) {
@ -743,7 +708,6 @@ configFiles(XF86ConfFilesPtr fileconf)
} }
xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath); xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
#endif
#if 0 #if 0
/* LogFile */ /* LogFile */

10
hw/xfree86/common/xf86Configure.c
View File

@ -39,9 +39,7 @@
#include <pciaccess.h> #include <pciaccess.h>
#include "Pci.h" #include "Pci.h"
#include "os.h" #include "os.h"
#ifdef XFree86LOADER
#include "loaderProcs.h" #include "loaderProcs.h"
#endif
#include "xf86.h" #include "xf86.h"
#include "xf86Config.h" #include "xf86Config.h"
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
@ -605,7 +603,6 @@ configureFlagsSection (void)
static XF86ConfModulePtr static XF86ConfModulePtr
configureModuleSection (void) configureModuleSection (void)
{ {
#ifdef XFree86LOADER
char **elist, **el; char **elist, **el;
/* Find the list of extension modules. */ /* Find the list of extension modules. */
const char *esubdirs[] = { const char *esubdirs[] = {
@ -616,10 +613,8 @@ configureModuleSection (void)
"fonts", "fonts",
NULL NULL
}; };
#endif
parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec) parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
#ifdef XFree86LOADER
elist = LoaderListDirs(esubdirs, NULL); elist = LoaderListDirs(esubdirs, NULL);
if (elist) { if (elist) {
for (el = elist; *el; el++) { for (el = elist; *el; el++) {
@ -656,7 +651,6 @@ configureModuleSection (void)
} }
xfree(elist); xfree(elist);
} }
#endif
return ptr; return ptr;
} }
@ -666,10 +660,8 @@ configureFilesSection (void)
{ {
parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec) parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
#ifdef XFree86LOADER
if (xf86ModulePath) if (xf86ModulePath)
ptr->file_modulepath = strdup(xf86ModulePath); ptr->file_modulepath = strdup(xf86ModulePath);
#endif
if (defaultFontPath) if (defaultFontPath)
ptr->file_fontpath = strdup(defaultFontPath); ptr->file_fontpath = strdup(defaultFontPath);
if (rgbPath) if (rgbPath)
@ -791,10 +783,8 @@ DoConfigure()
for (vl = vlist; *vl; vl++) for (vl = vlist; *vl; vl++)
ErrorF("\t%s\n", *vl); ErrorF("\t%s\n", *vl);
#ifdef XFree86LOADER
/* Load all the drivers that were found. */ /* Load all the drivers that were found. */
xf86LoadModules(vlist, NULL); xf86LoadModules(vlist, NULL);
#endif /* XFree86LOADER */
xfree(vlist); xfree(vlist);

4
hw/xfree86/common/xf86DGA.c
View File

@ -63,11 +63,7 @@ DGACopyModeInfo(
XDGAModePtr xmode XDGAModePtr xmode
); );
#if defined(XFree86LOADER) || !defined(XFreeXDGA)
_X_EXPORT int *XDGAEventBase = NULL; _X_EXPORT int *XDGAEventBase = NULL;
#else
_X_EXPORT int *XDGAEventBase = &DGAEventBase;
#endif
#define DGA_GET_SCREEN_PRIV(pScreen) \ #define DGA_GET_SCREEN_PRIV(pScreen) \
((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr)) ((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr))

4
hw/xfree86/common/xf86DoProbe.c
View File

@ -40,10 +40,8 @@
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include "os.h" #include "os.h"
#ifdef XFree86LOADER
#include "loaderProcs.h" #include "loaderProcs.h"
#include "xf86Config.h" #include "xf86Config.h"
#endif /* XFree86LOADER */
#include "xf86_OSlib.h" #include "xf86_OSlib.h"
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
@ -55,7 +53,6 @@ DoProbe()
Bool probeResult; Bool probeResult;
Bool ioEnableFailed = FALSE; Bool ioEnableFailed = FALSE;
#ifdef XFree86LOADER
/* Find the list of video driver modules. */ /* Find the list of video driver modules. */
char **list = xf86DriverlistFromCompile(); char **list = xf86DriverlistFromCompile();
char **l; char **l;
@ -70,7 +67,6 @@ DoProbe()
/* Load all the drivers that were found. */ /* Load all the drivers that were found. */
xf86LoadModules(list, NULL); xf86LoadModules(list, NULL);
#endif /* XFree86LOADER */
/* Disable PCI devices */ /* Disable PCI devices */
xf86AccessInit(); xf86AccessInit();

3
hw/xfree86/common/xf86DoScanPci.c
View File

@ -41,9 +41,6 @@
#include <X11/Xmd.h> #include <X11/Xmd.h>
#include <pciaccess.h> #include <pciaccess.h>
#include "os.h" #include "os.h"
#ifdef XFree86LOADER
#include "loaderProcs.h"
#endif
#include "xf86.h" #include "xf86.h"
#include "xf86Priv.h" #include "xf86Priv.h"
#include "xf86Pci.h" #include "xf86Pci.h"

2
hw/xfree86/common/xf86Globals.c
View File

@ -189,14 +189,12 @@ Bool xf86Initialising = FALSE;
Bool xf86ProbeFailed = FALSE; Bool xf86ProbeFailed = FALSE;
Bool xf86DoProbe = FALSE; Bool xf86DoProbe = FALSE;
Bool xf86DoConfigure = FALSE; Bool xf86DoConfigure = FALSE;
#ifdef XFree86LOADER
DriverPtr *xf86DriverList = NULL; DriverPtr *xf86DriverList = NULL;
int xf86NumDrivers = 0; int xf86NumDrivers = 0;
InputDriverPtr *xf86InputDriverList = NULL; InputDriverPtr *xf86InputDriverList = NULL;
int xf86NumInputDrivers = 0; int xf86NumInputDrivers = 0;
ModuleInfoPtr *xf86ModuleInfoList = NULL; ModuleInfoPtr *xf86ModuleInfoList = NULL;
int xf86NumModuleInfos = 0; int xf86NumModuleInfos = 0;
#endif
int xf86NumScreens = 0; int xf86NumScreens = 0;
const char *xf86VisualNames[] = { const char *xf86VisualNames[] = {

46
hw/xfree86/common/xf86Helper.c
View File

@ -73,7 +73,6 @@
static int xf86ScrnInfoPrivateCount = 0; static int xf86ScrnInfoPrivateCount = 0;
#ifdef XFree86LOADER
/* Add a pointer to a new DriverRec to xf86DriverList */ /* Add a pointer to a new DriverRec to xf86DriverList */
_X_EXPORT void _X_EXPORT void
@ -175,7 +174,6 @@ xf86DeleteModuleInfo(int idx)
xf86ModuleInfoList[idx] = NULL; xf86ModuleInfoList[idx] = NULL;
} }
} }
#endif
/* Allocate a new ScrnInfoRec in xf86Screens */ /* Allocate a new ScrnInfoRec in xf86Screens */
@ -202,11 +200,7 @@ xf86AllocateScreen(DriverPtr drv, int flags)
xf86Screens[i]->drv = drv; xf86Screens[i]->drv = drv;
drv->refCount++; drv->refCount++;
#ifdef XFree86LOADER
xf86Screens[i]->module = DuplicateModule(drv->module, NULL); xf86Screens[i]->module = DuplicateModule(drv->module, NULL);
#else
xf86Screens[i]->module = NULL;
#endif
/* /*
* set the initial access state. This will be modified after PreInit. * set the initial access state. This will be modified after PreInit.
* XXX Or should we do it some other place? * XXX Or should we do it some other place?
@ -263,10 +257,8 @@ xf86DeleteScreen(int scrnIndex, int flags)
xf86OptionListFree(pScrn->options); xf86OptionListFree(pScrn->options);
#ifdef XFree86LOADER
if (pScrn->module) if (pScrn->module)
UnloadModule(pScrn->module); UnloadModule(pScrn->module);
#endif
if (pScrn->drv) if (pScrn->drv)
pScrn->drv->refCount--; pScrn->drv->refCount--;
@ -324,11 +316,7 @@ xf86AllocateInput(InputDriverPtr drv, int flags)
new->drv = drv; new->drv = drv;
drv->refCount++; drv->refCount++;
#ifdef XFree86LOADER
new->module = DuplicateModule(drv->module, NULL); new->module = DuplicateModule(drv->module, NULL);
#else
new->module = NULL;
#endif
new->next = xf86InputDevs; new->next = xf86InputDevs;
xf86InputDevs = new; xf86InputDevs = new;
return new; return new;
@ -355,10 +343,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
pInp->free(pInp, 0); pInp->free(pInp, 0);
#endif #endif
#ifdef XFree86LOADER
if (pInp->module) if (pInp->module)
UnloadModule(pInp->module); UnloadModule(pInp->module);
#endif
if (pInp->drv) if (pInp->drv)
pInp->drv->refCount--; pInp->drv->refCount--;
@ -2386,17 +2372,12 @@ xf86GetVersion()
_X_EXPORT CARD32 _X_EXPORT CARD32
xf86GetModuleVersion(pointer module) xf86GetModuleVersion(pointer module)
{ {
#ifdef XFree86LOADER
return (CARD32)LoaderGetModuleVersion(module); return (CARD32)LoaderGetModuleVersion(module);
#else
return 0;
#endif
} }
_X_EXPORT pointer _X_EXPORT pointer
xf86LoadDrvSubModule(DriverPtr drv, const char *name) xf86LoadDrvSubModule(DriverPtr drv, const char *name)
{ {
#ifdef XFree86LOADER
pointer ret; pointer ret;
int errmaj = 0, errmin = 0; int errmaj = 0, errmin = 0;
@ -2405,15 +2386,11 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name)
if (!ret) if (!ret)
LoaderErrorMsg(NULL, name, errmaj, errmin); LoaderErrorMsg(NULL, name, errmaj, errmin);
return ret; return ret;
#else
return (pointer)1;
#endif
} }
_X_EXPORT pointer _X_EXPORT pointer
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
{ {
#ifdef XFree86LOADER
pointer ret; pointer ret;
int errmaj = 0, errmin = 0; int errmaj = 0, errmin = 0;
@ -2422,9 +2399,6 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
if (!ret) if (!ret)
LoaderErrorMsg(pScrn->name, name, errmaj, errmin); LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
return ret; return ret;
#else
return (pointer)1;
#endif
} }
/* /*
@ -2433,9 +2407,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
_X_EXPORT pointer _X_EXPORT pointer
xf86LoadOneModule(char *name, pointer opt) xf86LoadOneModule(char *name, pointer opt)
{ {
#ifdef XFree86LOADER
int errmaj, errmin; int errmaj, errmin;
#endif
char *Name; char *Name;
pointer mod; pointer mod;
@ -2457,13 +2429,9 @@ xf86LoadOneModule(char *name, pointer opt)
return NULL; return NULL;
} }
#ifdef XFree86LOADER
mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin); mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);
if (!mod) if (!mod)
LoaderErrorMsg(NULL, Name, errmaj, errmin); LoaderErrorMsg(NULL, Name, errmaj, errmin);
#else
mod = (pointer)1;
#endif
xfree(Name); xfree(Name);
return mod; return mod;
} }
@ -2475,7 +2443,7 @@ xf86UnloadSubModule(pointer mod)
* This is disabled for now. The loader isn't smart enough yet to undo * This is disabled for now. The loader isn't smart enough yet to undo
* relocations. * relocations.
*/ */
#if defined(XFree86LOADER) && 0 #if 0
UnloadSubModule(mod); UnloadSubModule(mod);
#endif #endif
} }
@ -2483,59 +2451,47 @@ xf86UnloadSubModule(pointer mod)
_X_EXPORT Bool _X_EXPORT Bool
xf86LoaderCheckSymbol(const char *name) xf86LoaderCheckSymbol(const char *name)
{ {
#ifdef XFree86LOADER
return LoaderSymbol(name) != NULL; return LoaderSymbol(name) != NULL;
#else
return TRUE;
#endif
} }
_X_EXPORT void _X_EXPORT void
xf86LoaderReqSymLists(const char **list0, ...) xf86LoaderReqSymLists(const char **list0, ...)
{ {
#ifdef XFree86LOADER
va_list ap; va_list ap;
va_start(ap, list0); va_start(ap, list0);
LoaderVReqSymLists(list0, ap); LoaderVReqSymLists(list0, ap);
va_end(ap); va_end(ap);
#endif
} }
_X_EXPORT void _X_EXPORT void
xf86LoaderReqSymbols(const char *sym0, ...) xf86LoaderReqSymbols(const char *sym0, ...)
{ {
#ifdef XFree86LOADER
va_list ap; va_list ap;
va_start(ap, sym0); va_start(ap, sym0);
LoaderVReqSymbols(sym0, ap); LoaderVReqSymbols(sym0, ap);
va_end(ap); va_end(ap);
#endif
} }
_X_EXPORT void _X_EXPORT void
xf86LoaderRefSymLists(const char **list0, ...) xf86LoaderRefSymLists(const char **list0, ...)
{ {
#ifdef XFree86LOADER
va_list ap; va_list ap;
va_start(ap, list0); va_start(ap, list0);
LoaderVRefSymLists(list0, ap); LoaderVRefSymLists(list0, ap);
va_end(ap); va_end(ap);
#endif
} }
_X_EXPORT void _X_EXPORT void
xf86LoaderRefSymbols(const char *sym0, ...) xf86LoaderRefSymbols(const char *sym0, ...)
{ {
#ifdef XFree86LOADER
va_list ap; va_list ap;
va_start(ap, sym0); va_start(ap, sym0);
LoaderVRefSymbols(sym0, ap); LoaderVRefSymbols(sym0, ap);
va_end(ap); va_end(ap);
#endif
} }

4
hw/xfree86/common/xf86InPriv.h
View File

@ -35,11 +35,7 @@
#define _xf86InPriv_h #define _xf86InPriv_h
/* xf86Globals.c */ /* xf86Globals.c */
#ifdef XFree86LOADER
extern InputDriverPtr *xf86InputDriverList; extern InputDriverPtr *xf86InputDriverList;
#else
extern InputDriverPtr xf86InputDriverList[];
#endif
extern int xf86NumInputDrivers; extern int xf86NumInputDrivers;
/* xf86Xinput.c */ /* xf86Xinput.c */

21
hw/xfree86/common/xf86Init.c
View File

@ -62,9 +62,7 @@
#include "compiler.h" #include "compiler.h"
#ifdef XFree86LOADER
#include "loaderProcs.h" #include "loaderProcs.h"
#endif
#ifdef XFreeXDGA #ifdef XFreeXDGA
#include "dgaproc.h" #include "dgaproc.h"
#endif #endif
@ -505,10 +503,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
{ {
int i, j, k, scr_index; int i, j, k, scr_index;
static unsigned long generation = 0; static unsigned long generation = 0;
#ifdef XFree86LOADER
char **modulelist; char **modulelist;
pointer *optionlist; pointer *optionlist;
#endif
screenLayoutPtr layout; screenLayoutPtr layout;
Pix24Flags screenpix24, pix24; Pix24Flags screenpix24, pix24;
MessageType pix24From = X_DEFAULT; MessageType pix24From = X_DEFAULT;
@ -566,7 +562,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
if (!autoconfig) if (!autoconfig)
PostConfigInit(); PostConfigInit();
#ifdef XFree86LOADER
/* Initialise the loader */ /* Initialise the loader */
LoaderInit(); LoaderInit();
@ -604,7 +599,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
ErrorF("video driver: %s\n", *l); ErrorF("video driver: %s\n", *l);
LoaderFreeDirList(list); LoaderFreeDirList(list);
} }
#endif
#endif #endif
xf86OpenConsole(); xf86OpenConsole();
@ -629,7 +623,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
/* Initialise the resource broker */ /* Initialise the resource broker */
xf86ResourceBrokerInit(); xf86ResourceBrokerInit();
#ifdef XFree86LOADER
/* Load all modules specified explicitly in the config file */ /* Load all modules specified explicitly in the config file */
if ((modulelist = xf86ModulelistFromConfig(&optionlist))) { if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
xf86LoadModules(modulelist, optionlist); xf86LoadModules(modulelist, optionlist);
@ -660,7 +653,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
* XXX Nothing keeps track of them for other modules. * XXX Nothing keeps track of them for other modules.
*/ */
/* XXX What do we do if not all of these could be loaded? */ /* XXX What do we do if not all of these could be loaded? */
#endif
/* /*
* At this point, xf86DriverList[] is all filled in with entries for * At this point, xf86DriverList[] is all filled in with entries for
@ -892,12 +884,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
exit(0); exit(0);
} }
#ifdef XFree86LOADER
/* Remove (unload) drivers that are not required */ /* Remove (unload) drivers that are not required */
for (i = 0; i < xf86NumDrivers; i++) for (i = 0; i < xf86NumDrivers; i++)
if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0) if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
xf86DeleteDriver(i); xf86DeleteDriver(i);
#endif
/* /*
* At this stage we know how many screens there are. * At this stage we know how many screens there are.
@ -1202,12 +1192,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv)
#endif #endif
} }
#ifdef XFree86LOADER
if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) { if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
/* For now, just a warning */ /* For now, just a warning */
xf86Msg(X_WARNING, "Some symbols could not be resolved!\n"); xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
} }
#endif
xf86PostScreenInit(); xf86PostScreenInit();
@ -1387,9 +1375,7 @@ OsVendorInit()
signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */ signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
#endif #endif
OsDelayInitColors = TRUE; OsDelayInitColors = TRUE;
#ifdef XFree86LOADER
loadableFonts = TRUE; loadableFonts = TRUE;
#endif
if (!beenHere) if (!beenHere)
xf86LogInit(); xf86LogInit();
@ -1681,9 +1667,7 @@ ddxProcessArgument(int argc, char **argv, int i)
} }
if (!strcmp(argv[i],"-ignoreABI")) if (!strcmp(argv[i],"-ignoreABI"))
{ {
#ifdef XFree86LOADER
LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL); LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
#endif
return 1; return 1;
} }
if (!strcmp(argv[i],"-verbose")) if (!strcmp(argv[i],"-verbose"))
@ -2090,9 +2074,7 @@ xf86PrintBanner()
#endif #endif
ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n" ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n"
"\tto make sure that you have the latest version.\n"); "\tto make sure that you have the latest version.\n");
#ifdef XFree86LOADER
ErrorF("Module Loader present\n"); ErrorF("Module Loader present\n");
#endif
} }
static void static void
@ -2139,7 +2121,6 @@ xf86RunVtInit(void)
} }
} }
#ifdef XFree86LOADER
/* /*
* xf86LoadModules iterates over a list that is being passed in. * xf86LoadModules iterates over a list that is being passed in.
*/ */
@ -2182,8 +2163,6 @@ xf86LoadModules(char **list, pointer *optlist)
return !failed; return !failed;
} }
#endif
/* Pixmap format stuff */ /* Pixmap format stuff */
_X_EXPORT PixmapFormatPtr _X_EXPORT PixmapFormatPtr

29
hw/xfree86/common/xf86Io.c
View File

@ -470,32 +470,3 @@ searchdone:
} }
return (Success); return (Success);
} }
#if defined(DDXTIME) && !defined(QNX4)
/*
* These are getting tossed in here until I can think of where
* they really belong
*/
#define HALFMONTH ((unsigned long) 1<<31)
_X_EXPORT CARD32
GetTimeInMillis()
{
struct timeval tp;
register CARD32 val;
register INT32 diff;
static CARD32 oldval = 0;
static CARD32 time = 0;
gettimeofday(&tp, 0);
val = (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
if (oldval) {
diff = val - oldval;
if (diff > 0)
time += diff;
}
oldval = val;
return time;
}
#endif /* DDXTIME && !QNX4 */

6
hw/xfree86/common/xf86MiscExt.c
View File

@ -459,12 +459,10 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
mseParamsPtr mse = structure; mseParamsPtr mse = structure;
InputInfoPtr pInfo; InputInfoPtr pInfo;
MouseDevPtr pMse; MouseDevPtr pMse;
#ifdef XFree86LOADER
pointer xf86MouseProtocolIDToName pointer xf86MouseProtocolIDToName
= LoaderSymbol("xf86MouseProtocolIDToName"); = LoaderSymbol("xf86MouseProtocolIDToName");
if (!xf86MouseProtocolIDToName) if (!xf86MouseProtocolIDToName)
return MISC_RET_NOMODULE; return MISC_RET_NOMODULE;
#endif
if (mse->type < MTYPE_MICROSOFT if (mse->type < MTYPE_MICROSOFT
|| ( mse->type > MTYPE_EXPPS2 || ( mse->type > MTYPE_EXPPS2
&& (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE))) && (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE)))
@ -563,12 +561,8 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd)
pMse->chordMiddle = mse->chordmiddle; pMse->chordMiddle = mse->chordmiddle;
pMse->mouseFlags = mse->flags; pMse->mouseFlags = mse->flags;
#ifdef XFree86LOADER
pMse->protocol = ((const char *(*)(MouseProtocolID)) pMse->protocol = ((const char *(*)(MouseProtocolID))
xf86MouseProtocolIDToName)(pMse->protocolID); xf86MouseProtocolIDToName)(pMse->protocolID);
#else
pMse->protocol = xf86MouseProtocolIDToName(pMse->protocolID);
#endif
if (mse->device) { if (mse->device) {
if (MiscExtAuthorizeDevice(pInfo, mse->device)) { if (MiscExtAuthorizeDevice(pInfo, mse->device)) {

4
hw/xfree86/common/xf86Priv.h
View File

@ -97,13 +97,9 @@ extern unsigned short xf86MouseCflags[];
extern Bool xf86SupportedMouseTypes[]; extern Bool xf86SupportedMouseTypes[];
extern int xf86NumMouseTypes; extern int xf86NumMouseTypes;
#ifdef XFree86LOADER
extern DriverPtr *xf86DriverList; extern DriverPtr *xf86DriverList;
extern ModuleInfoPtr *xf86ModuleInfoList; extern ModuleInfoPtr *xf86ModuleInfoList;
extern int xf86NumModuleInfos; extern int xf86NumModuleInfos;
#else
extern DriverPtr xf86DriverList[];
#endif
extern int xf86NumDrivers; extern int xf86NumDrivers;
extern Bool xf86Resetting; extern Bool xf86Resetting;
extern Bool xf86Initialising; extern Bool xf86Initialising;

2
hw/xfree86/common/xf86str.h
View File

@ -328,7 +328,6 @@ typedef struct _DriverRec {
#define HaveDriverFuncs 1 #define HaveDriverFuncs 1
#ifdef XFree86LOADER
/* /*
* The optional module list struct. This allows modules exporting helping * The optional module list struct. This allows modules exporting helping
* functions to configuration tools, the Xserver, or any other * functions to configuration tools, the Xserver, or any other
@ -342,7 +341,6 @@ typedef struct _ModuleInfoRec {
const OptionInfoRec * (*AvailableOptions)(void *unused); const OptionInfoRec * (*AvailableOptions)(void *unused);
pointer unused[8]; /* leave some space for more fields */ pointer unused[8]; /* leave some space for more fields */
} ModuleInfoRec, *ModuleInfoPtr; } ModuleInfoRec, *ModuleInfoPtr;
#endif
/* /*
* These are the private bus types. New types can be added here. Types * These are the private bus types. New types can be added here. Types

9
hw/xfree86/common/xf86xv.c
View File

@ -53,9 +53,7 @@
#include <X11/extensions/Xv.h> #include <X11/extensions/Xv.h>
#include <X11/extensions/Xvproto.h> #include <X11/extensions/Xvproto.h>
#include "xvdix.h" #include "xvdix.h"
#ifdef XFree86LOADER
#include "xvmodproc.h" #include "xvmodproc.h"
#endif
#include "xf86xvpriv.h" #include "xf86xvpriv.h"
@ -118,16 +116,9 @@ int XF86XvScreenIndex = -1;
static unsigned long XF86XVGeneration = 0; static unsigned long XF86XVGeneration = 0;
static unsigned long PortResource = 0; static unsigned long PortResource = 0;
#ifdef XFree86LOADER
int (*XvGetScreenIndexProc)(void) = NULL; int (*XvGetScreenIndexProc)(void) = NULL;
unsigned long (*XvGetRTPortProc)(void) = NULL; unsigned long (*XvGetRTPortProc)(void) = NULL;
int (*XvScreenInitProc)(ScreenPtr) = NULL; int (*XvScreenInitProc)(ScreenPtr) = NULL;
#else
int (*XvGetScreenIndexProc)(void) = XvGetScreenIndex;
unsigned long (*XvGetRTPortProc)(void) = XvGetRTPort;
int (*XvScreenInitProc)(ScreenPtr) = XvScreenInit;
#endif
#define GET_XV_SCREEN(pScreen) \ #define GET_XV_SCREEN(pScreen) \
((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr)) ((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr))

6
hw/xfree86/common/xf86xvmc.c
View File

@ -41,19 +41,13 @@
#include "resource.h" #include "resource.h"
#include "dixstruct.h" #include "dixstruct.h"
#ifdef XFree86LOADER
#include "xvmodproc.h" #include "xvmodproc.h"
#endif
#include "xf86xvpriv.h" #include "xf86xvpriv.h"
#include "xf86xvmc.h" #include "xf86xvmc.h"
typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr); typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr);
#ifdef XFree86LOADER
_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL; _X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL;
#else
_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit;
#endif
typedef struct { typedef struct {

2
hw/xfree86/ddc/Makefile.am
View File

@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = ddcPriv.h DDC.HOWTO EXTRA_DIST = ddcPriv.h DDC.HOWTO

2
hw/xfree86/ddc/xf86DDC.c
View File

@ -121,14 +121,12 @@ static const OptionInfoRec DDCOptions[] = {
{ -1, NULL, OPTV_NONE, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE },
}; };
#ifdef XFree86LOADER
/*ARGSUSED*/ /*ARGSUSED*/
static const OptionInfoRec * static const OptionInfoRec *
DDCAvailableOptions(void *unused) DDCAvailableOptions(void *unused)
{ {
return (DDCOptions); return (DDCOptions);
} }
#endif
/** /**
* Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are

4
hw/xfree86/dixmods/Makefile.am
View File

@ -31,7 +31,7 @@ fontsmoduledir = $(moduledir)/fonts
fontsmodule_LTLIBRARIES = libfreetype.la \ fontsmodule_LTLIBRARIES = libfreetype.la \
libtype1.la libtype1.la
AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/cfb \ -I$(top_srcdir)/cfb \
@ -64,6 +64,7 @@ libdbe_la_SOURCES = dbemodule.c
libfb_la_LDFLAGS = -avoid-version libfb_la_LDFLAGS = -avoid-version
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c
libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS)
libglx_la_LDFLAGS = -avoid-version libglx_la_LDFLAGS = -avoid-version
if AIGLX if AIGLX
@ -93,6 +94,7 @@ libtype1_la_LDFLAGS = -avoid-version
libtype1_la_SOURCES = type1mod.c libtype1_la_SOURCES = type1mod.c
libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c libdixmods_la_SOURCES = $(top_srcdir)/mi/miinitext.c
libdixmods_la_CFLAGS = -DXFree86LOADER $(AM_CFLAGS)
libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c libxorgxkb_la_SOURCES = xkbVT.c xkbPrivate.c xkbKillSrv.c
libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la libxorgxkb_la_LIBADD = $(top_builddir)/dix/libdix.la

2
hw/xfree86/dixmods/extmod/Makefile.am
View File

@ -11,7 +11,7 @@ if XV
XV_SRCS = xvmod.c xvmodproc.h XV_SRCS = xvmod.c xvmodproc.h
endif endif
AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = @XORG_CFLAGS@
INCLUDES = @XORG_INCS@ \ INCLUDES = @XORG_INCS@ \
-I$(top_srcdir)/afb \ -I$(top_srcdir)/afb \
-I$(top_srcdir)/mfb \ -I$(top_srcdir)/mfb \

7
hw/xfree86/doc/sgml/DESIGN.sgml
View File

@ -6436,7 +6436,6 @@ static PciChipsets ZZZPciChipsets[] = {
driver. This is required for the dynamically loaded version: driver. This is required for the dynamically loaded version:
<p> <p>
<code> <code>
#ifdef XFree86LOADER
static XF86ModuleVersionInfo zzzVersRec = static XF86ModuleVersionInfo zzzVersRec =
{ {
"zzz", "zzz",
@ -6450,7 +6449,6 @@ static XF86ModuleVersionInfo zzzVersRec =
MOD_CLASS_VIDEODRV, MOD_CLASS_VIDEODRV,
{0,0,0,0} {0,0,0,0}
}; };
#endif
</code> </code>
<p> <p>
<item>Define a data structure to hold the driver's screen-specific data. <item>Define a data structure to hold the driver's screen-specific data.
@ -6508,9 +6506,7 @@ static const OptionInfoRec ZZZOptions[] = {
the driver to the main list of drivers. the driver to the main list of drivers.
<code> <code>
#ifdef XFree86LOADER static MODULESETUPPROTO(zzzSetup);
static MODULESETUPPROTO(mgaSetup);
XF86ModuleData zzzModuleData = { &amp;zzzVersRec, zzzSetup, NULL }; XF86ModuleData zzzModuleData = { &amp;zzzVersRec, zzzSetup, NULL };
@ -6540,7 +6536,6 @@ zzzSetup(pointer module, pointer opts, int *errmaj, int *errmin)
return NULL; return NULL;
} }
} }
#endif
</code> </code>
<sect2>GetRec, FreeRec <sect2>GetRec, FreeRec

6
hw/xfree86/dri/Makefile.am
View File

@ -7,9 +7,9 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_builddir)/GL/include \ -I$(top_builddir)/GL/include \
-I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/include \
-DHAVE_XORG_CONFIG_H \ -DHAVE_XORG_CONFIG_H \
@SERVER_DEFINES@ \ \
@MODULE_DEFINES@ \ \
@LOADER_DEFINES@ \ \
@DRIPROTO_CFLAGS@ \ @DRIPROTO_CFLAGS@ \
@LIBDRM_CFLAGS@ \ @LIBDRM_CFLAGS@ \
@GL_CFLAGS@ @GL_CFLAGS@

8
hw/xfree86/dri/dri.c
View File

@ -69,7 +69,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "mi.h" #include "mi.h"
#include "mipointer.h" #include "mipointer.h"
#if defined(XFree86LOADER) && !defined(PANORAMIX) #if !defined(PANORAMIX)
extern Bool noPanoramiXExtension; extern Bool noPanoramiXExtension;
#endif #endif
@ -135,14 +135,9 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
* If Xinerama is on, don't allow DRI to initialise. It won't be usable * If Xinerama is on, don't allow DRI to initialise. It won't be usable
* anyway. * anyway.
*/ */
#if defined(PANORAMIX) && !defined(XFree86LOADER)
xineramaInCore = TRUE;
#elif defined(XFree86LOADER)
if (xf86LoaderCheckSymbol("noPanoramiXExtension")) if (xf86LoaderCheckSymbol("noPanoramiXExtension"))
xineramaInCore = TRUE; xineramaInCore = TRUE;
#endif
#if defined(PANORAMIX) || defined(XFree86LOADER)
if (xineramaInCore) { if (xineramaInCore) {
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
DRIDrvMsg(pScreen->myNum, X_WARNING, DRIDrvMsg(pScreen->myNum, X_WARNING,
@ -150,7 +145,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD)
return FALSE; return FALSE;
} }
} }
#endif
drmWasAvailable = drmAvailable(); drmWasAvailable = drmAvailable();

2
hw/xfree86/dummylib/Makefile.am
View File

@ -6,7 +6,7 @@ noinst_LIBRARIES = libdummy.a libdummy-nonserver.a
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
if NEED_STRLCAT if NEED_STRLCAT
STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c

2
hw/xfree86/exa/Makefile.am
View File

@ -7,7 +7,7 @@ INCLUDES = \
-I$(srcdir)/../../../exa \ -I$(srcdir)/../../../exa \
-I$(srcdir)/../../../miext/cw -I$(srcdir)/../../../miext/cw
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
libexa_la_SOURCES = \ libexa_la_SOURCES = \
examodule.c examodule.c

2
hw/xfree86/fbdevhw/Makefile.am
View File

@ -11,7 +11,7 @@ endif
INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
sdk_HEADERS = fbdevhw.h sdk_HEADERS = fbdevhw.h

2
hw/xfree86/i2c/Makefile.am
View File

@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h

18
hw/xfree86/i2c/bt829.h
View File

@ -82,8 +82,6 @@ int bt829_SetCC(BT829Ptr bt);
"bt829_SetOUT_EN", \ "bt829_SetOUT_EN", \
"bt829_SetP_IO" "bt829_SetP_IO"
#ifdef XFree86LOADER
#define xf86_bt829_Detect ((BT829Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("bt829_Detect")) #define xf86_bt829_Detect ((BT829Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("bt829_Detect"))
#define xf86_bt829_ATIInit ((int (*)(BT829Ptr))LoaderSymbol("bt829_ATIInit")) #define xf86_bt829_ATIInit ((int (*)(BT829Ptr))LoaderSymbol("bt829_ATIInit"))
#define xf86_bt829_SetFormat ((int (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetFormat")) #define xf86_bt829_SetFormat ((int (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetFormat"))
@ -96,20 +94,4 @@ int bt829_SetCC(BT829Ptr bt);
#define xf86_bt829_SetOUT_EN ((void (*)(BT829Ptr, Bool))LoaderSymbol("bt829_SetOUT_EN")) #define xf86_bt829_SetOUT_EN ((void (*)(BT829Ptr, Bool))LoaderSymbol("bt829_SetOUT_EN"))
#define xf86_bt829_SetP_IO ((void (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetP_IO")) #define xf86_bt829_SetP_IO ((void (*)(BT829Ptr, CARD8))LoaderSymbol("bt829_SetP_IO"))
#else
#define xf86_bt829_Detect bt829_Detect
#define xf86_bt829_ATIInit bt829_ATIInit
#define xf86_bt829_SetFormat bt829_SetFormat
#define xf86_bt829_SetMux bt829_SetMux
#define xf86_bt829_SetCaptSize bt829_SetCaptSize
#define xf86_bt829_SetBrightness bt829_SetBrightness
#define xf86_bt829_SetContrast bt829_SetContrast
#define xf86_bt829_SetSaturation bt829_SetSaturation
#define xf86_bt829_SetTint bt829_SetTint
#define xf86_bt829_SetOUT_EN bt829_SetOUT_EN
#define xf86_bt829_SetP_IO bt829_SetP_IO
#endif
#endif #endif

13
hw/xfree86/i2c/fi1236.h
View File

@ -100,8 +100,6 @@ void fi1236_dump_status(FI1236Ptr f);
"FI1236_set_tuner_type", \ "FI1236_set_tuner_type", \
"TUNER_set_frequency" "TUNER_set_frequency"
#ifdef XFree86LOADER
#define xf86_Detect_FI1236 ((FI1236Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_FI1236")) #define xf86_Detect_FI1236 ((FI1236Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_FI1236"))
#define xf86_FI1236_set_tuner_type ((void (*)(FI1236Ptr, int))LoaderSymbol("FI1236_set_tuner_type")) #define xf86_FI1236_set_tuner_type ((void (*)(FI1236Ptr, int))LoaderSymbol("FI1236_set_tuner_type"))
#define xf86_TUNER_set_frequency ((void (*)(FI1236Ptr, CARD32))LoaderSymbol("TUNER_set_frequency")) #define xf86_TUNER_set_frequency ((void (*)(FI1236Ptr, CARD32))LoaderSymbol("TUNER_set_frequency"))
@ -109,15 +107,4 @@ void fi1236_dump_status(FI1236Ptr f);
#define xf86_TUNER_get_afc_hint ((int (*)(FI1236Ptr))LoaderSymbol("TUNER_get_afc_hint")) #define xf86_TUNER_get_afc_hint ((int (*)(FI1236Ptr))LoaderSymbol("TUNER_get_afc_hint"))
#define xf86_fi1236_dump_status ((void (*)(FI1236Ptr))LoaderSymbol("fi1236_dump_status")) #define xf86_fi1236_dump_status ((void (*)(FI1236Ptr))LoaderSymbol("fi1236_dump_status"))
#else
#define xf86_Detect_FI1236 Detect_FI1236
#define xf86_FI1236_set_tuner_type FI1236_set_tuner_type
#define xf86_TUNER_set_frequency TUNER_set_frequency
#define xf86_FI1236_AFC FI1236_AFC
#define xf86_TUNER_get_afc_hint TUNER_get_afc_hint
#define xf86_fi1236_dump_status fi1236_dump_status
#endif
#endif #endif

15
hw/xfree86/i2c/i2c_def.h
View File

@ -3,8 +3,6 @@
/* the following are a workaround for possible loader bug.. /* the following are a workaround for possible loader bug..
WATCH function types ! */ WATCH function types ! */
#if XFree86LOADER
#define CreateI2CBusRec ((pointer (*)(void))LoaderSymbol("xf86CreateI2CBusRec")) #define CreateI2CBusRec ((pointer (*)(void))LoaderSymbol("xf86CreateI2CBusRec"))
#define DestroyI2CBusRec ((pointer (*)(I2CBusPtr, Bool, Bool))LoaderSymbol("xf86DestroyI2CBusRec")) #define DestroyI2CBusRec ((pointer (*)(I2CBusPtr, Bool, Bool))LoaderSymbol("xf86DestroyI2CBusRec"))
#define I2CBusInit ((Bool (*)(pointer))LoaderSymbol("xf86I2CBusInit")) #define I2CBusInit ((Bool (*)(pointer))LoaderSymbol("xf86I2CBusInit"))
@ -13,17 +11,4 @@
#define I2CDevInit ((Bool (*)(I2CDevPtr))LoaderSymbol("xf86I2CDevInit")) #define I2CDevInit ((Bool (*)(I2CDevPtr))LoaderSymbol("xf86I2CDevInit"))
#define I2CProbeAddress ((Bool (*)(I2CBusPtr,I2CSlaveAddr))LoaderSymbol("xf86I2CProbeAddress")) #define I2CProbeAddress ((Bool (*)(I2CBusPtr,I2CSlaveAddr))LoaderSymbol("xf86I2CProbeAddress"))
#else
#define CreateI2CBusRec xf86CreateI2CBusRec
#define DestroyI2CBusRec xf86DestroyI2CBusRec
#define I2CBusInit xf86I2CBusInit
#define I2C_WriteRead xf86I2CWriteRead
#define CreateI2CDevRec xf86CreateI2CDevRec
#define I2CDevInit xf86I2CDevInit
#define I2CProbeAddress xf86I2CProbeAddress
#endif
#endif #endif

12
hw/xfree86/i2c/msp3430.h
View File

@ -105,22 +105,10 @@ void MSP3430SetSAP (MSP3430Ptr m, int mode);
"MSP3430SetVolume", \ "MSP3430SetVolume", \
"MSP3430SetSAP" "MSP3430SetSAP"
#ifdef XFree86LOADER
#define xf86_DetectMSP3430 ((MSP3430Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("DetectMSP3430")) #define xf86_DetectMSP3430 ((MSP3430Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("DetectMSP3430"))
#define xf86_ResetMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("ResetMSP3430")) #define xf86_ResetMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("ResetMSP3430"))
#define xf86_MSP3430SetVolume ((void (*)(MSP3430Ptr, CARD8))LoaderSymbol("MSP3430SetVolume")) #define xf86_MSP3430SetVolume ((void (*)(MSP3430Ptr, CARD8))LoaderSymbol("MSP3430SetVolume"))
#define xf86_MSP3430SetSAP ((void (*)(MSP3430Ptr, int))LoaderSymbol("MSP3430SetSAP")) #define xf86_MSP3430SetSAP ((void (*)(MSP3430Ptr, int))LoaderSymbol("MSP3430SetSAP"))
#define xf86_InitMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("InitMSP3430")) #define xf86_InitMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("InitMSP3430"))
#else
#define xf86_DetectMSP3430 DetectMSP3430
#define xf86_ResetMSP3430 ResetMSP3430
#define xf86_MSP3430SetVolume MSP3430SetVolume
#define xf86_MSP3430SetSAP MSP3430SetSAP
#define xf86_InitMSP3430 InitMSP3430
#endif
#endif #endif

11
hw/xfree86/i2c/tda8425.h
View File

@ -34,20 +34,9 @@ void tda8425_mute(TDA8425Ptr t, Bool mute);
"tda8425_setaudio", \ "tda8425_setaudio", \
"tda8425_mute" "tda8425_mute"
#ifdef XFree86LOADER
#define xf86_Detect_tda8425 ((TDA8425Ptr (*)(I2CBusPtr, I2CSlaveAddr,Bool))LoaderSymbol("Detect_tda8425")) #define xf86_Detect_tda8425 ((TDA8425Ptr (*)(I2CBusPtr, I2CSlaveAddr,Bool))LoaderSymbol("Detect_tda8425"))
#define xf86_tda8425_init ((Bool (*)(TDA8425Ptr))LoaderSymbol("tda8425_init")) #define xf86_tda8425_init ((Bool (*)(TDA8425Ptr))LoaderSymbol("tda8425_init"))
#define xf86_tda8425_setaudio ((void (*)(TDA8425Ptr))LoaderSymbol("tda8425_setaudio")) #define xf86_tda8425_setaudio ((void (*)(TDA8425Ptr))LoaderSymbol("tda8425_setaudio"))
#define xf86_tda8425_mute ((void (*)(TDA8425Ptr, Bool))LoaderSymbol("tda8425_mute")) #define xf86_tda8425_mute ((void (*)(TDA8425Ptr, Bool))LoaderSymbol("tda8425_mute"))
#else
#define xf86_Detect_tda8425 Detect_tda8425
#define xf86_tda8425_init tda8425_init
#define xf86_tda8425_setaudio tda8425_setaudio
#define xf86_tda8425_mute tda8425_mute
#endif
#endif #endif

13
hw/xfree86/i2c/tda9850.h
View File

@ -29,8 +29,6 @@ CARD16 tda9850_getstatus(TDA9850Ptr t);
"tda9850_mute", \ "tda9850_mute", \
"tda9850_sap_mute" "tda9850_sap_mute"
#ifdef XFree86LOADER
#define xf86_Detect_tda9850 ((TDA9850Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9850")) #define xf86_Detect_tda9850 ((TDA9850Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9850"))
#define xf86_tda9850_init ((Bool (*)(TDA9850Ptr))LoaderSymbol("tda9850_init")) #define xf86_tda9850_init ((Bool (*)(TDA9850Ptr))LoaderSymbol("tda9850_init"))
#define xf86_tda9850_setaudio ((void (*)(TDA9850Ptr))LoaderSymbol("tda9850_setaudio")) #define xf86_tda9850_setaudio ((void (*)(TDA9850Ptr))LoaderSymbol("tda9850_setaudio"))
@ -38,15 +36,4 @@ CARD16 tda9850_getstatus(TDA9850Ptr t);
#define xf86_tda9850_sap_mute ((void (*)(TDA9850Ptr, Bool))LoaderSymbol("tda9850_sap_mute")) #define xf86_tda9850_sap_mute ((void (*)(TDA9850Ptr, Bool))LoaderSymbol("tda9850_sap_mute"))
#define xf86_tda9850_getstatus ((CARD16 (*)(TDA9850Ptr))LoaderSymbol("tda9850_getstatus")) #define xf86_tda9850_getstatus ((CARD16 (*)(TDA9850Ptr))LoaderSymbol("tda9850_getstatus"))
#else
#define xf86_Detect_tda9850 Detect_tda9850
#define xf86_tda9850_init tda9850_init
#define xf86_tda9850_setaudio tda9850_setaudio
#define xf86_tda9850_mute tda9850_mute
#define xf86_tda9850_sap_mute tda9850_sap_mute
#define xf86_tda9850_getstatus tda9850_getstatus
#endif
#endif #endif

12
hw/xfree86/i2c/tda9885.h
View File

@ -51,22 +51,10 @@ void tda9885_dumpstatus(TDA9885Ptr t);
"tda9885_setaudio", \ "tda9885_setaudio", \
"tda9885_mute" "tda9885_mute"
#ifdef XFree86LOADER
#define xf86_Detect_tda9885 ((TDA9885Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9885")) #define xf86_Detect_tda9885 ((TDA9885Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9885"))
#define xf86_tda9885_init ((Bool (*)(TDA9885Ptr))LoaderSymbol("tda9885_init")) #define xf86_tda9885_init ((Bool (*)(TDA9885Ptr))LoaderSymbol("tda9885_init"))
#define xf86_tda9885_setparameters ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_setparameters")) #define xf86_tda9885_setparameters ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_setparameters"))
#define xf86_tda9885_getstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_getstatus")) #define xf86_tda9885_getstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_getstatus"))
#define xf86_tda9885_dumpstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_dumpstatus")) #define xf86_tda9885_dumpstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_dumpstatus"))
#else
#define xf86_Detect_tda9885 Detect_tda9885
#define xf86_tda9885_init tda9885_init
#define xf86_tda9885_setparameters tda9885_setparameters
#define xf86_tda9885_getstatus tda9885_getstatus
#define xf86_tda9885_dumpstatus tda9885_dumpstatus
#endif
#endif #endif

15
hw/xfree86/i2c/uda1380.h
View File

@ -66,8 +66,6 @@ void uda1380_dumpstatus(UDA1380Ptr t);
"uda1380_getstatus", \ "uda1380_getstatus", \
"uda1380_dumpstatus" "uda1380_dumpstatus"
#ifdef XFree86LOADER
#define xf86_Detect_uda1380 ((UDA1380Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_uda1380")) #define xf86_Detect_uda1380 ((UDA1380Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_uda1380"))
#define xf86_uda1380_init ((Bool (*)(UDA1380Ptr))LoaderSymbol("uda1380_init")) #define xf86_uda1380_init ((Bool (*)(UDA1380Ptr))LoaderSymbol("uda1380_init"))
#define xf86_uda1380_shutdown ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_shutdown")) #define xf86_uda1380_shutdown ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_shutdown"))
@ -77,17 +75,4 @@ void uda1380_dumpstatus(UDA1380Ptr t);
#define xf86_uda1380_getstatus ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_getstatus")) #define xf86_uda1380_getstatus ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_getstatus"))
#define xf86_uda1380_dumpstatus ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_dumpstatus")) #define xf86_uda1380_dumpstatus ((void (*)(UDA1380Ptr))LoaderSymbol("uda1380_dumpstatus"))
#else
#define xf86_Detect_uda1380 Detect_uda1380
#define xf86_uda1380_init uda1380_init
#define xf86_uda1380_shutdown uda1380_shutdown
#define xf86_uda1380_setvolume uda1380_setvolume
#define xf86_uda1380_mute uda1380_mute
#define xf86_uda1380_setparameters uda1380_setparameters
#define xf86_uda1380_getstatus uda1380_getstatus
#define xf86_uda1380_dumpstatus uda1380_dumpstatus
#endif
#endif #endif

22
hw/xfree86/int10/Makefile.am
View File

@ -2,19 +2,22 @@ module_LTLIBRARIES = libint10.la
sdk_HEADERS = xf86int10.h sdk_HEADERS = xf86int10.h
EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ EXTRA_CFLAGS =
libint10_la_LDFLAGS = -avoid-version libint10_la_LDFLAGS = -avoid-version
COMMON_SOURCES = \
helper_exec.c \
helper_mem.c \
pci.c \
xf86int10.c \
xf86int10module.c
if INT10_VM86 if INT10_VM86
AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
libint10_la_SOURCES = \ libint10_la_SOURCES = \
helper_exec.c \ $(COMMON_SOURCES) \
helper_mem.c \
pci.c \
xf86int10.c \
xf86int10module.c \
$(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \ $(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \
$(srcdir)/../os-support/linux/int10/linux.c $(srcdir)/../os-support/linux/int10/linux.c
endif endif
@ -22,8 +25,11 @@ endif
if INT10_X86EMU if INT10_X86EMU
AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS) AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS)
INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \ libint10_la_SOURCES = \
xf86int10.c xf86x86emu.c generic.c x86emu.c $(COMMON_SOURCES) \
xf86x86emu.c \
generic.c \
x86emu.c
endif endif
if INT10_STUB if INT10_STUB

104
hw/xfree86/int10/generic.c
View File

@ -63,12 +63,6 @@ static void UnmapVRam(xf86Int10InfoPtr pInt);
static void *sysMem = NULL; static void *sysMem = NULL;
xf86Int10InfoPtr
xf86InitInt10(int entityIndex)
{
return xf86ExtendedInitInt10(entityIndex, 0);
}
xf86Int10InfoPtr xf86Int10InfoPtr
xf86ExtendedInitInt10(int entityIndex, int Flags) xf86ExtendedInitInt10(int entityIndex, int Flags)
{ {
@ -149,59 +143,12 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
if (xf86IsEntityPrimary(entityIndex) if (xf86IsEntityPrimary(entityIndex)
&& !(initPrimary(options))) { && !(initPrimary(options))) {
if (! xf86int10GetBiosSegment(pInt, &bios,
if (bios.bus == BUS_ISA && bios.location.legacy) { (unsigned char *)sysMem - V_BIOS)) {
xf86DrvMsg(screen, X_CONFIG,
"Overriding BIOS location: 0x%x\n",
bios.location.legacy);
cs = bios.location.legacy >> 4;
#define CHECK_V_SEGMENT_RANGE(x) \
if (((x) << 4) < V_BIOS) {\
xf86DrvMsg(screen, X_ERROR, \
"V_BIOS address 0x%lx out of range\n", \
(unsigned long)(x) << 4); \
goto error1; \
}
CHECK_V_SEGMENT_RANGE(cs);
vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
if (!int10_check_bios(screen, cs, vbiosMem)) {
xf86DrvMsg(screen, X_ERROR,
"No V_BIOS at specified address 0x%lx\n",
(unsigned long)cs << 4);
goto error1; goto error1;
} }
} else {
if (bios.bus == BUS_PCI) {
xf86DrvMsg(screen, X_WARNING,
"Option BiosLocation for primary device ignored: "
"It points to PCI.\n");
xf86DrvMsg(screen, X_WARNING,
"You must set Option InitPrimary also\n");
}
cs = MEM_RW(pInt,((0x10<<2)+2));
CHECK_V_SEGMENT_RANGE(cs);
vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
if (!int10_check_bios(screen, cs, vbiosMem)) {
cs = MEM_RW(pInt, (0x42 << 2) + 2);
CHECK_V_SEGMENT_RANGE(cs);
vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
if (!int10_check_bios(screen, cs, vbiosMem)) {
cs = V_BIOS >> 4;
vbiosMem = (unsigned char *)sysMem - V_BIOS + (cs << 4);
if (!int10_check_bios(screen, cs, vbiosMem)) {
xf86DrvMsg(screen, X_ERROR, "No V_BIOS found\n");
goto error1;
}
}
}
}
xf86DrvMsg(screen, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
(unsigned long)cs);
set_return_trap(pInt); set_return_trap(pInt);
pInt->BIOSseg = cs;
pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH); pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
if (! (pInt->Flags & SET_BIOS_SCRATCH)) if (! (pInt->Flags & SET_BIOS_SCRATCH))
@ -209,54 +156,33 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
xf86Int10SaveRestoreBIOSVars(pInt, TRUE); xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
} else { } else {
BusType location_type; const BusType location_type = xf86int10GetBiosLocationType(pInt,
&bios);
int bios_location = V_BIOS; int bios_location = V_BIOS;
int pci_entity;
EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex);
reset_int_vect(pInt); reset_int_vect(pInt);
set_return_trap(pInt); set_return_trap(pInt);
if (bios.bus != BUS_NONE) {
switch (location_type = bios.bus) {
case BUS_PCI:
xf86DrvMsg(screen,X_CONFIG,"Overriding bios location: "
"PCI:%i:%i%i\n",bios.location.pci.bus,
bios.location.pci.dev,bios.location.pci.func);
break;
case BUS_ISA:
bios_location = bios.location.legacy;
if (bios.location.legacy)
xf86DrvMsg(screen,X_CONFIG,"Overriding bios location: "
"Legacy:0x%x\n",bios.location.legacy);
else
xf86DrvMsg(screen,X_CONFIG,"Overriding bios location: "
"Legacy\n");
break;
default:
break;
}
} else
location_type = pEnt->location.type;
xfree(pEnt);
switch (location_type) { switch (location_type) {
case BUS_PCI: case BUS_PCI: {
vbiosMem = (unsigned char *)base + bios_location; const int pci_entity = (bios.bus == BUS_PCI)
if (bios.bus == BUS_PCI) ? xf86GetPciEntity(bios.location.pci.bus,
pci_entity = xf86GetPciEntity(bios.location.pci.bus,
bios.location.pci.dev, bios.location.pci.dev,
bios.location.pci.func); bios.location.pci.func)
else : pInt->entityIndex;
pci_entity = pInt->entityIndex;
vbiosMem = (unsigned char *)base + bios_location;
if (!(size = mapPciRom(pci_entity,(unsigned char *)(vbiosMem)))) { if (!(size = mapPciRom(pci_entity,(unsigned char *)(vbiosMem)))) {
xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3)\n"); xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3)\n");
goto error1; goto error1;
} }
INTPriv(pInt)->highMemory = GET_HIGH_BASE(size); INTPriv(pInt)->highMemory = GET_HIGH_BASE(size);
break; break;
}
case BUS_ISA: case BUS_ISA:
if (bios.bus == BUS_ISA) {
bios_location = bios.location.legacy;
}
vbiosMem = (unsigned char *)sysMem + bios_location; vbiosMem = (unsigned char *)sysMem + bios_location;
#if 0 #if 0
(void)memset(vbiosMem, 0, V_BIOS_SIZE); (void)memset(vbiosMem, 0, V_BIOS_SIZE);

8
hw/xfree86/int10/helper_exec.c
View File

@ -594,7 +594,7 @@ pciCfg1outb(CARD16 addr, CARD8 val)
} }
CARD8 CARD8
bios_checksum(CARD8 *start, int size) bios_checksum(const CARD8 *start, int size)
{ {
CARD8 sum = 0; CARD8 sum = 0;
@ -703,3 +703,9 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save)
xf86UnMapVidMem(pInt->scrnIndex,base - BIOS_SCRATCH_OFF ,pagesize); xf86UnMapVidMem(pInt->scrnIndex,base - BIOS_SCRATCH_OFF ,pagesize);
} }
#endif #endif
xf86Int10InfoPtr
xf86InitInt10(int entityIndex)
{
return xf86ExtendedInitInt10(entityIndex, 0);
}

147
hw/xfree86/int10/helper_mem.c
View File

@ -224,7 +224,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex)
} }
Bool Bool
int10skip(void* options) int10skip(const void* options)
{ {
Bool noint10 = FALSE; Bool noint10 = FALSE;
@ -235,7 +235,7 @@ int10skip(void* options)
} }
Bool Bool
int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem) int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem)
{ {
int size; int size;
@ -262,7 +262,7 @@ int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem)
} }
Bool Bool
initPrimary(void* options) initPrimary(const void* options)
{ {
Bool initPrimary = FALSE; Bool initPrimary = FALSE;
@ -281,39 +281,33 @@ initPrimary(void* options)
* be used with extreme care. * be used with extreme care.
*/ */
void void
xf86int10ParseBiosLocation(void* options, xf86int10ParseBiosLocation(const void* options,
xf86int10BiosLocationPtr bios) xf86int10BiosLocationPtr bios)
{ {
char *s; const char *p;
char *p; const char *str;
char *str = NULL;
if (options)
str = xf86GetOptValString(options,OPT_BIOS_LOCATION);
bios->bus = BUS_NONE; bios->bus = BUS_NONE;
if (!str)
if ((options == NULL)
|| ((str = xf86GetOptValString(options, OPT_BIOS_LOCATION)) == NULL)) {
return; return;
}
s = xstrdup(str); if (strncasecmp(str, "pci", 3) == 0) {
p = strtok(s,":"); bios->bus = BUS_PCI;
if (xf86NameCmp(p,"pci") == 0) bios->bus = BUS_PCI; } else if (strncasecmp(str, "primary", 7) == 0) {
else bios->bus = BUS_ISA;
if (xf86NameCmp(p,"primary") == 0) bios->bus = BUS_ISA; }
else {
return;
}
xfree(s); p = strchr(str, ':');
if (bios->bus == BUS_NONE) return;
s = xstrdup(str);
p = strchr(s, ':');
switch (bios->bus) { switch (bios->bus) {
case BUS_ISA: case BUS_ISA:
if (p) bios->location.legacy = (p != NULL) ? atoi(++p) : 0;
bios->location.legacy = atoi(++p);
else
bios->location.legacy = 0;
break; break;
case BUS_PCI: case BUS_PCI:
if (p) { if (p) {
@ -332,8 +326,107 @@ xf86int10ParseBiosLocation(void* options,
default: default:
break; break;
} }
xfree(s);
} }
BusType
xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt,
const xf86int10BiosLocationPtr bios)
{
BusType location_type = bios->bus;
switch (location_type) {
case BUS_PCI:
xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: "
"PCI:%i:%i%i\n",bios->location.pci.bus,
bios->location.pci.dev,bios->location.pci.func);
break;
case BUS_ISA:
if (bios->location.legacy)
xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: "
"Legacy:0x%x\n",bios->location.legacy);
else
xf86DrvMsg(pInt->scrnIndex,X_CONFIG,"Overriding bios location: "
"Legacy\n");
break;
case BUS_NONE: {
EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex);
location_type = pEnt->location.type;
xfree(pEnt);
break;
}
default:
break;
}
return location_type;
}
#define CHECK_V_SEGMENT_RANGE(x) \
if (((x) << 4) < V_BIOS) { \
xf86DrvMsg(pInt->scrnIndex, X_ERROR, \
"V_BIOS address 0x%lx out of range\n", \
(unsigned long)(x) << 4); \
return FALSE; \
}
Bool
xf86int10GetBiosSegment(xf86Int10InfoPtr pInt,
const xf86int10BiosLocationPtr bios, void * base)
{
unsigned i;
int cs = ~0;
int segments[4];
const char * format;
if (bios->bus == BUS_ISA && bios->location.legacy) {
xf86DrvMsg(pInt->scrnIndex, X_CONFIG,
"Overriding BIOS location: 0x%x\n",
bios->location.legacy);
segments[0] = bios->location.legacy >> 4;
segments[1] = ~0;
format = "No V_BIOS at specified address 0x%lx\n";
} else {
if (bios->bus == BUS_PCI) {
xf86DrvMsg(pInt->scrnIndex, X_WARNING,
"Option BiosLocation for primary device ignored: "
"It points to PCI.\n");
xf86DrvMsg(pInt->scrnIndex, X_WARNING,
"You must set Option InitPrimary also\n");
}
segments[0] = MEM_RW(pInt, (0x10 << 2) + 2);
segments[1] = MEM_RW(pInt, (0x42 << 2) + 2);
segments[2] = V_BIOS >> 4;
segments[3] = ~0;
format = "No V_BIOS found\n";
}
for (i = 0; segments[i] != ~0; i++) {
unsigned char * vbiosMem;
cs = segments[i];
CHECK_V_SEGMENT_RANGE(cs);
vbiosMem = (unsigned char *)base + (cs << 4);
if (int10_check_bios(pInt->scrnIndex, cs, vbiosMem)) {
break;
}
}
if (segments[i] == ~0) {
xf86DrvMsg(pInt->scrnIndex, X_ERROR, format, (unsigned long)cs << 4);
return FALSE;
}
xf86DrvMsg(pInt->scrnIndex, X_INFO, "Primary V_BIOS segment is: 0x%lx\n",
(unsigned long)cs);
pInt->BIOSseg = cs;
return TRUE;
}

15
hw/xfree86/int10/xf86int10.h
View File

@ -143,7 +143,7 @@ void dump_code(xf86Int10InfoPtr pInt);
void dump_registers(xf86Int10InfoPtr pInt); void dump_registers(xf86Int10InfoPtr pInt);
void stack_trace(xf86Int10InfoPtr pInt); void stack_trace(xf86Int10InfoPtr pInt);
xf86Int10InfoPtr getInt10Rec(int entityIndex); xf86Int10InfoPtr getInt10Rec(int entityIndex);
CARD8 bios_checksum(CARD8 *start, int size); CARD8 bios_checksum(const CARD8 *start, int size);
void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); void LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); void UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga);
#if defined (_PC) #if defined (_PC)
@ -182,11 +182,16 @@ int setup_system_bios(void *base_addr);
void reset_int_vect(xf86Int10InfoPtr pInt); void reset_int_vect(xf86Int10InfoPtr pInt);
void set_return_trap(xf86Int10InfoPtr pInt); void set_return_trap(xf86Int10InfoPtr pInt);
void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex); void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex);
Bool int10skip(void* options); Bool int10skip(const void* options);
Bool int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem); Bool int10_check_bios(int scrnIndex, int codeSeg,
Bool initPrimary(void* options); const unsigned char* vbiosMem);
void xf86int10ParseBiosLocation(void* options, Bool initPrimary(const void* options);
void xf86int10ParseBiosLocation(const void* options,
xf86int10BiosLocationPtr bios); xf86int10BiosLocationPtr bios);
BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt,
const xf86int10BiosLocationPtr bios);
Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt,
const xf86int10BiosLocationPtr bios, void * base);
#ifdef DEBUG #ifdef DEBUG
void dprint(unsigned long start, unsigned long size); void dprint(unsigned long start, unsigned long size);
#endif #endif

2
hw/xfree86/loader/Makefile.am
View File

@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \
-I$(srcdir)/../ddc -I$(srcdir)/../i2c -I$(srcdir)/../ddc -I$(srcdir)/../i2c
#AM_LDFLAGS = -r #AM_LDFLAGS = -r
AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS)
if XORG_LOADER_SPARC if XORG_LOADER_SPARC
SPARC_SOURCES = SparcMulDiv.S SPARC_SOURCES = SparcMulDiv.S

2
hw/xfree86/os-support/bsd/Makefile.am
View File

@ -50,7 +50,7 @@ ARCH_SOURCES = \
endif endif
# FIXME: NetBSD Aperture defines (configure.ac) # FIXME: NetBSD Aperture defines (configure.ac)
AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS)
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)

4
hw/xfree86/os-support/bsd/bsd_jstk.c
View File

@ -36,9 +36,7 @@
#include <machine/joystick.h> #include <machine/joystick.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef XFree86LOADER
#include "misc.h" #include "misc.h"
#endif
#include "xf86.h" #include "xf86.h"
#define JS_RETURN sizeof(struct joystick) #define JS_RETURN sizeof(struct joystick)
@ -174,7 +172,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons)
return 1; return 1;
} }
#ifdef XFree86LOADER
/* /*
* Entry point for XFree86 Loader * Entry point for XFree86 Loader
*/ */
@ -184,5 +181,4 @@ bsd_jstkModuleInit(pointer *data, INT32 *magic)
*magic = MAGIC_DONE; *magic = MAGIC_DONE;
*data = NULL; *data = NULL;
} }
#endif
/* end of bsd_jstk.c */ /* end of bsd_jstk.c */

2
hw/xfree86/os-support/bus/Makefile.am
View File

@ -53,6 +53,6 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
INCLUDES = $(XORG_INCS) INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ AM_CFLAGS = $(XORG_CFLAGS)
EXTRA_DIST = $(sdk_HEADERS) EXTRA_DIST = $(sdk_HEADERS)

5
hw/xfree86/os-support/drm/Makefile.am
View File

@ -7,9 +7,8 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/glx \
-I$(top_srcdir)/GL/include \ -I$(top_srcdir)/GL/include \
-DHAVE_XORG_CONFIG_H \ -DHAVE_XORG_CONFIG_H \
@LIBDRM_CFLAGS@ \ @LIBDRM_CFLAGS@
@SERVER_DEFINES@ \
@LOADER_DEFINES@
libdrm_la_LDFLAGS = -module -avoid-version libdrm_la_LDFLAGS = -module -avoid-version
libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_ladir = $(moduledir)/@XORG_OS@
libdrm_la_SOURCES = \ libdrm_la_SOURCES = \

34
hw/xfree86/os-support/drm/xf86drm.c
View File

@ -37,18 +37,10 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86Server
#include "xf86.h" #include "xf86.h"
#include "xf86_OSproc.h" #include "xf86_OSproc.h"
#define _DRM_MALLOC xalloc #define _DRM_MALLOC xalloc
#define _DRM_FREE xfree #define _DRM_FREE xfree
# ifndef XFree86LOADER
# include <sys/mman.h>
# endif
#else
# define _DRM_MALLOC malloc
# define _DRM_FREE free
#endif
#include "drm.h" #include "drm.h"
#include <stdio.h> #include <stdio.h>
@ -124,20 +116,10 @@ drmMsg(const char *format, ...)
{ {
va_list ap; va_list ap;
#ifndef XFree86Server
const char *env;
if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose"))
#endif
{
va_start(ap, format); va_start(ap, format);
#ifdef XFree86Server
xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap);
#else
vfprintf(stderr, format, ap);
#endif
va_end(ap); va_end(ap);
} }
}
static void *drmHashTable = NULL; /* Context switch callbacks */ static void *drmHashTable = NULL; /* Context switch callbacks */
@ -270,19 +252,15 @@ static int drmOpenDevice(long dev, int minor)
int fd; int fd;
mode_t devmode = DRM_DEV_MODE; mode_t devmode = DRM_DEV_MODE;
int isroot = !geteuid(); int isroot = !geteuid();
#if defined(XFree86Server)
uid_t user = DRM_DEV_UID; uid_t user = DRM_DEV_UID;
gid_t group = DRM_DEV_GID; gid_t group = DRM_DEV_GID;
#endif
sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor);
drmMsg("drmOpenDevice: node name is %s\n", buf); drmMsg("drmOpenDevice: node name is %s\n", buf);
#if defined(XFree86Server)
devmode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE; devmode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE;
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID; group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID;
#endif
if (stat(DRM_DIR_NAME, &st)) { if (stat(DRM_DIR_NAME, &st)) {
if (!isroot) return DRM_ERR_NOT_ROOT; if (!isroot) return DRM_ERR_NOT_ROOT;
@ -297,10 +275,8 @@ static int drmOpenDevice(long dev, int minor)
remove(buf); remove(buf);
mknod(buf, S_IFCHR | devmode, dev); mknod(buf, S_IFCHR | devmode, dev);
} }
#if defined(XFree86Server)
chown(buf, user, group); chown(buf, user, group);
chmod(buf, devmode); chmod(buf, devmode);
#endif
fd = open(buf, O_RDWR, 0); fd = open(buf, O_RDWR, 0);
drmMsg("drmOpenDevice: open result is %d, (%s)\n", drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@ -314,10 +290,8 @@ static int drmOpenDevice(long dev, int minor)
if (!isroot) return DRM_ERR_NOT_ROOT; if (!isroot) return DRM_ERR_NOT_ROOT;
remove(buf); remove(buf);
mknod(buf, S_IFCHR | devmode, dev); mknod(buf, S_IFCHR | devmode, dev);
#if defined(XFree86Server)
chown(buf, user, group); chown(buf, user, group);
chmod(buf, devmode); chmod(buf, devmode);
#endif
} }
fd = open(buf, O_RDWR, 0); fd = open(buf, O_RDWR, 0);
drmMsg("drmOpenDevice: open result is %d, (%s)\n", drmMsg("drmOpenDevice: open result is %d, (%s)\n",
@ -454,16 +428,12 @@ static int drmOpenByName(const char *name)
char * id; char * id;
if (!drmAvailable()) { if (!drmAvailable()) {
#if !defined(XFree86Server)
return -1;
#else
/* try to load the kernel module now */ /* try to load the kernel module now */
if (!xf86LoadKernelModule(name)) { if (!xf86LoadKernelModule(name)) {
ErrorF("[drm] failed to load kernel module \"%s\"\n", ErrorF("[drm] failed to load kernel module \"%s\"\n",
name); name);
return -1; return -1;
} }
#endif
} }
/* /*
@ -546,7 +516,6 @@ static int drmOpenByName(const char *name)
*/ */
int drmOpen(const char *name, const char *busid) int drmOpen(const char *name, const char *busid)
{ {
#ifdef XFree86Server
if (!drmAvailable() && name != NULL) { if (!drmAvailable() && name != NULL) {
/* try to load the kernel */ /* try to load the kernel */
if (!xf86LoadKernelModule(name)) { if (!xf86LoadKernelModule(name)) {
@ -555,7 +524,6 @@ int drmOpen(const char *name, const char *busid)
return -1; return -1;
} }
} }
#endif
if (busid) { if (busid) {
int fd; int fd;
@ -2259,7 +2227,6 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex,
return 0; return 0;
} }
#if defined(XFree86Server)
static void drmSIGIOHandler(int interrupt, void *closure) static void drmSIGIOHandler(int interrupt, void *closure)
{ {
unsigned long key; unsigned long key;
@ -2323,4 +2290,3 @@ int drmRemoveSIGIOHandler(int fd)
return xf86RemoveSIGIOHandler(fd); return xf86RemoveSIGIOHandler(fd);
} }
#endif

2
hw/xfree86/os-support/drm/xf86drmHash.c
View File

@ -81,10 +81,8 @@
#if !HASH_MAIN #if !HASH_MAIN
# include "drm.h" # include "drm.h"
# include "xf86drm.h" # include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h" # include "xf86.h"
#endif #endif
#endif
#define N(x) drm##x #define N(x) drm##x

2
hw/xfree86/os-support/drm/xf86drmRandom.c
View File

@ -84,10 +84,8 @@
#if !RANDOM_MAIN #if !RANDOM_MAIN
# include "drm.h" # include "drm.h"
# include "xf86drm.h" # include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h" # include "xf86.h"
#endif #endif
#endif
#define N(x) drm##x #define N(x) drm##x

5
hw/xfree86/os-support/drm/xf86drmSL.c
View File

@ -53,12 +53,7 @@
#else #else
# include "drm.h" # include "drm.h"
# include "xf86drm.h" # include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h" # include "xf86.h"
# else
# include <stdio.h>
# include <stdlib.h>
# endif
#endif #endif
#define N(x) drm##x #define N(x) drm##x

Some files were not shown because too many files have changed in this diff Show More