[xserver-commit] xfree86/common atKeynames.h,3.21,3.22 compiler.h,3.106,3.107 fourcc.h,1.5,1.6 modeline2c.pl,1.11,1.12 xf86.h,3.173,3.174 xf86AutoConfig.c,1.3,1.4 xf86Beta.c,3.10,3.11 xf86Bus.c,1.79,1.80 xf86Bus.h,1.23,1.24 xf86Config.c,3.277,3.278 xf86Config.h,1.7,1.8 xf86Configure.c,3.81,3.82 xf86Cursor.c,3.37,3.38 xf86DGA.c,1.47,1.48 xf86DPMS.c,1.11,1.12 xf86Debug.c,1.7,1.8 xf86DefModes.c,1.10,1.11 xf86DoProbe.c,1.14,1.15 xf86DoScanPci.c,1.15,1.16 xf86Events.c,3.159,3.160 xf86Globals.c,1.42,1.43 xf86Helper.c,1.136,1.137 xf86InPriv.h,1.5,1.6 xf86Init.c,3.212,3.213 xf86Io.c,3.56,3.57 xf86Kbd.c,3.26,3.27 xf86KbdBSD.c,3.22,3.23 xf86KbdLnx.c,3.17,3.18 xf86KbdMach.c,3.8,3.9 xf86Keymap.h,3.20,3.21 xf86MiscExt.c,1.16,1.17 xf86Mode.c,1.69,1.70 xf86Module.h,1.37,1.38 xf86Opt.h,1.15,1.16 xf86Option.c,1.29,1.30 xf86PM.c,3.9,3.10 xf86PciInfo.h,1.156,1.157 xf86Priv.h,3.83,3.84 xf86Privstr.h,1.41,1.42 xf86RandR.c,1.8,1.9 xf86Resources.h,1.15,1.16 xf86Versions.c,1.2,1.3 xf86VidMode.c,1.17,1.18 xf86XKB.c,3.12,3.13 xf86Xinput.c,3.70,3.71 xf86Xinput.h,3.36,3.37 xf86cmap.c,1.25,1.26 xf86cmap.h,1.9,1.10 xf86fbBus.c,1.3,1.4 xf86fbman.c,1.28,1.29 xf86fbman.h,1.14,1.15 xf86isaBus.c,3.6,3.7 xf86noBus.c,1.2,1.3 xf86pciBus.c,3.77,3.78 xf86pciBus.h,3.10,3.11 xf86sbusBus.c,3.7,3.8 xf86sbusBus.h,3.5,3.6 xf86str.h,1.97,1.98 xf86xv.c,1.37,1.38 xf86xv.h,1.25,1.26 xf86xvmc.c,1.6,1.7 xf86xvmc.h,1.7,1.8 xf86xvpriv.h,1.2,1.3 xisb.c,1.6,1.7 xisb.h,1.1,1.2
Daniel Stone
xserver-commit@pdx.freedesktop.org
- Previous message: [xserver-commit] xfree86/loader SparcMulDiv.S,1.1,1.2 aout.h,1.8,1.9 aoutloader.c,1.20,1.21 aoutloader.h,1.4,1.5 ar.h,1.4,1.5 coff.h,1.6,1.7 coffloader.c,1.22,1.23 coffloader.h,1.4,1.5 dixsym.c,1.63,1.64 dlloader.c,1.13,1.14 dlloader.h,1.3,1.4 elf.h,1.17,1.18 elfloader.c,1.62,1.63 elfloader.h,1.4,1.5 extsym.c,1.9,1.10 fontsym.c,1.14,1.15 hash.c,1.25,1.26 hash.h,1.3,1.4 loader.c,1.71,1.72 loader.h,1.28,1.29 loaderProcs.h,1.21,1.22 loadext.c,1.8,1.9 loadfont.c,1.4,1.5 loadmod.c,1.73,1.74 misym.c,1.38,1.39 os.c,1.4,1.5 os2funcs.c,1.8,1.9 sym.h,1.7,1.8 xf86sym.c,1.242,1.243
- Next message: [xserver-commit] xfree86/vbe vbe.c,1.3,1.4 vbe.h,1.5,1.6 vbeModes.c,1.4,1.5 vbeModes.h,1.1,1.2 vbe_module.c,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: daniel
Update of /cvs/xserver/xfree86/common
In directory pdx:/home/daniel/src/xserver/hw/xfree86/common
Modified Files:
atKeynames.h compiler.h fourcc.h modeline2c.pl xf86.h
xf86AutoConfig.c xf86Beta.c xf86Bus.c xf86Bus.h xf86Config.c
xf86Config.h xf86Configure.c xf86Cursor.c xf86DGA.c xf86DPMS.c
xf86Debug.c xf86DefModes.c xf86DoProbe.c xf86DoScanPci.c
xf86Events.c xf86Globals.c xf86Helper.c xf86InPriv.h
xf86Init.c xf86Io.c xf86Kbd.c xf86KbdBSD.c xf86KbdLnx.c
xf86KbdMach.c xf86Keymap.h xf86MiscExt.c xf86Mode.c
xf86Module.h xf86Opt.h xf86Option.c xf86PM.c xf86PciInfo.h
xf86Priv.h xf86Privstr.h xf86RandR.c xf86Resources.h
xf86Versions.c xf86VidMode.c xf86XKB.c xf86Xinput.c
xf86Xinput.h xf86cmap.c xf86cmap.h xf86fbBus.c xf86fbman.c
xf86fbman.h xf86isaBus.c xf86noBus.c xf86pciBus.c xf86pciBus.h
xf86sbusBus.c xf86sbusBus.h xf86str.h xf86xv.c xf86xv.h
xf86xvmc.c xf86xvmc.h xf86xvpriv.h xisb.c xisb.h
Log Message:
Checkin stage #4: everything else we've changed.
Index: atKeynames.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/atKeynames.h,v
retrieving revision 3.21
retrieving revision 3.22
diff -u -d -r3.21 -r3.22
--- a/atKeynames.h 9 Oct 2003 11:43:59 -0000 3.21
+++ b/atKeynames.h 19 Feb 2004 03:51:36 -0000 3.22
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.20 2003/08/24 17:36:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.21 2003/10/09 11:43:59 pascal Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -55,8 +55,8 @@
#define XK_TECHNICAL
#define XK_KATAKANA
-#include "keysym.h"
-#include "XF86keysym.h"
+#include <X11/keysym.h>
+#include <X11/XF86keysym.h>
#define GLYPHS_PER_KEY 4
#define NUM_KEYCODES 248
Index: compiler.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/compiler.h,v
retrieving revision 3.106
retrieving revision 3.107
diff -u -d -r3.106 -r3.107
--- a/compiler.h 2 Feb 2004 03:55:28 -0000 3.106
+++ b/compiler.h 19 Feb 2004 03:51:36 -0000 3.107
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.105 2003/12/18 21:56:37 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/compiler.h,v 3.106 2004/02/02 03:55:28 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
Index: fourcc.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/fourcc.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/fourcc.h 24 Aug 2003 17:36:48 -0000 1.5
+++ b/fourcc.h 19 Feb 2004 03:51:36 -0000 1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.4 2003/04/23 21:51:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.5 2003/08/24 17:36:48 dawes Exp $ */
/*
* Copyright (c) 2000-2003 by The XFree86 Project, Inc.
Index: modeline2c.pl
===================================================================
RCS file: /cvs/xserver/xfree86/common/modeline2c.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/modeline2c.pl 3 Nov 2003 05:11:01 -0000 1.11
+++ b/modeline2c.pl 19 Feb 2004 03:51:36 -0000 1.12
@@ -34,7 +34,7 @@
# the sale, use or other dealings in this Software without prior written
# authorization from the copyright holder(s) and author(s).
#
-# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.10tsi Exp $
+# $XFree86: xc/programs/Xserver/hw/xfree86/common/modeline2c.pl,v 1.11 2003/11/03 05:11:01 tsi Exp $
#my %flagshash;
$flagshash{""} = "0";
Index: xf86.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86.h,v
retrieving revision 3.173
retrieving revision 3.174
diff -u -d -r3.173 -r3.174
--- a/xf86.h 27 Jan 2004 01:31:44 -0000 3.173
+++ b/xf86.h 19 Feb 2004 03:51:36 -0000 3.174
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.172 2003/09/24 02:43:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86.h,v 3.173 2004/01/27 01:31:44 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -225,6 +225,13 @@
/* xf86Helper.c */
+#if defined(__GNUC__) && \
+ ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ > 4)))
+#define _printf_attribute(a,b) __attribute((format(printf,a,b)))
+#else
+#define _printf_attribute(a,b) /**/
+#endif
+
#ifdef printf
#define printf_defined
#undef printf
@@ -358,10 +365,8 @@
pointer value);
Bool xf86IsUnblank(int mode);
-#ifdef XFree86LOADER
void xf86AddModuleInfo(ModuleInfoPtr info, pointer module);
void xf86DeleteModuleInfo(int idx);
-#endif
#ifdef printf_defined
#define printf xf86printf
@@ -444,4 +449,46 @@
#endif /* _NO_XF86_PROTOTYPES */
+/* this is an absolutely terrible hack to fix an absolutely terrible hack; the
+ * wrong solution to the wrong problem. -daniel */
+Bool noXkbExtension = 0;
+
+#define DEFAULT_MODULE_PATH "/opt/fdo/lib/xfree86/modules"
+#define DEFAULT_LOGPREFIX "/var/log/XFree86."
+#define XF86CONFIGFILE "/etc/xfree86.conf"
+#define XORG_RELEASE " "
+
+#define DPMS_SERVER
+#include <X11/extensions/dpms.h>
+extern CARD32 defaultDPMSStandbyTime;
+extern CARD32 defaultDPMSSuspendTime;
+extern CARD32 defaultDPMSOffTime;
+extern CARD32 DPMSStandbyTime;
+extern CARD32 DPMSSuspendTime;
+extern CARD32 DPMSOffTime;
+extern CARD16 DPMSPowerLevel;
+extern Bool defaultDPMSEnabled;
+extern Bool DPMSEnabled;
+extern Bool DPMSEnabledSwitch;
+extern Bool DPMSDisabledSwitch;
+extern Bool DPMSCapableFlag;
+
+#define NO_XFIXES
+#define NO_DAMAGE
+#define NO_COMPOSITE
+
+#if defined(__linux__)
+#define OSNAME "linux"
+#elif defined(__FreeBSD__)
+#define OSNAME "freebsd"
+#elif defined(__NetBSD__)
+#define OSNAME "netbsd"
+#elif defined(__OpenBSD__)
+#define OSNAME "openbsd"
+#elif defined(SVR4) && defined(sun)
+#define OSNAME "solaris"
+#else
+#define OSNAME "unknown"
+#endif
+
#endif /* _XF86_H */
Index: xf86AutoConfig.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86AutoConfig.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86AutoConfig.c 12 Dec 2003 00:39:16 -0000 1.3
+++ b/xf86AutoConfig.c 19 Feb 2004 03:51:36 -0000 1.4
@@ -47,7 +47,7 @@
* Author: David Dawes <dawes@XFree86.Org>.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.2 2003/11/03 05:11:01 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.3 2003/12/12 00:39:16 dawes Exp $ */
#include "xf86.h"
#include "xf86Parser.h"
Index: xf86Beta.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Beta.c,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/xf86Beta.c 24 Aug 2003 17:36:49 -0000 3.10
+++ b/xf86Beta.c 19 Feb 2004 03:51:36 -0000 3.11
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Beta.c,v 3.9 2002/05/31 18:45:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Beta.c,v 3.10 2003/08/24 17:36:49 dawes Exp $ */
/*
* Copyright (c) 1996-2002 by The XFree86 Project, Inc.
*
Index: xf86Bus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Bus.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- a/xf86Bus.c 3 Nov 2003 05:11:01 -0000 1.79
+++ b/xf86Bus.c 19 Feb 2004 03:51:36 -0000 1.80
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.78tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.79 2003/11/03 05:11:01 tsi Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
@@ -2156,13 +2156,11 @@
resError(resList list)
{
FatalError("A driver tried to allocate the %s %sresource at \n"
- "0x%lx:0x%lx which conflicted with another resource. Send the\n"
- "output of the server to %s. Please \n"
- "specify your computer hardware as closely as possible.\n",
- ResIsBlock(list)?"Block":"Sparse",
+ "0x%lx:0x%lx which conflicted with another resource.\n",
+ ResIsBlock(list) ?"Block":"Sparse",
ResIsMem(list)?"Mem":"Io",
ResIsBlock(list)?list->rBegin:list->rBase,
- ResIsBlock(list)?list->rEnd:list->rMask,BUILDERADDR);
+ ResIsBlock(list)?list->rEnd:list->rMask);
}
/*
@@ -2481,7 +2479,6 @@
if (xf86NumScreens > 1)
needRAC = TRUE;
-#ifdef XFree86LOADER
xf86MsgVerb(X_INFO, 3, "do I need RAC?");
if (needRAC) {
@@ -2491,7 +2488,6 @@
FatalError("Cannot load RAC module\n");
} else
xf86ErrorFVerb(3, " No, I don't.\n");
-#endif
xf86MsgVerb(X_INFO, 3, "resource ranges after preInit:\n");
xf86PrintResList(3, Acc);
@@ -2504,22 +2500,18 @@
ScreenPtr pScreen;
unsigned int flags;
int nummem = 0, numio = 0;
-#ifdef XFree86LOADER
pointer xf86RACInit = NULL;
-#endif
if (doFramebufferMode) {
SetSIGIOForState(OPERATING);
return;
}
-#ifdef XFree86LOADER
if (needRAC) {
xf86RACInit = LoaderSymbol("xf86RACInit");
if (!xf86RACInit)
FatalError("Cannot resolve symbol \"xf86RACInit\"\n");
}
-#endif
#ifdef DEBUG
ErrorF("PostScreenInit generation: %i\n",serverGeneration);
#endif
@@ -2598,12 +2590,8 @@
xf86ErrorFVerb(3, "Screen %d is using RAC for io\n", i);
}
-#ifdef XFree86LOADER
((Bool(*)(ScreenPtr,unsigned int))xf86RACInit)
(pScreen,flags);
-#else
- xf86RACInit(pScreen,flags);
-#endif
}
}
Index: xf86Bus.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Bus.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- a/xf86Bus.h 24 Aug 2003 17:36:50 -0000 1.23
+++ b/xf86Bus.h 19 Feb 2004 03:51:36 -0000 1.24
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.h,v 1.22 2003/05/22 20:11:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.h,v 1.23 2003/08/24 17:36:50 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
Index: xf86Config.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Config.c,v
retrieving revision 3.277
retrieving revision 3.278
diff -u -d -r3.277 -r3.278
--- a/xf86Config.c 15 Oct 2003 22:51:48 -0000 3.277
+++ b/xf86Config.c 19 Feb 2004 03:51:36 -0000 3.278
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.277 2003/10/15 22:51:48 dawes Exp $ */
/*
@@ -63,10 +63,8 @@
#include "globals.h"
-#ifdef XINPUT
#include "xf86Xinput.h"
extern DeviceAssocRec mouse_assoc;
-#endif
#ifdef XKB
#define XKB_IN_SERVER
@@ -479,7 +477,6 @@
}
driverlist[count] = NULL;
-#ifdef XFree86LOADER
{
const char *subdirs[] = {NULL, NULL};
static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};
@@ -533,43 +530,6 @@
xfree(clist);
xfree(dlist);
}
-#endif /* XFree86LOADER */
-
- return driverlist;
-}
-
-
-char **
-xf86DriverlistFromCompile(void)
-{
- static char **driverlist = NULL;
- static Bool generated = FALSE;
-
- /* This string is modified in-place */
- static char drivernames[] = DRIVERS;
-
- if (!generated) {
- generated = TRUE;
- driverlist = GenerateDriverlist("drivers", drivernames);
- }
-
- return driverlist;
-}
-
-
-char **
-xf86InputDriverlistFromCompile(void)
-{
- static char **driverlist = NULL;
- static Bool generated = FALSE;
-
- /* This string is modified in-place */
- static char drivernames[] = IDRIVERS;
-
- if (!generated) {
- generated = TRUE;
- driverlist = GenerateDriverlist("input", drivernames);
- }
return driverlist;
}
@@ -679,7 +639,6 @@
}
-#ifdef XFree86LOADER
/* ModulePath */
if (fileconf) {
@@ -690,7 +649,6 @@
}
xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath);
-#endif
#if 0
/* LogFile */
Index: xf86Config.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xf86Config.h 8 Oct 2003 14:58:27 -0000 1.7
+++ b/xf86Config.h 19 Feb 2004 03:51:36 -0000 1.8
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.h,v 1.6 2003/08/24 17:36:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.h,v 1.7 2003/10/08 14:58:27 dawes Exp $ */
/*
* Copyright (c) 1997-2000 by The XFree86 Project, Inc.
Index: xf86Configure.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Configure.c,v
retrieving revision 3.81
retrieving revision 3.82
diff -u -d -r3.81 -r3.82
--- a/xf86Configure.c 29 Oct 2003 04:17:21 -0000 3.81
+++ b/xf86Configure.c 19 Feb 2004 03:51:36 -0000 3.82
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.81 2003/10/29 04:17:21 dawes Exp $ */
/*
* Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales.
*
@@ -30,22 +30,20 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "os.h"
-#ifdef XFree86LOADER
#include "loaderProcs.h"
-#endif
#include "xf86.h"
#include "xf86Config.h"
#include "xf86Priv.h"
-#include "xf86PciData.h"
#define IN_XSERVER
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
#include "vbe.h"
#include "xf86DDC.h"
+#include "xf86PciData.h"
#if defined(__sparc__) && !defined(__OpenBSD__)
#include "xf86Bus.h"
#include "xf86Sbus.h"
@@ -400,7 +398,7 @@
/* Move device info to parser structure */
sprintf(identifier, "Card%d", screennum);
- ptr->dev_identifier = strdup(identifier);
+ ptr->dev_identifier = xstrdup(identifier);
/* ptr->dev_identifier = DevToConfig[screennum].GDev.identifier;*/
ptr->dev_vendor = DevToConfig[screennum].GDev.vendor;
ptr->dev_board = DevToConfig[screennum].GDev.board;
@@ -588,7 +586,6 @@
static XF86ConfModulePtr
configureModuleSection (void)
{
-#ifdef XFree86LOADER
char **elist, **el;
/* Find the list of extension modules. */
const char *esubdirs[] = {
@@ -599,10 +596,8 @@
"fonts",
NULL
};
-#endif
parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec)
-#ifdef XFree86LOADER
elist = LoaderListDirs(esubdirs, NULL);
if (elist) {
for (el = elist; *el; el++) {
@@ -643,7 +638,6 @@
}
xfree(elist);
}
-#endif
return ptr;
}
@@ -653,14 +647,12 @@
{
parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec)
-#ifdef XFree86LOADER
if (xf86ModulePath)
- ptr->file_modulepath = strdup(xf86ModulePath);
-#endif
+ ptr->file_modulepath = xstrdup(xf86ModulePath);
if (defaultFontPath)
- ptr->file_fontpath = strdup(defaultFontPath);
+ ptr->file_fontpath = xstrdup(defaultFontPath);
if (rgbPath)
- ptr->file_rgbpath = strdup(rgbPath);
+ ptr->file_rgbpath = xstrdup(rgbPath);
return ptr;
}
@@ -672,8 +664,8 @@
ptr->mon_identifier = xf86confmalloc(19);
sprintf(ptr->mon_identifier, "Monitor%d", screennum);
- ptr->mon_vendor = strdup("Monitor Vendor");
- ptr->mon_modelname = strdup("Monitor Model");
+ ptr->mon_vendor = xstrdup("Monitor Vendor");
+ ptr->mon_modelname = xstrdup("Monitor Model");
return ptr;
}
@@ -691,7 +683,7 @@
ptr->mon_identifier = xf86confmalloc(19);
sprintf(ptr->mon_identifier, "Monitor%d", screennum);
- ptr->mon_vendor = strdup(ConfiguredMonitor->vendor.name);
+ ptr->mon_vendor = xstrdup(ConfiguredMonitor->vendor.name);
ptr->mon_modelname = xf86confmalloc(12);
sprintf(ptr->mon_modelname, "%x", ConfiguredMonitor->vendor.prod_id);
@@ -707,7 +699,7 @@
/* when values available add DisplaySize option AS A COMMENT */
displaySizeLen = snprintf(displaySize_string, displaySizeMaxLen,
- "\t#DisplaySize\t%5d %5d\t# mm\n",
+ "\t#DisplaySize\t%5d %5d\t# mm\n",
mon_width, mon_height);
if (displaySizeLen>0 && displaySizeLen<displaySizeMaxLen) {
@@ -774,10 +766,8 @@
for (vl = vlist; *vl; vl++)
ErrorF("\t%s\n", *vl);
-#ifdef XFree86LOADER
/* Load all the drivers that were found. */
xf86LoadModules(vlist, NULL);
-#endif /* XFree86LOADER */
xfree(vlist);
@@ -992,7 +982,7 @@
ErrorF("To test the server, run 'XFree86 -xf86config %s'\n\n", filename);
bail:
- OsCleanup(TRUE);
+ OsCleanup();
AbortDDX();
fflush(stderr);
exit(0);
Index: xf86Cursor.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Cursor.c,v
retrieving revision 3.37
retrieving revision 3.38
diff -u -d -r3.37 -r3.38
--- a/xf86Cursor.c 7 Nov 2003 22:20:17 -0000 3.37
+++ b/xf86Cursor.c 19 Feb 2004 03:51:36 -0000 3.38
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.36 2003/08/24 17:36:51 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Cursor.c,v 3.37 2003/11/07 22:20:17 dawes Exp $ */
/*
* Copyright (c) 1994-2003 by The XFree86 Project, Inc.
*
@@ -29,8 +29,8 @@
/* $XConsortium: xf86Cursor.c /main/10 1996/10/19 17:58:23 kaleb $ */
#define NEED_EVENTS
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "input.h"
#include "cursor.h"
#include "mipointer.h"
@@ -43,10 +43,8 @@
#include "xf86Priv.h"
#include "xf86_OSproc.h"
-#ifdef XINPUT
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
#include "xf86Xinput.h"
-#endif
#ifdef XFreeXDGA
#include "dgaproc.h"
@@ -74,14 +72,8 @@
xf86CursorOffScreen,
xf86CrossScreen,
xf86WarpCursor,
-#ifdef XINPUT
xf86eqEnqueue,
xf86eqSwitchScreen
-#else
- /* let miPointerInitialize take care of these */
- NULL,
- NULL
-#endif
};
static xf86ScreenLayoutRec xf86ScreenLayout[MAXSCREENS];
Index: xf86DGA.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DGA.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- a/xf86DGA.c 24 Aug 2003 17:36:51 -0000 1.47
+++ b/xf86DGA.c 19 Feb 2004 03:51:36 -0000 1.48
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.47 2003/08/24 17:36:51 dawes Exp $ */
/*
* Copyright (c) 1998-2002 by The XFree86 Project, Inc.
*
@@ -32,7 +32,7 @@
#include "xf86str.h"
#include "xf86Priv.h"
#include "dgaproc.h"
-#include "xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
#include "colormapst.h"
#include "pixmapstr.h"
#include "inputstr.h"
@@ -58,11 +58,7 @@
XDGAModePtr xmode
);
-#if defined(XFree86LOADER) || !defined(XFreeXDGA)
int *XDGAEventBase = NULL;
-#else
-int *XDGAEventBase = &DGAEventBase;
-#endif
#define DGA_GET_SCREEN_PRIV(pScreen) \
((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr))
Index: xf86DPMS.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DPMS.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- a/xf86DPMS.c 11 Nov 2003 21:02:28 -0000 1.11
+++ b/xf86DPMS.c 19 Feb 2004 03:51:36 -0000 1.12
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.10 2003/10/17 20:02:12 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.11 2003/11/11 21:02:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -31,7 +31,7 @@
* This file contains the DPMS functions required by the extension.
*/
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "globals.h"
#include "xf86.h"
Index: xf86Debug.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Debug.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xf86Debug.c 24 Sep 2003 02:43:17 -0000 1.7
+++ b/xf86Debug.c 19 Feb 2004 03:51:36 -0000 1.8
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Debug.c,v 1.6 2003/08/24 17:36:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Debug.c,v 1.7 2003/09/24 02:43:17 dawes Exp $ */
/*
* Copyright (c) 2000-2003 by The XFree86 Project, Inc.
@@ -33,7 +33,7 @@
#include <sys/time.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
Index: xf86DefModes.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DefModes.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/xf86DefModes.c 3 Nov 2003 05:11:02 -0000 1.10
+++ b/xf86DefModes.c 19 Feb 2004 03:51:36 -0000 1.11
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DefModes.c,v 1.10 2003/11/03 05:11:02 tsi Exp $ */
/* THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT -- LOOK at
* modeline2c.pl */
Index: xf86DoProbe.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DoProbe.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/xf86DoProbe.c 29 Oct 2003 04:17:21 -0000 1.14
+++ b/xf86DoProbe.c 19 Feb 2004 03:51:36 -0000 1.15
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoProbe.c,v 1.13 2003/09/09 03:20:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoProbe.c,v 1.14 2003/10/29 04:17:21 dawes Exp $ */
/*
* Copyright (c) 1999-2002 by The XFree86 Project, Inc.
*
@@ -33,13 +33,11 @@
#include <ctype.h>
#include <stdlib.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "os.h"
-#ifdef XFree86LOADER
#include "loaderProcs.h"
#include "xf86Config.h"
-#endif /* XFree86LOADER */
#include "xf86.h"
#include "xf86Priv.h"
@@ -54,7 +52,6 @@
int i;
Bool probeResult;
-#ifdef XFree86LOADER
/* Find the list of video driver modules. */
char **list = xf86DriverlistFromCompile();
char **l;
@@ -69,7 +66,6 @@
/* Load all the drivers that were found. */
xf86LoadModules(list, NULL);
-#endif /* XFree86LOADER */
/* Disable PCI devices */
xf86AccessInit();
@@ -98,7 +94,7 @@
}
}
- OsCleanup(TRUE);
+ OsCleanup();
AbortDDX();
fflush(stderr);
exit(0);
Index: xf86DoScanPci.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86DoScanPci.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xf86DoScanPci.c 23 Sep 2003 06:43:46 -0000 1.15
+++ b/xf86DoScanPci.c 19 Feb 2004 03:51:36 -0000 1.16
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoScanPci.c,v 1.14 2003/09/09 03:20:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DoScanPci.c,v 1.15 2003/09/23 06:43:46 dawes Exp $ */
/*
* Copyright (c) 1999-2002 by The XFree86 Project, Inc.
*
@@ -33,12 +33,10 @@
#include <ctype.h>
#include <stdlib.h>
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "os.h"
-#ifdef XFree86LOADER
#include "loaderProcs.h"
-#endif
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Pci.h"
@@ -50,9 +48,7 @@
int j,skip,globalVerbose,scanpciVerbose;
ScanPciSetupProcPtr PciSetup;
ScanPciDisplayCardInfoProcPtr DisplayPCICardInfo;
-#ifdef XFree86LOADER
int errmaj, errmin;
-#endif
/*
* first we need to finish setup of the OS so that we can call other
@@ -91,7 +87,6 @@
/*
* now get the loader set up and load the scanpci module
*/
-#ifdef XFree86LOADER
/* Initialise the loader */
LoaderInit();
/* Tell the loader the default module search path */
@@ -109,10 +104,6 @@
PciSetup = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
DisplayPCICardInfo =
(ScanPciDisplayCardInfoProcPtr)LoaderSymbol("ScanPciDisplayPCICardInfo");
-#else
- PciSetup = ScanPciSetupPciIds;
- DisplayPCICardInfo = ScanPciDisplayPCICardInfo;
-#endif
if (!(*PciSetup)())
FatalError("ScanPciSetupPciIds() failed\n");
Index: xf86Events.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Events.c,v
retrieving revision 3.159
retrieving revision 3.160
diff -u -d -r3.159 -r3.160
--- a/xf86Events.c 22 Nov 2003 04:22:11 -0000 3.159
+++ b/xf86Events.c 19 Feb 2004 03:51:36 -0000 3.160
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.158 2003/11/03 05:11:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Events.c,v 3.159 2003/11/22 04:22:11 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -56,9 +56,9 @@
#define I_NEED_OS2_H
#endif
-#include "X.h"
-#include "Xpoll.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xpoll.h>
+#include <X11/Xproto.h>
#include "misc.h"
#include "compiler.h"
@@ -74,12 +74,8 @@
#include "dgaproc.h"
#endif
-#ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
-#else
-#include "inputstr.h"
-#endif
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "xf86Xinput.h"
#include "mi.h"
@@ -90,6 +86,7 @@
#include "xf86bigfont.h"
#endif
+
#ifdef XKB
extern Bool noXkbExtension;
#endif
@@ -97,11 +94,7 @@
#define XE_POINTER 1
#define XE_KEYBOARD 2
-#ifdef XINPUT
#define __EqEnqueue(ev) xf86eqEnqueue(ev)
-#else
-#define __EqEnqueue(ev) mieqEnqueue(ev)
-#endif
#define EqEnqueue(ev) { \
int __sigstate = xf86BlockSIGIO (); \
@@ -264,11 +257,7 @@
xf86Info.inputPending = FALSE;
-#ifdef XINPUT
xf86eqProcessInputEvents();
-#else
- mieqProcessInputEvents();
-#endif
miPointerUpdate();
miPointerPosition(&x, &y);
@@ -424,7 +413,7 @@
*/
#ifdef __linux__
-extern u_char SpecialServerMap[];
+extern unsigned char SpecialServerMap[];
#endif
#if !defined(__UNIXOS2__) && \
@@ -1139,13 +1128,11 @@
void
xf86Wakeup(pointer blockData, int err, pointer pReadmask)
{
-#if !defined(__UNIXOS2__) && !defined(__QNX__)
fd_set* LastSelectMask = (fd_set*)pReadmask;
fd_set devicesWithInput;
InputInfoPtr pInfo;
if (err >= 0) {
-
XFD_ANDSET(&devicesWithInput, LastSelectMask, &EnabledDevices);
if (XFD_ANYSET(&devicesWithInput)) {
if (xf86Info.kbdEvents)
@@ -1168,29 +1155,6 @@
}
}
}
-#else /* __UNIXOS2__ and __QNX__ */
-
- InputInfoPtr pInfo;
-
- (xf86Info.kbdEvents)(); /* Under OS/2 and QNX, always call */
-
- pInfo = xf86InputDevs;
- while (pInfo) {
- if (pInfo->read_input && pInfo->fd >= 0) {
- int sigstate = xf86BlockSIGIO();
-
- pInfo->read_input(pInfo);
- xf86UnblockSIGIO(sigstate);
- /*
- * Must break here because more than one device may share
- * the same file descriptor.
- */
- break;
- }
- pInfo = pInfo->next;
- }
-
-#endif /* __UNIXOS2__ and __QNX__ */
if (err >= 0) { /* we don't want the handlers called if select() */
IHPtr ih; /* returned with an error condition, do we? */
@@ -1277,13 +1241,11 @@
#ifdef XF86BIGFONT
XF86BigfontCleanup();
#endif
-#if defined(XFree86LOADER)
if (xf86Initialising)
LoaderCheckUnresolved(LD_RESOLV_IFDONE);
ErrorF("\n"
" *** If unresolved symbols were reported above, they might not\n"
" *** be the reason for the server aborting.\n");
-#endif
FatalError("Caught signal %d. Server aborting\n", signo);
}
@@ -1588,11 +1550,7 @@
tevent.u.keyButtonPointer.rootX = mousex;
tevent.u.keyButtonPointer.rootY = mousey;
tevent.u.keyButtonPointer.time = xf86Info.lastEventTime = GetTimeInMillis();
-#ifdef XINPUT
xf86eqEnqueue(&tevent);
-#else
- mieqEnqueue(&tevent);
-#endif
xf86Info.inputPending = TRUE; /* virtual event */
}
Index: xf86Globals.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Globals.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- a/xf86Globals.c 27 Jan 2004 01:31:44 -0000 1.42
+++ b/xf86Globals.c 19 Feb 2004 03:51:36 -0000 1.43
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.41 2003/08/24 17:36:52 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Globals.c,v 1.42 2004/01/27 01:31:44 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -31,7 +31,7 @@
* This file contains all the XFree86 global variables.
*/
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "windowstr.h"
#include "propertyst.h"
@@ -121,9 +121,7 @@
0, /* wskbdType */
#endif
NULL, /* pMouse */
-#ifdef XINPUT
NULL, /* mouseLocal */
-#endif
-1, /* lastEventTime */
FALSE, /* vtRequestsPending */
FALSE, /* inputPending */
@@ -185,14 +183,12 @@
Bool xf86ProbeFailed = FALSE;
Bool xf86DoProbe = FALSE;
Bool xf86DoConfigure = FALSE;
-#ifdef XFree86LOADER
DriverPtr *xf86DriverList = NULL;
int xf86NumDrivers = 0;
InputDriverPtr *xf86InputDriverList = NULL;
int xf86NumInputDrivers = 0;
ModuleInfoPtr *xf86ModuleInfoList = NULL;
int xf86NumModuleInfos = 0;
-#endif
int xf86NumScreens = 0;
const char *xf86VisualNames[] = {
Index: xf86Helper.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Helper.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- a/xf86Helper.c 27 Jan 2004 01:31:45 -0000 1.136
+++ b/xf86Helper.c 19 Feb 2004 03:51:36 -0000 1.137
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.135 2003/10/08 14:58:27 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Helper.c,v 1.136 2004/01/27 01:31:45 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -36,7 +36,7 @@
* different drivers.
*/
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "servermd.h"
#include "pixmapstr.h"
@@ -66,7 +66,6 @@
static int xf86ScrnInfoPrivateCount = 0;
-#ifdef XFree86LOADER
/* Add a pointer to a new DriverRec to xf86DriverList */
void
@@ -160,7 +159,6 @@
xf86ModuleInfoList[idx] = NULL;
}
}
-#endif
/* Allocate a new ScrnInfoRec in xf86Screens */
@@ -187,11 +185,7 @@
xf86Screens[i]->drv = drv;
drv->refCount++;
-#ifdef XFree86LOADER
xf86Screens[i]->module = DuplicateModule(drv->module, NULL);
-#else
- xf86Screens[i]->module = NULL;
-#endif
/*
* set the initial access state. This will be modified after PreInit.
* XXX Or should we do it some other place?
@@ -246,10 +240,8 @@
xf86OptionListFree(pScrn->options);
-#ifdef XFree86LOADER
if (pScrn->module)
UnloadModule(pScrn->module);
-#endif
if (pScrn->drv)
pScrn->drv->refCount--;
@@ -307,11 +299,7 @@
new->drv = drv;
drv->refCount++;
-#ifdef XFree86LOADER
new->module = DuplicateModule(drv->module, NULL);
-#else
- new->module = NULL;
-#endif
new->next = xf86InputDevs;
xf86InputDevs = new;
return new;
@@ -338,10 +326,8 @@
pInp->free(pInp, 0);
#endif
-#ifdef XFree86LOADER
if (pInp->module)
UnloadModule(pInp->module);
-#endif
if (pInp->drv)
pInp->drv->refCount--;
@@ -1417,7 +1403,7 @@
xf86LogFile = lf;
}
- xf86LogFile = LogInit(xf86LogFile, LOGOLDSUFFIX);
+ LogInit(xf86LogFile, NULL);
xf86LogFileWasOpened = TRUE;
xf86SetVerbosity(xf86Verbose);
@@ -2357,17 +2343,12 @@
CARD32
xf86GetModuleVersion(pointer module)
{
-#ifdef XFree86LOADER
return (CARD32)LoaderGetModuleVersion(module);
-#else
- return 0;
-#endif
}
pointer
xf86LoadDrvSubModule(DriverPtr drv, const char *name)
{
-#ifdef XFree86LOADER
pointer ret;
int errmaj = 0, errmin = 0;
@@ -2376,15 +2357,11 @@
if (!ret)
LoaderErrorMsg(NULL, name, errmaj, errmin);
return ret;
-#else
- return (pointer)1;
-#endif
}
pointer
xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name)
{
-#ifdef XFree86LOADER
pointer ret;
int errmaj = 0, errmin = 0;
@@ -2393,9 +2370,6 @@
if (!ret)
LoaderErrorMsg(pScrn->name, name, errmaj, errmin);
return ret;
-#else
- return (pointer)1;
-#endif
}
/*
@@ -2404,9 +2378,7 @@
pointer
xf86LoadOneModule(char *name, pointer opt)
{
-#ifdef XFree86LOADER
int errmaj, errmin;
-#endif
char *Name;
pointer mod;
@@ -2428,13 +2400,9 @@
return NULL;
}
-#ifdef XFree86LOADER
mod = LoadModule(Name, NULL, NULL, NULL, opt, NULL, &errmaj, &errmin);
if (!mod)
LoaderErrorMsg(NULL, Name, errmaj, errmin);
-#else
- mod = (pointer)1;
-#endif
xfree(Name);
return mod;
}
@@ -2446,7 +2414,7 @@
* This is disabled for now. The loader isn't smart enough yet to undo
* relocations.
*/
-#if defined(XFree86LOADER) && 0
+#if 0
UnloadSubModule(mod);
#endif
}
@@ -2454,59 +2422,47 @@
Bool
xf86LoaderCheckSymbol(const char *name)
{
-#ifdef XFree86LOADER
return LoaderSymbol(name) != NULL;
-#else
- return TRUE;
-#endif
}
void
xf86LoaderReqSymLists(const char **list0, ...)
{
-#ifdef XFree86LOADER
va_list ap;
va_start(ap, list0);
LoaderVReqSymLists(list0, ap);
va_end(ap);
-#endif
}
void
xf86LoaderReqSymbols(const char *sym0, ...)
{
-#ifdef XFree86LOADER
va_list ap;
va_start(ap, sym0);
LoaderVReqSymbols(sym0, ap);
va_end(ap);
-#endif
}
void
xf86LoaderRefSymLists(const char **list0, ...)
{
-#ifdef XFree86LOADER
va_list ap;
va_start(ap, list0);
LoaderVRefSymLists(list0, ap);
va_end(ap);
-#endif
}
void
xf86LoaderRefSymbols(const char *sym0, ...)
{
-#ifdef XFree86LOADER
va_list ap;
va_start(ap, sym0);
LoaderVRefSymbols(sym0, ap);
va_end(ap);
-#endif
}
@@ -2625,10 +2581,6 @@
return NULL;
}
-/* Rather than duplicate loader's get OS function, just include it directly */
-#define LoaderGetOS xf86GetOS
-#include "loader/os.c"
-
/* new RAC */
/*
* xf86ConfigIsa/PciEntity() -- These helper functions assign an
Index: xf86InPriv.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86InPriv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/xf86InPriv.h 24 Aug 2003 17:36:52 -0000 1.5
+++ b/xf86InPriv.h 19 Feb 2004 03:51:36 -0000 1.6
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86InPriv.h,v 1.4 1999/05/17 13:17:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86InPriv.h,v 1.5 2003/08/24 17:36:52 dawes Exp $ */
/*
* Copyright (c) 1999 by The XFree86 Project, Inc.
@@ -31,11 +31,7 @@
#define _xf86InPriv_h
/* xf86Globals.c */
-#ifdef XFree86LOADER
extern InputDriverPtr *xf86InputDriverList;
-#else
-extern InputDriverPtr xf86InputDriverList[];
-#endif
extern int xf86NumInputDrivers;
/* xf86Xinput.c */
Index: xf86Init.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Init.c,v
retrieving revision 3.212
retrieving revision 3.213
diff -u -d -r3.212 -r3.213
--- a/xf86Init.c 27 Jan 2004 01:31:45 -0000 3.212
+++ b/xf86Init.c 19 Feb 2004 03:51:36 -0000 3.213
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.211 2003/11/01 00:47:01 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */
/*
* Loosely based on code bearing the following copyright:
@@ -44,10 +44,10 @@
#ifdef __UNIXOS2__
#define I_NEED_OS2_H
#endif
-#include "X.h"
-#include "Xmd.h"
-#include "Xproto.h"
-#include "Xatom.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
+#include <X11/Xproto.h>
+#include <X11/Xatom.h>
#include "input.h"
#include "servermd.h"
#include "windowstr.h"
@@ -57,9 +57,7 @@
#include "compiler.h"
-#ifdef XFree86LOADER
#include "loaderProcs.h"
-#endif
#ifdef XFreeXDGA
#include "dgaproc.h"
#endif
@@ -71,14 +69,9 @@
#include "xf86_OSlib.h"
#include "xf86Version.h"
#include "xf86Date.h"
-#include "xf86Build.h"
#include "mipointer.h"
-#ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
-#else
-#include "inputstr.h"
-#endif
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "xf86DDC.h"
#include "xf86Xinput.h"
#include "xf86InPriv.h"
@@ -111,13 +104,11 @@
void (*xf86OSPMClose)(void) = NULL;
-#ifdef XFree86LOADER
static char *baseModules[] = {
"bitmap",
"pcidata",
NULL
};
-#endif
/* Common pixmap formats */
@@ -268,10 +259,8 @@
{
int i, j, k, scr_index;
static unsigned long generation = 0;
-#ifdef XFree86LOADER
char **modulelist;
pointer *optionlist;
-#endif
screenLayoutPtr layout;
Pix24Flags screenpix24, pix24;
MessageType pix24From = X_DEFAULT;
@@ -333,7 +322,6 @@
if (!autoconfig)
PostConfigInit();
-#ifdef XFree86LOADER
/* Initialise the loader */
LoaderInit();
@@ -377,7 +365,6 @@
if (!xf86LoadModules(baseModules, NULL))
FatalError("Unable to load required base modules, Exiting...\n");
-#endif
xf86OpenConsole();
@@ -404,7 +391,6 @@
/* Initialise the resource broker */
xf86ResourceBrokerInit();
-#ifdef XFree86LOADER
/* Load all modules specified explicitly in the config file */
if ((modulelist = xf86ModulelistFromConfig(&optionlist))) {
xf86LoadModules(modulelist, optionlist);
@@ -433,7 +419,6 @@
* XXX Nothing keeps track of them for other modules.
*/
/* 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
@@ -640,18 +625,16 @@
/* XXX Should this be before or after loading dependent modules? */
if (xf86ProbeOnly)
{
- OsCleanup(TRUE);
+ OsCleanup();
AbortDDX();
fflush(stderr);
exit(0);
}
-#ifdef XFree86LOADER
/* Remove (unload) drivers that are not required */
for (i = 0; i < xf86NumDrivers; i++)
if (xf86DriverList[i] && xf86DriverList[i]->refCount <= 0)
xf86DeleteDriver(i);
-#endif
/*
* At this stage we know how many screens there are.
@@ -951,12 +934,10 @@
#endif
}
-#ifdef XFree86LOADER
if ((serverGeneration == 1) && LoaderCheckUnresolved(LD_RESOLV_IFDONE)) {
/* For now, just a warning */
xf86Msg(X_WARNING, "Some symbols could not be resolved!\n");
}
-#endif
xf86PostScreenInit();
@@ -1100,11 +1081,7 @@
RegisterKeyboardDevice(xf86Info.pKeyboard);
miRegisterPointerDevice(screenInfo.screens[0], xf86Info.pMouse);
-#ifdef XINPUT
xf86eqInit ((DevicePtr)xf86Info.pKeyboard, (DevicePtr)xf86Info.pMouse);
-#else
- mieqInit ((DevicePtr)xf86Info.pKeyboard, (DevicePtr)xf86Info.pMouse);
-#endif
}
#ifndef SET_STDERR_NONBLOCKING
@@ -1127,9 +1104,7 @@
signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */
#endif
OsDelayInitColors = TRUE;
-#ifdef XFree86LOADER
loadableFonts = TRUE;
-#endif
if (!beenHere)
xf86LogInit();
@@ -1266,7 +1241,6 @@
"the full server output, not just the last messages.\n");
if (xf86LogFile && xf86LogFileWasOpened)
ErrorF("This can be found in the log file \"%s\".\n", xf86LogFile);
- ErrorF("Please report problems to %s.\n", BUILDERADDR);
ErrorF("\n");
}
@@ -1403,9 +1377,7 @@
}
if (!strcmp(argv[i],"-ignoreABI"))
{
-#ifdef XFree86LOADER
LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL);
-#endif
return 1;
}
#ifdef DO_CHECK_BETA
@@ -1712,25 +1684,8 @@
static void
xf86PrintBanner()
{
-#if PRE_RELEASE
- ErrorF("\n"
- "This is a pre-release version of XFree86, and is not supported in any\n"
- "way. Bugs may be reported to XFree86@XFree86.Org and patches submitted\n"
- "to fixes@XFree86.Org. Before reporting bugs in pre-release versions,\n"
- "please check the latest version in the XFree86 CVS repository\n"
- "(http://www.XFree86.Org/cvs).\n");
-#endif
ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
- XF86_VERSION_PATCH);
-#if XF86_VERSION_SNAP > 0
- ErrorF(".%d", XF86_VERSION_SNAP);
-#endif
-
-#if XF86_VERSION_SNAP >= 900
- ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
- XF86_VERSION_SNAP - 900);
-#endif
-
+ XF86_VERSION_PATCH);
#ifdef XF86_CUSTOM_VERSION
ErrorF(" (%s)", XF86_CUSTOM_VERSION);
#endif
@@ -1748,42 +1703,7 @@
}
}
#endif
-#if defined(BUILD_DATE) && (BUILD_DATE > 19000000)
- {
- struct tm t;
- char buf[100];
-
- bzero(&t, sizeof(t));
- bzero(buf, sizeof(buf));
- t.tm_mday = BUILD_DATE % 100;
- t.tm_mon = (BUILD_DATE / 100) % 100 - 1;
- t.tm_year = BUILD_DATE / 10000 - 1900;
- if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
- ErrorF("Build Date: %s\n", buf);
- }
-#endif
-#if defined(CLOG_DATE) && (CLOG_DATE > 19000000)
- {
- struct tm t;
- char buf[100];
-
- bzero(&t, sizeof(t));
- bzero(buf, sizeof(buf));
- t.tm_mday = CLOG_DATE % 100;
- t.tm_mon = (CLOG_DATE / 100) % 100 - 1;
- t.tm_year = CLOG_DATE / 10000 - 1900;
- if (strftime(buf, sizeof(buf), "%d %B %Y", &t))
- ErrorF("Changelog Date: %s\n", buf);
- }
-#endif
-#if defined(BUILDERSTRING)
- ErrorF("%s \n",BUILDERSTRING);
-#endif
- ErrorF("\tBefore reporting problems, check http://www.XFree86.Org/\n"
- "\tto make sure that you have the latest version.\n");
-#ifdef XFree86LOADER
ErrorF("Module Loader present\n");
-#endif
}
static void
@@ -1826,7 +1746,6 @@
}
}
-#ifdef XFree86LOADER
/*
* xf86LoadModules iterates over a list that is being passed in.
*/
@@ -1869,8 +1788,6 @@
return !failed;
}
-#endif
-
/* Pixmap format stuff */
PixmapFormatPtr
Index: xf86Io.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Io.c,v
retrieving revision 3.56
retrieving revision 3.57
diff -u -d -r3.56 -r3.57
--- a/xf86Io.c 3 Nov 2003 05:11:02 -0000 3.56
+++ b/xf86Io.c 19 Feb 2004 03:51:36 -0000 3.57
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.55tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Io.c,v 3.56 2003/11/03 05:11:02 tsi Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -51,8 +51,8 @@
/* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */
#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "inputstr.h"
#include "scrnintstr.h"
@@ -64,11 +64,9 @@
#include "xf86_OSlib.h"
#include "mipointer.h"
-#ifdef XINPUT
#include "xf86Xinput.h"
-#include "XIproto.h"
+#include <X11/extensions/XIproto.h>
#include "exevents.h"
-#endif
#ifdef XKB
#include <X11/extensions/XKB.h>
Index: xf86Kbd.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Kbd.c,v
retrieving revision 3.26
retrieving revision 3.27
diff -u -d -r3.26 -r3.27
--- a/xf86Kbd.c 24 Aug 2003 17:36:53 -0000 3.26
+++ b/xf86Kbd.c 19 Feb 2004 03:51:36 -0000 3.27
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c,v 3.25 2003/03/25 04:18:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Kbd.c,v 3.26 2003/08/24 17:36:53 dawes Exp $ */
/*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -54,8 +54,8 @@
#define I_NEED_OS2_H
#endif
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "input.h"
#include "scrnintstr.h"
Index: xf86KbdBSD.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86KbdBSD.c,v
retrieving revision 3.22
retrieving revision 3.23
diff -u -d -r3.22 -r3.23
--- a/xf86KbdBSD.c 7 Oct 2003 22:00:52 -0000 3.22
+++ b/xf86KbdBSD.c 19 Feb 2004 03:51:36 -0000 3.23
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.21 2003/08/24 17:36:53 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdBSD.c,v 3.22 2003/10/07 22:00:52 herrb Exp $ */
/*
* Derived from xf86Kbd.c by S_ren Schmidt (sos@login.dkuug.dk)
* which is Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
@@ -51,8 +51,8 @@
/* $XConsortium: xf86KbdBSD.c /main/6 1996/10/23 13:12:27 kaleb $ */
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "input.h"
#include "scrnintstr.h"
Index: xf86KbdLnx.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86KbdLnx.c,v
retrieving revision 3.17
retrieving revision 3.18
diff -u -d -r3.17 -r3.18
--- a/xf86KbdLnx.c 24 Aug 2003 17:36:53 -0000 3.17
+++ b/xf86KbdLnx.c 19 Feb 2004 03:51:36 -0000 3.18
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v 3.16 2001/03/05 20:18:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdLnx.c,v 3.17 2003/08/24 17:36:53 dawes Exp $ */
/*
* Linux version of keymapping setup. The kernel (since 0.99.14) has support
* for fully remapping the keyboard, but there are some differences between
@@ -57,8 +57,8 @@
/* $XConsortium: xf86KbdLnx.c /main/7 1996/10/19 17:59:00 kaleb $ */
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "input.h"
#include "scrnintstr.h"
@@ -70,7 +70,6 @@
#include "atKeynames.h"
#include "xf86Keymap.h"
-#include "DECkeysym.h"
/*
* LegalModifier --
@@ -306,7 +305,7 @@
#define NUM_CUSTOMKEYS NR_KEYS
-u_char SpecialServerMap[NUM_CUSTOMKEYS];
+unsigned char SpecialServerMap[NUM_CUSTOMKEYS];
static void
readKernelMapping(KeySymsPtr pKeySyms, CARD8 *pModMap)
Index: xf86KbdMach.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86KbdMach.c,v
retrieving revision 3.8
retrieving revision 3.9
diff -u -d -r3.8 -r3.9
--- a/xf86KbdMach.c 25 Jul 1998 16:55:09 -0000 3.8
+++ b/xf86KbdMach.c 19 Feb 2004 03:51:36 -0000 3.9
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.8 1998/07/25 16:55:09 dawes Exp $ */
/*
*****************************************************************************
* HISTORY
@@ -37,8 +37,8 @@
*/
/* $XConsortium: xf86KbdMach.c /main/9 1996/02/21 17:38:43 kaleb $ */
-#include "X.h"
-#include "Xmd.h"
+#include <X11/X.h>
+#include <X11/Xmd.h>
#include "input.h"
#include "scrnintstr.h"
Index: xf86Keymap.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Keymap.h,v
retrieving revision 3.20
retrieving revision 3.21
diff -u -d -r3.20 -r3.21
--- a/xf86Keymap.h 24 Aug 2003 17:36:53 -0000 3.20
+++ b/xf86Keymap.h 19 Feb 2004 03:51:36 -0000 3.21
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.19 2002/05/31 18:45:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.20 2003/08/24 17:36:53 dawes Exp $ */
/*
* Copyright (c) 1994-2002 by The XFree86 Project, Inc.
Index: xf86MiscExt.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86MiscExt.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- a/xf86MiscExt.c 3 Nov 2003 05:11:02 -0000 1.16
+++ b/xf86MiscExt.c 19 Feb 2004 03:51:36 -0000 1.17
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v 1.15tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86MiscExt.c,v 1.16 2003/11/03 05:11:02 tsi Exp $ */
/*
* Copyright (c) 1999-2003 by The XFree86 Project, Inc.
*
@@ -35,7 +35,7 @@
#define I_NEED_OS2_H
#endif
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
@@ -49,16 +49,11 @@
#define XF86_OS_PRIVS
#include "xf86_OSlib.h"
-#ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "xf86Xinput.h"
-#else
-#include "inputstr.h"
-#endif
#include "xf86OSmouse.h"
-#include "../input/mouse/mouse.h"
#ifdef DEBUG
# define DEBUG_P(x) ErrorF(x"\n");
@@ -456,12 +451,10 @@
mseParamsPtr mse = structure;
InputInfoPtr pInfo;
MouseDevPtr pMse;
-#ifdef XFree86LOADER
pointer xf86MouseProtocolIDToName
= LoaderSymbol("xf86MouseProtocolIDToName");
if (!xf86MouseProtocolIDToName)
return MISC_RET_NOMODULE;
-#endif
if (mse->type < MTYPE_MICROSOFT
|| ( mse->type > MTYPE_EXPPS2
&& (mse->type!=MTYPE_OSMOUSE && mse->type!=MTYPE_XQUEUE)))
@@ -560,12 +553,8 @@
pMse->chordMiddle = mse->chordmiddle;
pMse->mouseFlags = mse->flags;
-#ifdef XFree86LOADER
pMse->protocol = ((const char *(*)(MouseProtocolID))
xf86MouseProtocolIDToName)(pMse->protocolID);
-#else
- pMse->protocol = xf86MouseProtocolIDToName(pMse->protocolID);
-#endif
if (mse->device) {
if (MiscExtAuthorizeDevice(pInfo, mse->device)) {
Index: xf86Mode.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Mode.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- a/xf86Mode.c 8 Oct 2003 14:58:28 -0000 1.69
+++ b/xf86Mode.c 19 Feb 2004 03:51:36 -0000 1.70
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.68 2003/09/11 10:08:37 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Mode.c,v 1.69 2003/10/08 14:58:28 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
@@ -35,7 +35,7 @@
* This file includes helper functions for mode related things.
*/
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "servermd.h"
#include "mibank.h"
Index: xf86Module.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Module.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/xf86Module.h 24 Aug 2003 17:36:54 -0000 1.37
+++ b/xf86Module.h 19 Feb 2004 03:51:36 -0000 1.38
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.36 2003/05/07 11:39:09 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Module.h,v 1.37 2003/08/24 17:36:54 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
Index: xf86Opt.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Opt.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xf86Opt.h 8 Oct 2003 14:30:38 -0000 1.15
+++ b/xf86Opt.h 19 Feb 2004 03:51:36 -0000 1.16
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Opt.h,v 1.14 2003/08/24 17:36:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Opt.h,v 1.15 2003/10/08 14:30:38 dawes Exp $ */
/*
* Copyright (c) 1998-2003 by The XFree86 Project, Inc.
Index: xf86Option.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Option.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- a/xf86Option.c 18 Oct 2003 12:34:19 -0000 1.29
+++ b/xf86Option.c 19 Feb 2004 03:51:36 -0000 1.30
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Option.c,v 1.28 2003/10/08 14:30:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Option.c,v 1.29 2003/10/18 12:34:19 dawes Exp $ */
/*
* Copyright (c) 1998-2003 by The XFree86 Project, Inc.
*
@@ -34,7 +34,7 @@
#include <stdlib.h>
#include <ctype.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Xinput.h"
Index: xf86PM.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86PM.c,v
retrieving revision 3.9
retrieving revision 3.10
diff -u -d -r3.9 -r3.10
--- a/xf86PM.c 24 Aug 2003 17:36:54 -0000 3.9
+++ b/xf86PM.c 19 Feb 2004 03:51:36 -0000 3.10
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PM.c,v 3.8 2002/09/29 23:54:34 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PM.c,v 3.9 2003/08/24 17:36:54 dawes Exp $ */
/*
* Copyright (c) 2000-2002 by The XFree86 Project, Inc.
*
@@ -26,7 +26,7 @@
* authorization from the copyright holder(s) and author(s).
*/
-#include "X.h"
+#include <X11/X.h>
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Xinput.h"
Index: xf86PciInfo.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86PciInfo.h,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- a/xf86PciInfo.h 30 Oct 2003 15:26:33 -0000 1.156
+++ b/xf86PciInfo.h 19 Feb 2004 03:51:36 -0000 1.157
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.155tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h,v 1.156 2003/10/30 15:26:33 tsi Exp $ */
/*
* Copyright (c) 1995-2003 by The XFree86 Project, Inc.
Index: xf86Priv.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Priv.h,v
retrieving revision 3.83
retrieving revision 3.84
diff -u -d -r3.83 -r3.84
--- a/xf86Priv.h 27 Jan 2004 01:31:45 -0000 3.83
+++ b/xf86Priv.h 19 Feb 2004 03:51:36 -0000 3.84
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.82 2003/09/09 03:20:36 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Priv.h,v 3.83 2004/01/27 01:31:45 dawes Exp $ */
/*
* Copyright (c) 1997-2002 by The XFree86 Project, Inc.
@@ -93,13 +93,9 @@
extern Bool xf86SupportedMouseTypes[];
extern int xf86NumMouseTypes;
-#ifdef XFree86LOADER
extern DriverPtr *xf86DriverList;
extern ModuleInfoPtr *xf86ModuleInfoList;
extern int xf86NumModuleInfos;
-#else
-extern DriverPtr xf86DriverList[];
-#endif
extern int xf86NumDrivers;
extern Bool xf86Resetting;
extern Bool xf86Initialising;
Index: xf86Privstr.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Privstr.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- a/xf86Privstr.h 27 Jan 2004 01:31:45 -0000 1.41
+++ b/xf86Privstr.h 19 Feb 2004 03:51:36 -0000 1.42
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.40 2003/10/17 20:02:12 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.41 2004/01/27 01:31:45 dawes Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -103,9 +103,7 @@
/* mouse part */
DeviceIntPtr pMouse;
-#ifdef XINPUT
pointer mouseLocal;
-#endif
/* event handler part */
int lastEventTime;
Index: xf86RandR.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86RandR.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/xf86RandR.c 10 Nov 2003 16:42:13 -0000 1.8
+++ b/xf86RandR.c 19 Feb 2004 03:51:36 -0000 1.9
@@ -1,5 +1,5 @@
/*
- * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.8 2003/11/10 16:42:13 tsi Exp $
*
* Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
@@ -22,7 +22,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "mibank.h"
#include "globals.h"
Index: xf86Resources.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Resources.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- a/xf86Resources.h 24 Aug 2003 17:36:55 -0000 1.15
+++ b/xf86Resources.h 19 Feb 2004 03:51:36 -0000 1.16
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h,v 1.14 2002/07/24 01:47:24 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Resources.h,v 1.15 2003/08/24 17:36:55 dawes Exp $ */
/*
* Copyright (c) 1999-2002 by The XFree86 Project, Inc.
Index: xf86Versions.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Versions.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xf86Versions.c 24 Aug 2003 20:01:19 -0000 1.2
+++ b/xf86Versions.c 19 Feb 2004 03:51:36 -0000 1.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Versions.c,v 1.1 2003/08/24 19:58:03 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Versions.c,v 1.2 2003/08/24 20:01:19 dawes Exp $ */
/*
* Copyright (c) 2003 by The XFree86 Project, Inc.
*
Index: xf86VidMode.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86VidMode.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- a/xf86VidMode.c 24 Aug 2003 17:36:55 -0000 1.17
+++ b/xf86VidMode.c 19 Feb 2004 03:51:36 -0000 1.18
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86VidMode.c,v 1.16 2003/06/18 16:17:37 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86VidMode.c,v 1.17 2003/08/24 17:36:55 dawes Exp $ */
/*
* Copyright (c) 1999-2003 by The XFree86 Project, Inc.
*
@@ -35,7 +35,7 @@
* maintained.
*/
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
Index: xf86XKB.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86XKB.c,v
retrieving revision 3.12
retrieving revision 3.13
diff -u -d -r3.12 -r3.13
--- a/xf86XKB.c 24 Aug 2003 17:36:55 -0000 3.12
+++ b/xf86XKB.c 19 Feb 2004 03:51:36 -0000 3.13
@@ -51,7 +51,7 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.11 2002/10/11 01:40:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.12 2003/08/24 17:36:55 dawes Exp $ */
#include <stdio.h>
#define NEED_EVENTS 1
@@ -61,7 +61,7 @@
#include "inputstr.h"
#include "scrnintstr.h"
#include "windowstr.h"
-#include "XI.h"
+#include <X11/extensions/XI.h>
#include "compiler.h"
@@ -70,7 +70,7 @@
#define XF86_OS_PRIVS
#include "xf86_OSlib.h"
-#include "XKBsrv.h"
+#include <X11/extensions/XKBsrv.h>
void
xf86InitXkb(void)
Index: xf86Xinput.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Xinput.c,v
retrieving revision 3.70
retrieving revision 3.71
diff -u -d -r3.70 -r3.71
--- a/xf86Xinput.c 3 Nov 2003 05:11:02 -0000 3.70
+++ b/xf86Xinput.c 19 Feb 2004 03:51:36 -0000 3.71
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 3.69tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.c,v 3.70 2003/11/03 05:11:02 tsi Exp $ */
/*
* Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org>
*
@@ -49,24 +49,20 @@
*/
/* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */
-#include "Xfuncproto.h"
-#include "Xmd.h"
-#ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
-#endif
+#include <X11/Xfuncproto.h>
+#include <X11/Xmd.h>
+#include <X11/extensions/XI.h>
+#include <X11/Xproto.h>
#include "xf86.h"
#include "xf86Priv.h"
#include "xf86Xinput.h"
-#ifdef XINPUT
#include "XIstubs.h"
-#endif
#include "mipointer.h"
#include "xf86InPriv.h"
#ifdef DPMSExtension
#define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
#include "dpmsproc.h"
#endif
@@ -86,7 +82,7 @@
#include <stdarg.h>
#include "osdep.h" /* EnabledDevices */
-#include "Xpoll.h"
+#include <X11/Xpoll.h>
#include "xf86_OSproc.h" /* sigio stuff */
/******************************************************************************
@@ -325,10 +321,8 @@
RegisterPointerDevice(dev);
else if (local->flags & XI86_CORE_KEYBOARD)
RegisterKeyboardDevice(dev);
-#ifdef XINPUT
else
RegisterOtherDevice(dev);
-#endif
if (serverGeneration == 1)
xf86Msg(X_INFO, "XINPUT: Adding extended input device \"%s\" (type: %s)\n",
@@ -337,7 +331,6 @@
}
-#ifdef XINPUT
/***********************************************************************
*
* Caller: ProcXOpenDevice
@@ -615,7 +608,6 @@
return (*local->control_proc)(local, control);
}
}
-#endif
/*
* adapted from mieq.c to support extended events
@@ -625,9 +617,7 @@
typedef struct _Event {
xEvent event;
-#ifdef XINPUT
deviceValuator val;
-#endif
ScreenPtr pScreen;
} EventRec, *EventPtr;
@@ -669,7 +659,6 @@
{
int oldtail, newtail;
Bool isMotion;
-#ifdef XINPUT
int count;
xf86AssertBlockedSIGIO ("xf86eqEnqueue");
@@ -705,7 +694,6 @@
}
break;
}
-#endif
oldtail = xf86EventQueue.tail;
isMotion = e->u.u.type == MotionNotify;
@@ -726,11 +714,9 @@
xf86EventQueue.lastMotion = isMotion;
xf86EventQueue.events[oldtail].event = *e;
-#ifdef XINPUT
if (count == 2) {
xf86EventQueue.events[oldtail].val = *((deviceValuator *) (((deviceKeyButtonPointer *) e)+1));
}
-#endif
/*
* Make sure that event times don't go backwards - this
* is "unnecessary", but very useful
@@ -754,23 +740,17 @@
int x, y;
struct {
xEvent event;
-#ifdef XINPUT
deviceValuator val;
-#endif
} xe;
-#ifdef XINPUT
DeviceIntPtr dev;
int id, count;
deviceKeyButtonPointer *dev_xe;
-#endif
while (xf86EventQueue.head != xf86EventQueue.tail) {
if (screenIsSaved == SCREEN_SAVER_ON)
SaveScreens (SCREEN_SAVER_OFF, ScreenSaverReset);
-#ifdef DPMSExtension
if (DPMSPowerLevel != DPMSModeOn)
DPMSSet(DPMSModeOn);
-#endif
e = &xf86EventQueue.events[xf86EventQueue.head];
/*
@@ -799,7 +779,6 @@
(*xf86EventQueue.pKbd->processInputProc)
(&xe.event, (DeviceIntPtr)xf86EventQueue.pKbd, 1);
break;
-#ifdef XINPUT
case ButtonPress:
case ButtonRelease:
case MotionNotify:
@@ -832,11 +811,6 @@
break;
}
(*dev->public.processInputProc)(&xe.event, dev, count);
-#else
- default:
- (*xf86EventQueue.pPtr->processInputProc)
- (&xe.event, (DeviceIntPtr)xf86EventQueue.pPtr, 1);
-#endif
break;
}
}
@@ -1472,7 +1446,6 @@
xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, int minval, int maxval,
int resolution, int min_res, int max_res)
{
-#ifdef XINPUT
if (maxval == -1) {
if (axnum == 0)
maxval = screenInfo.screens[0]->width - 1;
@@ -1482,7 +1455,6 @@
}
InitValuatorAxisStruct(dev, axnum, minval, maxval, resolution, min_res,
max_res);
-#endif
}
/*
@@ -1492,12 +1464,10 @@
void
xf86InitValuatorDefaults(DeviceIntPtr dev, int axnum)
{
-#ifdef XINPUT
if (axnum == 0)
dev->valuator->axisVal[0] = screenInfo.screens[0]->width / 2;
else if (axnum == 1)
dev->valuator->axisVal[1] = screenInfo.screens[0]->height / 2;
-#endif
}
/* end of xf86Xinput.c */
Index: xf86Xinput.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86Xinput.h,v
retrieving revision 3.36
retrieving revision 3.37
diff -u -d -r3.36 -r3.37
--- a/xf86Xinput.h 24 Aug 2003 17:36:55 -0000 3.36
+++ b/xf86Xinput.h 19 Feb 2004 03:51:36 -0000 3.37
@@ -49,7 +49,7 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h,v 3.35 2002/10/11 01:40:31 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h,v 3.36 2003/08/24 17:36:55 dawes Exp $ */
#ifndef _xf86Xinput_h
#define _xf86Xinput_h
@@ -59,11 +59,9 @@
#endif
#include "xf86str.h"
#include "inputstr.h"
-#ifdef XINPUT
-#include "extensions/XI.h"
-#include "extensions/XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
#include "XIstubs.h"
-#endif
/* Input device flags */
#define XI86_OPEN_ON_INIT 0x01 /* open the device at startup time */
@@ -97,7 +95,6 @@
#endif
#define HAS_MOTION_HISTORY(local) ((local)->dev->valuator && (local)->dev->valuator->numMotionEvents)
-#ifdef XINPUT
/* This holds the input driver entry and module information. */
typedef struct _InputDriverRec {
int driverVersion;
@@ -111,7 +108,6 @@
pointer module;
int refCount;
} InputDriverRec, *InputDriverPtr;
-#endif
/* This is to input devices what the ScrnInfoRec is to screens. */
Index: xf86cmap.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86cmap.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- a/xf86cmap.c 17 Oct 2003 20:02:12 -0000 1.25
+++ b/xf86cmap.c 19 Feb 2004 03:51:36 -0000 1.26
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.24 2003/08/24 17:36:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.c,v 1.25 2003/10/17 20:02:12 alanh Exp $ */
/*
* Copyright (c) 1998-2001 by The XFree86 Project, Inc.
*
@@ -34,9 +34,9 @@
#undef _XOPEN_SOURCE
#endif
-#include "X.h"
+#include <X11/X.h>
#include "misc.h"
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include "colormapst.h"
#include "scrnintstr.h"
Index: xf86cmap.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86cmap.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/xf86cmap.h 17 Oct 2003 20:02:12 -0000 1.9
+++ b/xf86cmap.h 19 Feb 2004 03:51:36 -0000 1.10
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.h,v 1.8 2003/08/24 17:36:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86cmap.h,v 1.9 2003/10/17 20:02:12 alanh Exp $ */
/*
* Copyright (c) 1998-2001 by The XFree86 Project, Inc.
Index: xf86fbBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86fbBus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/xf86fbBus.c 24 Aug 2003 17:36:55 -0000 1.3
+++ b/xf86fbBus.c 19 Feb 2004 03:51:36 -0000 1.4
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbBus.c,v 1.2 2001/10/28 03:33:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbBus.c,v 1.3 2003/08/24 17:36:55 dawes Exp $ */
/*
* Copyright (c) 2000-2001 by The XFree86 Project, Inc.
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
Index: xf86fbman.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86fbman.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- a/xf86fbman.c 3 Nov 2003 05:11:03 -0000 1.28
+++ b/xf86fbman.c 19 Feb 2004 03:51:36 -0000 1.29
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.c,v 1.27tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.c,v 1.28 2003/11/03 05:11:03 tsi Exp $ */
/*
* Copyright (c) 1998-2001 by The XFree86 Project, Inc.
@@ -30,7 +30,7 @@
#include "misc.h"
#include "xf86.h"
-#include "X.h"
+#include <X11/X.h>
#include "scrnintstr.h"
#include "regionstr.h"
#include "xf86fbman.h"
Index: xf86fbman.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86fbman.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/xf86fbman.h 9 Oct 2003 12:40:54 -0000 1.14
+++ b/xf86fbman.h 19 Feb 2004 03:51:36 -0000 1.15
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.h,v 1.13 2003/08/24 17:36:55 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86fbman.h,v 1.14 2003/10/09 12:40:54 alanh Exp $ */
/*
* Copyright (c) 1998-2001 by The XFree86 Project, Inc.
Index: xf86isaBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86isaBus.c,v
retrieving revision 3.6
retrieving revision 3.7
diff -u -d -r3.6 -r3.7
--- a/xf86isaBus.c 24 Aug 2003 17:36:55 -0000 3.6
+++ b/xf86isaBus.c 19 Feb 2004 03:51:36 -0000 3.7
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c,v 3.5 2000/12/06 15:35:11 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86isaBus.c,v 3.6 2003/08/24 17:36:55 dawes Exp $ */
/*
* Copyright (c) 1997-2000 by The XFree86 Project, Inc.
*
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
Index: xf86noBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86noBus.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xf86noBus.c 24 Aug 2003 17:36:55 -0000 1.2
+++ b/xf86noBus.c 19 Feb 2004 03:51:36 -0000 1.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86noBus.c,v 1.1 2002/09/18 08:54:55 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86noBus.c,v 1.2 2003/08/24 17:36:55 dawes Exp $ */
/*
* Copyright (c) 2000-2002 by The XFree86 Project, Inc.
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
Index: xf86pciBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86pciBus.c,v
retrieving revision 3.77
retrieving revision 3.78
diff -u -d -r3.77 -r3.78
--- a/xf86pciBus.c 3 Nov 2003 05:11:03 -0000 3.77
+++ b/xf86pciBus.c 19 Feb 2004 03:51:36 -0000 3.78
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.76tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.c,v 3.77 2003/11/03 05:11:03 tsi Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
*
@@ -34,7 +34,7 @@
#include <ctype.h>
#include <stdlib.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "Pci.h"
#include "xf86.h"
@@ -1701,7 +1701,6 @@
/*
* Initialise the pcidata entry points.
*/
-#ifdef XFree86LOADER
xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds");
xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds");
xf86FindPciNamesByDevice =
@@ -1712,14 +1711,6 @@
(ScanPciFindClassBySubsysProcPtr)LoaderSymbol("ScanPciFindPciClassBySubsys");
xf86FindPciClassByDevice =
(ScanPciFindClassByDeviceProcPtr)LoaderSymbol("ScanPciFindPciClassByDevice");
-#else
- xf86SetupPciIds = ScanPciSetupPciIds;
- xf86ClosePciIds = ScanPciClosePciIds;
- xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice;
- xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys;
- xf86FindPciClassBySubsys = ScanPciFindPciClassBySubsys;
- xf86FindPciClassByDevice = ScanPciFindPciClassByDevice;
-#endif
if (!xf86SetupPciIds())
FatalError("xf86SetupPciIds() failed\n");
Index: xf86pciBus.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86pciBus.h,v
retrieving revision 3.10
retrieving revision 3.11
diff -u -d -r3.10 -r3.11
--- a/xf86pciBus.h 24 Aug 2003 17:36:56 -0000 3.10
+++ b/xf86pciBus.h 19 Feb 2004 03:51:36 -0000 3.11
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.h,v 3.9 2003/05/22 20:11:40 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86pciBus.h,v 3.10 2003/08/24 17:36:56 dawes Exp $ */
/*
* Copyright (c) 1999-2003 by The XFree86 Project, Inc.
Index: xf86sbusBus.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86sbusBus.c,v
retrieving revision 3.7
retrieving revision 3.8
diff -u -d -r3.7 -r3.8
--- a/xf86sbusBus.c 28 Oct 2001 03:33:19 -0000 3.7
+++ b/xf86sbusBus.c 19 Feb 2004 03:51:36 -0000 3.8
@@ -20,12 +20,12 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.6 2001/03/03 22:16:35 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.c,v 3.7 2001/10/28 03:33:19 tsi Exp $ */
#include <ctype.h>
#include <stdio.h>
#include <unistd.h>
-#include "X.h"
+#include <X11/X.h>
#include "os.h"
#include "xf86.h"
#include "xf86Priv.h"
Index: xf86sbusBus.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86sbusBus.h,v
retrieving revision 3.5
retrieving revision 3.6
diff -u -d -r3.5 -r3.6
--- a/xf86sbusBus.h 10 Dec 2002 02:42:35 -0000 3.5
+++ b/xf86sbusBus.h 19 Feb 2004 03:51:36 -0000 3.6
@@ -20,7 +20,7 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.4 2001/10/28 03:33:19 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86sbusBus.h,v 3.5 2002/12/10 02:42:35 tsi Exp $ */
#ifndef _XF86_SBUSBUS_H
#define _XF86_SBUSBUS_H
Index: xf86str.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86str.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- a/xf86str.h 30 Oct 2003 17:36:56 -0000 1.97
+++ b/xf86str.h 19 Feb 2004 03:51:36 -0000 1.98
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.96 2003/10/17 20:02:12 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86str.h,v 1.97 2003/10/30 17:36:56 tsi Exp $ */
/*
* Copyright (c) 1997-2003 by The XFree86 Project, Inc.
@@ -43,6 +43,7 @@
#include "xf86Module.h"
#include "xf86Opt.h"
#include "xf86Pci.h"
+#include "os.h"
/*
* memType is of the size of the addressable memory (machine size)
@@ -249,7 +250,6 @@
int refCount;
} DriverRec, *DriverPtr;
-#ifdef XFree86LOADER
/*
* The optional module list struct. This allows modules exporting helping
* functions to configuration tools, the Xserver, or any other
@@ -263,7 +263,6 @@
const OptionInfoRec * (*AvailableOptions)(void *unused);
pointer unused[8]; /* leave some space for more fields */
} ModuleInfoRec, *ModuleInfoPtr;
-#endif
/*
* These are the private bus types. New types can be added here. Types
Index: xf86xv.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xv.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- a/xf86xv.c 10 Nov 2003 18:22:15 -0000 1.37
+++ b/xf86xv.c 19 Feb 2004 03:51:36 -0000 1.38
@@ -28,14 +28,14 @@
* authorization from the copyright holder(s) and author(s).
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.36tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */
#include "misc.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "regionstr.h"
#include "windowstr.h"
@@ -46,12 +46,10 @@
#include "gcstruct.h"
#include "dixstruct.h"
-#include "Xv.h"
-#include "Xvproto.h"
+#include <X11/extensions/Xv.h>
+#include <X11/extensions/Xvproto.h>
#include "xvdix.h"
-#ifdef XFree86LOADER
#include "xvmodproc.h"
-#endif
#include "xf86xvpriv.h"
@@ -114,16 +112,9 @@
static unsigned long XF86XVGeneration = 0;
static unsigned long PortResource = 0;
-#ifdef XFree86LOADER
int (*XvGetScreenIndexProc)(void) = NULL;
unsigned long (*XvGetRTPortProc)(void) = 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) \
((XvScreenPtr)((pScreen)->devPrivates[XF86XvScreenIndex].ptr))
Index: xf86xv.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xv.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- a/xf86xv.h 24 Aug 2003 17:36:56 -0000 1.25
+++ b/xf86xv.h 19 Feb 2004 03:51:36 -0000 1.26
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.h,v 1.24 2003/04/23 21:51:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.h,v 1.25 2003/08/24 17:36:56 dawes Exp $ */
/*
* Copyright (c) 1998-2003 by The XFree86 Project, Inc.
Index: xf86xvmc.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xvmc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/xf86xvmc.c 8 Oct 2003 22:31:59 -0000 1.6
+++ b/xf86xvmc.c 19 Feb 2004 03:51:36 -0000 1.7
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvmc.c,v 1.5 2003/08/24 17:36:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvmc.c,v 1.6 2003/10/08 22:31:59 mvojkovi Exp $ */
/*
* Copyright (c) 2001-2003 by The XFree86 Project, Inc.
@@ -31,24 +31,18 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "resource.h"
#include "dixstruct.h"
-#ifdef XFree86LOADER
#include "xvmodproc.h"
-#endif
#include "xf86xvpriv.h"
#include "xf86xvmc.h"
-#ifdef XFree86LOADER
int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = NULL;
-#else
-int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr) = XvMCScreenInit;
-#endif
typedef struct {
Index: xf86xvmc.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xvmc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/xf86xvmc.h 8 Oct 2003 22:31:59 -0000 1.7
+++ b/xf86xvmc.h 19 Feb 2004 03:51:36 -0000 1.8
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvmc.h,v 1.6 2003/08/24 17:36:56 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvmc.h,v 1.7 2003/10/08 22:31:59 mvojkovi Exp $ */
/*
* Copyright (c) 2001 by The XFree86 Project, Inc.
Index: xf86xvpriv.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xf86xvpriv.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/xf86xvpriv.h 24 Aug 2003 17:36:56 -0000 1.2
+++ b/xf86xvpriv.h 19 Feb 2004 03:51:36 -0000 1.3
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvpriv.h,v 1.1 2003/04/23 21:51:25 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xvpriv.h,v 1.2 2003/08/24 17:36:56 dawes Exp $ */
/*
* Copyright (c) 2003 by The XFree86 Project, Inc.
Index: xisb.c
===================================================================
RCS file: /cvs/xserver/xfree86/common/xisb.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/xisb.c 25 Mar 2003 04:18:21 -0000 1.6
+++ b/xisb.c 19 Feb 2004 03:51:36 -0000 1.7
@@ -24,7 +24,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.5 2000/11/06 19:24:07 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.c,v 1.6 2003/03/25 04:18:21 dawes Exp $ */
/*
X Input Serial Buffer routines for use in any XInput driver that accesses
Index: xisb.h
===================================================================
RCS file: /cvs/xserver/xfree86/common/xisb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/xisb.h 5 Dec 1998 14:40:10 -0000 1.1
+++ b/xisb.h 19 Feb 2004 03:51:36 -0000 1.2
@@ -24,7 +24,7 @@
* in this Software without prior written authorization from Metro Link.
*
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xisb.h,v 1.1 1998/12/05 14:40:10 dawes Exp $ */
#ifndef _xisb_H_
#define _xisb_H_
- Previous message: [xserver-commit] xfree86/loader SparcMulDiv.S,1.1,1.2 aout.h,1.8,1.9 aoutloader.c,1.20,1.21 aoutloader.h,1.4,1.5 ar.h,1.4,1.5 coff.h,1.6,1.7 coffloader.c,1.22,1.23 coffloader.h,1.4,1.5 dixsym.c,1.63,1.64 dlloader.c,1.13,1.14 dlloader.h,1.3,1.4 elf.h,1.17,1.18 elfloader.c,1.62,1.63 elfloader.h,1.4,1.5 extsym.c,1.9,1.10 fontsym.c,1.14,1.15 hash.c,1.25,1.26 hash.h,1.3,1.4 loader.c,1.71,1.72 loader.h,1.28,1.29 loaderProcs.h,1.21,1.22 loadext.c,1.8,1.9 loadfont.c,1.4,1.5 loadmod.c,1.73,1.74 misym.c,1.38,1.39 os.c,1.4,1.5 os2funcs.c,1.8,1.9 sym.h,1.7,1.8 xf86sym.c,1.242,1.243
- Next message: [xserver-commit] xfree86/vbe vbe.c,1.3,1.4 vbe.h,1.5,1.6 vbeModes.c,1.4,1.5 vbeModes.h,1.1,1.2 vbe_module.c,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]