diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-10 10:37:59 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-08-10 10:37:59 -0700 |
| commit | c2535f67923bde0bfb0e72363467110806e2f40f (patch) | |
| tree | 86e27df1edccb7318a378a25c1a74c212d10ce85 /hw | |
| parent | c0cb8d1fb80540e093da54da3ee2f55bdf139274 (diff) | |
| parent | db82e12fac5eaa16a39fc1bd0bc31ad95089dc95 (diff) | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
Diffstat (limited to 'hw')
749 files changed, 1186 insertions, 3868 deletions
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am index 8a5e981fe..542bfdb24 100644 --- a/hw/darwin/Makefile.am +++ b/hw/darwin/Makefile.am @@ -54,7 +54,6 @@ EXTRA_DIST = \ darwinKeyboard.c \ darwinKeyboard.h \ darwinXinput.c \ - iokit/.cvsignore \ iokit/xfIOKit.c \ iokit/xfIOKitCursor.c \ iokit/xfIOKit.h \ @@ -66,11 +65,8 @@ EXTRA_DIST = \ quartz/cr/crFrame.m \ quartz/cr/cr.h \ quartz/cr/crScreen.m \ - quartz/cr/.cvsignore \ quartz/cr/XView.h \ quartz/cr/XView.m \ - quartz/.cvsignore \ - quartz/fullscreen/.cvsignore \ quartz/fullscreen/fullscreen.c \ quartz/fullscreen/quartzCursor.c \ quartz/fullscreen/quartzCursor.h \ @@ -98,7 +94,6 @@ EXTRA_DIST = \ quartz/XDarwinStartup.c \ quartz/XDarwinStartup.man \ quartz/xpr/appledri.c \ - quartz/xpr/.cvsignore \ quartz/xpr/dri.c \ quartz/xpr/dri.h \ quartz/xpr/dristruct.h \ diff --git a/hw/darwin/darwin.c b/hw/darwin/darwin.c index 10afbaf78..bd9998976 100644 --- a/hw/darwin/darwin.c +++ b/hw/darwin/darwin.c @@ -29,8 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xserver/xorg/hw/darwin/darwin.c,v 1.8 2005/07/03 08:53:38 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.55 2003/11/15 00:07:09 torrey Exp $ */ #include <X11/X.h> #include <X11/Xproto.h> diff --git a/hw/darwin/darwin.h b/hw/darwin/darwin.h index 4f4e9b91f..cd572258c 100644 --- a/hw/darwin/darwin.h +++ b/hw/darwin/darwin.h @@ -23,7 +23,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.20 2003/11/15 00:07:09 torrey Exp $ */ #ifndef _DARWIN_H #define _DARWIN_H diff --git a/hw/darwin/darwinClut8.h b/hw/darwin/darwinClut8.h index 06e7b71c5..8e914f3fd 100644 --- a/hw/darwin/darwinClut8.h +++ b/hw/darwin/darwinClut8.h @@ -1,7 +1,6 @@ /* * Darwin default 8-bit Colormap for StaticColor */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinClut8.h,v 1.1.8.1 2003/03/04 01:31:43 torrey Exp $ */ #ifndef _DARWIN_CLUT8_ #define _DARWIN_CLUT8_ diff --git a/hw/darwin/darwinEvents.c b/hw/darwin/darwinEvents.c index 61100d9b3..6b902df05 100644 --- a/hw/darwin/darwinEvents.c +++ b/hw/darwin/darwinEvents.c @@ -29,7 +29,6 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinEvents.c,v 1.6 2004/03/31 22:29:09 torrey Exp $ */ #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/darwin/darwinKeyboard.c b/hw/darwin/darwinKeyboard.c index dbc449dc3..c148d96ce 100644 --- a/hw/darwin/darwinKeyboard.c +++ b/hw/darwin/darwinKeyboard.c @@ -38,7 +38,6 @@ // //============================================================================= -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.21 2004/04/01 00:05:22 torrey Exp $ */ /* =========================================================================== diff --git a/hw/darwin/darwinKeyboard.h b/hw/darwin/darwinKeyboard.h index 0ea9c1d60..f4a861186 100644 --- a/hw/darwin/darwinKeyboard.h +++ b/hw/darwin/darwinKeyboard.h @@ -23,7 +23,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.18 2003/05/14 05:27:55 torrey Exp $ */ #ifndef DARWIN_KEYBOARD_H #define DARWIN_KEYBOARD_H 1 diff --git a/hw/darwin/darwinXinput.c b/hw/darwin/darwinXinput.c index d3716a1d4..260d72af7 100644 --- a/hw/darwin/darwinXinput.c +++ b/hw/darwin/darwinXinput.c @@ -1,4 +1,3 @@ -/* $Xorg: stubs.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* * X server support of the XINPUT extension for Darwin @@ -52,7 +51,6 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/darwinXinput.c,v 1.1 2004/05/28 07:44:00 torrey Exp $ */ #define NEED_EVENTS #include <X11/X.h> diff --git a/hw/darwin/iokit/xfIOKit.c b/hw/darwin/iokit/xfIOKit.c index 7d69382af..95a7fb32c 100644 --- a/hw/darwin/iokit/xfIOKit.c +++ b/hw/darwin/iokit/xfIOKit.c @@ -33,8 +33,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKit.c,v 1.2 2003/10/16 23:50:09 torrey Exp $ */ #include <X11/X.h> #include <X11/Xproto.h> diff --git a/hw/darwin/iokit/xfIOKit.h b/hw/darwin/iokit/xfIOKit.h index 288063da1..27d27bc70 100644 --- a/hw/darwin/iokit/xfIOKit.h +++ b/hw/darwin/iokit/xfIOKit.h @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKit.h,v 1.10 2003/03/15 18:02:08 torrey Exp $ */ #ifndef _XFIOKIT_H #define _XFIOKIT_H diff --git a/hw/darwin/iokit/xfIOKitCursor.c b/hw/darwin/iokit/xfIOKitCursor.c index 69eb41d2f..ef3e254d7 100644 --- a/hw/darwin/iokit/xfIOKitCursor.c +++ b/hw/darwin/iokit/xfIOKitCursor.c @@ -57,7 +57,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/xfIOKitCursor.c,v 1.6 2002/12/10 00:00:39 torrey Exp $ */ #include "scrnintstr.h" #include "cursorstr.h" diff --git a/hw/darwin/iokit/xfIOKitStartup.c b/hw/darwin/iokit/xfIOKitStartup.c index 09c5daa1c..512793aa5 100644 --- a/hw/darwin/iokit/xfIOKitStartup.c +++ b/hw/darwin/iokit/xfIOKitStartup.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/iokit/xfIOKitStartup.c,v 1.1 2003/05/14 05:27:56 torrey Exp $ */ #include "darwin.h" #include "darwinKeyboard.h" diff --git a/hw/darwin/quartz/Preferences.h b/hw/darwin/quartz/Preferences.h index d8c3c2ea2..cf43758e7 100644 --- a/hw/darwin/quartz/Preferences.h +++ b/hw/darwin/quartz/Preferences.h @@ -25,7 +25,6 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/Preferences.h,v 1.2 2003/01/15 02:34:05 torrey Exp $ */ #import <Cocoa/Cocoa.h> diff --git a/hw/darwin/quartz/XDarwinStartup.c b/hw/darwin/quartz/XDarwinStartup.c index 0adb4c212..8697776bf 100644 --- a/hw/darwin/quartz/XDarwinStartup.c +++ b/hw/darwin/quartz/XDarwinStartup.c @@ -38,7 +38,6 @@ * dealings in this Software without prior written authorization from * Torrey T. Lyons. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XDarwinStartup.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include <unistd.h> #include <stdio.h> diff --git a/hw/darwin/quartz/XServer.h b/hw/darwin/quartz/XServer.h index 828fce17f..030ccb51f 100644 --- a/hw/darwin/quartz/XServer.h +++ b/hw/darwin/quartz/XServer.h @@ -29,8 +29,6 @@ * sale, use or other dealings in this Software without prior written * authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.4 2005/04/20 12:25:19 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.h,v 1.16 2003/11/23 06:04:01 torrey Exp $ */ #define BOOL xBOOL #include <X11/Xproto.h> diff --git a/hw/darwin/quartz/applewm.c b/hw/darwin/quartz/applewm.c index d79df4cee..6db036f1b 100644 --- a/hw/darwin/quartz/applewm.c +++ b/hw/darwin/quartz/applewm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/applewm.c,v 1.2 2003/09/16 00:36:13 torrey Exp $ */ /************************************************************************** Copyright (c) 2002 Apple Computer, Inc. All Rights Reserved. diff --git a/hw/darwin/quartz/applewmExt.h b/hw/darwin/quartz/applewmExt.h index b27083ac7..60d49ef59 100644 --- a/hw/darwin/quartz/applewmExt.h +++ b/hw/darwin/quartz/applewmExt.h @@ -27,7 +27,6 @@ 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/darwin/quartz/applewmExt.h,v 1.2 2003/11/11 23:48:41 torrey Exp $ */ #ifndef _APPLEWMEXT_H_ #define _APPLEWMEXT_H_ diff --git a/hw/darwin/quartz/cr/XView.h b/hw/darwin/quartz/cr/XView.h index 01f5b04b4..26f789da2 100644 --- a/hw/darwin/quartz/cr/XView.h +++ b/hw/darwin/quartz/cr/XView.h @@ -25,7 +25,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XView.h,v 1.2 2002/07/15 19:58:31 torrey Exp $ */ #import <Cocoa/Cocoa.h> diff --git a/hw/darwin/quartz/fullscreen/fullscreen.c b/hw/darwin/quartz/fullscreen/fullscreen.c index 05542eafe..a4881f9d9 100644 --- a/hw/darwin/quartz/fullscreen/fullscreen.c +++ b/hw/darwin/quartz/fullscreen/fullscreen.c @@ -25,8 +25,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2004/07/30 19:12:18 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/fullscreen/fullscreen.c,v 1.3 2003/11/27 01:59:53 torrey Exp $ */ #include "quartzCommon.h" #include "darwin.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.c b/hw/darwin/quartz/fullscreen/quartzCursor.c index 8abce2318..e2333e2ea 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.c +++ b/hw/darwin/quartz/fullscreen/quartzCursor.c @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.5 2003/01/23 00:34:26 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/fullscreen/quartzCursor.h b/hw/darwin/quartz/fullscreen/quartzCursor.h index efcc4435e..57fac68a5 100644 --- a/hw/darwin/quartz/fullscreen/quartzCursor.h +++ b/hw/darwin/quartz/fullscreen/quartzCursor.h @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/pseudoramiX.c b/hw/darwin/quartz/pseudoramiX.c index 71093f5fb..ab57827d3 100644 --- a/hw/darwin/quartz/pseudoramiX.c +++ b/hw/darwin/quartz/pseudoramiX.c @@ -32,7 +32,6 @@ shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from Digital Equipment Corporation. ******************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.4 2004/07/02 01:30:33 torrey Exp $ */ #include "pseudoramiX.h" diff --git a/hw/darwin/quartz/pseudoramiX.h b/hw/darwin/quartz/pseudoramiX.h index c2943369d..df5010d1d 100644 --- a/hw/darwin/quartz/pseudoramiX.h +++ b/hw/darwin/quartz/pseudoramiX.h @@ -1,7 +1,6 @@ /* * Minimal implementation of PanoramiX/Xinerama */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.h,v 1.3 2004/07/02 01:30:33 torrey Exp $ */ extern int noPseudoramiXExtension; diff --git a/hw/darwin/quartz/quartz.c b/hw/darwin/quartz/quartz.c index 22151198a..36a8bea08 100644 --- a/hw/darwin/quartz/quartz.c +++ b/hw/darwin/quartz/quartz.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /************************************************************** * * Quartz-specific support for the Darwin X Server @@ -30,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.16 2004/07/02 01:30:33 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/quartz/quartz.h b/hw/darwin/quartz/quartz.h index cee43325d..f1b36b6b1 100644 --- a/hw/darwin/quartz/quartz.h +++ b/hw/darwin/quartz/quartz.h @@ -30,8 +30,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.7 2003/11/12 20:21:51 torrey Exp $ */ #ifndef _QUARTZ_H #define _QUARTZ_H diff --git a/hw/darwin/quartz/quartzAudio.c b/hw/darwin/quartz/quartzAudio.c index 2106dfad4..b477b037b 100644 --- a/hw/darwin/quartz/quartzAudio.c +++ b/hw/darwin/quartz/quartzAudio.c @@ -35,7 +35,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */ #include "quartzCommon.h" #include "quartzAudio.h" diff --git a/hw/darwin/quartz/quartzAudio.h b/hw/darwin/quartz/quartzAudio.h index e20c21ad2..c406bbc2a 100644 --- a/hw/darwin/quartz/quartzAudio.h +++ b/hw/darwin/quartz/quartzAudio.h @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzAudio.h,v 1.2 2001/04/01 20:45:43 tsi Exp $ */ #ifndef _QUARTZAUDIO_H #define _QUARTZAUDIO_H diff --git a/hw/darwin/quartz/quartzCommon.h b/hw/darwin/quartz/quartzCommon.h index 949f724c1..f5dff662c 100644 --- a/hw/darwin/quartz/quartzCommon.h +++ b/hw/darwin/quartz/quartzCommon.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.3 2004/07/30 19:12:17 torrey Exp $ */ /* * quartzCommon.h * @@ -32,7 +31,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCommon.h,v 1.15 2004/06/08 22:58:10 torrey Exp $ */ #ifndef _QUARTZCOMMON_H #define _QUARTZCOMMON_H diff --git a/hw/darwin/quartz/quartzCursor.c b/hw/darwin/quartz/quartzCursor.c index 711ce64f0..e2333e2ea 100644 --- a/hw/darwin/quartz/quartzCursor.c +++ b/hw/darwin/quartz/quartzCursor.c @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.c,v 1.4 2002/11/19 23:01:30 torrey Exp $ */ #include "quartzCommon.h" #include "quartzCursor.h" diff --git a/hw/darwin/quartz/quartzCursor.h b/hw/darwin/quartz/quartzCursor.h index 4db5531fa..56cc94d49 100644 --- a/hw/darwin/quartz/quartzCursor.h +++ b/hw/darwin/quartz/quartzCursor.h @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.h,v 1.2 2001/09/23 04:04:49 torrey Exp $ */ #ifndef QUARTZCURSOR_H #define QUARTZCURSOR_H diff --git a/hw/darwin/quartz/quartzKeyboard.c b/hw/darwin/quartz/quartzKeyboard.c index d2fe922d3..fc12522be 100644 --- a/hw/darwin/quartz/quartzKeyboard.c +++ b/hw/darwin/quartz/quartzKeyboard.c @@ -32,7 +32,6 @@ promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzKeyboard.c,v 1.1 2003/11/01 08:13:08 torrey Exp $ */ #include "quartzCommon.h" diff --git a/hw/darwin/quartz/quartzPasteboard.c b/hw/darwin/quartz/quartzPasteboard.c index 536dcc336..e92fe5c79 100644 --- a/hw/darwin/quartz/quartzPasteboard.c +++ b/hw/darwin/quartz/quartzPasteboard.c @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.c,v 1.3 2001/09/23 04:04:49 torrey Exp $ */ #include "quartzPasteboard.h" diff --git a/hw/darwin/quartz/quartzPasteboard.h b/hw/darwin/quartz/quartzPasteboard.h index 296c52c17..afcb6e587 100644 --- a/hw/darwin/quartz/quartzPasteboard.h +++ b/hw/darwin/quartz/quartzPasteboard.h @@ -29,7 +29,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzPasteboard.h,v 1.1 2001/03/15 22:24:27 torrey Exp $ */ #ifndef _QUARTZPASTEBOARD_H #define _QUARTZPASTEBOARD_H @@ -42,4 +41,4 @@ char * QuartzReadCocoaPasteboard(void); // caller must free string void QuartzWritePasteboard(); void QuartzWriteCocoaPasteboard(char *text); -#endif /* _QUARTZPASTEBOARD_H */
\ No newline at end of file +#endif /* _QUARTZPASTEBOARD_H */ diff --git a/hw/darwin/quartz/quartzStartup.c b/hw/darwin/quartz/quartzStartup.c index cd58701b1..277e5935f 100644 --- a/hw/darwin/quartz/quartzStartup.c +++ b/hw/darwin/quartz/quartzStartup.c @@ -28,7 +28,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzStartup.c,v 1.8 2003/11/05 00:15:00 torrey Exp $ */ #include <fcntl.h> #include <unistd.h> @@ -288,4 +287,4 @@ int DarwinModeProcessArgument( int argc, char *argv[], int i ) } return 0; -}
\ No newline at end of file +} diff --git a/hw/darwin/quartz/xpr/Xplugin.h b/hw/darwin/quartz/xpr/Xplugin.h index e2e97b4c8..fb6842c87 100644 --- a/hw/darwin/quartz/xpr/Xplugin.h +++ b/hw/darwin/quartz/xpr/Xplugin.h @@ -30,7 +30,6 @@ Note that these interfaces are provided solely for the use of the X11 server. Any other uses are unsupported and strongly discouraged. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/Xplugin.h,v 1.2 2003/05/02 00:08:49 torrey Exp $ */ #ifndef XPLUGIN_H #define XPLUGIN_H 1 diff --git a/hw/darwin/quartz/xpr/appledri.c b/hw/darwin/quartz/xpr/appledri.c index d4cd27b8f..6d9bae10f 100644 --- a/hw/darwin/quartz/xpr/appledri.c +++ b/hw/darwin/quartz/xpr/appledri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dri.c b/hw/darwin/quartz/xpr/dri.c index e8e49f965..9aeaaa588 100644 --- a/hw/darwin/quartz/xpr/dri.c +++ b/hw/darwin/quartz/xpr/dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -35,13 +34,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 <unistd.h> -#endif #define NEED_REPLIES #define NEED_EVENTS diff --git a/hw/darwin/quartz/xpr/dri.h b/hw/darwin/quartz/xpr/dri.h index f826167f6..cf2638a9f 100644 --- a/hw/darwin/quartz/xpr/dri.h +++ b/hw/darwin/quartz/xpr/dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/dristruct.h b/hw/darwin/quartz/xpr/dristruct.h index 0df8f1890..9a3d01c9b 100644 --- a/hw/darwin/quartz/xpr/dristruct.h +++ b/hw/darwin/quartz/xpr/dristruct.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/darwin/quartz/xpr/x-hash.c b/hw/darwin/quartz/xpr/x-hash.c index feffb1b9e..a7024b2da 100644 --- a/hw/darwin/quartz/xpr/x-hash.c +++ b/hw/darwin/quartz/xpr/x-hash.c @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-hash.h" #include "x-list.h" diff --git a/hw/darwin/quartz/xpr/x-hash.h b/hw/darwin/quartz/xpr/x-hash.h index 97d4cc40c..5d4f7f93a 100644 --- a/hw/darwin/quartz/xpr/x-hash.h +++ b/hw/darwin/quartz/xpr/x-hash.h @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-hash.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_HASH_H #define X_HASH_H 1 diff --git a/hw/darwin/quartz/xpr/x-list.c b/hw/darwin/quartz/xpr/x-list.c index c2f1db161..b9f23928b 100644 --- a/hw/darwin/quartz/xpr/x-list.c +++ b/hw/darwin/quartz/xpr/x-list.c @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "x-list.h" #include <stdlib.h> diff --git a/hw/darwin/quartz/xpr/x-list.h b/hw/darwin/quartz/xpr/x-list.h index 3faed5330..bd55a53d0 100644 --- a/hw/darwin/quartz/xpr/x-list.h +++ b/hw/darwin/quartz/xpr/x-list.h @@ -27,7 +27,6 @@ copyright holders shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/x-list.h,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #ifndef X_LIST_H #define X_LIST_H 1 diff --git a/hw/darwin/quartz/xpr/xpr.h b/hw/darwin/quartz/xpr/xpr.h index 5b881c725..73a88c03d 100644 --- a/hw/darwin/quartz/xpr/xpr.h +++ b/hw/darwin/quartz/xpr/xpr.h @@ -26,8 +26,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.2 2004/04/23 19:16:52 eich Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xpr.h,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #ifndef XPR_H #define XPR_H diff --git a/hw/darwin/quartz/xpr/xprAppleWM.c b/hw/darwin/quartz/xpr/xprAppleWM.c index 2db6a2432..21746f6e9 100644 --- a/hw/darwin/quartz/xpr/xprAppleWM.c +++ b/hw/darwin/quartz/xpr/xprAppleWM.c @@ -27,7 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.2 2003/06/30 01:45:13 torrey Exp $ */ #include "xpr.h" #include "applewmExt.h" diff --git a/hw/darwin/quartz/xpr/xprCursor.c b/hw/darwin/quartz/xpr/xprCursor.c index ee06043df..cb949dadc 100644 --- a/hw/darwin/quartz/xpr/xprCursor.c +++ b/hw/darwin/quartz/xpr/xprCursor.c @@ -30,7 +30,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprCursor.c,v 1.1 2003/04/30 23:15:42 torrey Exp $ */ #include "quartzCommon.h" #include "xpr.h" diff --git a/hw/darwin/quartz/xpr/xprFrame.c b/hw/darwin/quartz/xpr/xprFrame.c index 0dff7c56d..ed02d4b62 100644 --- a/hw/darwin/quartz/xpr/xprFrame.c +++ b/hw/darwin/quartz/xpr/xprFrame.c @@ -27,8 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2005/04/20 12:25:20 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprFrame.c,v 1.4 2003/11/12 20:21:52 torrey Exp $ */ #include "xpr.h" #include "rootlessCommon.h" diff --git a/hw/darwin/quartz/xpr/xprScreen.c b/hw/darwin/quartz/xpr/xprScreen.c index eaad13f7b..1755ca6f7 100644 --- a/hw/darwin/quartz/xpr/xprScreen.c +++ b/hw/darwin/quartz/xpr/xprScreen.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.5 2004/09/18 00:38:30 torrey Exp $ */ /* * Xplugin rootless implementation screen functions */ @@ -28,7 +27,6 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/xpr/xprScreen.c,v 1.11 2004/07/15 18:53:25 torrey Exp $ */ #include "quartzCommon.h" #include "quartz.h" diff --git a/hw/darwin/utils/dumpkeymap.c b/hw/darwin/utils/dumpkeymap.c index 8f3340b15..d2eeca5c2 100644 --- a/hw/darwin/utils/dumpkeymap.c +++ b/hw/darwin/utils/dumpkeymap.c @@ -1,4 +1,3 @@ -// $XFree86: dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $ //============================================================================= // // Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com> diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am index 93abd7a0e..81b62f1fe 100644 --- a/hw/dmx/Makefile.am +++ b/hw/dmx/Makefile.am @@ -81,7 +81,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \ config/libdmxconfig.a \ @DMXMODULES_LIBS@ -Xdmx_CFLAGS = @SERVER_DEFINES@ \ +Xdmx_CFLAGS = \ -DHAVE_DMX_CONFIG_H \ $(GLX_INCS) \ $(GLX_DEFS) \ diff --git a/hw/dmx/config/Makefile.am b/hw/dmx/config/Makefile.am index 7376ec23a..fbc7f35a1 100644 --- a/hw/dmx/config/Makefile.am +++ b/hw/dmx/config/Makefile.am @@ -27,7 +27,7 @@ endif AM_YFLAGS = -d AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -I$(top_srcdir)/hw/dmx \ $(GLX_INCS) \ -DHAVE_DMX_CONFIG_H \ diff --git a/hw/dmx/dmx-config.h b/hw/dmx/dmx-config.h index 11e8fb8e5..9647448dc 100644 --- a/hw/dmx/dmx-config.h +++ b/hw/dmx/dmx-config.h @@ -93,6 +93,5 @@ #undef DAMAGE #undef COMPOSITE #undef FONTCACHE -#undef XFree86LOADER #endif /* DMX_CONFIG_H */ diff --git a/hw/dmx/dmxcmap.c b/hw/dmx/dmxcmap.c index f46dc5411..b4279e7ce 100644 --- a/hw/dmx/dmxcmap.c +++ b/hw/dmx/dmxcmap.c @@ -46,7 +46,7 @@ #include "micmap.h" -static int dmxInitColormapPrivateFunc(ColormapPtr pColormap) +static int dmxInitColormapPrivateFunc(ColormapPtr pColormap, int index) { return TRUE; } diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c index e7f04df16..9c5356ed5 100644 --- a/hw/dmx/dmxinit.c +++ b/hw/dmx/dmxinit.c @@ -1046,14 +1046,3 @@ void ddxUseMsg(void) ErrorF(" Ctrl-Alt-q Quit (core devices 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 diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c index 9a76a6696..9cdd123b9 100644 --- a/hw/dmx/dmxpict.c +++ b/hw/dmx/dmxpict.c @@ -662,7 +662,7 @@ static int dmxProcRenderSetPictureFilter(ClientPtr client) int nparams; REQUEST(xRenderSetPictureFilterReq); - REQUEST_SIZE_MATCH(xRenderSetPictureFilterReq); + REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq); VERIFY_PICTURE(pPicture, stuff->picture, client, SecurityWriteAccess, RenderErrBase + BadPicture); diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am index a798647cc..2f4a3b708 100644 --- a/hw/dmx/glxProxy/Makefile.am +++ b/hw/dmx/glxProxy/Makefile.am @@ -31,8 +31,8 @@ libglxproxy_a_SOURCES = compsize.c \ renderpixswap.c \ unpack.h -AM_CFLAGS = @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ +AM_CFLAGS = \ + \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/include \ -I$(top_srcdir)/GL/include \ diff --git a/hw/dmx/glxProxy/compsize.c b/hw/dmx/glxProxy/compsize.c index cffa1af8d..29669e318 100644 --- a/hw/dmx/glxProxy/compsize.c +++ b/hw/dmx/glxProxy/compsize.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/lib/GL/glx/compsize.c,v 1.3 2001/03/21 16:04:39 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/g_disptab.c b/hw/dmx/glxProxy/g_disptab.c index f507a874f..124a65511 100644 --- a/hw/dmx/glxProxy/g_disptab.c +++ b/hw/dmx/glxProxy/g_disptab.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/hw/dmx/glxProxy/g_disptab.h b/hw/dmx/glxProxy/g_disptab.h index 0b6d47be7..f02e4f59c 100644 --- a/hw/dmx/glxProxy/g_disptab.h +++ b/hw/dmx/glxProxy/g_disptab.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ #ifndef _GLX_g_disptab_h_ #define _GLX_g_disptab_h_ diff --git a/hw/dmx/glxProxy/global.c b/hw/dmx/glxProxy/global.c index 960021a2b..0e6efeff7 100644 --- a/hw/dmx/glxProxy/global.c +++ b/hw/dmx/glxProxy/global.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index d7ea70728..78cb34eec 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.8 2001/05/02 15:06:05 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -59,7 +58,6 @@ #include "glxutil.h" #include "glxext.h" #include "unpack.h" -#include "GL/glx_ansic.h" #include "GL/glxproto.h" #include "glxvendor.h" @@ -158,7 +156,7 @@ static int CreateContext(__GLXclientState *cl, if (!glxc) { return BadAlloc; } - __glXMemset(glxc, 0, sizeof(__GLXcontext)); + memset(glxc, 0, sizeof(__GLXcontext)); pScreen = screenInfo.screens[screen]; pGlxScreen = &__glXActiveScreens[screen]; @@ -610,7 +608,7 @@ static int AddCurrentContext(__GLXclientState *cl, __GLXcontext *glxc, DrawableP cl->currentContexts = table; cl->numCurrentContexts++; - __glXMemset(cl->be_currentCTag + num*screenInfo.numScreens, 0, + memset(cl->be_currentCTag + num*screenInfo.numScreens, 0, screenInfo.numScreens * sizeof(GLXContextTag)); return num+1; @@ -2589,7 +2587,7 @@ int __glXClientInfo(__GLXclientState *cl, GLbyte *pc) cl->GLClientminorVersion = req->minor; if (cl->GLClientextensions) __glXFree(cl->GLClientextensions); buf = (const char *)(req+1); - cl->GLClientextensions = __glXStrdup(buf); + cl->GLClientextensions = strdup(buf); to_screen = screenInfo.numScreens - 1; diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c index 565793e22..3404d557a 100644 --- a/hw/dmx/glxProxy/glxcmdsswap.c +++ b/hw/dmx/glxProxy/glxcmdsswap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.5 2001/03/21 16:29:36 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -44,7 +43,6 @@ #include <windowstr.h> #include "unpack.h" #include "glxext.h" -#include "GL/glx_ansic.h" #include "glxvendor.h" extern int glxIsExtensionSupported( char *ext ); @@ -714,7 +712,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc) } cl->largeCmdBufSize = hdr->length; } - __glXMemcpy(cl->largeCmdBuf, pc, req->dataBytes); + memcpy(cl->largeCmdBuf, pc, req->dataBytes); cl->largeCmdBytesSoFar = req->dataBytes; cl->largeCmdBytesTotal = hdr->length; @@ -737,7 +735,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc) return __glXBadLargeRequest; } - __glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, + memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, pc, req->dataBytes); cl->largeCmdBytesSoFar += req->dataBytes; @@ -759,7 +757,7 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc) return __glXBadLargeRequest; } - __glXMemcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, + memcpy(cl->largeCmdBuf + cl->largeCmdBytesSoFar, pc, req->dataBytes); cl->largeCmdBytesSoFar += req->dataBytes; diff --git a/hw/dmx/glxProxy/glxcontext.h b/hw/dmx/glxProxy/glxcontext.h index 465101a97..d59df3f0c 100644 --- a/hw/dmx/glxProxy/glxcontext.h +++ b/hw/dmx/glxProxy/glxcontext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxcontext.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_context_h_ #define _GLX_context_h_ diff --git a/hw/dmx/glxProxy/glxdrawable.h b/hw/dmx/glxProxy/glxdrawable.h index 6e00ad62f..59fffa747 100644 --- a/hw/dmx/glxProxy/glxdrawable.h +++ b/hw/dmx/glxProxy/glxdrawable.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxdrawable.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_drawable_h_ #define _GLX_drawable_h_ diff --git a/hw/dmx/glxProxy/glxerror.h b/hw/dmx/glxProxy/glxerror.h index d75cc2b2e..f69cadbde 100644 --- a/hw/dmx/glxProxy/glxerror.h +++ b/hw/dmx/glxProxy/glxerror.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _GLX_error_h_ #define _GLX_error_h_ diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c index 5ddfbe608..de8bef8fb 100644 --- a/hw/dmx/glxProxy/glxext.c +++ b/hw/dmx/glxProxy/glxext.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.c,v 1.7 2001/03/21 16:29:36 dawes Exp $ +/* ** The contents of this file are subject to the GLX Public License Version 1.0 ** (the "License"). You may not use this file except in compliance with the ** License. You may obtain a copy of the License at Silicon Graphics, Inc., @@ -79,7 +79,7 @@ static void ResetClientState(int clientIndex) } keep_be_displays = cl->be_displays; - __glXMemset(cl, 0, sizeof(__GLXclientState)); + memset(cl, 0, sizeof(__GLXclientState)); cl->be_displays = keep_be_displays; /* @@ -90,7 +90,7 @@ static void ResetClientState(int clientIndex) cl->GLClientminorVersion = 0; 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) { return BadAlloc; } - __glXMemset(cl, 0, sizeof(__GLXclientState)); + memset(cl, 0, sizeof(__GLXclientState)); cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) ); if (!cl->be_displays) { __glXFree( cl ); return BadAlloc; } - __glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); + memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); } if (!cl->inUse) { @@ -468,7 +468,7 @@ static int __glXSwapDispatch(ClientPtr client) if (!cl) { return BadAlloc; } - __glXMemset(cl, 0, sizeof(__GLXclientState)); + memset(cl, 0, sizeof(__GLXclientState)); cl->be_displays = (Display **) __glXMalloc( screenInfo.numScreens * sizeof(Display *) ); if (!cl->be_displays) { @@ -476,7 +476,7 @@ static int __glXSwapDispatch(ClientPtr client) return BadAlloc; } - __glXMemset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); + memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *)); } if (!cl->inUse) { diff --git a/hw/dmx/glxProxy/glxext.h b/hw/dmx/glxProxy/glxext.h index 7e6756f86..8572aa43a 100644 --- a/hw/dmx/glxProxy/glxext.h +++ b/hw/dmx/glxProxy/glxext.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.4 2001/03/21 16:29:36 dawes Exp $ */ #ifndef _glxext_h_ #define _glxext_h_ diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c index a7d4ce13d..0f9012d39 100644 --- a/hw/dmx/glxProxy/glxscreens.c +++ b/hw/dmx/glxProxy/glxscreens.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.6 2001/03/21 16:29:36 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -48,13 +47,6 @@ #include "glxserver.h" -#ifdef IN_MODULE -#include <xf86_ansic.h> -#else -#include <string.h> -#include <signal.h> -#endif - #include <windowstr.h> #include "glxfbconfig.h" diff --git a/hw/dmx/glxProxy/glxscreens.h b/hw/dmx/glxProxy/glxscreens.h index 22d397171..5f93e497b 100644 --- a/hw/dmx/glxProxy/glxscreens.h +++ b/hw/dmx/glxProxy/glxscreens.h @@ -1,7 +1,6 @@ #ifndef _GLX_screens_h_ #define _GLX_screens_h_ -/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/glxserver.h b/hw/dmx/glxProxy/glxserver.h index 7db7efef0..db5be4365 100644 --- a/hw/dmx/glxProxy/glxserver.h +++ b/hw/dmx/glxProxy/glxserver.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxserver.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef _GLX_server_h_ #define _GLX_server_h_ @@ -46,7 +45,6 @@ #include <extnsionst.h> #include <resource.h> #include <scrnintstr.h> -#include "GL/glx_ansic.h" /* diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index e353263a7..27a27c335 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c index 822ef25a0..f30b05fb1 100644 --- a/hw/dmx/glxProxy/glxutil.c +++ b/hw/dmx/glxProxy/glxutil.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free @@ -41,7 +40,6 @@ #include <pixmapstr.h> #include <windowstr.h> #include "glxutil.h" -#include "GL/glx_ansic.h" /************************************************************************/ @@ -82,7 +80,7 @@ __glXCalloc(size_t numElements, size_t elementSize) /* XXX: handle out of memory error */ return NULL; } - __glXMemset(addr, 0, size); + memset(addr, 0, size); return addr; } diff --git a/hw/dmx/glxProxy/glxutil.h b/hw/dmx/glxProxy/glxutil.h index 176444ee9..94ca7da95 100644 --- a/hw/dmx/glxProxy/glxutil.h +++ b/hw/dmx/glxProxy/glxutil.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/glxutil.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef _glxcmds_h_ #define _glxcmds_h_ diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c index 4259974f9..e55f80252 100644 --- a/hw/dmx/glxProxy/glxvendor.c +++ b/hw/dmx/glxProxy/glxvendor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */ /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */ /* ** License Applicability. Except to the extent portions of this file are diff --git a/hw/dmx/glxProxy/glxvisuals.c b/hw/dmx/glxProxy/glxvisuals.c index c20e9551e..77bb137cf 100644 --- a/hw/dmx/glxProxy/glxvisuals.c +++ b/hw/dmx/glxProxy/glxvisuals.c @@ -37,6 +37,7 @@ #include <dmx-config.h> #endif +#include <assert.h> #include "dmx.h" #include "glxserver.h" #include "glxutil.h" diff --git a/hw/dmx/glxProxy/render2swap.c b/hw/dmx/glxProxy/render2swap.c index 3fb894325..e7cbff21f 100644 --- a/hw/dmx/glxProxy/render2swap.c +++ b/hw/dmx/glxProxy/render2swap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/render2swap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/renderpixswap.c b/hw/dmx/glxProxy/renderpixswap.c index bedefe781..881967ccf 100644 --- a/hw/dmx/glxProxy/renderpixswap.c +++ b/hw/dmx/glxProxy/renderpixswap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */ /* ** License Applicability. Except to the extent portions of this file are ** made subject to an alternative license as permitted in the SGI Free diff --git a/hw/dmx/glxProxy/unpack.h b/hw/dmx/glxProxy/unpack.h index abad7b147..713e3aaa2 100644 --- a/hw/dmx/glxProxy/unpack.h +++ b/hw/dmx/glxProxy/unpack.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */ #ifndef __GLX_unpack_h__ #define __GLX_unpack_h__ diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am index d37c2a9ce..326506e77 100644 --- a/hw/dmx/input/Makefile.am +++ b/hw/dmx/input/Makefile.am @@ -60,7 +60,7 @@ GLX_DEFS = @GL_CFLAGS@ GLX_INCS = -I@MESA_SOURCE@/include endif -AM_CFLAGS = @SERVER_DEFINES@ \ +AM_CFLAGS = \ -I$(top_srcdir)/hw/dmx \ -I$(top_srcdir)/hw/xfree86/common \ $(GLX_INCS) \ diff --git a/hw/dmx/input/dmxeq.c b/hw/dmx/input/dmxeq.c index 7a6bb11fc..a2fb07f1e 100644 --- a/hw/dmx/input/dmxeq.c +++ b/hw/dmx/input/dmxeq.c @@ -1,6 +1,5 @@ /* $XFree86$ */ /* - * $Xorg: mieq.c,v 1.4 2001/02/09 02:05:20 xorgcvs Exp $ * * Copyright 1990, 1998 The Open Group * diff --git a/hw/kdrive/ati/ati_dripriv.h b/hw/kdrive/ati/ati_dripriv.h index 1343f07f5..f0e139383 100644 --- a/hw/kdrive/ati/ati_dripriv.h +++ b/hw/kdrive/ati/ati_dripriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_dripriv.h,v 1.3 2000/11/18 19:37:11 tsi Exp $ */ /* * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, * Precision Insight, Inc., Cedar Park, Texas, and diff --git a/hw/kdrive/ati/r128_common.h b/hw/kdrive/ati/r128_common.h index 506f97c68..862fea599 100644 --- a/hw/kdrive/ati/r128_common.h +++ b/hw/kdrive/ati/r128_common.h @@ -31,7 +31,6 @@ * Converted to common header format: * Jens Owen <jens@tungstengraphics.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_common.h,v 1.2 2002/12/16 16:19:10 dawes Exp $ * */ diff --git a/hw/kdrive/ati/r128_sarea.h b/hw/kdrive/ati/r128_sarea.h index b73797ae6..6fbd05ecb 100644 --- a/hw/kdrive/ati/r128_sarea.h +++ b/hw/kdrive/ati/r128_sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h,v 1.7 2002/02/16 21:26:35 herrb Exp $ */ /* * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, * Precision Insight, Inc., Cedar Park, Texas, and diff --git a/hw/kdrive/ati/radeon_common.h b/hw/kdrive/ati/radeon_common.h index 2539ba68f..6c416c6b1 100644 --- a/hw/kdrive/ati/radeon_common.h +++ b/hw/kdrive/ati/radeon_common.h @@ -31,7 +31,6 @@ * Converted to common header format: * Jens Owen <jens@tungstengraphics.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_common.h,v 1.2 2003/04/07 01:22:09 martin Exp $ * */ diff --git a/hw/kdrive/ati/radeon_sarea.h b/hw/kdrive/ati/radeon_sarea.h index 82a72ed19..1d39bca52 100644 --- a/hw/kdrive/ati/radeon_sarea.h +++ b/hw/kdrive/ati/radeon_sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h,v 1.5 2002/10/30 12:52:14 alanh Exp $ */ /* * Copyright 2000 ATI Technologies Inc., Markham, Ontario, * VA Linux Systems Inc., Fremont, California. diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c index a9ea0eb0c..fbb16a465 100644 --- a/hw/kdrive/ephyr/ephyr.c +++ b/hw/kdrive/ephyr/ephyr.c @@ -40,6 +40,8 @@ extern DeviceIntPtr pKdKeyboard; static int mouseState = 0; +Bool EphyrWantGrayScale = 0; + Bool ephyrInitialize (KdCardInfo *card, EphyrPriv *priv) { @@ -80,7 +82,10 @@ ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv) screen->width = width; screen->height = height; } - + + if (EphyrWantGrayScale) + screen->fb[0].depth = 8; + if (screen->fb[0].depth && screen->fb[0].depth != hostx_get_depth()) { if (screen->fb[0].depth < hostx_get_depth() @@ -98,12 +103,15 @@ ephyrScreenInitialize (KdScreenInfo *screen, EphyrScrPriv *scrpriv) if (screen->fb[0].depth <= 8) { - screen->fb[0].visuals = ((1 << StaticGray) | - (1 << GrayScale) | - (1 << StaticColor) | - (1 << PseudoColor) | - (1 << TrueColor) | - (1 << DirectColor)); + if (EphyrWantGrayScale) + screen->fb[0].visuals = ((1 << StaticGray) | (1 << GrayScale)); + else + screen->fb[0].visuals = ((1 << StaticGray) | + (1 << GrayScale) | + (1 << StaticColor) | + (1 << PseudoColor) | + (1 << TrueColor) | + (1 << DirectColor)); screen->fb[0].redMask = 0x00; screen->fb[0].greenMask = 0x00; diff --git a/hw/kdrive/ephyr/ephyrinit.c b/hw/kdrive/ephyr/ephyrinit.c index 58478e690..1aa608e93 100644 --- a/hw/kdrive/ephyr/ephyrinit.c +++ b/hw/kdrive/ephyr/ephyrinit.c @@ -29,6 +29,7 @@ #include "ephyr.h" extern Window EphyrPreExistingHostWin; +extern Bool EphyrWantGrayScale; void InitCard (char *name) @@ -62,6 +63,7 @@ ddxUseMsg (void) ErrorF("-parent XID Use existing window as Xephyr root win\n"); ErrorF("-host-cursor Re-use exisiting X host server cursor\n"); ErrorF("-fullscreen Attempt to run Xephyr fullscreen\n"); + ErrorF("-grayscale Simulate 8bit grayscale\n"); ErrorF("-fakexa Simulate acceleration using software rendering\n"); ErrorF("\n"); @@ -94,6 +96,11 @@ ddxProcessArgument (int argc, char **argv, int i) hostx_use_fullscreen(); return 1; } + else if (!strcmp (argv[i], "-grayscale")) + { + EphyrWantGrayScale = 1; + return 1; + } else if (!strcmp (argv[i], "-fakexa")) { ephyrFuncs.initAccel = ephyrDrawInit; diff --git a/hw/kdrive/ephyr/hostx.c b/hw/kdrive/ephyr/hostx.c index ae776a7eb..d0a2f2f95 100644 --- a/hw/kdrive/ephyr/hostx.c +++ b/hw/kdrive/ephyr/hostx.c @@ -533,15 +533,9 @@ hostx_screen_init (int width, int height, int buffer_height) /* Ask the WM to keep our size static */ size_hints = XAllocSizeHints(); -#if 0 size_hints->max_width = size_hints->min_width = width; size_hints->max_height = size_hints->min_height = height; size_hints->flags = PMinSize|PMaxSize; -#else - size_hints->min_width = 100; - size_hints->min_height = 100; - size_hints->flags = PMinSize; -#endif XSetWMNormalHints(HostX.dpy, HostX.win, size_hints); XFree(size_hints); @@ -669,7 +663,7 @@ void hostx_load_keymap(void) { KeySym *keymap; - int mapWidth, min_keycode, max_keycode; + int host_width, min_keycode, max_keycode, width; int i,j; XDisplayKeycodes(HostX.dpy, &min_keycode, &max_keycode); @@ -679,25 +673,21 @@ hostx_load_keymap(void) keymap = XGetKeyboardMapping(HostX.dpy, min_keycode, max_keycode - min_keycode + 1, - &mapWidth); + &host_width); /* Try and copy the hosts keymap into our keymap to avoid loads * of messing around. * * kdrive cannot can have more than 4 keysyms per keycode - * so we only copy the first 4 ( xorg has 6 per keycode ) + * so we only copy at most the first 4 ( xorg has 6 per keycode, XVNC 2 ) */ + width = (host_width > 4) ? 4 : host_width; for (i=0; i<(max_keycode - min_keycode+1); i++) - for (j=0; j<4; j++) - kdKeymap[ (i*4)+j ] = keymap[ (i*mapWidth) + j ]; + for (j=0; j<width; j++) + kdKeymap[ (i*width)+j ] = keymap[ (i*host_width) + j ]; - /* old way - memcpy (kdKeymap, keymap, - (max_keycode - min_keycode + 1)*mapWidth*sizeof(KeySym)); - */ - - EPHYR_DBG("keymap width: %d", mapWidth); + EPHYR_DBG("keymap width, host:%d kdrive:%d", host_width, width); /* all kdrive vars - see kkeymap.c */ @@ -705,7 +695,7 @@ hostx_load_keymap(void) kdMaxScanCode = max_keycode; kdMinKeyCode = min_keycode; kdMaxKeyCode = max_keycode; - kdKeymapWidth = (mapWidth > 4) ? 4 : mapWidth; + kdKeymapWidth = width; XFree(keymap); } diff --git a/hw/kdrive/pm2/glint_regs.h b/hw/kdrive/pm2/glint_regs.h index 269b05fbe..84f220298 100644 --- a/hw/kdrive/pm2/glint_regs.h +++ b/hw/kdrive/pm2/glint_regs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36tsi Exp $ */ /* * glint register file diff --git a/hw/kdrive/sis300/sis_reg.h b/hw/kdrive/sis300/sis_reg.h index 2b305ff04..6e5a8f6d5 100644 --- a/hw/kdrive/sis300/sis_reg.h +++ b/hw/kdrive/sis300/sis_reg.h @@ -25,7 +25,6 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. **************************************************************************/ -/* $XFree86: xc/lib/GL/mesa/src/drv/sis/sis_reg.h,v 1.3 2000/09/26 15:56:48 tsi Exp $ */ /* * Authors: diff --git a/hw/kdrive/smi/smi.c b/hw/kdrive/smi/smi.c index 96c774aac..7d4d725c7 100644 --- a/hw/kdrive/smi/smi.c +++ b/hw/kdrive/smi/smi.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.c,v 1.11 2002/10/18 06:31:17 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/smi/smi.h b/hw/kdrive/smi/smi.h index 93b856939..19fdcbad4 100644 --- a/hw/kdrive/smi/smi.h +++ b/hw/kdrive/smi/smi.h @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smi.h,v 1.6 2001/07/24 19:06:03 keithp Exp $ */ #ifndef _SMI_H_ #define _SMI_H_ diff --git a/hw/kdrive/smi/smidraw.c b/hw/kdrive/smi/smidraw.c index 4e1a9fd45..06606ad1b 100644 --- a/hw/kdrive/smi/smidraw.c +++ b/hw/kdrive/smi/smidraw.c @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smidraw.c,v 1.7 2001/07/24 19:06:03 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/smi/smidraw.h b/hw/kdrive/smi/smidraw.h index 3ec0831fc..f91b68c56 100644 --- a/hw/kdrive/smi/smidraw.h +++ b/hw/kdrive/smi/smidraw.h @@ -21,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64draw.h,v 1.1 2001/06/03 18:48:19 keithp Exp $ */ #ifndef _SMIDRAW_H_ #define _SMIDRAW_H_ diff --git a/hw/kdrive/smi/smistub.c b/hw/kdrive/smi/smistub.c index 5770e2a6f..e0f33fe6f 100644 --- a/hw/kdrive/smi/smistub.c +++ b/hw/kdrive/smi/smistub.c @@ -22,7 +22,6 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/smi/smistub.c,v 1.4 2002/10/08 21:25:35 keithp Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> diff --git a/hw/kdrive/smi/smivideo.c b/hw/kdrive/smi/smivideo.c index 32c73516a..46593a0ee 100644 --- a/hw/kdrive/smi/smivideo.c +++ b/hw/kdrive/smi/smivideo.c @@ -19,7 +19,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/kdrive/mach64/mach64video.c,v 1.10 2003/04/23 21:51:18 tsi Exp $ */ #ifdef HAVE_CONFIG_H #include <kdrive-config.h> #endif diff --git a/hw/kdrive/src/fourcc.h b/hw/kdrive/src/fourcc.h index b19f5decc..54be7ebe8 100644 --- a/hw/kdrive/src/fourcc.h +++ b/hw/kdrive/src/fourcc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/fourcc.h,v 1.4 2003/04/23 21:51:24 tsi Exp $ */ /* This header file contains listings of STANDARD guids for video formats. diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index 8580dc2ee..4e672f16f 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -1814,7 +1814,7 @@ KdXVCopyPackedData(KdScreenInfo *screen, CARD8 *src, CARD8 *dst, int randr, src = src + top * srcDown + left * srcRight; w >>= 1; - srcRight >>= 1; + /* srcRight >>= 1; */ srcNext = srcRight >> 1; while (h--) { CARD16 *s = (CARD16 *)src; diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 23d404df5..773c45420 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -1,4 +1,3 @@ -/* $Xorg: InitInput.c,v 1.4 2001/02/09 02:04:44 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitInput.c,v 3.9 2001/12/14 19:59:45 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c index 212f79b7c..b8253f607 100644 --- a/hw/vfb/InitOutput.c +++ b/hw/vfb/InitOutput.c @@ -1,4 +1,3 @@ -/* $Xorg: InitOutput.c,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ */ /* Copyright 1993, 1998 The Open Group @@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/vfb/InitOutput.c,v 3.25 2003/11/15 04:01:56 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -450,17 +448,6 @@ ddxProcessArgument(int argc, char *argv[], int i) 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 int diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am index bd87d1d4b..baab5ca22 100644 --- a/hw/vfb/Makefile.am +++ b/hw/vfb/Makefile.am @@ -21,7 +21,7 @@ Xvfb_LDFLAGS = AM_CFLAGS = -DHAVE_DIX_CONFIG_H \ -DNO_HW_ONLY_EXTS \ -DNO_MODULE_EXTS \ - @SERVER_DEFINES@ \ + \ $(XVFBMODULES_CFLAGS) # Man page diff --git a/hw/vfb/lk201kbd.h b/hw/vfb/lk201kbd.h index 9b4090ed0..d0198d06b 100644 --- a/hw/vfb/lk201kbd.h +++ b/hw/vfb/lk201kbd.h @@ -45,7 +45,6 @@ SOFTWARE. ******************************************************************/ -/* $Xorg: lk201kbd.h,v 1.4 2001/02/09 02:04:45 xorgcvs Exp $ */ #define MIN_LK201_KEY 86 #define MAX_LK201_KEY 251 diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index b50b6ab07..67bfd80d9 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -7,16 +7,16 @@ DOC_SUBDIR = doc SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \ ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \ xf8_32bpp loader scanpci dixmods exa \ - $(DRI_SUBDIR) utils $(DOC_SUBDIR) getconfig + $(DRI_SUBDIR) utils $(DOC_SUBDIR) DIST_SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support \ parser rac ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp \ xf8_16bpp xf8_32bpp loader scanpci dixmods dri exa \ - utils doc getconfig + utils doc bin_PROGRAMS = Xorg -AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ Xorg_SOURCES = xorg.c @@ -40,7 +40,6 @@ XORG_LIBS = \ libosandcommon.la \ rac/librac.a \ parser/libxf86config.a \ - dummylib/libdummy.a \ dixmods/libdixmods.la \ @XORG_LIBS@ diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am index 0fe8aff27..d983ee9cc 100644 --- a/hw/xfree86/common/Makefile.am +++ b/hw/xfree86/common/Makefile.am @@ -32,7 +32,7 @@ BUILT_SOURCES = xf86DefModeSet.c AM_LDFLAGS = -r libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \ - xf86Cursor.c xf86DGA.c xf86DPMS.c \ + xf86Cursor.c xf86cvt.c xf86DGA.c xf86DPMS.c \ xf86DoProbe.c xf86DoScanPci.c xf86Events.c \ xf86Globals.c xf86Io.c xf86AutoConfig.c \ xf86MiscExt.c xf86Option.c \ @@ -103,4 +103,4 @@ if LNXACPI XORG_CFLAGS += -DHAVE_ACPI endif -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/common/atKeynames.h b/hw/xfree86/common/atKeynames.h index d37f5b0f0..1415fce20 100644 --- a/hw/xfree86/common/atKeynames.h +++ b/hw/xfree86/common/atKeynames.h @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 39c8b8c59..a330fadf4 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -1,4 +1,3 @@ -/* $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. * @@ -1079,7 +1078,10 @@ xf86WriteMmio32Be(__volatile__ void *base, const unsigned long offset, extern volatile unsigned char *ioBase; #if defined(linux) && defined(__powerpc64__) -# include <asm/memory.h> +# include <linux/version.h> +# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) +# include <asm/memory.h> +# endif #endif /* defined(linux) && defined(__powerpc64__) */ #ifndef eieio /* We deal with arch-specific eieio() routines above... */ # define eieio() __asm__ __volatile__ ("eieio" ::: "memory") @@ -1512,88 +1514,7 @@ inl(unsigned short port) # endif /* ix86 */ -# elif defined(__powerpc__) /* && !__GNUC__ */ -/* - * NON-GCC PowerPC - Presumed to be PowerMAX OS for now - */ -# ifndef PowerMAX_OS -# error - Non-gcc PowerPC and !PowerMAXOS ??? -# endif - -# define PPCIO_DEBUG 0 -# define PPCIO_INLINE 1 -# define USE_ABS_MACRO 1 -/* - * Use compiler intrinsics to access certain PPC machine instructions - */ -# define eieio() __inst_eieio() -# define stw_brx(val,base,ndx) __inst_sthbrx(val,base,ndx) -# define stl_brx(val,base,ndx) __inst_stwbrx(val,base,ndx) -# define ldw_brx(base,ndx) __inst_lhbrx(base,ndx) -# define ldl_brx(base,ndx) __inst_lwbrx(base,ndx) - -# define ldq_u(p) (*((unsigned long long *)(p))) -# define ldl_u(p) (*((unsigned long *)(p))) -# define ldw_u(p) (*((unsigned short *)(p))) -# define stq_u(v,p) (*(unsigned long long *)(p)) = (v) -# define stl_u(v,p) (*(unsigned long *)(p)) = (v) -# define stw_u(v,p) (*(unsigned short *)(p)) = (v) -# define mem_barrier() eieio() -# define write_mem_barrier() eieio() - -extern volatile unsigned char *ioBase; - -# if !defined(abs) && defined(USE_ABS_MACRO) -# define abs(x) ((x) >= 0 ? (x) : -(x)) -# endif - -# undef inb -# undef inw -# undef inl -# undef outb -# undef outw -# undef outl - -# if PPCIO_DEBUG - -extern void debug_outb(unsigned int a, unsigned char b, int line, char *file); -extern void debug_outw(unsigned int a, unsigned short w, int line, char *file); -extern void debug_outl(unsigned int a, unsigned int l, int line, char *file); -extern unsigned char debug_inb(unsigned int a, int line, char *file); -extern unsigned short debug_inw(unsigned int a, int line, char *file); -extern unsigned int debug_inl(unsigned int a, int line, char *file); - -# define outb(a,b) debug_outb(a,b, __LINE__, __FILE__) -# define outw(a,w) debug_outw(a,w, __LINE__, __FILE__) -# define outl(a,l) debug_outl(a,l, __LINE__, __FILE__) -# define inb(a) debug_inb(a, __LINE__, __FILE__) -# define inw(a) debug_inw(a, __LINE__, __FILE__) -# define inl(a) debug_inl(a, __LINE__, __FILE__) - -# else /* !PPCIO_DEBUG */ - -extern unsigned char inb(unsigned int a); -extern unsigned short inw(unsigned int a); -extern unsigned int inl(unsigned int a); - -# if PPCIO_INLINE - -# define outb(a,b) \ - (*((volatile unsigned char *)(ioBase + (a))) = (b), eieio()) -# define outw(a,w) (stw_brx((w),ioBase,(a)), eieio()) -# define outl(a,l) (stl_brx((l),ioBase,(a)), eieio()) - -# else /* !PPCIO_INLINE */ - -extern void outb(unsigned int a, unsigned char b); -extern void outw(unsigned int a, unsigned short w); -extern void outl(unsigned int a, unsigned int l); - -# endif /* PPCIO_INLINE */ - -# endif /* !PPCIO_DEBUG */ - -# else /* !GNUC && !PPC */ +# else /* !GNUC */ # if !defined(QNX4) # if defined(__STDC__) && (__STDC__ == 1) # ifndef asm @@ -1602,17 +1523,13 @@ extern void outl(unsigned int a, unsigned int l); # endif # ifndef SCO325 # if defined(__UNIXWARE__) -# if defined(IN_MODULE) # /* avoid including <sys/types.h> for <sys/inline.h> on UnixWare */ -# define ushort unsigned short -# define ushort_t unsigned short -# define ulong unsigned long -# define ulong_t unsigned long -# define uint_t unsigned int -# define uchar_t unsigned char -# else -# include <sys/types.h> -# endif /* IN_MODULE */ +# define ushort unsigned short +# define ushort_t unsigned short +# define ulong unsigned long +# define ulong_t unsigned long +# define uint_t unsigned int +# define uchar_t unsigned char # endif /* __UNIXWARE__ */ # if !defined(sgi) && !defined(__SUNPRO_C) # include <sys/inline.h> diff --git a/hw/xfree86/common/fourcc.h b/hw/xfree86/common/fourcc.h index e60aa4e83..853657e86 100644 --- a/hw/xfree86/common/fourcc.h +++ b/hw/xfree86/common/fourcc.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/scoasm.h b/hw/xfree86/common/scoasm.h index 5a5af8eb9..8f80e7b1e 100644 --- a/hw/xfree86/common/scoasm.h +++ b/hw/xfree86/common/scoasm.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/scoasm.h,v 3.1 2003/08/24 17:36:49 dawes Exp $ */ /* * Copyright (c) 1996 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h index 3c416a0be..4903791f2 100644 --- a/hw/xfree86/common/xf86.h +++ b/hw/xfree86/common/xf86.h @@ -1,4 +1,3 @@ -/* $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. @@ -53,7 +52,6 @@ extern Bool xf86DoConfigurePass1; extern int xf86ScreenIndex; /* Index into pScreen.devPrivates */ extern int xf86CreateRootWindowIndex; /* Index into pScreen.devPrivates */ extern int xf86PixmapIndex; -extern Bool xf86ResAccessEnter; extern ScrnInfoPtr *xf86Screens; /* List of pointers to ScrnInfoRecs */ extern const unsigned char byte_reversed[256]; extern ScrnInfoPtr xf86CurrentScreen; @@ -166,9 +164,6 @@ void xf86EnablePciBusMaster(pciVideoPtr pPci, Bool enable); #endif void xf86RegisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func, pointer arg); Bool xf86DeregisterStateChangeNotificationCallback(xf86StateChangeNotificationCallbackFunc func); -#ifdef async -Bool xf86QueueAsyncEvent(void (*func)(pointer),pointer arg); -#endif int xf86GetLastScrnFlag(int entityIndex); void xf86SetLastScrnFlag(int entityIndex, int scrnIndex); @@ -199,6 +194,10 @@ void *xf86GetPointerScreenFuncs(void); void xf86InitOrigins(void); void xf86ReconfigureLayout(void); +/* xf86cvt.c */ +DisplayModePtr xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, + Bool Reduced, Bool Interlaced); + /* xf86DPMS.c */ Bool xf86DPMSInit(ScreenPtr pScreen, DPMSSetProcPtr set, int flags); @@ -354,10 +353,8 @@ int xf86RegisterRootWindowProperty(int ScrnIndex, Atom property, Atom type, pointer value); Bool xf86IsUnblank(int mode); -#ifdef XFree86LOADER void xf86AddModuleInfo(ModuleInfoPtr info, pointer module); void xf86DeleteModuleInfo(int idx); -#endif /* xf86Debug.c */ #ifdef BUILDDEBUG diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index be07ec9d4..4dcc997c1 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -1,6 +1,3 @@ -/* $DHD: xc/programs/Xserver/hw/xfree86/common/xf86AutoConfig.c,v 1.15 2003/09/24 19:39:36 dawes Exp $ */ -/* $XdotOrg: $ */ - /* * Copyright 2003 by David H. Dawes. * Copyright 2003 by X-Oz Technologies. @@ -32,8 +29,6 @@ * 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 $ */ - #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif @@ -45,9 +40,7 @@ #include "xf86Priv.h" #include "xf86_OSlib.h" -/* - * Sections for the default built-in configuration. - */ +/* Sections for the default built-in configuration. */ #define BUILTIN_MODULE_SECTION \ "Section \"Module\"\n" \ @@ -78,7 +71,6 @@ #define BUILTIN_MONITOR_SECTION \ "Section \"Monitor\"\n" \ "\tIdentifier\t" BUILTIN_MONITOR_NAME "\n" \ - "\tOption\t\"TargetRefresh\"\t\"75.0\"\n" \ "EndSection\n\n" #define BUILTIN_SCREEN_NAME \ @@ -101,17 +93,6 @@ #define BUILTIN_LAYOUT_SECTION_POST \ "EndSection\n\n" - -#ifndef GET_CONFIG_CMD -#define GET_CONFIG_CMD "getconfig" -#endif - -#ifndef GETCONFIG_DIR -#define GETCONFIG_DIR PROJECTROOT "/lib/X11/getconfig" -#endif - -#define GETCONFIG_WHITESPACE " \t\n" - static const char **builtinConfig = NULL; static int builtinLines = 0; static const char *deviceList[] = { @@ -171,6 +152,61 @@ AppendToConfig(const char *s) AppendToList(s, &builtinConfig, &builtinLines); } +static const char * +videoPtrToDriverName(pciVideoPtr info) +{ + /* + * things not handled yet: + * amd/cyrix/nsc + * xgi + */ + + switch (info->vendor) + { + case 0x1142: return "apm"; + case 0xedd8: return "ark"; + case 0x1a03: return "ast"; + case 0x1002: return "ati"; + case 0x102c: return "chips"; + case 0x1013: return "cirrus"; + case 0x8086: + if ((info->chipType == 0x00d1) || (info->chipType == 0x7800)) + return "i740"; + else return "i810"; + case 0x102b: return "mga"; + case 0x10c8: return "neomagic"; + case 0x105d: return "i128"; + case 0x10de: case 0x12d2: return "nv"; + case 0x1163: return "rendition"; + case 0x5333: + switch (info->chipType) + { + case 0x88d0: case 0x88d1: case 0x88f0: case 0x8811: + case 0x8812: case 0x8814: case 0x8901: + return "s3"; + case 0x5631: case 0x883d: case 0x8a01: case 0x8a10: + case 0x8c01: case 0x8c03: case 0x8904: case 0x8a13: + return "s3virge"; + default: + return "savage"; + } + case 0x1039: return "sis"; + case 0x126f: return "siliconmotion"; + case 0x121a: + if (info->chipType < 0x0003) + return "voodoo"; + else + return "tdfx"; + case 0x3d3d: return "glint"; + case 0x1023: return "trident"; + case 0x100c: return "tseng"; + case 0x1106: return "via"; + case 0x15ad: return "vmware"; + default: break; + } + return NULL; +} + Bool xf86AutoConfig(void) { @@ -178,7 +214,6 @@ xf86AutoConfig(void) char buf[1024]; pciVideoPtr *pciptr, info = NULL; char *driver = NULL; - FILE *gp = NULL; ConfigStatus ret; /* Find the primary device, and get some information about it. */ @@ -195,108 +230,8 @@ xf86AutoConfig(void) ErrorF("xf86PciVideoInfo is not set\n"); } - if (info) { - char *tmp; - char *path = NULL, *a, *b; - char *searchPath = NULL; - - /* - * Look for the getconfig program first in the xf86ModulePath - * directories, then in GETCONFIG_DIR, then in BINDIR. If it - * isn't found in any of those locations, just use the normal - * search path. - */ - - if (xf86ModulePath) { - a = xnfstrdup(xf86ModulePath); - b = strtok(a, ","); - while (b) { - path = xnfrealloc(path, - strlen(b) + 1 + strlen(GET_CONFIG_CMD) + 1); - sprintf(path, "%s/%s", b, GET_CONFIG_CMD); - if (access(path, X_OK) == 0) - break; - b = strtok(NULL, ","); - } - if (!b) { - xfree(path); - path = NULL; - } - xfree(a); - } - - if (!path) { - path = xnfstrdup(GETCONFIG_DIR "/" GET_CONFIG_CMD); - if (access(path, X_OK) != 0) { - xfree(path); - path = NULL; - } - } - -#ifdef BINDIR - if (!path) { - path = xnfstrdup(BINDIR "/" GET_CONFIG_CMD); - if (access(path, X_OK) != 0) { - xfree(path); - path = NULL; - } - } -#endif - - if (!path) - path = xnfstrdup(GET_CONFIG_CMD); - - /* - * Build up the config file directory search path: - * - * /etc/X11 - * PROJECTROOT/etc/X11 - * xf86ModulePath - * PROJECTROOT/lib/X11/getconfig (GETCONFIG_DIR) - */ - - searchPath = xnfalloc(strlen("/etc/X11") + 1 + - strlen(PROJECTROOT "/etc/X11") + 1 + - (xf86ModulePath ? strlen(xf86ModulePath) : 0) - + 1 + - strlen(GETCONFIG_DIR) + 1); - strcpy(searchPath, "/etc/X11," PROJECTROOT "/etc/X11,"); - if (xf86ModulePath && *xf86ModulePath) { - strcat(searchPath, xf86ModulePath); - strcat(searchPath, ","); - } - strcat(searchPath, GETCONFIG_DIR); - - ErrorF("xf86AutoConfig: Primary PCI is %d:%d:%d\n", - info->bus, info->device, info->func); - - snprintf(buf, sizeof(buf), "%s" -#ifdef DEBUG - " -D" -#endif - " -X %d" - " -I %s" - " -v 0x%04x -d 0x%04x -r 0x%02x -s 0x%04x" - " -b 0x%04x -c 0x%04x", - path, - (unsigned int)xorgGetVersion(), - searchPath, - info->vendor, info->chipType, info->chipRev, - info->subsysVendor, info->subsysCard, - info->class << 8 | info->subclass); - ErrorF("Running \"%s\"\n", buf); - gp = Popen(buf, "r"); - if (gp) { - if (fgets(buf, sizeof(buf) - 1, gp)) { - buf[strlen(buf) - 1] = '\0'; - tmp = strtok(buf, GETCONFIG_WHITESPACE); - if (tmp) - driver = xnfstrdup(tmp); - } - } - xfree(path); - xfree(searchPath); - } + if (info) + driver = videoPtrToDriverName(info); AppendToConfig(BUILTIN_MODULE_SECTION); AppendToConfig(BUILTIN_MONITOR_SECTION); @@ -307,19 +242,12 @@ xf86AutoConfig(void) AppendToConfig(buf); ErrorF("New driver is \"%s\"\n", driver); buf[0] = '\t'; - while (fgets(buf + 1, sizeof(buf) - 2, gp)) { - AppendToConfig(buf); - ErrorF("Extra line: %s", buf); - } AppendToConfig(BUILTIN_DEVICE_SECTION_POST); snprintf(buf, sizeof(buf), BUILTIN_SCREEN_SECTION, driver, 0, driver, 0); AppendToConfig(buf); } - if (gp) - Pclose(gp); - for (p = deviceList; *p; p++) { snprintf(buf, sizeof(buf), BUILTIN_DEVICE_SECTION, *p, 0, *p); AppendToConfig(buf); @@ -338,13 +266,6 @@ xf86AutoConfig(void) } AppendToConfig(BUILTIN_LAYOUT_SECTION_POST); -#ifdef BUILTIN_EXTRA - AppendToConfig(BUILTIN_EXTRA); -#endif - - if (driver) - xfree(driver); - xf86MsgVerb(X_DEFAULT, 0, "Using default built-in configuration (%d lines)\n", builtinLines); @@ -357,12 +278,9 @@ xf86AutoConfig(void) xf86setBuiltinConfig(builtinConfig); ret = xf86HandleConfigFile(TRUE); FreeConfig(); - switch(ret) { - case CONFIG_OK: - return TRUE; - default: + + if (ret != CONFIG_OK) xf86Msg(X_ERROR, "Error parsing the built-in default configuration.\n"); - return FALSE; - } -} + return (ret == CONFIG_OK); +} diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 057dfb041..e5c9615d3 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -65,7 +65,7 @@ xf86CurrentAccessRec xf86CurrentAccess = {NULL,NULL}; BusRec primaryBus = { BUS_NONE, {{0}}}; -Bool xf86ResAccessEnter = FALSE; +static Bool xf86ResAccessEnter = FALSE; #ifdef REDUCER /* Resources that temporarily conflict with estimated resources */ @@ -664,32 +664,6 @@ xf86AccessRestoreState(void) * Otherwise resources needed for access control might be shadowed * by other resources! */ -#ifdef async - -static AsyncQPtr *AsyncQ = NULL; -_X_EXPORT ScrnInfoPtr xf86CurrentScreen = NULL; - -#define SETUP_Q org = AsyncQ; \ - AsyncQ = &new; - -#define PROCESS_Q xf86CurrentScreen = pScrn; - if (!new) AsyncQ = org; \ - else { \ - AsyncQPtr tmp_Q; \ - while (1) {\ - new->func(new->arg);\ - if (!(new->next)) {\ - AsyncQ = org; xfree(new); break; \ - } \ - tmp_Q = new->next; \ - xfree(new); \ - new = tmp_Q; \ - } \ - } -#else -#define SETUP_Q -#define PROCESS_Q -#endif _X_EXPORT void xf86EnableAccess(ScrnInfoPtr pScrn) @@ -698,9 +672,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn) register EntityAccessPtr pceAcc; register xf86AccessPtr pAcc; EntityAccessPtr tmp; -#ifdef async - AsyncQPtr *org, new = NULL; -#endif #ifdef DEBUG ErrorF("Enable access %i\n",pScrn->scrnIndex); @@ -709,9 +680,7 @@ xf86EnableAccess(ScrnInfoPtr pScrn) /* Entity is not under access control or currently enabled */ if (!pScrn->access) { if (pScrn->busAccess) { - SETUP_Q; ((BusAccPtr)pScrn->busAccess)->set_f(pScrn->busAccess); - PROCESS_Q; } return; } @@ -722,7 +691,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn) if (peAcc == pceAcc) { return; } - SETUP_Q; if (pScrn->CurrentAccess->pMemAccess == pceAcc) pScrn->CurrentAccess->pMemAccess = NULL; while (pceAcc) { @@ -740,13 +708,11 @@ xf86EnableAccess(ScrnInfoPtr pScrn) peAcc = peAcc->next; } pScrn->CurrentAccess->pIoAccess = (EntityAccessPtr) pScrn->access; - PROCESS_Q; return; case MEM_IO: pceAcc = pScrn->CurrentAccess->pIoAccess; if (peAcc != pceAcc) { /* current Io != pAccess */ - SETUP_Q; tmp = pceAcc; while (pceAcc) { pAcc = pceAcc->pAccess; @@ -769,7 +735,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn) if (pceAcc == peAcc) { /* current Mem == pAccess */ return; } - SETUP_Q; while (pceAcc) { /* current Mem != pAccess */ pAcc = pceAcc->pAccess; if (pAcc && pAcc->AccessDisable) @@ -787,7 +752,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn) } pScrn->CurrentAccess->pMemAccess = pScrn->CurrentAccess->pIoAccess = (EntityAccessPtr) pScrn->access; - PROCESS_Q; return; case MEM: @@ -795,7 +759,6 @@ xf86EnableAccess(ScrnInfoPtr pScrn) if (peAcc == pceAcc) { return; } - SETUP_Q; if (pScrn->CurrentAccess->pIoAccess == pceAcc) pScrn->CurrentAccess->pIoAccess = NULL; while (pceAcc) { @@ -813,14 +776,11 @@ xf86EnableAccess(ScrnInfoPtr pScrn) peAcc = peAcc->next; } pScrn->CurrentAccess->pMemAccess = (EntityAccessPtr) pScrn->access; - PROCESS_Q; return; case NONE: if (pScrn->busAccess) { - SETUP_Q; ((BusAccPtr)pScrn->busAccess)->set_f(pScrn->busAccess); - PROCESS_Q; } return; } @@ -3160,23 +3120,6 @@ notifyStateChange(xf86NotifyState state) } } -#ifdef async -_X_EXPORT Bool -xf86QueueAsyncEvent(void (*func)(pointer),pointer arg) -{ - AsyncQPtr new; - - if (!AsyncQ) return FALSE; - - new = (AsyncQPtr)xfnalloc(sizeof(AsyncQRec)); - new->func = func; - new->arg = arg; - (*AsyncQPtr)->next = new; - AsyncQPtr = &new; - return TRUE; -} -#endif - /* Multihead accel sharing accessor functions and entity Private handling */ _X_EXPORT int diff --git a/hw/xfree86/common/xf86Bus.h b/hw/xfree86/common/xf86Bus.h index 96da6e6a9..b7d16089c 100644 --- a/hw/xfree86/common/xf86Bus.h +++ b/hw/xfree86/common/xf86Bus.h @@ -1,4 +1,3 @@ -/* $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. @@ -75,15 +74,6 @@ typedef struct { IOADDRESS domainIO; } EntityRec, *EntityPtr; -/* asynchronous event handling */ -#ifdef async -typedef struct _AsyncQRec { - void (*func)(pointer); - pointer arg; - struct _AsyncQRec *next; -} AsyncQRec, *AsyncQPtr; -#endif - #define NO_SEPARATE_IO_FROM_MEM 0x0001 #define NO_SEPARATE_MEM_FROM_IO 0x0002 #define NEED_VGA_ROUTED 0x0004 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 36dde3031..4d933aa9d 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Config.c,v 1.32 2006/06/01 19:53:06 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Config.c,v 3.276 2003/10/08 14:58:26 dawes Exp $ */ /* @@ -75,6 +73,7 @@ extern DeviceAssocRec mouse_assoc; #endif #ifdef XKB +#undef XKB_IN_SERVER #define XKB_IN_SERVER #include <X11/extensions/XKBsrv.h> #endif @@ -512,7 +511,6 @@ fixup_video_driver_list(char **drivers) static char ** GenerateDriverlist(char * dirname, char * drivernames) { -#ifdef XFree86LOADER char **ret; const char *subdirs[] = { dirname, NULL }; static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL}; @@ -523,39 +521,6 @@ GenerateDriverlist(char * dirname, char * drivernames) fixup_video_driver_list(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 } @@ -617,6 +582,9 @@ static Bool configFiles(XF86ConfFilesPtr fileconf) { MessageType pathFrom = X_DEFAULT; + int countDirs; + char *temp_path; + char *log_buf; /* FontPath */ @@ -676,13 +644,13 @@ configFiles(XF86ConfFilesPtr fileconf) FatalError("No valid FontPath could be found."); /* make fontpath more readable in the logfiles */ - int countDirs = 1; - char *temp_path = defaultFontPath; + countDirs = 1; + temp_path = defaultFontPath; while((temp_path = index(temp_path, ',')) != NULL) { countDirs++; temp_path++; } - char *log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1); + log_buf = xnfalloc(strlen(defaultFontPath) + (2 * countDirs) + 1); if(!log_buf) /* fallback to old method */ xf86Msg(pathFrom, "FontPath set to \"%s\"\n", defaultFontPath); else { @@ -728,7 +696,6 @@ configFiles(XF86ConfFilesPtr fileconf) } -#ifdef XFree86LOADER /* ModulePath */ if (fileconf) { @@ -739,7 +706,6 @@ configFiles(XF86ConfFilesPtr fileconf) } xf86Msg(xf86ModPathFrom, "ModulePath set to \"%s\"\n", xf86ModulePath); -#endif #if 0 /* LogFile */ diff --git a/hw/xfree86/common/xf86Config.h b/hw/xfree86/common/xf86Config.h index 77b25ed32..0786ec6fe 100644 --- a/hw/xfree86/common/xf86Config.h +++ b/hw/xfree86/common/xf86Config.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86Configure.c b/hw/xfree86/common/xf86Configure.c index 4b9d418b9..f0efa625e 100644 --- a/hw/xfree86/common/xf86Configure.c +++ b/hw/xfree86/common/xf86Configure.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Configure.c,v 3.80 2003/10/08 14:58:27 dawes Exp $ */ /* * Copyright 2000-2002 by Alan Hourihane, Flint Mountain, North Wales. * @@ -37,9 +36,7 @@ #include <X11/X.h> #include <X11/Xmd.h> #include "os.h" -#ifdef XFree86LOADER #include "loaderProcs.h" -#endif #include "xf86.h" #include "xf86Config.h" #include "xf86_OSlib.h" @@ -602,7 +599,6 @@ configureFlagsSection (void) static XF86ConfModulePtr configureModuleSection (void) { -#ifdef XFree86LOADER char **elist, **el; /* Find the list of extension modules. */ const char *esubdirs[] = { @@ -613,10 +609,8 @@ configureModuleSection (void) "fonts", NULL }; -#endif parsePrologue (XF86ConfModulePtr, XF86ConfModuleRec) -#ifdef XFree86LOADER elist = LoaderListDirs(esubdirs, NULL); if (elist) { for (el = elist; *el; el++) { @@ -653,7 +647,6 @@ configureModuleSection (void) } xfree(elist); } -#endif return ptr; } @@ -663,10 +656,8 @@ configureFilesSection (void) { parsePrologue (XF86ConfFilesPtr, XF86ConfFilesRec) -#ifdef XFree86LOADER if (xf86ModulePath) ptr->file_modulepath = strdup(xf86ModulePath); -#endif if (defaultFontPath) ptr->file_fontpath = strdup(defaultFontPath); if (rgbPath) @@ -788,10 +779,8 @@ DoConfigure() 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); diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c index 787c39de8..14e0fcd91 100644 --- a/hw/xfree86/common/xf86Cursor.c +++ b/hw/xfree86/common/xf86Cursor.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c index 88324eb19..55c85e630 100644 --- a/hw/xfree86/common/xf86DGA.c +++ b/hw/xfree86/common/xf86DGA.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DGA.c,v 1.8 2006/02/15 20:44:13 ajax Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DGA.c,v 1.46 2002/12/03 18:17:40 tsi Exp $ */ /* * Copyright (c) 1998-2002 by The XFree86 Project, Inc. * @@ -63,11 +61,7 @@ DGACopyModeInfo( XDGAModePtr xmode ); -#if defined(XFree86LOADER) || !defined(XFreeXDGA) _X_EXPORT int *XDGAEventBase = NULL; -#else -_X_EXPORT int *XDGAEventBase = &DGAEventBase; -#endif #define DGA_GET_SCREEN_PRIV(pScreen) \ ((DGAScreenPtr)((pScreen)->devPrivates[DGAScreenIndex].ptr)) diff --git a/hw/xfree86/common/xf86DPMS.c b/hw/xfree86/common/xf86DPMS.c index 001c3d4bf..3aa83e882 100644 --- a/hw/xfree86/common/xf86DPMS.c +++ b/hw/xfree86/common/xf86DPMS.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86DPMS.c,v 1.11 2003/11/11 21:02:28 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86DPMS.c,v 1.8 2005/07/03 08:53:42 daniels Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/common/xf86Date.h b/hw/xfree86/common/xf86Date.h index 4b65d2c1f..978c4fa15 100644 --- a/hw/xfree86/common/xf86Date.h +++ b/hw/xfree86/common/xf86Date.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.4 2004/08/16 22:48:50 kem Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Date.h,v 1.54 2003/12/19 04:52:10 dawes Exp $ */ /* * Copyright (c) 2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/common/xf86Debug.c b/hw/xfree86/common/xf86Debug.c index 5579cde5b..2eb28876d 100644 --- a/hw/xfree86/common/xf86Debug.c +++ b/hw/xfree86/common/xf86Debug.c @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86DoProbe.c b/hw/xfree86/common/xf86DoProbe.c index b74f37e11..fc0a9f4eb 100644 --- a/hw/xfree86/common/xf86DoProbe.c +++ b/hw/xfree86/common/xf86DoProbe.c @@ -1,4 +1,3 @@ -/* $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. * @@ -40,10 +39,8 @@ #include <X11/X.h> #include <X11/Xmd.h> #include "os.h" -#ifdef XFree86LOADER #include "loaderProcs.h" #include "xf86Config.h" -#endif /* XFree86LOADER */ #include "xf86_OSlib.h" #include "xf86.h" #include "xf86Priv.h" @@ -55,7 +52,6 @@ DoProbe() Bool probeResult; Bool ioEnableFailed = FALSE; -#ifdef XFree86LOADER /* Find the list of video driver modules. */ char **list = xf86DriverlistFromCompile(); char **l; @@ -70,7 +66,6 @@ DoProbe() /* Load all the drivers that were found. */ xf86LoadModules(list, NULL); -#endif /* XFree86LOADER */ /* Disable PCI devices */ xf86AccessInit(); diff --git a/hw/xfree86/common/xf86DoScanPci.c b/hw/xfree86/common/xf86DoScanPci.c index 9f8c15651..746ff70e7 100644 --- a/hw/xfree86/common/xf86DoScanPci.c +++ b/hw/xfree86/common/xf86DoScanPci.c @@ -1,4 +1,3 @@ -/* $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. * @@ -40,9 +39,7 @@ #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" @@ -54,9 +51,7 @@ void DoScanPci(int argc, char **argv, int i) 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 @@ -95,7 +90,6 @@ void DoScanPci(int argc, char **argv, int i) /* * 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 */ @@ -113,10 +107,6 @@ void DoScanPci(int argc, char **argv, int i) PciSetup = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds"); DisplayPCICardInfo = (ScanPciDisplayCardInfoProcPtr)LoaderSymbol("ScanPciDisplayPCICardInfo"); -#else - PciSetup = ScanPciSetupPciIds; - DisplayPCICardInfo = ScanPciDisplayPCICardInfo; -#endif if (!(*PciSetup)()) FatalError("ScanPciSetupPciIds() failed\n"); diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c index 397f75dc1..831c68ad8 100644 --- a/hw/xfree86/common/xf86Events.c +++ b/hw/xfree86/common/xf86Events.c @@ -1255,12 +1255,8 @@ xf86InterceptSigIll(void (*sigillhandler)(void)) xf86SigIllHandler = sigillhandler; } -#ifdef HAVE_EXECINFO_H -#define HAVE_BACKTRACE -#include <execinfo.h> -#endif - #ifdef HAVE_BACKTRACE +#include <execinfo.h> static __inline__ void xorg_backtrace(void) { diff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c index b3b5c1b29..745c06379 100644 --- a/hw/xfree86/common/xf86Globals.c +++ b/hw/xfree86/common/xf86Globals.c @@ -1,4 +1,3 @@ -/* $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. @@ -189,14 +188,12 @@ Bool xf86Initialising = FALSE; 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[] = { diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c index 1e7742761..c7d3fae7a 100644 --- a/hw/xfree86/common/xf86Helper.c +++ b/hw/xfree86/common/xf86Helper.c @@ -1,4 +1,3 @@ -/* $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. @@ -70,7 +69,6 @@ static int xf86ScrnInfoPrivateCount = 0; -#ifdef XFree86LOADER /* Add a pointer to a new DriverRec to xf86DriverList */ _X_EXPORT void @@ -172,7 +170,6 @@ xf86DeleteModuleInfo(int idx) xf86ModuleInfoList[idx] = NULL; } } -#endif /* Allocate a new ScrnInfoRec in xf86Screens */ @@ -199,11 +196,7 @@ xf86AllocateScreen(DriverPtr drv, int flags) 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? @@ -260,10 +253,8 @@ xf86DeleteScreen(int scrnIndex, int flags) xf86OptionListFree(pScrn->options); -#ifdef XFree86LOADER if (pScrn->module) UnloadModule(pScrn->module); -#endif if (pScrn->drv) pScrn->drv->refCount--; @@ -321,11 +312,7 @@ xf86AllocateInput(InputDriverPtr drv, int flags) 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; @@ -352,10 +339,8 @@ xf86DeleteInput(InputInfoPtr pInp, int flags) pInp->free(pInp, 0); #endif -#ifdef XFree86LOADER if (pInp->module) UnloadModule(pInp->module); -#endif if (pInp->drv) pInp->drv->refCount--; @@ -2381,17 +2366,12 @@ xf86GetVersion() _X_EXPORT CARD32 xf86GetModuleVersion(pointer module) { -#ifdef XFree86LOADER return (CARD32)LoaderGetModuleVersion(module); -#else - return 0; -#endif } _X_EXPORT pointer xf86LoadDrvSubModule(DriverPtr drv, const char *name) { -#ifdef XFree86LOADER pointer ret; int errmaj = 0, errmin = 0; @@ -2400,15 +2380,11 @@ xf86LoadDrvSubModule(DriverPtr drv, const char *name) if (!ret) LoaderErrorMsg(NULL, name, errmaj, errmin); return ret; -#else - return (pointer)1; -#endif } _X_EXPORT pointer xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) { -#ifdef XFree86LOADER pointer ret; int errmaj = 0, errmin = 0; @@ -2417,9 +2393,6 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) if (!ret) LoaderErrorMsg(pScrn->name, name, errmaj, errmin); return ret; -#else - return (pointer)1; -#endif } /* @@ -2428,9 +2401,7 @@ xf86LoadSubModule(ScrnInfoPtr pScrn, const char *name) _X_EXPORT pointer xf86LoadOneModule(char *name, pointer opt) { -#ifdef XFree86LOADER int errmaj, errmin; -#endif char *Name; pointer mod; @@ -2452,13 +2423,9 @@ xf86LoadOneModule(char *name, pointer opt) 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; } @@ -2470,7 +2437,7 @@ xf86UnloadSubModule(pointer mod) * This is disabled for now. The loader isn't smart enough yet to undo * relocations. */ -#if defined(XFree86LOADER) && 0 +#if 0 UnloadSubModule(mod); #endif } @@ -2478,59 +2445,28 @@ xf86UnloadSubModule(pointer mod) _X_EXPORT Bool xf86LoaderCheckSymbol(const char *name) { -#ifdef XFree86LOADER return LoaderSymbol(name) != NULL; -#else - return TRUE; -#endif } +/* These two are just ABI stubs, they don't do anything in dlloader world */ _X_EXPORT void xf86LoaderReqSymLists(const char **list0, ...) { -#ifdef XFree86LOADER - va_list ap; - - va_start(ap, list0); - LoaderVReqSymLists(list0, ap); - va_end(ap); -#endif } _X_EXPORT void xf86LoaderReqSymbols(const char *sym0, ...) { -#ifdef XFree86LOADER - va_list ap; - - va_start(ap, sym0); - LoaderVReqSymbols(sym0, ap); - va_end(ap); -#endif } _X_EXPORT void xf86LoaderRefSymLists(const char **list0, ...) { -#ifdef XFree86LOADER - va_list ap; - - va_start(ap, list0); - LoaderVRefSymLists(list0, ap); - va_end(ap); -#endif } _X_EXPORT void xf86LoaderRefSymbols(const char *sym0, ...) { -#ifdef XFree86LOADER - va_list ap; - - va_start(ap, sym0); - LoaderVRefSymbols(sym0, ap); - va_end(ap); -#endif } diff --git a/hw/xfree86/common/xf86InPriv.h b/hw/xfree86/common/xf86InPriv.h index 4a02606d3..58c18904e 100644 --- a/hw/xfree86/common/xf86InPriv.h +++ b/hw/xfree86/common/xf86InPriv.h @@ -1,4 +1,3 @@ -/* $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. @@ -35,11 +34,7 @@ #define _xf86InPriv_h /* xf86Globals.c */ -#ifdef XFree86LOADER extern InputDriverPtr *xf86InputDriverList; -#else -extern InputDriverPtr xf86InputDriverList[]; -#endif extern int xf86NumInputDrivers; /* xf86Xinput.c */ diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 3aed36974..d045c0676 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/hw/xfree86/common/xf86Init.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v 3.212 2004/01/27 01:31:45 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Init.c,v 1.36 2006/06/01 18:47:01 daniels Exp $ */ /* * Loosely based on code bearing the following copyright: @@ -62,9 +60,7 @@ #include "compiler.h" -#ifdef XFree86LOADER #include "loaderProcs.h" -#endif #ifdef XFreeXDGA #include "dgaproc.h" #endif @@ -114,12 +110,10 @@ extern void os2ServerVideoAccess(); void (*xf86OSPMClose)(void) = NULL; #endif -#ifdef XFree86LOADER static char *baseModules[] = { "pcidata", NULL }; -#endif /* Common pixmap formats */ @@ -272,10 +266,8 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) { 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 +325,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) if (!autoconfig) PostConfigInit(); -#ifdef XFree86LOADER /* Initialise the loader */ LoaderInit(); @@ -377,8 +368,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) if (!xf86LoadModules(baseModules, NULL)) FatalError("Unable to load required base modules, Exiting...\n"); -#endif - xf86OpenConsole(); /* Do a general bus probe. This will be a PCI probe for x86 platforms */ @@ -401,7 +390,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) /* Initialise the resource broker */ xf86ResourceBrokerInit(); -#ifdef XFree86LOADER /* Load all modules specified explicitly in the config file */ if ((modulelist = xf86ModulelistFromConfig(&optionlist))) { xf86LoadModules(modulelist, optionlist); @@ -432,7 +420,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) * 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 @@ -672,12 +659,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) 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. @@ -982,12 +967,10 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) #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(); @@ -1167,9 +1150,7 @@ OsVendorInit() signal(SIGCHLD, SIG_DFL); /* Need to wait for child processes */ #endif OsDelayInitColors = TRUE; -#ifdef XFree86LOADER loadableFonts = TRUE; -#endif if (!beenHere) xf86LogInit(); @@ -1461,9 +1442,7 @@ ddxProcessArgument(int argc, char **argv, int i) } if (!strcmp(argv[i],"-ignoreABI")) { -#ifdef XFree86LOADER LoaderSetOptions(LDR_OPT_ABI_MISMATCH_NONFATAL); -#endif return 1; } if (!strcmp(argv[i],"-verbose")) @@ -1870,9 +1849,7 @@ xf86PrintBanner() #endif ErrorF("\tBefore reporting problems, check "__VENDORDWEBSUPPORT__"\n" "\tto make sure that you have the latest version.\n"); -#ifdef XFree86LOADER ErrorF("Module Loader present\n"); -#endif } static void @@ -1919,7 +1896,6 @@ xf86RunVtInit(void) } } -#ifdef XFree86LOADER /* * xf86LoadModules iterates over a list that is being passed in. */ @@ -1962,8 +1938,6 @@ xf86LoadModules(char **list, pointer *optlist) return !failed; } -#endif - /* Pixmap format stuff */ _X_EXPORT PixmapFormatPtr diff --git a/hw/xfree86/common/xf86Io.c b/hw/xfree86/common/xf86Io.c index 4dbbd7e93..86ac74522 100644 --- a/hw/xfree86/common/xf86Io.c +++ b/hw/xfree86/common/xf86Io.c @@ -1,4 +1,3 @@ -/* $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. * @@ -49,7 +48,6 @@ */ /* $XConsortium: xf86Io.c /main/27 1996/10/19 17:58:55 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Io.c,v 1.6 2006/03/25 19:52:03 ajax Exp $ */ #define NEED_EVENTS #ifdef HAVE_XORG_CONFIG_H @@ -470,32 +468,3 @@ searchdone: } 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 */ - diff --git a/hw/xfree86/common/xf86Kbd.c b/hw/xfree86/common/xf86Kbd.c index 85f9e3406..a86581c25 100644 --- a/hw/xfree86/common/xf86Kbd.c +++ b/hw/xfree86/common/xf86Kbd.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86KbdBSD.c b/hw/xfree86/common/xf86KbdBSD.c index c1f6156e3..97a737db1 100644 --- a/hw/xfree86/common/xf86KbdBSD.c +++ b/hw/xfree86/common/xf86KbdBSD.c @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86KbdLnx.c b/hw/xfree86/common/xf86KbdLnx.c index c5361f5d9..74cb42d0f 100644 --- a/hw/xfree86/common/xf86KbdLnx.c +++ b/hw/xfree86/common/xf86KbdLnx.c @@ -1,4 +1,3 @@ -/* $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 diff --git a/hw/xfree86/common/xf86KbdMach.c b/hw/xfree86/common/xf86KbdMach.c index 89c23c24a..82e3c720e 100644 --- a/hw/xfree86/common/xf86KbdMach.c +++ b/hw/xfree86/common/xf86KbdMach.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86KbdMach.c,v 3.7.4.2 1998/06/04 17:35:20 dawes Exp $ */ /* ***************************************************************************** * HISTORY diff --git a/hw/xfree86/common/xf86Keymap.h b/hw/xfree86/common/xf86Keymap.h index f0998ba9b..5299badb3 100644 --- a/hw/xfree86/common/xf86Keymap.h +++ b/hw/xfree86/common/xf86Keymap.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86MiscExt.c b/hw/xfree86/common/xf86MiscExt.c index 80fbf417d..7596fbea7 100644 --- a/hw/xfree86/common/xf86MiscExt.c +++ b/hw/xfree86/common/xf86MiscExt.c @@ -1,4 +1,3 @@ -/* $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. * @@ -459,12 +458,10 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd) 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))) @@ -563,12 +560,8 @@ MiscExtApply(pointer structure, MiscExtStructType mse_or_kbd) 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)) { diff --git a/hw/xfree86/common/xf86Mode.c b/hw/xfree86/common/xf86Mode.c index 36e81559e..b892e3e6a 100644 --- a/hw/xfree86/common/xf86Mode.c +++ b/hw/xfree86/common/xf86Mode.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Mode.c,v 1.10 2006/03/07 16:00:57 libv 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. * diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h index a32569980..f54be49e6 100644 --- a/hw/xfree86/common/xf86Module.h +++ b/hw/xfree86/common/xf86Module.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86Opt.h b/hw/xfree86/common/xf86Opt.h index 718732353..dbb98da03 100644 --- a/hw/xfree86/common/xf86Opt.h +++ b/hw/xfree86/common/xf86Opt.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86Option.c b/hw/xfree86/common/xf86Option.c index d3e38b17d..0a4c11d8d 100644 --- a/hw/xfree86/common/xf86Option.c +++ b/hw/xfree86/common/xf86Option.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86PM.c b/hw/xfree86/common/xf86PM.c index 0262be3df..ac8896879 100644 --- a/hw/xfree86/common/xf86PM.c +++ b/hw/xfree86/common/xf86PM.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86PciInfo.h b/hw/xfree86/common/xf86PciInfo.h index c18d512a9..b8ba73f6a 100644 --- a/hw/xfree86/common/xf86PciInfo.h +++ b/hw/xfree86/common/xf86PciInfo.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86Priv.h b/hw/xfree86/common/xf86Priv.h index 0794de777..e7c0a9f67 100644 --- a/hw/xfree86/common/xf86Priv.h +++ b/hw/xfree86/common/xf86Priv.h @@ -1,4 +1,3 @@ -/* $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. @@ -95,13 +94,9 @@ extern unsigned short xf86MouseCflags[]; 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; diff --git a/hw/xfree86/common/xf86Privstr.h b/hw/xfree86/common/xf86Privstr.h index a35de2065..a01b07fd7 100644 --- a/hw/xfree86/common/xf86Privstr.h +++ b/hw/xfree86/common/xf86Privstr.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c index b06bd7728..288d72193 100644 --- a/hw/xfree86/common/xf86RandR.c +++ b/hw/xfree86/common/xf86RandR.c @@ -1,6 +1,4 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86RandR.c,v 1.25 2005/10/30 17:38:49 twini Exp $ */ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86RandR.c,v 1.7tsi Exp $ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * @@ -156,6 +154,8 @@ xf86RandRSetMode (ScreenPtr pScreen, int oldHeight = pScreen->height; int oldmmWidth = pScreen->mmWidth; int oldmmHeight = pScreen->mmHeight; + int oldVirtualX = scrp->virtualX; + int oldVirtualY = scrp->virtualY; WindowPtr pRoot = WindowTable[pScreen->myNum]; Bool ret = TRUE; @@ -188,10 +188,12 @@ xf86RandRSetMode (ScreenPtr pScreen, } if (!xf86SwitchMode (pScreen, mode)) { - scrp->virtualX = pScreen->width = oldWidth; - scrp->virtualY = pScreen->height = oldHeight; + pScreen->width = oldWidth; + pScreen->height = oldHeight; pScreen->mmWidth = oldmmWidth; pScreen->mmHeight = oldmmHeight; + scrp->virtualX = oldVirtualX; + scrp->virtualY = oldVirtualY; ret = FALSE; } /* @@ -270,8 +272,8 @@ xf86RandRSetConfig (ScreenPtr pScreen, xorgRRRotation RRRotation; RRRotation.RRConfig.rotation = oldRotation; RRRotation.RRConfig.rate = xf86RandRModeRefresh (scrp->currentMode); - RRRotation.RRConfig.width = pScreen->width; - RRRotation.RRConfig.height = pScreen->height; + RRRotation.RRConfig.width = scrp->virtualX; + RRRotation.RRConfig.height = scrp->virtualY; (*scrp->DriverFunc)(scrp, RR_SET_CONFIG, &RRRotation); } diff --git a/hw/xfree86/common/xf86Resources.h b/hw/xfree86/common/xf86Resources.h index ce2c62bb3..97bf817fe 100644 --- a/hw/xfree86/common/xf86Resources.h +++ b/hw/xfree86/common/xf86Resources.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86Version.h b/hw/xfree86/common/xf86Version.h index 45746bc90..f7ac89b1b 100644 --- a/hw/xfree86/common/xf86Version.h +++ b/hw/xfree86/common/xf86Version.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 3.566 2003/12/19 04:52:11 dawes Exp $ */ /* * Copyright (c) 1994-2003 by The XFree86 Project, Inc. @@ -59,4 +57,3 @@ #endif /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf86Version.h,v 1.2 2004/04/23 19:20:02 eich Exp $ */ diff --git a/hw/xfree86/common/xf86Versions.c b/hw/xfree86/common/xf86Versions.c index 881de1372..e984e80c1 100644 --- a/hw/xfree86/common/xf86Versions.c +++ b/hw/xfree86/common/xf86Versions.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 272665ba3..fb9151346 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86XKB.c b/hw/xfree86/common/xf86XKB.c index 68be17c3a..399eb02d9 100644 --- a/hw/xfree86/common/xf86XKB.c +++ b/hw/xfree86/common/xf86XKB.c @@ -51,7 +51,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86XKB.c,v 3.12 2003/08/24 17:36:55 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index a931a5d60..c56475b12 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -1,4 +1,3 @@ -/* $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> * @@ -48,7 +47,6 @@ * authorization from the copyright holder(s) and author(s). */ /* $XConsortium: xf86Xinput.c /main/14 1996/10/27 11:05:25 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86Xinput.c,v 1.8 2006/03/24 20:50:13 fredrik Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h index 9fb30413a..20bf0a9e1 100644 --- a/hw/xfree86/common/xf86Xinput.h +++ b/hw/xfree86/common/xf86Xinput.h @@ -49,7 +49,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $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 diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c index 1ee241d0b..ea6a26dcd 100644 --- a/hw/xfree86/common/xf86cmap.c +++ b/hw/xfree86/common/xf86cmap.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/common/xf86cmap.c,v 1.9 2005/09/05 07:43:51 daniels 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. * diff --git a/hw/xfree86/common/xf86cmap.h b/hw/xfree86/common/xf86cmap.h index 4291b971a..b98bd3bfd 100644 --- a/hw/xfree86/common/xf86cmap.h +++ b/hw/xfree86/common/xf86cmap.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86cvt.c b/hw/xfree86/common/xf86cvt.c new file mode 100644 index 000000000..dfb6e71e4 --- /dev/null +++ b/hw/xfree86/common/xf86cvt.c @@ -0,0 +1,292 @@ +/* + * Copyright 2005-2006 Luc Verhaegen. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/* + * The reason for having this function in a file of its own is + * so that ../utils/cvt/cvt can link to it, and that xf86CVTMode + * code is shared directly. + */ + +#include "xf86.h" + +/* + * Generate a CVT standard mode from HDisplay, VDisplay and VRefresh. + * + * These calculations are stolen from the CVT calculation spreadsheet written + * by Graham Loveridge. He seems to be claiming no copyright and there seems to + * be no license attached to this. He apparently just wants to see his name + * mentioned. + * + * This file can be found at http://www.vesa.org/Public/CVT/CVTd6r1.xls + * + * Comments and structure corresponds to the comments and structure of the xls. + * This should ease importing of future changes to the standard (not very + * likely though). + * + * About margins; i'm sure that they are to be the bit between HDisplay and + * HBlankStart, HBlankEnd and HTotal, VDisplay and VBlankStart, VBlankEnd and + * VTotal, where the overscan colour is shown. FB seems to call _all_ blanking + * outside sync "margin" for some reason. Since we prefer seeing proper + * blanking instead of the overscan colour, and since the Crtc* values will + * probably get altered after us, we will disable margins altogether. With + * these calculations, Margins will plainly expand H/VDisplay, and we don't + * want that. -- libv + * + */ +_X_EXPORT DisplayModePtr +xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, + Bool Interlaced) +{ + DisplayModeRec *Mode = xnfalloc(sizeof(DisplayModeRec)); + + /* 1) top/bottom margin size (% of height) - default: 1.8 */ +#define CVT_MARGIN_PERCENTAGE 1.8 + + /* 2) character cell horizontal granularity (pixels) - default 8 */ +#define CVT_H_GRANULARITY 8 + + /* 4) Minimum vertical porch (lines) - default 3 */ +#define CVT_MIN_V_PORCH 3 + + /* 4) Minimum number of vertical back porch lines - default 6 */ +#define CVT_MIN_V_BPORCH 6 + + /* Pixel Clock step (kHz) */ +#define CVT_CLOCK_STEP 250 + + Bool Margins = FALSE; + float VFieldRate, HPeriod; + int HDisplayRnd, HMargin; + int VDisplayRnd, VMargin, VSync; + float Interlace; /* Please rename this */ + + memset(Mode, 0, sizeof(DisplayModeRec)); + + /* CVT default is 60.0Hz */ + if (!VRefresh) + VRefresh = 60.0; + + /* 1. Required field rate */ + if (Interlaced) + VFieldRate = VRefresh * 2; + else + VFieldRate = VRefresh; + + /* 2. Horizontal pixels */ + HDisplayRnd = HDisplay - (HDisplay % CVT_H_GRANULARITY); + + /* 3. Determine left and right borders */ + if (Margins) { + /* right margin is actually exactly the same as left */ + HMargin = (((float) HDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0); + HMargin -= HMargin % CVT_H_GRANULARITY; + } else + HMargin = 0; + + /* 4. Find total active pixels */ + Mode->HDisplay = HDisplayRnd + 2*HMargin; + + /* 5. Find number of lines per field */ + if (Interlaced) + VDisplayRnd = VDisplay / 2; + else + VDisplayRnd = VDisplay; + + /* 6. Find top and bottom margins */ + /* nope. */ + if (Margins) + /* top and bottom margins are equal again. */ + VMargin = (((float) VDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0); + else + VMargin = 0; + + Mode->VDisplay = VDisplay + 2*VMargin; + + /* 7. Interlace */ + if (Interlaced) + Interlace = 0.5; + else + Interlace = 0.0; + + /* Determine VSync Width from aspect ratio */ + if (!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay)) + VSync = 4; + else if (!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay)) + VSync = 5; + else if (!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay)) + VSync = 6; + else if (!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay)) + VSync = 7; + else if (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)) + VSync = 7; + else /* Custom */ + VSync = 10; + + if (!Reduced) { /* simplified GTF calculation */ + + /* 4) Minimum time of vertical sync + back porch interval (µs) + * default 550.0 */ +#define CVT_MIN_VSYNC_BP 550.0 + + /* 3) Nominal HSync width (% of line period) - default 8 */ +#define CVT_HSYNC_PERCENTAGE 8 + + float HBlankPercentage; + int VSyncAndBackPorch, VBackPorch; + int HBlank; + + /* 8. Estimated Horizontal period */ + HPeriod = ((float) (1000000.0 / VFieldRate - CVT_MIN_VSYNC_BP)) / + (VDisplayRnd + 2 * VMargin + CVT_MIN_V_PORCH + Interlace); + + /* 9. Find number of lines in sync + backporch */ + if (((int)(CVT_MIN_VSYNC_BP / HPeriod) + 1) < (VSync + CVT_MIN_V_PORCH)) + VSyncAndBackPorch = VSync + CVT_MIN_V_PORCH; + else + VSyncAndBackPorch = (int)(CVT_MIN_VSYNC_BP / HPeriod) + 1; + + /* 10. Find number of lines in back porch */ + VBackPorch = VSyncAndBackPorch - VSync; + + /* 11. Find total number of lines in vertical field */ + Mode->VTotal = VDisplayRnd + 2 * VMargin + VSyncAndBackPorch + Interlace + + CVT_MIN_V_PORCH; + + /* 5) Definition of Horizontal blanking time limitation */ + /* Gradient (%/kHz) - default 600 */ +#define CVT_M_FACTOR 600 + + /* Offset (%) - default 40 */ +#define CVT_C_FACTOR 40 + + /* Blanking time scaling factor - default 128 */ +#define CVT_K_FACTOR 128 + + /* Scaling factor weighting - default 20 */ +#define CVT_J_FACTOR 20 + +#define CVT_M_PRIME CVT_M_FACTOR * CVT_K_FACTOR / 256 +#define CVT_C_PRIME (CVT_C_FACTOR - CVT_J_FACTOR) * CVT_K_FACTOR / 256 + \ + CVT_J_FACTOR + + /* 12. Find ideal blanking duty cycle from formula */ + HBlankPercentage = CVT_C_PRIME - CVT_M_PRIME * HPeriod/1000.0; + + /* 13. Blanking time */ + if (HBlankPercentage < 20) + HBlankPercentage = 20; + + HBlank = Mode->HDisplay * HBlankPercentage/(100.0 - HBlankPercentage); + HBlank -= HBlank % (2*CVT_H_GRANULARITY); + + /* 14. Find total number of pixels in a line. */ + Mode->HTotal = Mode->HDisplay + HBlank; + + /* Fill in HSync values */ + Mode->HSyncEnd = Mode->HDisplay + HBlank / 2; + + Mode->HSyncStart = Mode->HSyncEnd - + (Mode->HTotal * CVT_HSYNC_PERCENTAGE) / 100; + Mode->HSyncStart += CVT_H_GRANULARITY - + Mode->HSyncStart % CVT_H_GRANULARITY; + + /* Fill in VSync values */ + Mode->VSyncStart = Mode->VDisplay + CVT_MIN_V_PORCH; + Mode->VSyncEnd = Mode->VSyncStart + VSync; + + } else { /* Reduced blanking */ + /* Minimum vertical blanking interval time (µs) - default 460 */ +#define CVT_RB_MIN_VBLANK 460.0 + + /* Fixed number of clocks for horizontal sync */ +#define CVT_RB_H_SYNC 32.0 + + /* Fixed number of clocks for horizontal blanking */ +#define CVT_RB_H_BLANK 160.0 + + /* Fixed number of lines for vertical front porch - default 3 */ +#define CVT_RB_VFPORCH 3 + + int VBILines; + + /* 8. Estimate Horizontal period. */ + HPeriod = ((float) (1000000.0 / VFieldRate - CVT_RB_MIN_VBLANK)) / + (VDisplayRnd + 2*VMargin); + + /* 9. Find number of lines in vertical blanking */ + VBILines = ((float) CVT_RB_MIN_VBLANK) / HPeriod + 1; + + /* 10. Check if vertical blanking is sufficient */ + if (VBILines < (CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH)) + VBILines = CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH; + + /* 11. Find total number of lines in vertical field */ + Mode->VTotal = VDisplayRnd + 2 * VMargin + Interlace + VBILines; + + /* 12. Find total number of pixels in a line */ + Mode->HTotal = Mode->HDisplay + CVT_RB_H_BLANK; + + /* Fill in HSync values */ + Mode->HSyncEnd = Mode->HDisplay + CVT_RB_H_BLANK / 2; + Mode->HSyncStart = Mode->HSyncEnd - CVT_RB_H_SYNC; + + /* Fill in VSync values */ + Mode->VSyncStart = Mode->VDisplay + CVT_RB_VFPORCH; + Mode->VSyncEnd = Mode->VSyncStart + VSync; + } + + /* 15/13. Find pixel clock frequency (kHz for xf86) */ + Mode->Clock = Mode->HTotal * 1000.0 / HPeriod; + Mode->Clock -= Mode->Clock % CVT_CLOCK_STEP; + + /* 16/14. Find actual Horizontal Frequency (kHz) */ + Mode->HSync = ((float) Mode->Clock) / ((float) Mode->HTotal); + + /* 17/15. Find actual Field rate */ + Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / + ((float) (Mode->HTotal * Mode->VTotal)); + + /* 18/16. Find actual vertical frame frequency */ + /* ignore - just set the mode flag for interlaced */ + if (Interlaced) + Mode->VTotal *= 2; + + { + char Name[256]; + Name[0] = 0; + + snprintf(Name, 256, "%dx%d", HDisplay, VDisplay); + + Mode->name = xnfalloc(strlen(Name) + 1); + memcpy(Mode->name, Name, strlen(Name) + 1); + } + + if (Reduced) + Mode->Flags |= V_PHSYNC | V_NVSYNC; + else + Mode->Flags |= V_NHSYNC | V_PVSYNC; + + if (Interlaced) + Mode->Flags |= V_INTERLACE; + + return Mode; +} diff --git a/hw/xfree86/common/xf86fbBus.c b/hw/xfree86/common/xf86fbBus.c index cf8de47f6..102f6b1b2 100644 --- a/hw/xfree86/common/xf86fbBus.c +++ b/hw/xfree86/common/xf86fbBus.c @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86fbman.c b/hw/xfree86/common/xf86fbman.c index c3eadac1f..8141a8373 100644 --- a/hw/xfree86/common/xf86fbman.c +++ b/hw/xfree86/common/xf86fbman.c @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86fbman.h b/hw/xfree86/common/xf86fbman.h index adb26a1f1..4f2eac5e6 100644 --- a/hw/xfree86/common/xf86fbman.h +++ b/hw/xfree86/common/xf86fbman.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86isaBus.c b/hw/xfree86/common/xf86isaBus.c index 049dcda5f..3abad38ef 100644 --- a/hw/xfree86/common/xf86isaBus.c +++ b/hw/xfree86/common/xf86isaBus.c @@ -1,4 +1,3 @@ -/* $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. * diff --git a/hw/xfree86/common/xf86noBus.c b/hw/xfree86/common/xf86noBus.c index 52e8a194c..0e3e3cc6b 100644 --- a/hw/xfree86/common/xf86noBus.c +++ b/hw/xfree86/common/xf86noBus.c @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c index 4d587a13f..b763042cc 100644 --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1,4 +1,3 @@ -/* $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. * @@ -1690,19 +1689,12 @@ xf86PciProbe(void) /* * Initialise the pcidata entry points. */ -#ifdef XFree86LOADER xf86SetupPciIds = (ScanPciSetupProcPtr)LoaderSymbol("ScanPciSetupPciIds"); xf86ClosePciIds = (ScanPciCloseProcPtr)LoaderSymbol("ScanPciClosePciIds"); xf86FindPciNamesByDevice = (ScanPciFindByDeviceProcPtr)LoaderSymbol("ScanPciFindPciNamesByDevice"); xf86FindPciNamesBySubsys = (ScanPciFindBySubsysProcPtr)LoaderSymbol("ScanPciFindPciNamesBySubsys"); -#else - xf86SetupPciIds = ScanPciSetupPciIds; - xf86ClosePciIds = ScanPciClosePciIds; - xf86FindPciNamesByDevice = ScanPciFindPciNamesByDevice; - xf86FindPciNamesBySubsys = ScanPciFindPciNamesBySubsys; -#endif if (!xf86SetupPciIds()) FatalError("xf86SetupPciIds() failed\n"); diff --git a/hw/xfree86/common/xf86pciBus.h b/hw/xfree86/common/xf86pciBus.h index 75d82fbcf..90d9dd9b9 100644 --- a/hw/xfree86/common/xf86pciBus.h +++ b/hw/xfree86/common/xf86pciBus.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86sbusBus.c b/hw/xfree86/common/xf86sbusBus.c index 4e84729fb..2e06ffac4 100644 --- a/hw/xfree86/common/xf86sbusBus.c +++ b/hw/xfree86/common/xf86sbusBus.c @@ -20,7 +20,6 @@ * 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 $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/common/xf86sbusBus.h b/hw/xfree86/common/xf86sbusBus.h index 81c1b84ac..8576409d4 100644 --- a/hw/xfree86/common/xf86sbusBus.h +++ b/hw/xfree86/common/xf86sbusBus.h @@ -20,7 +20,6 @@ * 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 $ */ #ifndef _XF86_SBUSBUS_H #define _XF86_SBUSBUS_H diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h index 25e3a20bb..0c33afba2 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -1,4 +1,3 @@ -/* $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. @@ -319,7 +318,6 @@ typedef struct _DriverRec { #define HaveDriverFuncs 1 -#ifdef XFree86LOADER /* * The optional module list struct. This allows modules exporting helping * functions to configuration tools, the Xserver, or any other @@ -333,7 +331,6 @@ typedef struct _ModuleInfoRec { 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 diff --git a/hw/xfree86/common/xf86xv.c b/hw/xfree86/common/xf86xv.c index ede2e064e..89cb6bac4 100644 --- a/hw/xfree86/common/xf86xv.c +++ b/hw/xfree86/common/xf86xv.c @@ -28,7 +28,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86xv.c,v 1.37 2003/11/10 18:22:15 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -53,9 +52,7 @@ #include <X11/extensions/Xv.h> #include <X11/extensions/Xvproto.h> #include "xvdix.h" -#ifdef XFree86LOADER #include "xvmodproc.h" -#endif #include "xf86xvpriv.h" @@ -118,16 +115,9 @@ int XF86XvScreenIndex = -1; 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)) diff --git a/hw/xfree86/common/xf86xv.h b/hw/xfree86/common/xf86xv.h index fbe60cb48..e0feb57b8 100644 --- a/hw/xfree86/common/xf86xv.h +++ b/hw/xfree86/common/xf86xv.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c index 40c82c75d..f8ff0bed4 100644 --- a/hw/xfree86/common/xf86xvmc.c +++ b/hw/xfree86/common/xf86xvmc.c @@ -1,4 +1,3 @@ -/* $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. @@ -41,19 +40,13 @@ #include "resource.h" #include "dixstruct.h" -#ifdef XFree86LOADER #include "xvmodproc.h" -#endif #include "xf86xvpriv.h" #include "xf86xvmc.h" typedef int (*XvMCScreenInitProcPtr)(ScreenPtr, int, XvMCAdaptorPtr); -#ifdef XFree86LOADER _X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = NULL; -#else -_X_EXPORT XvMCScreenInitProcPtr XvMCScreenInitProc = XvMCScreenInit; -#endif typedef struct { diff --git a/hw/xfree86/common/xf86xvmc.h b/hw/xfree86/common/xf86xvmc.h index 0b073aac8..bc7a98c6a 100644 --- a/hw/xfree86/common/xf86xvmc.h +++ b/hw/xfree86/common/xf86xvmc.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xf86xvpriv.h b/hw/xfree86/common/xf86xvpriv.h index 0d1efdafb..ced053679 100644 --- a/hw/xfree86/common/xf86xvpriv.h +++ b/hw/xfree86/common/xf86xvpriv.h @@ -1,4 +1,3 @@ -/* $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. diff --git a/hw/xfree86/common/xisb.c b/hw/xfree86/common/xisb.c index 916066005..88506f659 100644 --- a/hw/xfree86/common/xisb.c +++ b/hw/xfree86/common/xisb.c @@ -24,7 +24,6 @@ * 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 $ */ /* X Input Serial Buffer routines for use in any XInput driver that accesses diff --git a/hw/xfree86/common/xorgHelper.c b/hw/xfree86/common/xorgHelper.c index d5e0fc159..7f9dd507a 100644 --- a/hw/xfree86/common/xorgHelper.c +++ b/hw/xfree86/common/xorgHelper.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/common/xorgHelper.c,v 1.3 2005/04/20 12:25:21 daniels Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/common/xorgVersion.h b/hw/xfree86/common/xorgVersion.h index 47005320a..f627e87a5 100644 --- a/hw/xfree86/common/xorgVersion.h +++ b/hw/xfree86/common/xorgVersion.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.3 2004/08/16 02:07:53 kem Exp $ */ /* * Copyright (c) 2004, X.Org Foundation @@ -48,4 +47,3 @@ # define XORG_VERSION_SNAP XORG_GET_SNAP_VERSION(XORG_VERSION_CURRENT) #endif -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xorgVersion.h,v 1.3 2004/08/16 02:07:53 kem Exp $ */ diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am index 0f563869a..7cfff4763 100644 --- a/hw/xfree86/ddc/Makefile.am +++ b/hw/xfree86/ddc/Makefile.am @@ -8,6 +8,6 @@ libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \ 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 diff --git a/hw/xfree86/ddc/ddcProperty.c b/hw/xfree86/ddc/ddcProperty.c index 00e721053..22deca687 100644 --- a/hw/xfree86/ddc/ddcProperty.c +++ b/hw/xfree86/ddc/ddcProperty.c @@ -3,7 +3,6 @@ * * Copyright 1999 by Andrew C Aitchison <A.C.Aitchison@dpmms.cam.ac.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/ddcProperty.c,v 1.9tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ddc/edid.c b/hw/xfree86/ddc/edid.c index 6d3b18c13..3ebafbbba 100644 --- a/hw/xfree86/ddc/edid.c +++ b/hw/xfree86/ddc/edid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.c,v 1.3 2000/11/03 18:46:08 eich Exp $ */ /* edid.c: retrieve EDID record from raw DDC1 data stream: data * is contained in an array of unsigned int each unsigned int diff --git a/hw/xfree86/ddc/edid.h b/hw/xfree86/ddc/edid.h index 9182fbdb0..30499a6da 100644 --- a/hw/xfree86/ddc/edid.h +++ b/hw/xfree86/ddc/edid.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/edid.h,v 1.6 2000/04/17 16:29:55 eich Exp $ */ /* edid.h: defines to parse an EDID block * diff --git a/hw/xfree86/ddc/interpret_edid.c b/hw/xfree86/ddc/interpret_edid.c index 718cbf77a..a16055491 100644 --- a/hw/xfree86/ddc/interpret_edid.c +++ b/hw/xfree86/ddc/interpret_edid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_edid.c,v 1.7 2000/04/17 16:29:55 eich Exp $ */ /* interpret_edid.c: interpret a primary EDID block * diff --git a/hw/xfree86/ddc/interpret_vdif.c b/hw/xfree86/ddc/interpret_vdif.c index c21bac17a..3a17e2f33 100644 --- a/hw/xfree86/ddc/interpret_vdif.c +++ b/hw/xfree86/ddc/interpret_vdif.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/interpret_vdif.c,v 1.5 1999/12/03 19:17:26 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ddc/print_edid.c b/hw/xfree86/ddc/print_edid.c index 609738ad9..30b607d4f 100644 --- a/hw/xfree86/ddc/print_edid.c +++ b/hw/xfree86/ddc/print_edid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_edid.c,v 1.15 2001/05/22 17:01:23 tsi Exp $ */ /* print_edid.c: print out all information retrieved from display device * diff --git a/hw/xfree86/ddc/print_vdif.c b/hw/xfree86/ddc/print_vdif.c index ededa21b2..13cd3abad 100644 --- a/hw/xfree86/ddc/print_vdif.c +++ b/hw/xfree86/ddc/print_vdif.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/print_vdif.c,v 1.4tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ddc/vdif.h b/hw/xfree86/ddc/vdif.h index 5c129aef0..1777b68a7 100644 --- a/hw/xfree86/ddc/vdif.h +++ b/hw/xfree86/ddc/vdif.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/vdif.h,v 1.4tsi Exp $ */ #ifndef _VDIF_H #define _VDIF_H diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c index 8822bacc1..dd64bd56f 100644 --- a/hw/xfree86/ddc/xf86DDC.c +++ b/hw/xfree86/ddc/xf86DDC.c @@ -15,15 +15,6 @@ static const OptionInfoRec *DDCAvailableOptions(void *unused); -const char *i2cSymbols[] = { - "xf86CreateI2CDevRec", - "xf86I2CDevInit", - "xf86I2CWriteRead", - "xf86I2CFindDev", - "xf86DestroyI2CDevRec", - NULL -}; - static MODULESETUPPROTO(ddcSetup); static XF86ModuleVersionInfo ddcVersRec = @@ -58,12 +49,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin) if (!setupDone) { setupDone = TRUE; xf86AddModuleInfo(&DDC, module); - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(i2cSymbols, NULL); - } /* * The return value must be non-NULL on success even though there @@ -121,14 +106,12 @@ static const OptionInfoRec DDCOptions[] = { { -1, NULL, OPTV_NONE, {0}, FALSE }, }; -#ifdef XFree86LOADER /*ARGSUSED*/ static const OptionInfoRec * DDCAvailableOptions(void *unused) { return (DDCOptions); } -#endif /** * Attempts to probe the monitor for EDID information, if NoDDC and NoDDC1 are @@ -350,8 +333,6 @@ DDCRead_DDC2(int scrnIndex, I2CBusPtr pBus, int start, int len) unsigned char *R_Buffer; int i; - xf86LoaderReqSymLists(i2cSymbols, NULL); - if (!(dev = xf86I2CFindDev(pBus, 0x00A0))) { dev = xf86CreateI2CDevRec(); dev->DevName = "ddc2"; diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h index 8c7c67164..fb1083606 100644 --- a/hw/xfree86/ddc/xf86DDC.h +++ b/hw/xfree86/ddc/xf86DDC.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ddc/xf86DDC.h,v 1.10 2000/06/07 22:03:09 tsi Exp $ */ /* xf86DDC.h * diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am index d1b806a7e..65dad8a86 100644 --- a/hw/xfree86/dixmods/Makefile.am +++ b/hw/xfree86/dixmods/Makefile.am @@ -31,7 +31,7 @@ fontsmoduledir = $(moduledir)/fonts fontsmodule_LTLIBRARIES = libfreetype.la \ libtype1.la -AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ @DIX_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/cfb \ @@ -64,6 +64,7 @@ libdbe_la_SOURCES = dbemodule.c libfb_la_LDFLAGS = -avoid-version libfb_la_LIBADD = $(top_builddir)/fb/libfb.la libfb_la_SOURCES = $(top_builddir)/fb/fbcmap.c fbmodule.c +libfb_la_CFLAGS = -DXFree86Server $(AM_CFLAGS) libglx_la_LDFLAGS = -avoid-version if AIGLX @@ -93,8 +94,10 @@ libtype1_la_LDFLAGS = -avoid-version libtype1_la_SOURCES = type1mod.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_LIBADD = $(top_builddir)/dix/libdix.la libxtrap_la_LDFLAGS = -avoid-version libxtrap_la_LIBADD = $(top_builddir)/XTrap/libxtrap.la diff --git a/hw/xfree86/dixmods/extmod/Makefile.am b/hw/xfree86/dixmods/extmod/Makefile.am index 0b1245dd7..229d4e592 100644 --- a/hw/xfree86/dixmods/extmod/Makefile.am +++ b/hw/xfree86/dixmods/extmod/Makefile.am @@ -11,7 +11,7 @@ if XV XV_SRCS = xvmod.c xvmodproc.h endif -AM_CFLAGS = @XORG_CFLAGS@ @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = @XORG_CFLAGS@ INCLUDES = @XORG_INCS@ \ -I$(top_srcdir)/afb \ -I$(top_srcdir)/mfb \ diff --git a/hw/xfree86/dixmods/extmod/dgaproc.h b/hw/xfree86/dixmods/extmod/dgaproc.h index eb9791098..5e424afb2 100644 --- a/hw/xfree86/dixmods/extmod/dgaproc.h +++ b/hw/xfree86/dixmods/extmod/dgaproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/dgaproc.h,v 1.21 2000/06/30 19:06:54 keithp Exp $ */ #ifndef __DGAPROC_H #define __DGAPROC_H diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h index 9a85b48d9..41f060b2a 100644 --- a/hw/xfree86/dixmods/extmod/modinit.h +++ b/hw/xfree86/dixmods/extmod/modinit.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.3 2005/04/20 12:25:13 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/Xext/extmod/modinit.h,v 1.1 2003/07/16 01:38:33 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xfree86/dixmods/extmod/vidmodeproc.h b/hw/xfree86/dixmods/extmod/vidmodeproc.h index 918d1e4df..c5ad03af2 100644 --- a/hw/xfree86/dixmods/extmod/vidmodeproc.h +++ b/hw/xfree86/dixmods/extmod/vidmodeproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/vidmodeproc.h,v 1.4 1999/12/13 01:39:40 robin Exp $ */ /* Prototypes for DGA functions that the DDX must provide */ diff --git a/hw/xfree86/dixmods/extmod/xf86dga.c b/hw/xfree86/dixmods/extmod/xf86dga.c index 9979bfb30..0736167f8 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga.c +++ b/hw/xfree86/dixmods/extmod/xf86dga.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga.c,v 3.21 2000/06/30 19:06:54 keithp Exp $ */ /* diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c index 1f52d7416..fa9530860 100644 --- a/hw/xfree86/dixmods/extmod/xf86dga2.c +++ b/hw/xfree86/dixmods/extmod/xf86dga2.c @@ -3,7 +3,6 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/dixmods/extmod/xf86misc.c b/hw/xfree86/dixmods/extmod/xf86misc.c index 3ce3c4266..3a6f83eca 100644 --- a/hw/xfree86/dixmods/extmod/xf86misc.c +++ b/hw/xfree86/dixmods/extmod/xf86misc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86misc.c,v 3.41 2003/11/17 22:20:27 dawes Exp $ */ /* * Copyright (c) 1995, 1996 The XFree86 Project, Inc diff --git a/hw/xfree86/dixmods/extmod/xf86miscproc.h b/hw/xfree86/dixmods/extmod/xf86miscproc.h index 87a251767..93b193ca7 100644 --- a/hw/xfree86/dixmods/extmod/xf86miscproc.h +++ b/hw/xfree86/dixmods/extmod/xf86miscproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86miscproc.h,v 1.5 2002/11/20 04:04:58 dawes Exp $ */ /* Prototypes for Pointer/Keyboard functions that the DDX must provide */ diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c index bcd08bf90..44ec9f11d 100644 --- a/hw/xfree86/dixmods/extmod/xf86vmode.c +++ b/hw/xfree86/dixmods/extmod/xf86vmode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xf86vmode.c,v 3.58 2003/11/06 18:37:57 tsi Exp $ */ /* @@ -29,8 +28,6 @@ or other dealings in this Software without prior written authorization from Kaleb S. KEITHLEY */ -/* $XdotOrg: xserver/xorg/hw/xfree86/dixmods/extmod/xf86vmode.c,v 1.9 2006/02/10 22:00:24 anholt Exp $ */ -/* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/dixmods/extmod/xvmod.c b/hw/xfree86/dixmods/extmod/xvmod.c index 7899f3a75..7c1450c7a 100644 --- a/hw/xfree86/dixmods/extmod/xvmod.c +++ b/hw/xfree86/dixmods/extmod/xvmod.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dixmods/extmod/xvmodproc.h b/hw/xfree86/dixmods/extmod/xvmodproc.h index b284e3f4e..81356a149 100644 --- a/hw/xfree86/dixmods/extmod/xvmodproc.h +++ b/hw/xfree86/dixmods/extmod/xvmodproc.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/Xext/xvmodproc.h,v 1.2 2001/03/05 04:51:55 mvojkovi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c index ee19454b0..415873ad0 100644 --- a/hw/xfree86/dixmods/xkbKillSrv.c +++ b/hw/xfree86/dixmods/xkbKillSrv.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxKillSrv.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxKillSrv.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c index 0479bcac3..e6d4f0fc0 100644 --- a/hw/xfree86/dixmods/xkbPrivate.c +++ b/hw/xfree86/dixmods/xkbPrivate.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/xkb/ddxPrivate.c,v 1.2 2003/04/03 16:20:22 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> @@ -26,13 +25,13 @@ XkbDDXPrivate(DeviceIntPtr dev,KeyCode key,XkbAction *act) if (xf86act->type == XkbSA_XFree86Private) { memcpy(msgbuf, xf86act->data, XkbAnyActionDataSize); msgbuf[XkbAnyActionDataSize]= '\0'; - if (strcmp(msgbuf, "-vmode")==0) + if (strcasecmp(msgbuf, "-vmode")==0) xf86ProcessActionEvent(ACTION_PREV_MODE, NULL); - else if (strcmp(msgbuf, "+vmode")==0) + else if (strcasecmp(msgbuf, "+vmode")==0) xf86ProcessActionEvent(ACTION_NEXT_MODE, NULL); - else if (strcmp(msgbuf, "ungrab")==0) + else if (strcasecmp(msgbuf, "ungrab")==0) xf86ProcessActionEvent(ACTION_DISABLEGRAB, NULL); - else if (strcmp(msgbuf, "clsgrb")==0) + else if (strcasecmp(msgbuf, "clsgrb")==0) xf86ProcessActionEvent(ACTION_CLOSECLIENT, NULL); else xf86ProcessActionEvent(ACTION_MESSAGE, (void *) msgbuf); diff --git a/hw/xfree86/dixmods/xkbVT.c b/hw/xfree86/dixmods/xkbVT.c index c637d5545..a1cdc7016 100644 --- a/hw/xfree86/dixmods/xkbVT.c +++ b/hw/xfree86/dixmods/xkbVT.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxVT.c,v 1.3 2000/08/17 19:53:46 cpqbld Exp $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. @@ -24,7 +23,6 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/programs/Xserver/xkb/ddxVT.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index 77d485665..3340af0b5 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -602,6 +602,9 @@ the keymap for a mapping to the .B Terminate action and, if found, use XKEYBOARD for processing actions, otherwise the builtin handler will be used. +.TP 7 +.BI "Option \*qAIGLX\*q \*q" boolean \*q +enable or disable AIGLX. AIGLX is enabled by default. .SH MODULE SECTION The .B Module diff --git a/hw/xfree86/doc/sgml/DESIGN.sgml b/hw/xfree86/doc/sgml/DESIGN.sgml index 84e4fad21..5beff653f 100644 --- a/hw/xfree86/doc/sgml/DESIGN.sgml +++ b/hw/xfree86/doc/sgml/DESIGN.sgml @@ -6436,7 +6436,6 @@ static PciChipsets ZZZPciChipsets[] = { driver. This is required for the dynamically loaded version: <p> <code> -#ifdef XFree86LOADER static XF86ModuleVersionInfo zzzVersRec = { "zzz", @@ -6450,7 +6449,6 @@ static XF86ModuleVersionInfo zzzVersRec = MOD_CLASS_VIDEODRV, {0,0,0,0} }; -#endif </code> <p> <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. <code> -#ifdef XFree86LOADER - -static MODULESETUPPROTO(mgaSetup); +static MODULESETUPPROTO(zzzSetup); XF86ModuleData zzzModuleData = { &zzzVersRec, zzzSetup, NULL }; @@ -6540,7 +6536,6 @@ zzzSetup(pointer module, pointer opts, int *errmaj, int *errmin) return NULL; } } -#endif </code> <sect2>GetRec, FreeRec diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am index 6de88e2bb..e711846b2 100644 --- a/hw/xfree86/dri/Makefile.am +++ b/hw/xfree86/dri/Makefile.am @@ -7,9 +7,9 @@ libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_builddir)/GL/include \ -I@MESA_SOURCE@/include \ -DHAVE_XORG_CONFIG_H \ - @SERVER_DEFINES@ \ - @MODULE_DEFINES@ \ - @LOADER_DEFINES@ \ + \ + \ + \ @DRIPROTO_CFLAGS@ \ @LIBDRM_CFLAGS@ \ @GL_CFLAGS@ diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index b58b670a2..7b4d5bda4 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -69,7 +68,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "mi.h" #include "mipointer.h" -#if defined(XFree86LOADER) && !defined(PANORAMIX) +#if !defined(PANORAMIX) extern Bool noPanoramiXExtension; #endif @@ -135,14 +134,9 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) * If Xinerama is on, don't allow DRI to initialise. It won't be usable * anyway. */ -#if defined(PANORAMIX) && !defined(XFree86LOADER) - xineramaInCore = TRUE; -#elif defined(XFree86LOADER) if (xf86LoaderCheckSymbol("noPanoramiXExtension")) xineramaInCore = TRUE; -#endif -#if defined(PANORAMIX) || defined(XFree86LOADER) if (xineramaInCore) { if (!noPanoramiXExtension) { DRIDrvMsg(pScreen->myNum, X_WARNING, @@ -150,7 +144,6 @@ DRIScreenInit(ScreenPtr pScreen, DRIInfoPtr pDRIInfo, int *pDRMFD) return FALSE; } } -#endif drmWasAvailable = drmAvailable(); diff --git a/hw/xfree86/dri/dri.h b/hw/xfree86/dri/dri.h index 312e8a8bb..b49c426eb 100644 --- a/hw/xfree86/dri/dri.h +++ b/hw/xfree86/dri/dri.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/drimodule.c b/hw/xfree86/dri/drimodule.c index 427065d91..331de8287 100644 --- a/hw/xfree86/dri/drimodule.c +++ b/hw/xfree86/dri/drimodule.c @@ -68,32 +68,6 @@ static ExtensionModule XF86DRIExt = NULL }; -static const char *drmSymbols[] = { - "drmAddContextTag", - "drmAddMap", - "drmAuthMagic", - "drmAvailable", - "drmClose", - "drmCreateContext", - "drmCreateDrawable", - "drmDelContextTag", - "drmDestroyContext", - "drmDestroyDrawable", - "drmFreeReservedContextList", - "drmGetContextTag", - "drmGetLock", - "drmGetReservedContextList", - "drmInstallSIGIOHandler", - "drmMap", - "drmOpen", - "drmRemoveSIGIOHandler", - "drmSetBusid", - "drmSetContextFlags", - "drmUnlock", - "drmUnmap", - NULL -}; - _X_EXPORT XF86ModuleData driModuleData = { &VersRec, driSetup, NULL }; static pointer @@ -110,10 +84,7 @@ driSetup(pointer module, pointer opts, int *errmaj, int *errmin) if (!drm) { if (errmaj) *errmaj = LDR_NOSUBENT; - } - else { - LoaderReqSymLists(drmSymbols, NULL); - LoaderRefSymbols("noPanoramiXExtension", NULL); + } else { LoadExtension(&XF86DRIExt, FALSE); } } else { diff --git a/hw/xfree86/dri/dristruct.h b/hw/xfree86/dri/dristruct.h index 6dc86d5c4..340c59a2e 100644 --- a/hw/xfree86/dri/dristruct.h +++ b/hw/xfree86/dri/dristruct.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.12 2002/10/30 12:52:03 alanh Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h index 77c16e0ef..a0d6084f3 100644 --- a/hw/xfree86/dri/sarea.h +++ b/hw/xfree86/dri/sarea.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ /** * \file sarea.h * SAREA definitions. @@ -34,7 +33,6 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/GL/dri/sarea.h,v 1.11 2002/10/30 12:52:03 alanh Exp $ */ #ifndef _SAREA_H_ #define _SAREA_H_ diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 4b0e35459..d14b3d800 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.12 2002/12/14 01:36:08 dawes Exp $ */ /************************************************************************** Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. @@ -81,6 +80,7 @@ static DISPATCH_PROC(ProcXF86DRIDispatch); static DISPATCH_PROC(ProcXF86DRIAuthConnection); static DISPATCH_PROC(SProcXF86DRIQueryVersion); +static DISPATCH_PROC(SProcXF86DRIQueryDirectRenderingCapable); static DISPATCH_PROC(SProcXF86DRIDispatch); static void XF86DRIResetProc(ExtensionEntry* extEntry); @@ -142,6 +142,9 @@ ProcXF86DRIQueryVersion( if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); + swaps(&rep.majorVersion, n); + swaps(&rep.minorVersion, n); + swapl(&rep.patchVersion, n); } WriteToClient(client, sizeof(xXF86DRIQueryVersionReply), (char *)&rep); return (client->noClientException); @@ -154,6 +157,7 @@ ProcXF86DRIQueryDirectRenderingCapable( { xXF86DRIQueryDirectRenderingCapableReply rep; Bool isCapable; + register int n; REQUEST(xXF86DRIQueryDirectRenderingCapableReq); REQUEST_SIZE_MATCH(xXF86DRIQueryDirectRenderingCapableReq); @@ -172,9 +176,14 @@ ProcXF86DRIQueryDirectRenderingCapable( } rep.isCapable = isCapable; - if (!LocalClient(client)) + if (!LocalClient(client) || client->swapped) rep.isCapable = 0; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); + } + WriteToClient(client, sizeof(xXF86DRIQueryDirectRenderingCapableReply), (char *)&rep); return (client->noClientException); @@ -627,22 +636,35 @@ SProcXF86DRIQueryVersion( } static int +SProcXF86DRIQueryDirectRenderingCapable( + register ClientPtr client +) +{ + register int n; + REQUEST(xXF86DRIQueryDirectRenderingCapableReq); + swaps(&stuff->length, n); + swapl(&stuff->screen, n); + return ProcXF86DRIQueryDirectRenderingCapable(client); +} + +static int SProcXF86DRIDispatch ( register ClientPtr client ) { REQUEST(xReq); - /* It is bound to be non-local when there is byte swapping */ - if (!LocalClient(client)) - return DRIErrorBase + XF86DRIClientNotLocal; - - /* only local clients are allowed DRI access */ + /* + * Only local clients are allowed DRI access, but remote clients still need + * these requests to find out cleanly. + */ switch (stuff->data) { case X_XF86DRIQueryVersion: return SProcXF86DRIQueryVersion(client); + case X_XF86DRIQueryDirectRenderingCapable: + return SProcXF86DRIQueryDirectRenderingCapable(client); default: - return BadRequest; + return DRIErrorBase + XF86DRIClientNotLocal; } } diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am index ab62a6b54..d89ee59a8 100644 --- a/hw/xfree86/dummylib/Makefile.am +++ b/hw/xfree86/dummylib/Makefile.am @@ -2,25 +2,16 @@ # libdummy-nonserver.a contains additional routines normally found in the # server for use in building the utilities like scanpci & the config tools -noinst_LIBRARIES = libdummy.a libdummy-nonserver.a +noinst_LIBRARIES = libdummy-nonserver.a INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) if NEED_STRLCAT STRL_SRCS = $(top_srcdir)/os/strlcat.c $(top_srcdir)/os/strlcpy.c endif -libdummy_a_SOURCES = getvalidbios.c getemptypci.c \ - pcitestmulti.c xf86allocscripi.c \ - xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \ - xf86getverb.c \ - xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \ - #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \ - #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \ - #$(srcdir)/../os-support/shared/sigiostubs.c - libdummy_nonserver_a_SOURCES = \ fatalerror.c \ getvalidbios.c \ diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h index ca27e43d1..b70b5d0b4 100644 --- a/hw/xfree86/dummylib/dummylib.h +++ b/hw/xfree86/dummylib/dummylib.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/getvalidbios.c b/hw/xfree86/dummylib/getvalidbios.c index d7c613122..1d061d433 100644 --- a/hw/xfree86/dummylib/getvalidbios.c +++ b/hw/xfree86/dummylib/getvalidbios.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/getvalidbios.c,v 1.1 2000/02/13 03:06:38 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/logvwrite.c b/hw/xfree86/dummylib/logvwrite.c index 516380707..26868e7c8 100644 --- a/hw/xfree86/dummylib/logvwrite.c +++ b/hw/xfree86/dummylib/logvwrite.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/verrorfverb.c,v 1.2 2003/08/25 04:13:05 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xalloc.c b/hw/xfree86/dummylib/xalloc.c index 7131dc5e6..b671d4dde 100644 --- a/hw/xfree86/dummylib/xalloc.c +++ b/hw/xfree86/dummylib/xalloc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xalloc.c,v 1.1 2000/02/13 03:06:39 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86addrestolist.c b/hw/xfree86/dummylib/xf86addrestolist.c index 86b8d5243..32789ecbb 100644 --- a/hw/xfree86/dummylib/xf86addrestolist.c +++ b/hw/xfree86/dummylib/xf86addrestolist.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86addrestolist.c,v 1.2tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c index 13c8c0bc5..b77948d0c 100644 --- a/hw/xfree86/dummylib/xf86drvmsg.c +++ b/hw/xfree86/dummylib/xf86drvmsg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c index 1320117fc..5ecd99e4d 100644 --- a/hw/xfree86/dummylib/xf86drvmsgverb.c +++ b/hw/xfree86/dummylib/xf86drvmsgverb.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c index 41ebbee21..9834c613b 100644 --- a/hw/xfree86/dummylib/xf86errorf.c +++ b/hw/xfree86/dummylib/xf86errorf.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c index 398d0b3c3..94f030719 100644 --- a/hw/xfree86/dummylib/xf86errorfverb.c +++ b/hw/xfree86/dummylib/xf86errorfverb.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c index 08cb5da80..ea5bb3560 100644 --- a/hw/xfree86/dummylib/xf86msg.c +++ b/hw/xfree86/dummylib/xf86msg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c index ffad8c7cb..4467af9d5 100644 --- a/hw/xfree86/dummylib/xf86msgverb.c +++ b/hw/xfree86/dummylib/xf86msgverb.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/dummylib/xf86opt.c b/hw/xfree86/dummylib/xf86opt.c index e46c00b69..1b7bca9c6 100644 --- a/hw/xfree86/dummylib/xf86opt.c +++ b/hw/xfree86/dummylib/xf86opt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86opt.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am index 8e85e1ede..31682c425 100644 --- a/hw/xfree86/exa/Makefile.am +++ b/hw/xfree86/exa/Makefile.am @@ -7,10 +7,22 @@ INCLUDES = \ -I$(srcdir)/../../../exa \ -I$(srcdir)/../../../miext/cw -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) libexa_la_SOURCES = \ examodule.c libexa_la_LIBADD = \ ../../../exa/libexa.la + +include $(top_srcdir)/cpprules.in + +drivermandir = $(DRIVER_MAN_DIR) +driverman_DATA = exa.$(DRIVER_MAN_SUFFIX) +CLEANFILES = $(driverman_DATA) exa.man + +exa.$(DRIVER_MAN_SUFFIX): exa.man + -rm -f exa.$(DRIVER_MAN_SUFFIX) + $(LN_S) exa.man exa.$(DRIVER_MAN_SUFFIX) + +EXTRA_DIST = exa.man.pre diff --git a/hw/xfree86/exa/exa.man.pre b/hw/xfree86/exa/exa.man.pre new file mode 100644 index 000000000..ea41b90e4 --- /dev/null +++ b/hw/xfree86/exa/exa.man.pre @@ -0,0 +1,40 @@ +.\" shorthand for double quote that works everywhere. +.ds q \N'34' +.TH EXA __drivermansuffix__ __vendorversion__ +.SH NAME +exa \- new 2D acceleration architecture for X.Org +.SH DESCRIPTION +.B EXA +provides a simple API for video drivers to implement for 2D acceleration. It +is a module loaded by drivers, and is not intended to be loaded on its own. See +your driver's manual page for how to enable +.B EXA +. +.PP +The +.B EXA +architecture is designed to make accelerating the Render extension simple and +efficient, and results in various performance tradeoffs compared to XAA. Some +options are available for debugging performance issues or driver rendering +problems. They are not intended for general use. +.TP +.BI "Option \*qEXANoComposite\*q \*q" boolean \*q +Disables acceleration of the Composite operation, which is at the heart of +the Render extension. Not related to the Composite extension. Default: No. +.TP +.BI "Option \*qEXANoUploadToScreen\*q \*q" boolean \*q +Disables acceleration of uploading pixmap data to the freamebuffer. Default: No. +.TP +.BI "Option \*qEXANoDownloadFromScreen\*q \*q" boolean \*q +Disables acceleration of downloading of pixmap data from the framebuffer. +.B NOTE: +Not usable with drivers which rely on DownloadFromScreen succeeding. +Default: No. +.TP +.BI "Option \*qMigrationHeuristic\*q \*q" anystr \*q +Chooses an alternate pixmap migration heuristic, for debugging purposes. The +default is intended to be the best performing one for general use, though others +may help with specific use cases. Available options include \*qalways\*q, +\*qgreedy\*q, and \*qsmart\*q. Default: smart. +.SH AUTHORS +Authors include: Keith Packard, Eric Anholt, Zack Rusin, and Michel Dänzer diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am index 9d79fa7f5..10de50e83 100644 --- a/hw/xfree86/fbdevhw/Makefile.am +++ b/hw/xfree86/fbdevhw/Makefile.am @@ -11,7 +11,7 @@ endif INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = fbdevhw.h diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h index cfc3fcdb6..741a4b341 100644 --- a/hw/xfree86/fbdevhw/fbdevhw.h +++ b/hw/xfree86/fbdevhw/fbdevhw.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.h,v 1.11 2001/10/01 13:44:12 eich Exp $ */ #ifndef _FBDEVHW_H_ #define _FBDEVHW_H_ diff --git a/hw/xfree86/fbdevhw/fbdevhwstub.c b/hw/xfree86/fbdevhw/fbdevhwstub.c index 80bccc8db..56ba92901 100644 --- a/hw/xfree86/fbdevhw/fbdevhwstub.c +++ b/hw/xfree86/fbdevhw/fbdevhwstub.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.12 2001/10/28 03:33:55 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/fbdevhw/fbpriv.h b/hw/xfree86/fbdevhw/fbpriv.h index a18b84345..4c08ec15d 100644 --- a/hw/xfree86/fbdevhw/fbpriv.h +++ b/hw/xfree86/fbdevhw/fbpriv.h @@ -2,7 +2,6 @@ * copyed from from linux kernel 2.2.4 * removed internal stuff (#ifdef __KERNEL__) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbpriv.h,v 1.2 2000/01/21 02:30:02 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/getconfig/.gitignore b/hw/xfree86/getconfig/.gitignore deleted file mode 100644 index dc5d5cb4d..000000000 --- a/hw/xfree86/getconfig/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -getconfig.1 -getconfig.1x -getconfig.5 -getconfig.5x diff --git a/hw/xfree86/getconfig/Makefile.am b/hw/xfree86/getconfig/Makefile.am deleted file mode 100644 index acd1d9f17..000000000 --- a/hw/xfree86/getconfig/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, and/or sell copies of the Software, and to permit persons -# to whom the Software is furnished to do so, provided that the above -# copyright notice(s) and this permission notice appear in all copies of -# the Software and that both the above copyright notice(s) and this -# permission notice appear in supporting documentation. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL -# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING -# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# -# Except as contained in this notice, the name of a copyright holder -# shall not be used in advertising or otherwise to promote the sale, use -# or other dealings in this Software without prior written authorization -# of the copyright holder. -# - -dist_bin_SCRIPTS = getconfig getconfig.pl - -getconfigdir = $(libdir)/X11/getconfig -dist_getconfig_DATA = xorg.cfg cfg.sample - -include $(top_srcdir)/cpprules.in - -appmandir = $(APP_MAN_DIR) -appman_PRE = getconfig.man -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -filemandir = $(FILE_MAN_DIR) -fileman_DATA = getconfig.$(FILE_MAN_SUFFIX) - -getconfig.$(FILE_MAN_SUFFIX): cfg.man - -rm -f getconfig.$(FILE_MAN_SUFFIX) - $(LN_S) cfg.man getconfig.$(FILE_MAN_SUFFIX) - -SUFFIXES += .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - -rm -f $@ - $(LN_S) $< $@ - -BUILT_SOURCES = $(appman_PRE) -CLEANFILES = $(appman_PRE) $(appman_DATA) $(fileman_DATA) cfg.man - -EXTRA_DIST = cfg.man.pre getconfig.man.pre diff --git a/hw/xfree86/getconfig/cfg.man.pre b/hw/xfree86/getconfig/cfg.man.pre deleted file mode 100644 index 3996809ad..000000000 --- a/hw/xfree86/getconfig/cfg.man.pre +++ /dev/null @@ -1,137 +0,0 @@ -.TH getconfig __filemansuffix__ __vendorversion__ -.SH NAME -getconfig - meta configuration files for getconfig(1) -.SH SYNOPSIS -.B \(**.cfg -.SH DESCRIPTION -.B getconfig -is a programmatic interface that is used by the -.B __xservername__ -server to get configuration information about video hardware when -operating without an -.B __xconfigfile__ -file. -.PP -This implementation of -.B getconfig -is written in perl. It processes rules from meta-configuration files. -All meta-configuration files have a -.I .cfg -suffix. -.PP -Lines starting with a pound-sign (#) are comments, and are ignored. -Blank lines that consist only of white space are also treated as comments -and ignored. -.PP -The first non-comment line must be a signature string followed by -the file format version number. The signature string is -.PP -.RS 4 -.nf -"Xorg getconfig rules file.\ \ Version: " -.fi -.RE -.PP -The currently defined version is "1.0". Files that do not have the -correct signature string are ignored. -.PP -The remaining non-comment lines define rules. The start of a new rule -is indicated by a line with no leading white space. Subsequent lines -making up a rule must be indented with white space. Logical lines within -a rule may be split over multiple physical lines by using the usual -continuation convention ('\e' at the end of the line). The first logical -line of each rule is a perl expression. It may be any valid perl -expression whose evaluated (with 'eval') result may be used as the -argument to a perl 'if' statement. The second logical line should be -the name of the __xservername__ video driver to use when the rule is true, and -subsequent logical lines of each rule, if present, are additional -configuration output for the video device's -.B __xconfigfile__ -.B Device -section. The driver name and additional lines of configuration information -are written to standard output when the rule is chosen as the successful -rule. -.PP -Pseudo rules consisting of perl expressions may be present in the file -for the purpose of defining custom perl variables or setting the weight -to use for the following rules. Pseudo rules are rules that consist of -a single logical line only, and the are never candidates themselves for the -successful rule. -.PP -Several perl variables are pre-defined, and may be used within rules. -They include: -.PP -.RS 4 -.nf -.BR "$vendor " "PCI vendor ID" -.BR "$device " "PCI device ID" -.BR "$revision " "PCI revision ID" -.BR "$subsys " "PCI subsystem ID" -.BR "$subsysVendor " "PCI subsystem vendor ID" -.BR "$class " "PCI class" -.BR "$XorgVersion " "Xorg version, as a 'v' string" -.BR "$XorgVersionNumeric " "Xorg numeric version" -.BR "$XorgVersionMajor " "Xorg major version" -.BR "$XorgVersionMinor " "Xorg minor version" -.BR "$XorgVersionPatch " "Xorg patch version" -.BR "$XorgVersionSnap " "Xorg snap version" -.BR "$weight " "current rule weight" -.fi -.RE -.PP -The -.B $weight -variable determines the weight of the rules as they are processed. The -weight for subsequent rules may be set with a pseudo rule that sets or -changes the value of -.BR $weight . -The default weight, and the weight used for built-in rules is 500. The -meta-configuration files are processed in an unpredictable order. The -weighting of the rules is used to determine their relative priority -.PP -After processing all of the rules, both built-in and those read from -the meta-configuration files, the -.B getconfig -program chooses as the successful rule the last and highest weighted -rule that evaluates to true. -.SH FILES -.I .cfg -files located in the search path. The search path typically specified -by the -.B __xservername__ -server is: -.PP -.RS 4 -.nf -.I /etc/X11 -.I __projectroot__/etc/X11 -.I <modulepath> -.I __projectroot__/lib/X11/getconfig -.fi -.RE -.PP -where -.I <modulepath> -is the -.B __xservername__ -server's module search path. -.PP -.TP 30 -.I __projectroot__/lib/X11/getconfig/xorg.cfg -Default rules file that gets installed. This file doesn't contain any -rules by default. -.TP 30 -.I __projectroot__/lib/X11/getconfig/cfg.sample -A sample rules file that gives some examples of what types of rules can -appear in rules files. - -.SH "SEE ALSO" -getconfig(1), -__xservername__(__appmansuffix__), -__xconfigfile__(__filemansuffix__). - -.SH AUTHORS -The __xservername__ automatic configuration support and the -.B getconfig -interface was written by David H. Dawes, with the support of X-Oz -Technologies for XFree86. diff --git a/hw/xfree86/getconfig/cfg.sample b/hw/xfree86/getconfig/cfg.sample deleted file mode 100644 index 93c98e4e2..000000000 --- a/hw/xfree86/getconfig/cfg.sample +++ /dev/null @@ -1,110 +0,0 @@ -# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/cfg.sample,v 1.2 2003/09/23 05:12:07 dawes Exp $ - -# Some sample Xorg getconfig rules file. - -# -# The line below is the getconfig rules file signature, and must be the -# first non-blank, non-comment line. -# - -Xorg Project getconfig rules file. Version: 1.0 - -# -# Set the weight for the following rules. This should be set, otherwise -# the previously set weight will get used, and you have no idea of knowing -# what that might be. -# - -$weight = 1000 - -# -# Rules. Rules consist of a condition (in perl code) followed by -# a driver name and optionally some additional strings. The start of a -# rule is indicated by a line with no leading white space. Subsequent -# lines making up a rule must be indented. Logical lines may be split -# over multiple physical lines by using the usual continuation '\'. -# -# Rules that are not followed by a driver name may be used to do other -# things, like setting the weight as above. -# - -# -# Pre-defined variables include: -# -# $vendor PCI vendor ID -# $device PCI device ID -# $revision PCI revision ID -# $subsys PCI subsystem ID -# $subsysVendor PCI subsystem vendor ID -# $class PCI class -# $XorgVersion Xorg version, as a 'v' string. -# -# The Xorg version information is also available as the following: -# -# $XorgVersionNumeric -# $XorgVersionMajor -# $XorgVersionMinor -# $XorgVersionPatch -# $XorgVersionSnap -# - -# Define a fake vendor ID for some sample rules. - -$novendor = 0x10000 -$nodevice = 0x10000 - -$vendor == $novendor - nodriver - Option "xx" - Videoram 1000 - -# A rule with continued lines. - -$vendor == $novendor && \ -$device == $nodevice - nodriver2 - Option \ - "yy" - -# Increase the weight of the following rules if the Xorg version is 4.3 or -# higher. - -$weight++ if ($XorgVersion ge v4.3) - -$vendor == $novendor - nodriver - Option "yy" - -# -# The weight can be changed at any times, and applies to rules that follow -# until changed again. -# - -$weight = 100 - -$vendor == $novendor && $XorgVersion eq v4.3.2.1 - nodriver3 - -$weight = 600 - -# -# The following two examples use some real values. -# - -# Example: make the default depth 24 for Radeon R200 and RV200 cards. - -$vendor == 0x1002 && \ - ($device >= 0x5148 && $device <= 0x514F || \ - $device >= 0x5168 && $device <= 0x516C || \ - $device == 0x4242 || \ - $device >= 0x5157 && device <= 0x5158) - ati - Option "DefaultDepth" "24" - - -# Example: enable DRI for MGA G400 - -$vendor == 0x102b && $device == 0x0525 - mga - Option "dri" - diff --git a/hw/xfree86/getconfig/getconfig b/hw/xfree86/getconfig/getconfig deleted file mode 100644 index a9e2b3ef2..000000000 --- a/hw/xfree86/getconfig/getconfig +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -# $XdotOrg$ - -# -# Copyright 2003 by David H. Dawes. -# Copyright 2003 by X-Oz Technologies. -# All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holder(s) -# and author(s) shall not be used in advertising or otherwise to promote -# the sale, use or other dealings in this Software without prior written -# authorization from the copyright holder(s) and author(s). -# -# Author: David Dawes <dawes@XFree86.Org>. -# - -# A simple wrapper to execute the real getconfig program. So long as perl -# is in $PATH, we don't need to know where it is this way. - -if echo $0 | grep / >/dev/null 2>&1; then - DIR=`dirname $0`/ -fi - -exec perl ${DIR}getconfig.pl "$@" diff --git a/hw/xfree86/getconfig/getconfig.man.pre b/hw/xfree86/getconfig/getconfig.man.pre deleted file mode 100644 index 9faede134..000000000 --- a/hw/xfree86/getconfig/getconfig.man.pre +++ /dev/null @@ -1,98 +0,0 @@ -.TH getconfig 1 __vendorversion__ -.SH NAME -getconfig - get configuration information for the __xservername__ server -.SH SYNOPSIS -.B getconfig -.RI [ option -.IR ... ] -.SH DESCRIPTION -.B getconfig -is a programmatic interface that is used by the -.B __xservername__ -server to get configuration information about video hardware when -operating without an -.B __xconfigfile__ -file. -.PP -This implementation of -.B getconfig -is written in perl. It processes a prioritized and ordered list of -rules supplied internally and from meta-configuration files. The rules -are in the form of perl expressions. -.B getconfig -writes to standard output the __xconfigfile__-style configuration data -specified by the last highest priority rule that evaluates to true. -Information about the format of the meta-configuration files can be -found in the getconfig(__filemansuffix__) manual page. -.SH OPTIONS -.TP 8 -.BI \-I " search-path" -Specify the search path to use for meta-config files. -.I search-path -is a comma-separated list of directories to search. Each directory in -the search path is searched for files with a -.I .cfg -suffix. Each such file is opened and checked for a valid signature -string. Rules are read from files with a valid signature string and -appended to the list of rules to evaluate. If no search path is specified, -only the internally supplied configuration rules will be used. -.TP 8 -.B \-D -Enable debugging output. -.TP 8 -.B \-V -Print out the version information and exit. -.TP 8 -.BI \-X -.BI __xservername__-version -Specify the __xservername__ version in numeric (integer) form. -.TP 8 -.BI \-b " subsys-id" -Specify the PCI subsystem ID of the video device. -.TP 8 -.BI \-c " class" -Specify the PCI class of the video device. -.TP 8 -.BI \-d " device-id" -Specify the PCI devide ID of the video device. -.TP 8 -.BI \-r " revision" -Specify the PCI revision of the video device. -.TP 8 -.BI \-s " subsysvendor-id" -Specify the PCI subsystem vendor ID of the video device. -.TP 8 -.BI \-v " vendor-id" -Specify the PCI vendor ID of the video device. -.SH FILES -.I .cfg -files located in the search path. The search path typically specified -by the -.B __xservername__ -server is: -.PP -.RS 4 -.nf -.I /etc/X11 -.I __projectroot__/etc/X11 -.I <modulepath> -.I __projectroot__/lib/X11/getconfig -.fi -.RE -.PP -where -.I <modulepath> -is the -.B __xservername__ -server's module search path. - -.SH "SEE ALSO" -getconfig(__filemansuffix__), -__xservername__(__appmansuffix__), -__xconfigfile__(__filemansuffix__). - -.SH AUTHORS -The __xservername__ automatic configuration support and the -.B getconfig -interface was written by David H. Dawes, with the support of X-Oz -Technologies for XFree86. diff --git a/hw/xfree86/getconfig/getconfig.pl b/hw/xfree86/getconfig/getconfig.pl deleted file mode 100644 index a540c686b..000000000 --- a/hw/xfree86/getconfig/getconfig.pl +++ /dev/null @@ -1,433 +0,0 @@ -#!/usr/bin/perl - -# $DHD: xc/programs/Xserver/hw/xfree86/getconfig/getconfig.pl,v 1.13 2003/09/23 05:12:07 dawes Exp $ -# $XdotOrg: $ - -# -# Copyright 2003 by David H. Dawes. -# Copyright 2003 by X-Oz Technologies. -# All rights reserved. -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holder(s) -# and author(s) shall not be used in advertising or otherwise to promote -# the sale, use or other dealings in this Software without prior written -# authorization from the copyright holder(s) and author(s). -# -# Author: David Dawes <dawes@XFree86.Org>. -# - - -# -# This script takes PCI id information, compares it against an ordered list -# of rules, and prints out the configuration information specified by the -# last matching rule. -# -# This script is called by xf86AutoConfig(). -# - -# Command line processing. - -$GetconfigVersion = v1.0; - -$debug = 0; - -$myname = $0; -$myname =~ s/.*\///; - -$signature = "Xorg Foundation getconfig rules file. Version: "; - -while (@ARGV[0] =~ /^-[A-Za-z]$/) { - $f = shift; - SWITCH: { - if ($f eq "-D") { - $debug = 1; - last SWITCH; - } - if ($f eq "-I") { - push(@searchPaths, split(/,/, shift)); - last SWITCH; - } - if ($f eq "-V") { - printf STDERR "$myname: Version %vd.\n", $GetconfigVersion; - exit 0; - } - if ($f eq "-X") { - $XorgVersionNumeric = shift; - if (!defined($XorgVersionNumeric)) { - print STDERR "$myname: -X requires the Xorg version.\n"; - exit 1; - } - } - if ($f eq "-b") { - $subsys = oct(shift); - if (!defined($subsys)) { - print STDERR "$myname: -b requires the subsys id.\n"; - exit 1; - } - last SWITCH; - } - if ($f eq "-c") { - $class = oct(shift); - if (!defined($class)) { - print STDERR "$myname: -c requires the class value.\n"; - exit 1; - } - last SWITCH; - } - if ($f eq "-d") { - $device = oct(shift); - if (!defined($device)) { - print STDERR "$myname: -d requires the device id.\n"; - exit 1; - } - last SWITCH; - } - if ($f eq "-r") { - $revision = oct(shift); - if (!defined($revision)) { - print STDERR "$myname: -r requires the device revision.\n"; - exit 1; - } - last SWITCH; - } - if ($f eq "-s") { - $subsysVendor = oct(shift); - if (!defined($subsysVendor)) { - print STDERR "$myname: -s requires the subsysVendor id.\n"; - exit 1; - } - last SWITCH; - } - if ($f eq "-v") { - $vendor = oct(shift); - if (!defined($vendor)) { - print STDERR "$myname: -v requires the vendor id.\n"; - exit 1; - } - last SWITCH; - } - } -} - -printf STDERR "$myname: Version %vd.\n", $GetconfigVersion; - -if (defined($XorgVersionNumeric)) { - $XorgVersionMajor = $XorgVersionNumeric / 10000000; - $XorgVersionMinor = ($XorgVersionNumeric % 10000000) / 100000; - $XorgVersionPatch = ($XorgVersionNumeric % 100000) / 1000; - $XorgVersionSnapshot = $XorgVersionNumeric % 1000; - $XorgVersion = chr($XorgVersionMajor) . chr($XorgVersionMinor) . - chr($XorgVersionPatch) . chr($XorgVersionSnapshot); -} - -if ($debug) { - printf STDERR "$myname: Xorg Version: %d, %d.%d.%d.%d, %vd.\n", - $XorgVersionNumeric, $XorgVersionMajor, $XorgVersionMinor, - $XorgVersionPatch, $XorgVersionSnapshot, $XorgVersion; -} else { - printf STDERR "$myname: Xorg Version: %vd.\n", $XorgVersion; -} - - -# The rules here are just basic vendor ID to driver mappings. -# Ideally this is all that would be required. More complicated configuration -# rules will be provided in external files. - -# XXX This set of basic rules isn't complete yet. - -@rules = ( - -# Set the weight for the built-in rules. -['$weight = 500'], - -# APM -['$vendor == 0x1142', - 'apm'], - -# ARK -['$vendor == 0xedd8', - 'apm'], - -# AST -['$vendor == 0x1a03', - 'ast'], - -# ATI -['$vendor == 0x1002', - 'ati'], - -# Chips & Technologies -['$vendor == 0x102c', - 'chips'], - -# Cirrus -['$vendor == 0x1013', - 'cirrus'], - -# Intel -['$vendor == 0x8086', - 'i810'], -['$vendor == 0x8086 && ($chipType == 0x00d1 || $chipType == 0x7800)', - 'i740'], - -# Matrox -['$vendor == 0x102b', - 'mga'], - -# Neomagic -['$vendor == 0x10c8', - 'neomagic'], - -# Number Nine -['$vendor == 0x105d', - 'i128'], - -# NVIDIA -['$vendor == 0x10de || $vendor == 0x12d2', - 'nv'], - -# S3 -['$vendor == 0x5333 && ($device == 0x88d0 ||' . - '$device == 0x88d1 ||' . - '$device == 0x88f0 ||' . - '$device == 0x8811 ||' . - '$device == 0x8812 ||' . - '$device == 0x8814 ||' . - '$device == 0x8901)', - 's3'], - -# S3 virge -['$vendor == 0x5333 && ($device == 0x5631 ||' . - '$device == 0x883d ||' . - '$device == 0x8a01 ||' . - '$device == 0x8a10 ||' . - '$device == 0x8c01 ||' . - '$device == 0x8c03 ||' . - '$device == 0x8904 ||' . - '$device == 0x8a13)', - 's3virge'], - -# S3 Savage -['$vendor == 0x5333 && ($device >= 0x8a20 && $device <= 0x8a22 ||' . - '$device == 0x9102 ||' . - '$device >= 0x8c10 && $device <= 0x8c13 ||' . - '$device == 0x8a25 ||' . - '$device == 0x8a26 ||' . - '$device >= 0x8d01 && $device <= 0x8d04 ||' . - '$device >= 0x8c2a && $device <= 0x8c2f ||' . - '$device == 0x8c22 ||' . - '$device == 0x8c24 ||' . - '$device == 0x8c26)', - 'savage'], - -# SIS -['$vendor == 0x1039', - 'sis'], - -# SMI -['$vendor == 0x126f', - 'siliconmotion'], - -# 3Dfx -['$vendor == 0x121a', - 'tdfx'], - -# 3Dlabs -['$vendor == 0x3d3d', - 'glint'], - -# Trident -['$vendor == 0x1023', - 'trident'], - -# Tseng Labs -['$vendor == 0x100c', - 'tseng'], - -# VIA -['$vendor == 0x1106', - 'via'], - -# VMware -['$vendor == 0x15ad', - 'vmware'], - -); - -# Reverse the search path list, since the later rules have higher priority -# than earlier ones (weighting being equal). - -@searchPaths = reverse(@searchPaths); - -if ($debug) { - $i = 0; - for $path (@searchPaths) { - print STDERR "$myname: Search path $i is: \"$path\".\n"; - $i++; - } -} - -print STDERR "$myname: ", $#rules + 1, " built-in rule", plural($#rules + 1), - ".\n"; - -for $path (@searchPaths) { - while (<$path/*.cfg>) { - @tmp = readRulesFile($_); - if (defined(@tmp[0])) { - push @rules, @tmp; - } - } -} - -if ($debug) { - $i = 0; - for $r (@rules) { - print STDERR "$myname: rule $i is: \'@$r\'.\n"; - $i++ - } -} - -$i = 0; -$e = 0; -$weight = 0; -$w = 0; -for $r (@rules) { - ($cond, $d, @o) = @$r; - $result = eval $cond; - if ($@) { - print STDERR "$myname: Error evaluating rule $i \'$cond\': $@"; - $e++; - } - if ($debug) { - print STDERR "$myname: rule $i \'$cond\' evaluates to \'$result\'.\n"; - } - if ($result && defined($d) && $weight >= $w) { - $driver = $d; - @opts = @o; - $w = $weight; - } - $i++; -} - -print STDERR "$myname: Evaluated $i rule", plural($i), - " with $e error", plural($e), ".\n"; - -print STDERR "$myname: Weight of result is $w.\n"; - -if ($debug) { - if (defined($driver)) { - print STDERR "$myname: Driver is \'$driver\'.\n"; - } else { - print STDERR "$myname: No driver.\n"; - } - if (defined(@opts)) { - print STDERR "$myname: options are:\n"; - for $opt (@opts) { - print STDERR "\t$opt\n"; - } - } else { - print STDERR "$myname: No options.\n"; - } -} - -print "$driver\n"; -for $opt (@opts) { - print "$opt\n"; -} - -exit 0; - -# Subroutines. - -sub readRulesFile { - my ($file) = @_; - my $signatureOK = 0; - my @r, @tmp; - my $line, $cont, $prevcont, $fileversion; - - undef @tmp; - undef @r; - - if (open(RF, "<$file")) { - $prevcont = 0; - while (<RF>) { - chop; - $line = $_; - next if ($line =~ /^#/); - next if ($line =~ /^\s*$/); - if (!$signatureOK) { - if ($line =~ /^$signature(.*)$/) { - $fileversion = $1; - $signatureOK = 1; - print STDERR - "$myname: rules file \'$file\' has version $fileversion.\n"; - next; - } - } - if (!$signatureOK) { - print STDERR "$myname: file \'$file\' has bad signature.\n"; - close(RF); - last; - } - $cont = 0; - if ($line =~ s/\\\s*$//) { - $cont = 1; - } - if (!$prevcont && $line =~ /^\S+/) { - if (defined(@tmp[0])) { - push(@r,[@tmp]); - } - undef @tmp; - } - if ($prevcont) { - push(@tmp, pop(@tmp) . $line); - } else { - push(@tmp, $line); - } - $prevcont = $cont; - } - if (defined(@tmp[0])) { - push(@r,[@tmp]); - } - if (!defined(@r[0])) { - print STDERR "$myname: no rules in file \'$file\'.\n"; - } else { - print STDERR "$myname: ", $#r + 1, - " rule", plural($#r + 1), - " added from file \'$file\'.\n"; - } - } else { - print STDERR "$myname: cannot open file \'$file\'.\n"; - } - - return @r; -} - -sub plural { - my ($count) = @_; - - if ($count != 1) { - return "s"; - } else { - return ""; - } -} - diff --git a/hw/xfree86/getconfig/xorg.cfg b/hw/xfree86/getconfig/xorg.cfg deleted file mode 100644 index a591bf32f..000000000 --- a/hw/xfree86/getconfig/xorg.cfg +++ /dev/null @@ -1,50 +0,0 @@ -# $XdotOrg: xc/programs/Xserver/hw/xfree86/getconfig/xorg.cfg,v 1.2 2004/04/23 19:54:01 eich Exp $ - -# Base Xorg getconfig rules file. - -# -# The line below is the getconfig rules file signature, and must be the -# first non-blank, non-comment line. -# - -Xorg Foundation getconfig rules file. Version: 1.0 - -# -# Set the weight for the following rules. This should be set, otherwise -# the previously set weight will get used, and you have no idea of knowing -# what that might be. -# - -$weight = 1000 - -# -# Rules. Rules consist of a condition (in perl code) followed by -# a driver name and optionally some additional strings. The start of a -# rule is indicated by a line with no leading white space. subsequent -# lines making up a rule must be indented. Logical lines may be split -# over multiple physical lines by using the usual continuation '\'. -# -# Rules that are not followed by a driver name may be used to do other -# things, like setting the weight as above. -# - -# -# Pre-defined variables include: -# -# $vendor PCI vendor ID -# $device PCI device ID -# $revision PCI revision ID -# $subsys PCI subsystem ID -# $subsysVendor PCI subsystem vendor ID -# $class PCI class -# $XorgVersion Xorg version, as a 'v' string. -# -# The Xorg version information is also available as the following: -# -# $XorgVersionNumeric -# $XorgVersionMajor -# $XorgVersionMinor -# $XorgVersionPatch -# $XorgVersionSnap -# - diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am index 6e36f0cc8..cbf4f6571 100644 --- a/hw/xfree86/i2c/Makefile.am +++ b/hw/xfree86/i2c/Makefile.am @@ -15,7 +15,7 @@ libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c 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 diff --git a/hw/xfree86/i2c/bt829.h b/hw/xfree86/i2c/bt829.h index 2c7c00d34..bca9d37de 100644 --- a/hw/xfree86/i2c/bt829.h +++ b/hw/xfree86/i2c/bt829.h @@ -82,8 +82,6 @@ int bt829_SetCC(BT829Ptr bt); "bt829_SetOUT_EN", \ "bt829_SetP_IO" -#ifdef XFree86LOADER - #define xf86_bt829_Detect ((BT829Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("bt829_Detect")) #define xf86_bt829_ATIInit ((int (*)(BT829Ptr))LoaderSymbol("bt829_ATIInit")) #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_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 diff --git a/hw/xfree86/i2c/fi1236.c b/hw/xfree86/i2c/fi1236.c index 742645bba..110563ed9 100644 --- a/hw/xfree86/i2c/fi1236.c +++ b/hw/xfree86/i2c/fi1236.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/i2c/fi1236.c,v 1.9 2006/02/10 22:00:25 anholt Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/i2c/fi1236.h b/hw/xfree86/i2c/fi1236.h index 7c1d07024..eda1c781c 100644 --- a/hw/xfree86/i2c/fi1236.h +++ b/hw/xfree86/i2c/fi1236.h @@ -100,8 +100,6 @@ void fi1236_dump_status(FI1236Ptr f); "FI1236_set_tuner_type", \ "TUNER_set_frequency" -#ifdef XFree86LOADER - #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_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_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 diff --git a/hw/xfree86/i2c/i2c_def.h b/hw/xfree86/i2c/i2c_def.h index 84b9c5d91..6e119e478 100644 --- a/hw/xfree86/i2c/i2c_def.h +++ b/hw/xfree86/i2c/i2c_def.h @@ -3,8 +3,6 @@ /* the following are a workaround for possible loader bug.. WATCH function types ! */ -#if XFree86LOADER - #define CreateI2CBusRec ((pointer (*)(void))LoaderSymbol("xf86CreateI2CBusRec")) #define DestroyI2CBusRec ((pointer (*)(I2CBusPtr, Bool, Bool))LoaderSymbol("xf86DestroyI2CBusRec")) #define I2CBusInit ((Bool (*)(pointer))LoaderSymbol("xf86I2CBusInit")) @@ -13,17 +11,4 @@ #define I2CDevInit ((Bool (*)(I2CDevPtr))LoaderSymbol("xf86I2CDevInit")) #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 diff --git a/hw/xfree86/i2c/msp3430.h b/hw/xfree86/i2c/msp3430.h index 8726bacf5..1cb9b869d 100644 --- a/hw/xfree86/i2c/msp3430.h +++ b/hw/xfree86/i2c/msp3430.h @@ -105,22 +105,10 @@ void MSP3430SetSAP (MSP3430Ptr m, int mode); "MSP3430SetVolume", \ "MSP3430SetSAP" -#ifdef XFree86LOADER - #define xf86_DetectMSP3430 ((MSP3430Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("DetectMSP3430")) #define xf86_ResetMSP3430 ((void (*)(MSP3430Ptr))LoaderSymbol("ResetMSP3430")) #define xf86_MSP3430SetVolume ((void (*)(MSP3430Ptr, CARD8))LoaderSymbol("MSP3430SetVolume")) #define xf86_MSP3430SetSAP ((void (*)(MSP3430Ptr, int))LoaderSymbol("MSP3430SetSAP")) #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 diff --git a/hw/xfree86/i2c/tda8425.h b/hw/xfree86/i2c/tda8425.h index ec1908ba9..4abb4175f 100644 --- a/hw/xfree86/i2c/tda8425.h +++ b/hw/xfree86/i2c/tda8425.h @@ -34,20 +34,9 @@ void tda8425_mute(TDA8425Ptr t, Bool mute); "tda8425_setaudio", \ "tda8425_mute" -#ifdef XFree86LOADER - #define xf86_Detect_tda8425 ((TDA8425Ptr (*)(I2CBusPtr, I2CSlaveAddr,Bool))LoaderSymbol("Detect_tda8425")) #define xf86_tda8425_init ((Bool (*)(TDA8425Ptr))LoaderSymbol("tda8425_init")) #define xf86_tda8425_setaudio ((void (*)(TDA8425Ptr))LoaderSymbol("tda8425_setaudio")) #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 diff --git a/hw/xfree86/i2c/tda9850.h b/hw/xfree86/i2c/tda9850.h index 2c8ddcc6e..d5dec36fe 100644 --- a/hw/xfree86/i2c/tda9850.h +++ b/hw/xfree86/i2c/tda9850.h @@ -29,8 +29,6 @@ CARD16 tda9850_getstatus(TDA9850Ptr t); "tda9850_mute", \ "tda9850_sap_mute" -#ifdef XFree86LOADER - #define xf86_Detect_tda9850 ((TDA9850Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9850")) #define xf86_tda9850_init ((Bool (*)(TDA9850Ptr))LoaderSymbol("tda9850_init")) #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_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 diff --git a/hw/xfree86/i2c/tda9885.h b/hw/xfree86/i2c/tda9885.h index a63b34764..46ae9fc0d 100644 --- a/hw/xfree86/i2c/tda9885.h +++ b/hw/xfree86/i2c/tda9885.h @@ -51,22 +51,10 @@ void tda9885_dumpstatus(TDA9885Ptr t); "tda9885_setaudio", \ "tda9885_mute" -#ifdef XFree86LOADER - #define xf86_Detect_tda9885 ((TDA9885Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_tda9885")) #define xf86_tda9885_init ((Bool (*)(TDA9885Ptr))LoaderSymbol("tda9885_init")) #define xf86_tda9885_setparameters ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_setparameters")) #define xf86_tda9885_getstatus ((void (*)(TDA9885Ptr))LoaderSymbol("tda9885_getstatus")) #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 diff --git a/hw/xfree86/i2c/uda1380.h b/hw/xfree86/i2c/uda1380.h index acf96c556..95ad92b92 100644 --- a/hw/xfree86/i2c/uda1380.h +++ b/hw/xfree86/i2c/uda1380.h @@ -66,8 +66,6 @@ void uda1380_dumpstatus(UDA1380Ptr t); "uda1380_getstatus", \ "uda1380_dumpstatus" -#ifdef XFree86LOADER - #define xf86_Detect_uda1380 ((UDA1380Ptr (*)(I2CBusPtr, I2CSlaveAddr))LoaderSymbol("Detect_uda1380")) #define xf86_uda1380_init ((Bool (*)(UDA1380Ptr))LoaderSymbol("uda1380_init")) #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_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 diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c index 9049fe4fd..53382a859 100644 --- a/hw/xfree86/i2c/xf86i2c.c +++ b/hw/xfree86/i2c/xf86i2c.c @@ -6,7 +6,6 @@ * (c) 1998 Gerd Knorr <kraxel@cs.tu-berlin.de> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.c,v 1.14 2003/05/05 21:18:41 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/i2c/xf86i2c.h b/hw/xfree86/i2c/xf86i2c.h index 81765e4a9..76d2ebf92 100644 --- a/hw/xfree86/i2c/xf86i2c.h +++ b/hw/xfree86/i2c/xf86i2c.h @@ -2,7 +2,6 @@ * Copyright (C) 1998 Itai Nahshon, Michael Schimek */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/i2c/xf86i2c.h,v 1.10 2003/07/16 01:38:47 dawes Exp $ */ #ifndef _XF86I2C_H #define _XF86I2C_H diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am index f606f5e12..c059070ec 100644 --- a/hw/xfree86/int10/Makefile.am +++ b/hw/xfree86/int10/Makefile.am @@ -2,19 +2,22 @@ module_LTLIBRARIES = libint10.la sdk_HEADERS = xf86int10.h -EXTRA_CFLAGS = @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +EXTRA_CFLAGS = libint10_la_LDFLAGS = -avoid-version -if INT10_VM86 -AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) -INCLUDES = $(XORG_INCS) -libint10_la_SOURCES = \ +COMMON_SOURCES = \ helper_exec.c \ helper_mem.c \ pci.c \ xf86int10.c \ - xf86int10module.c \ + xf86int10module.c + +if INT10_VM86 +AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS) $(EXTRA_CFLAGS) +INCLUDES = $(XORG_INCS) +libint10_la_SOURCES = \ + $(COMMON_SOURCES) \ $(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \ $(srcdir)/../os-support/linux/int10/linux.c endif @@ -22,8 +25,11 @@ endif if INT10_X86EMU AM_CFLAGS = -D_X86EMU -DNO_SYS_HEADERS -D_PC $(XORG_CFLAGS) $(EXTRA_CFLAGS) INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu -libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \ - xf86int10.c xf86x86emu.c generic.c x86emu.c +libint10_la_SOURCES = \ + $(COMMON_SOURCES) \ + xf86x86emu.c \ + generic.c \ + x86emu.c endif if INT10_STUB diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c index 69596d48e..46a1179de 100644 --- a/hw/xfree86/int10/generic.c +++ b/hw/xfree86/int10/generic.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/generic.c,v 1.28 2003/09/08 14:25:30 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment @@ -63,12 +62,6 @@ static void UnmapVRam(xf86Int10InfoPtr pInt); static void *sysMem = NULL; xf86Int10InfoPtr -xf86InitInt10(int entityIndex) -{ - return xf86ExtendedInitInt10(entityIndex, 0); -} - -xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, int Flags) { xf86Int10InfoPtr pInt; @@ -142,59 +135,12 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) { - - if (bios.bus == BUS_ISA && bios.location.legacy) { - 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; - } - } 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; - } - } - } + if (! xf86int10GetBiosSegment(pInt, &bios, + (unsigned char *)sysMem - V_BIOS)) { + goto error1; } - - xf86DrvMsg(screen, X_INFO, "Primary V_BIOS segment is: 0x%lx\n", - (unsigned long)cs); set_return_trap(pInt); - pInt->BIOSseg = cs; pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH); if (! (pInt->Flags & SET_BIOS_SCRATCH)) @@ -202,54 +148,33 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) xf86Int10SaveRestoreBIOSVars(pInt, TRUE); } else { - BusType location_type; + const BusType location_type = xf86int10GetBiosLocationType(pInt, + &bios); int bios_location = V_BIOS; - int pci_entity; - - EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex); + reset_int_vect(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) { - case BUS_PCI: + case BUS_PCI: { + const int pci_entity = (bios.bus == BUS_PCI) + ? xf86GetPciEntity(bios.location.pci.bus, + bios.location.pci.dev, + bios.location.pci.func) + : pInt->entityIndex; + vbiosMem = (unsigned char *)base + bios_location; - if (bios.bus == BUS_PCI) - pci_entity = xf86GetPciEntity(bios.location.pci.bus, - bios.location.pci.dev, - bios.location.pci.func); - else - pci_entity = pInt->entityIndex; if (!(size = mapPciRom(pci_entity,(unsigned char *)(vbiosMem)))) { xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3)\n"); goto error1; } INTPriv(pInt)->highMemory = GET_HIGH_BASE(size); break; + } case BUS_ISA: + if (bios.bus == BUS_ISA) { + bios_location = bios.location.legacy; + } vbiosMem = (unsigned char *)sysMem + bios_location; #if 0 (void)memset(vbiosMem, 0, V_BIOS_SIZE); diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 1809e2d95..734d84720 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_exec.c,v 1.26 2003/11/06 18:38:12 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment @@ -576,7 +575,7 @@ pciCfg1outb(CARD16 addr, CARD8 val) } CARD8 -bios_checksum(CARD8 *start, int size) +bios_checksum(const CARD8 *start, int size) { CARD8 sum = 0; @@ -685,3 +684,9 @@ xf86Int10SaveRestoreBIOSVars(xf86Int10InfoPtr pInt, Bool save) xf86UnMapVidMem(pInt->scrnIndex,base - BIOS_SCRATCH_OFF ,pagesize); } #endif + +xf86Int10InfoPtr +xf86InitInt10(int entityIndex) +{ + return xf86ExtendedInitInt10(entityIndex, 0); +} diff --git a/hw/xfree86/int10/helper_mem.c b/hw/xfree86/int10/helper_mem.c index 65ffe3df5..c62377ca8 100644 --- a/hw/xfree86/int10/helper_mem.c +++ b/hw/xfree86/int10/helper_mem.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/helper_mem.c,v 1.25 2002/09/16 18:06:08 eich Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment @@ -224,7 +223,7 @@ xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex) } Bool -int10skip(void* options) +int10skip(const void* options) { Bool noint10 = FALSE; @@ -235,7 +234,7 @@ int10skip(void* options) } Bool -int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem) +int10_check_bios(int scrnIndex, int codeSeg, const unsigned char* vbiosMem) { int size; @@ -262,7 +261,7 @@ int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem) } Bool -initPrimary(void* options) +initPrimary(const void* options) { Bool initPrimary = FALSE; @@ -281,39 +280,33 @@ initPrimary(void* options) * be used with extreme care. */ void -xf86int10ParseBiosLocation(void* options, +xf86int10ParseBiosLocation(const void* options, xf86int10BiosLocationPtr bios) { - char *s; - char *p; - char *str = NULL; - - if (options) - str = xf86GetOptValString(options,OPT_BIOS_LOCATION); + const char *p; + const char *str; bios->bus = BUS_NONE; - if (!str) + + if ((options == NULL) + || ((str = xf86GetOptValString(options, OPT_BIOS_LOCATION)) == NULL)) { return; - - s = xstrdup(str); - p = strtok(s,":"); - if (xf86NameCmp(p,"pci") == 0) bios->bus = BUS_PCI; - else - if (xf86NameCmp(p,"primary") == 0) bios->bus = BUS_ISA; + } - xfree(s); - - if (bios->bus == BUS_NONE) return; + if (strncasecmp(str, "pci", 3) == 0) { + bios->bus = BUS_PCI; + } else if (strncasecmp(str, "primary", 7) == 0) { + bios->bus = BUS_ISA; + } + else { + return; + } - s = xstrdup(str); - p = strchr(s, ':'); + p = strchr(str, ':'); switch (bios->bus) { case BUS_ISA: - if (p) - bios->location.legacy = atoi(++p); - else - bios->location.legacy = 0; + bios->location.legacy = (p != NULL) ? atoi(++p) : 0; break; case BUS_PCI: if (p) { @@ -332,8 +325,107 @@ xf86int10ParseBiosLocation(void* options, default: 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; +} diff --git a/hw/xfree86/int10/pci.c b/hw/xfree86/int10/pci.c index 520df1495..7ef6328da 100644 --- a/hw/xfree86/int10/pci.c +++ b/hw/xfree86/int10/pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/pci.c,v 1.11 2001/10/01 13:44:13 eich Exp $ */ /* * XFree86 int10 module diff --git a/hw/xfree86/int10/stub.c b/hw/xfree86/int10/stub.c index 35b74cd42..58b65782c 100644 --- a/hw/xfree86/int10/stub.c +++ b/hw/xfree86/int10/stub.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/stub.c,v 1.2 2000/02/12 03:39:57 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index 303cf8925..d74643eaf 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.c,v 1.10tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86int10.h b/hw/xfree86/int10/xf86int10.h index 9e137df41..ec4fbd67f 100644 --- a/hw/xfree86/int10/xf86int10.h +++ b/hw/xfree86/int10/xf86int10.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86int10.h,v 1.23 2002/04/04 14:05:51 eich Exp $ */ /* * XFree86 int10 module @@ -143,7 +142,7 @@ void dump_code(xf86Int10InfoPtr pInt); void dump_registers(xf86Int10InfoPtr pInt); void stack_trace(xf86Int10InfoPtr pInt); 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 UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga); #if defined (_PC) @@ -182,11 +181,16 @@ int setup_system_bios(void *base_addr); void reset_int_vect(xf86Int10InfoPtr pInt); void set_return_trap(xf86Int10InfoPtr pInt); void * xf86HandleInt10Options(ScrnInfoPtr pScrn, int entityIndex); -Bool int10skip(void* options); -Bool int10_check_bios(int scrnIndex, int codeSeg, unsigned char* vbiosMem); -Bool initPrimary(void* options); -void xf86int10ParseBiosLocation(void* options, +Bool int10skip(const void* options); +Bool int10_check_bios(int scrnIndex, int codeSeg, + const unsigned char* vbiosMem); +Bool initPrimary(const void* options); +void xf86int10ParseBiosLocation(const void* options, xf86int10BiosLocationPtr bios); +BusType xf86int10GetBiosLocationType(const xf86Int10InfoPtr pInt, + const xf86int10BiosLocationPtr bios); +Bool xf86int10GetBiosSegment(xf86Int10InfoPtr pInt, + const xf86int10BiosLocationPtr bios, void * base); #ifdef DEBUG void dprint(unsigned long start, unsigned long size); #endif diff --git a/hw/xfree86/int10/xf86x86emu.c b/hw/xfree86/int10/xf86x86emu.c index 62a34e3aa..83663b0e6 100644 --- a/hw/xfree86/int10/xf86x86emu.c +++ b/hw/xfree86/int10/xf86x86emu.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.c,v 1.11 2001/04/30 14:34:58 tsi Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/int10/xf86x86emu.h b/hw/xfree86/int10/xf86x86emu.h index a7eb6d3c7..4af2dafb7 100644 --- a/hw/xfree86/int10/xf86x86emu.h +++ b/hw/xfree86/int10/xf86x86emu.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/int10/xf86x86emu.h,v 1.1 2000/01/23 04:44:35 dawes Exp $ */ /* * XFree86 int10 module * execute BIOS int 10h calls in x86 real mode environment diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am index 0cda5c159..030672389 100644 --- a/hw/xfree86/loader/Makefile.am +++ b/hw/xfree86/loader/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../dixmods/extmod \ -I$(srcdir)/../ddc -I$(srcdir)/../i2c #AM_LDFLAGS = -r -AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DIN_LOADER $(XORG_CFLAGS) if XORG_LOADER_SPARC SPARC_SOURCES = SparcMulDiv.S @@ -30,4 +30,5 @@ libloader_a_SOURCES = \ fontsym.c \ misym.c \ xf86sym.c \ + sym.h \ $(SPARC_SOURCES) diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index 0963bef15..043c1a705 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -244,7 +244,6 @@ _X_HIDDEN void *dixLookupTab[] = { SYMVAR(globalSerialNumber) SYMVAR(lastDeviceEventTime) SYMVAR(monitorResolution) - SYMVAR(permitOldBugs) SYMVAR(screenInfo) SYMVAR(serverClient) SYMVAR(serverGeneration) diff --git a/hw/xfree86/loader/dlloader.c b/hw/xfree86/loader/dlloader.c index 3c62f863b..a0e867056 100644 --- a/hw/xfree86/loader/dlloader.c +++ b/hw/xfree86/loader/dlloader.c @@ -105,6 +105,8 @@ DLFindSymbolLocal(pointer module, const char *name) return p; } +static void *global_scope = NULL; + void * DLFindSymbol(const char *name) { @@ -117,11 +119,17 @@ DLFindSymbol(const char *name) return p; } + if (!global_scope) + global_scope = dlopen(NULL, DLOPEN_LAZY | DLOPEN_GLOBAL); + + if (global_scope) + return dlsym(global_scope, name); + return NULL; } void * -DLLoadModule(loaderPtr modrec, int fd, int flags) +DLLoadModule(loaderPtr modrec, int flags) { DLModulePtr dlfile; DLModuleList *l; diff --git a/hw/xfree86/loader/dlloader.h b/hw/xfree86/loader/dlloader.h index b705a18d0..8ae610f02 100644 --- a/hw/xfree86/loader/dlloader.h +++ b/hw/xfree86/loader/dlloader.h @@ -26,7 +26,7 @@ #ifndef _DLLOADER_H #define _DLLOADER_H -extern void *DLLoadModule(loaderPtr, int, int flags); +extern void *DLLoadModule(loaderPtr, int flags); extern void DLUnloadModule(void *); extern void *DLFindSymbol(const char *name); diff --git a/hw/xfree86/loader/loader.c b/hw/xfree86/loader/loader.c index a5c5b2c8e..ddd624c2a 100644 --- a/hw/xfree86/loader/loader.c +++ b/hw/xfree86/loader/loader.c @@ -97,22 +97,6 @@ static int refCount[MAX_HANDLE]; */ static int moduleseq = 0; -typedef struct { - int num; - const char **list; -} symlist; - -/* - * List of symbols that may be referenced, and which are allowed to be - * unresolved providing that they don't appear on the "reqired" list. - */ -static symlist refList = { 0, NULL }; - -/* List of symbols that must not be unresolved */ -static symlist reqList = { 0, NULL }; - -static int fatalReqSym = 0; - /* Prototypes for static functions. */ static loaderPtr _LoaderListPush(void); static loaderPtr _LoaderListPop(int); @@ -300,165 +284,25 @@ _LoaderModuleToName(int module) return 0; } -/* - * Add a list of symbols to the referenced list. - */ - -static void -AppendSymbol(symlist * list, const char *sym) -{ - list->list = xnfrealloc(list->list, (list->num + 1) * sizeof(char **)); - /* copy the symbol, since it comes from a module - that can be unloaded later */ - list->list[list->num] = xnfstrdup(sym); - list->num++; -} - -static void -AppendSymList(symlist * list, const char **syms) -{ - while (*syms) { - AppendSymbol(list, *syms); - syms++; - } -} - -static int -SymInList(symlist * list, char *sym) -{ - int i; - - for (i = 0; i < list->num; i++) - if (strcmp(list->list[i], sym) == 0) - return 1; - - return 0; -} - -void -LoaderVRefSymbols(const char *sym0, va_list args) -{ - const char *s; - - if (sym0 == NULL) - return; - - s = sym0; - do { - AppendSymbol(&refList, s); - s = va_arg(args, const char *); - } while (s != NULL); -} - +/* These four are just ABI stubs */ _X_EXPORT void LoaderRefSymbols(const char *sym0, ...) { - va_list ap; - - va_start(ap, sym0); - LoaderVRefSymbols(sym0, ap); - va_end(ap); -} - -void -LoaderVRefSymLists(const char **list0, va_list args) -{ - const char **l; - - if (list0 == NULL) - return; - - l = list0; - do { - AppendSymList(&refList, l); - l = va_arg(args, const char **); - } while (l != NULL); } _X_EXPORT void LoaderRefSymLists(const char **list0, ...) { - va_list ap; - - va_start(ap, list0); - LoaderVRefSymLists(list0, ap); - va_end(ap); -} - -void -LoaderVReqSymLists(const char **list0, va_list args) -{ - const char **l; - - if (list0 == NULL) - return; - - l = list0; - do { - AppendSymList(&reqList, l); - l = va_arg(args, const char **); - } while (l != NULL); } _X_EXPORT void LoaderReqSymLists(const char **list0, ...) { - va_list ap; - - va_start(ap, list0); - LoaderVReqSymLists(list0, ap); - va_end(ap); -} - -void -LoaderVReqSymbols(const char *sym0, va_list args) -{ - const char *s; - - if (sym0 == NULL) - return; - - s = sym0; - do { - AppendSymbol(&reqList, s); - s = va_arg(args, const char *); - } while (s != NULL); } _X_EXPORT void LoaderReqSymbols(const char *sym0, ...) { - va_list ap; - - va_start(ap, sym0); - LoaderVReqSymbols(sym0, ap); - va_end(ap); -} - -/* - * _LoaderHandleUnresolved() decides what to do with an unresolved - * symbol. Symbols that are not on the "referenced" or "required" lists - * get a warning if they are unresolved. Symbols that are on the "required" - * list generate a fatal error if they are unresolved. - */ - -int -_LoaderHandleUnresolved(char *symbol, char *module) -{ - int fatalsym = 0; - - if (xf86ShowUnresolved && !fatalsym) { - if (SymInList(&reqList, symbol)) { - fatalReqSym = 1; - ErrorF("Required symbol %s from module %s is unresolved!\n", - symbol, module); - } - if (!SymInList(&refList, symbol)) { - ErrorF("Symbol %s from module %s is unresolved!\n", - symbol, module); - } - } - return (fatalsym); } /* Public Interface to the loader. */ @@ -469,7 +313,6 @@ LoaderOpen(const char *module, const char *cname, int handle, { loaderPtr tmp; int new_handle; - int fd; #if defined(DEBUG) ErrorF("LoaderOpen(%s)\n", module); @@ -525,16 +368,6 @@ LoaderOpen(const char *module, const char *cname, int handle, freeHandles[new_handle] = HANDLE_USED; refCount[new_handle] = 1; - if ((fd = open(module, O_RDONLY)) < 0) { - xf86Msg(X_ERROR, "Unable to open %s\n", module); - freeHandles[new_handle] = HANDLE_FREE; - if (errmaj) - *errmaj = LDR_NOMODOPEN; - if (errmin) - *errmin = errno; - return -1; - } - tmp = _LoaderListPush(); tmp->name = malloc(strlen(module) + 1); strcpy(tmp->name, module); @@ -543,7 +376,7 @@ LoaderOpen(const char *module, const char *cname, int handle, tmp->handle = new_handle; tmp->module = moduleseq++; - if ((tmp->private = DLLoadModule(tmp, fd, flags)) == NULL) { + if ((tmp->private = DLLoadModule(tmp, flags)) == NULL) { xf86Msg(X_ERROR, "Failed to load %s\n", module); _LoaderListPop(new_handle); freeHandles[new_handle] = HANDLE_FREE; @@ -554,8 +387,6 @@ LoaderOpen(const char *module, const char *cname, int handle, return -1; } - close(fd); - return new_handle; } @@ -578,15 +409,11 @@ LoaderSymbol(const char *sym) return (DLFindSymbol(sym)); } +/* more stub */ _X_EXPORT int LoaderCheckUnresolved(int delay_flag) { - int ret = 0; - - if (fatalReqSym) - FatalError("Some required symbols were unresolved\n"); - - return ret; + return 0; } int diff --git a/hw/xfree86/loader/loader.h b/hw/xfree86/loader/loader.h index c0913849d..46d4c3ed3 100644 --- a/hw/xfree86/loader/loader.h +++ b/hw/xfree86/loader/loader.h @@ -92,7 +92,6 @@ extern unsigned long LoaderOptions; /* Internal Functions */ void LoaderDuplicateSymbol(const char *, const int); -int _LoaderHandleUnresolved(char *, char *); char *_LoaderModuleToName(int); int LoaderOpen(const char *, const char *, int, int *, int *, int *, int); int LoaderHandleOpen(int); diff --git a/hw/xfree86/loader/loaderProcs.h b/hw/xfree86/loader/loaderProcs.h index 0e77e6b3a..ecbd6762d 100644 --- a/hw/xfree86/loader/loaderProcs.h +++ b/hw/xfree86/loader/loaderProcs.h @@ -103,13 +103,6 @@ ModuleDescPtr AddSibling(ModuleDescPtr head, ModuleDescPtr new); void LoaderSetPath(const char *path); void LoaderSortExtensions(void); -void LoaderVReqSymLists(const char **, va_list args); -void LoaderVReqSymbols(const char *, va_list args); -void LoaderVRefSymLists(const char **, va_list args); -void LoaderVRefSymbols(const char *, va_list args); - -void LoaderShowStack(void); -void *LoaderSymbolHandle(const char *, int); int LoaderUnload(int); unsigned long LoaderGetModuleVersion(ModuleDescPtr mod); diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index fd84a924c..12f5dc9cc 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -115,6 +115,17 @@ FreeStringList(char **paths) static char **defaultPathList = NULL; +static Bool +PathIsAbsolute(const char *path) +{ +#ifdef __UNIXOS2__ + return (*path == '/' || (strlen(path) > 2 && isalpha(elem[0]) && + elem[1] == ':' && elem[2] == '/')); +#else + return (*path == '/'); +#endif +} + /* * Convert a comma-separated path into a NULL-terminated array of path * elements, rejecting any that are not full absolute paths, and appending @@ -138,13 +149,7 @@ InitPathList(const char *path) return NULL; elem = strtok(fullpath, ","); while (elem) { - /* Only allow fully specified paths */ -#ifndef __UNIXOS2__ - if (*elem == '/') -#else - if (*elem == '/' || (strlen(elem) > 2 && isalpha(elem[0]) && - elem[1] == ':' && elem[2] == '/')) -#endif + if (PathIsAbsolute(elem)) { len = strlen(elem); addslash = (elem[len - 1] != '/'); @@ -389,23 +394,65 @@ FreeSubdirs(const char **subdirs) } static char * -FindModule(const char *module, const char *dir, const char **subdirlist, +FindModuleInSubdir(const char *dirpath, const char *module) +{ + struct dirent *direntry = NULL; + DIR *dir = NULL; + char *ret = NULL, tmpBuf[PATH_MAX]; + struct stat stat_buf; + + dir = opendir(dirpath); + if (!dir) + return NULL; + + while ((direntry = readdir(dir))) { + if (direntry->d_name[0] == '.') + continue; + if ((stat(direntry->d_name, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) { + snprintf(tmpBuf, PATH_MAX, "%s/%s", dirpath, direntry->d_name); + if ((ret = FindModuleInSubdir(tmpBuf, module))) + break; + continue; + } + + snprintf(tmpBuf, PATH_MAX, "lib%s.so", module); + if (strcmp(direntry->d_name, tmpBuf) == 0) { + ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2); + sprintf(ret, "%s/%s", dirpath, tmpBuf); + break; + } + + snprintf(tmpBuf, PATH_MAX, "%s_drv.so", module); + if (strcmp(direntry->d_name, tmpBuf) == 0) { + ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2); + sprintf(ret, "%s/%s", dirpath, tmpBuf); + break; + } + + snprintf(tmpBuf, PATH_MAX, "%s.so", module); + if (strcmp(direntry->d_name, tmpBuf) == 0) { + ret = malloc(strlen(tmpBuf) + strlen(dirpath) + 2); + sprintf(ret, "%s/%s", dirpath, tmpBuf); + break; + } + } + + closedir(dir); + return ret; +} + +static char * +FindModule(const char *module, const char *dirname, const char **subdirlist, PatternPtr patterns) { - char buf[PATH_MAX + 1], tmpBuf[PATH_MAX + 1]; + char buf[PATH_MAX + 1]; char *dirpath = NULL; char *name = NULL; - struct stat stat_buf; int dirlen; const char **subdirs = NULL; const char **s; -#ifndef __EMX__ - dirpath = (char *)dir; -#else - dirpath = xalloc(strlen(dir) + 10); - strcpy(dirpath, (char *)__XOS2RedirRoot(dir)); -#endif + dirpath = (char *)dirname; if (strlen(dirpath) > PATH_MAX) return NULL; @@ -418,38 +465,15 @@ FindModule(const char *module, const char *dir, const char **subdirlist, continue; strcpy(buf, dirpath); strcat(buf, *s); - if ((stat(buf, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) { - if (buf[dirlen - 1] != '/') { - buf[dirlen++] = '/'; - } - - snprintf(tmpBuf, PATH_MAX, "%slib%s.so", buf, module); - if (stat(tmpBuf, &stat_buf) == 0) { - name = tmpBuf; - break; - } - - snprintf(tmpBuf, PATH_MAX, "%s%s_drv.so", buf, module); - if (stat(tmpBuf, &stat_buf) == 0) { - name = tmpBuf; - break; - } - - snprintf(tmpBuf, PATH_MAX, "%s%s.so", buf, module); - if (stat(tmpBuf, &stat_buf) == 0) { - name = tmpBuf; - break; - } - } + if ((name = FindModuleInSubdir(buf, module))) + break; } + FreeSubdirs(subdirs); - if (dirpath != dir) + if (dirpath != dirname) xfree(dirpath); - if (name) { - return xstrdup(name); - } - return NULL; + return name; } _X_EXPORT char ** @@ -731,13 +755,7 @@ LoadSubModule(ModuleDescPtr parent, const char *module, xf86MsgVerb(X_INFO, 3, "Loading sub module \"%s\"\n", module); - /* Absolute module paths are not allowed here */ -#ifndef __UNIXOS2__ - if (module[0] == '/') -#else - if (isalpha(module[0]) && module[1] == ':' && module[2] == '/') -#endif - { + if (PathIsAbsolute(module)) { xf86Msg(X_ERROR, "LoadSubModule: Absolute module path not permitted: \"%s\"\n", module); @@ -767,12 +785,7 @@ LoadSubModuleLocal(ModuleDescPtr parent, const char *module, xf86MsgVerb(X_INFO, 3, "Loading local sub module \"%s\"\n", module); - /* Absolute module paths are not allowed here */ -#ifndef __UNIXOS2__ - if (module[0] == '/') -#else - if (isalpha(module[0]) && module[1] == ':' && module[2] == '/') -#endif + if (PathIsAbsolute(module)) { xf86Msg(X_ERROR, "LoadSubModule: Absolute module path not permitted: \"%s\"\n", @@ -889,14 +902,8 @@ doLoadModule(const char *module, const char *path, const char **subdirlist, * if the module name is not a full pathname, we need to * check the elements in the path */ -#ifndef __UNIXOS2__ - if (module[0] == '/') - found = xstrdup(module); -#else - /* accept a drive name here */ - if (isalpha(module[0]) && module[1] == ':' && module[2] == '/') - found = xstrdup(module); -#endif + if (PathIsAbsolute(module)) + xstrdup(module); path_elem = pathlist; while (!found && *path_elem != NULL) { found = FindModule(m, *path_elem, subdirlist, patterns); diff --git a/hw/xfree86/loader/os.c b/hw/xfree86/loader/os.c index 42ab0bc70..83fd24787 100644 --- a/hw/xfree86/loader/os.c +++ b/hw/xfree86/loader/os.c @@ -33,10 +33,11 @@ /* * OSNAME is a standard form of the OS name that may be used by the - * loader and by OS-specific modules. + * loader and by OS-specific modules. OSNAME here is different from what's in + * dix-config.h */ -#ifndef OSNAME +#undef OSNAME #if defined(__linux__) #define OSNAME "linux" #elif defined(__FreeBSD__) @@ -66,7 +67,6 @@ #else #define OSNAME "unknown" #endif -#endif /* Return the OS name, and run-time OS version */ diff --git a/hw/xfree86/loader/xf86sym.c b/hw/xfree86/loader/xf86sym.c index ad4f77353..69e11d535 100644 --- a/hw/xfree86/loader/xf86sym.c +++ b/hw/xfree86/loader/xf86sym.c @@ -356,9 +356,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86RegisterStateChangeNotificationCallback) SYMFUNC(xf86DeregisterStateChangeNotificationCallback) SYMFUNC(xf86NoSharedResources) -#ifdef async - SYMFUNC(xf86QueueAsyncEvent) -#endif /* Shared Accel Accessor Functions */ SYMFUNC(xf86GetLastScrnFlag) SYMFUNC(xf86SetLastScrnFlag) @@ -372,6 +369,9 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMFUNC(xf86AllocateEntityPrivateIndex) SYMFUNC(xf86GetEntityPrivate) + /* xf86cvt.c */ + SYMFUNC(xf86CVTMode) + /* xf86Configure.c */ SYMFUNC(xf86AddDeviceToConfigure) @@ -1146,9 +1146,6 @@ _X_HIDDEN void *xfree86LookupTab[] = { SYMVAR(xf86DummyVar3) #endif -#ifdef async - SYMVAR(xf86CurrentScreen) -#endif /* predefined resource lists from xf86Bus.h */ SYMVAR(resVgaExclusive) SYMVAR(resVgaShared) diff --git a/hw/xfree86/os-support/assyntax.h b/hw/xfree86/os-support/assyntax.h index 13cc2f3e0..b50313607 100644 --- a/hw/xfree86/os-support/assyntax.h +++ b/hw/xfree86/os-support/assyntax.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/assyntax.h,v 3.13 2003/08/24 17:37:03 dawes Exp $ */ #ifndef __ASSYNTAX_H__ #define __ASSYNTAX_H__ diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am index ae89a6bf6..20885e866 100644 --- a/hw/xfree86/os-support/bsd/Makefile.am +++ b/hw/xfree86/os-support/bsd/Makefile.am @@ -50,7 +50,7 @@ ARCH_SOURCES = \ endif # FIXME: NetBSD Aperture defines (configure.ac) -AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/bsd/alpha_video.c b/hw/xfree86/os-support/bsd/alpha_video.c index 518deaa1e..5052b7862 100644 --- a/hw/xfree86/os-support/bsd/alpha_video.c +++ b/hw/xfree86/os-support/bsd/alpha_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c,v 1.6 2003/12/30 15:18:30 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/arm_video.c b/hw/xfree86/os-support/bsd/arm_video.c index bdc2e0a2b..4a3d5ca52 100644 --- a/hw/xfree86/os-support/bsd/arm_video.c +++ b/hw/xfree86/os-support/bsd/arm_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/arm_video.c,v 1.1tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/bsdResource.c b/hw/xfree86/os-support/bsd/bsdResource.c index 0ecd6f64f..37749c913 100644 --- a/hw/xfree86/os-support/bsd/bsdResource.c +++ b/hw/xfree86/os-support/bsd/bsdResource.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsdResource.c,v 1.6 2001/02/16 14:45:10 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/bsd/bsd_VTsw.c b/hw/xfree86/os-support/bsd/bsd_VTsw.c index d97782dc6..00591d135 100644 --- a/hw/xfree86/os-support/bsd/bsd_VTsw.c +++ b/hw/xfree86/os-support/bsd/bsd_VTsw.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_VTsw.c,v 3.5.4.3 1998/06/05 16:23:03 dawes Exp $ */ /* * Derived from VTsw_usl.c which is * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/bsd_axp.c b/hw/xfree86/os-support/bsd/bsd_axp.c index 00b928a5e..51ffef148 100644 --- a/hw/xfree86/os-support/bsd/bsd_axp.c +++ b/hw/xfree86/os-support/bsd/bsd_axp.c @@ -1,4 +1,3 @@ -/* $XFree86: bsd_axp.c,v 1.2 2002/10/29 23:19:13 herrb Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/bsd_ev56.c b/hw/xfree86/os-support/bsd/bsd_ev56.c index 62952a343..b2141192e 100644 --- a/hw/xfree86/os-support/bsd/bsd_ev56.c +++ b/hw/xfree86/os-support/bsd/bsd_ev56.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_ev56.c,v 1.1 2000/03/05 16:59:17 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c index 4d883a2be..eb6d85053 100644 --- a/hw/xfree86/os-support/bsd/bsd_init.c +++ b/hw/xfree86/os-support/bsd/bsd_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c,v 3.21 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/bsd_io.c b/hw/xfree86/os-support/bsd/bsd_io.c index 6e288d43f..b433d7ba3 100644 --- a/hw/xfree86/os-support/bsd/bsd_io.c +++ b/hw/xfree86/os-support/bsd/bsd_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_io.c,v 3.22 2002/05/18 21:15:16 herrb Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/bsd/bsd_jstk.c b/hw/xfree86/os-support/bsd/bsd_jstk.c index bc99f2914..b5b91b0c7 100644 --- a/hw/xfree86/os-support/bsd/bsd_jstk.c +++ b/hw/xfree86/os-support/bsd/bsd_jstk.c @@ -23,7 +23,6 @@ /* Modified for FreeBSD by David Dawes <dawes@XFree86.org> */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c,v 3.7 1998/07/25 16:56:34 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -36,9 +35,7 @@ #include <machine/joystick.h> #include <fcntl.h> -#ifdef XFree86LOADER #include "misc.h" -#endif #include "xf86.h" #define JS_RETURN sizeof(struct joystick) @@ -174,7 +171,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons) return 1; } -#ifdef XFree86LOADER /* * Entry point for XFree86 Loader */ @@ -184,5 +180,4 @@ bsd_jstkModuleInit(pointer *data, INT32 *magic) *magic = MAGIC_DONE; *data = NULL; } -#endif /* end of bsd_jstk.c */ diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.c b/hw/xfree86/os-support/bsd/bsd_kbd.c index 4b4ba3af3..65d577eb8 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.c +++ b/hw/xfree86/os-support/bsd/bsd_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.c,v 1.8 2003/11/04 03:16:58 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/bsd/bsd_kbd.h b/hw/xfree86/os-support/bsd/bsd_kbd.h index c042d88bf..b2ae179e1 100644 --- a/hw/xfree86/os-support/bsd/bsd_kbd.h +++ b/hw/xfree86/os-support/bsd/bsd_kbd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kbd.h,v 1.1 2002/10/11 01:40:34 dawes Exp $ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c index 5215d54e4..0a0434f2a 100644 --- a/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c +++ b/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_kqueue_apm.c,v 1.5 2002/07/30 23:24:32 herrb Exp $ */ /* * Copyright (C) 2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bsd/bsd_mouse.c b/hw/xfree86/os-support/bsd/bsd_mouse.c index f54c7d7a5..21fe1ff18 100644 --- a/hw/xfree86/os-support/bsd/bsd_mouse.c +++ b/hw/xfree86/os-support/bsd/bsd_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c,v 1.28 2004/02/06 17:15:36 tsi Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/bsd/i386_video.c b/hw/xfree86/os-support/bsd/i386_video.c index 8668396e0..f4ea3f5c9 100644 --- a/hw/xfree86/os-support/bsd/i386_video.c +++ b/hw/xfree86/os-support/bsd/i386_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c,v 1.4 2003/09/24 02:43:34 dawes Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/libusb/data.c b/hw/xfree86/os-support/bsd/libusb/data.c index 0ac1a63bc..df5a9d2f6 100644 --- a/hw/xfree86/os-support/bsd/libusb/data.c +++ b/hw/xfree86/os-support/bsd/libusb/data.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/data.c,v 1.1.2.2 1999/12/03 10:12:41 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/libusb/descr.c b/hw/xfree86/os-support/bsd/libusb/descr.c index 2306d2f58..bbcb55853 100644 --- a/hw/xfree86/os-support/bsd/libusb/descr.c +++ b/hw/xfree86/os-support/bsd/libusb/descr.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/descr.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/libusb/parse.c b/hw/xfree86/os-support/bsd/libusb/parse.c index feff9779a..c68ccb524 100644 --- a/hw/xfree86/os-support/bsd/libusb/parse.c +++ b/hw/xfree86/os-support/bsd/libusb/parse.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/parse.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/libusb/usage.c b/hw/xfree86/os-support/bsd/libusb/usage.c index f909ee691..a8a5f650e 100644 --- a/hw/xfree86/os-support/bsd/libusb/usage.c +++ b/hw/xfree86/os-support/bsd/libusb/usage.c @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usage.c,v 1.1.2.2 1999/12/03 10:12:42 hohndel Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bsd/libusb/usb.h b/hw/xfree86/os-support/bsd/libusb/usb.h index 69ef79a62..fedd3e545 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb.h +++ b/hw/xfree86/os-support/bsd/libusb/usb.h @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ #define _DIAGASSERT(e) assert(e) diff --git a/hw/xfree86/os-support/bsd/libusb/usbvar.h b/hw/xfree86/os-support/bsd/libusb/usbvar.h index cb0bf33ec..db2cae171 100644 --- a/hw/xfree86/os-support/bsd/libusb/usbvar.h +++ b/hw/xfree86/os-support/bsd/libusb/usbvar.h @@ -25,7 +25,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usbvar.h,v 1.1 2000/02/11 18:06:51 dawes Exp $ */ struct report_desc { unsigned int size; diff --git a/hw/xfree86/os-support/bsd/ppc_video.c b/hw/xfree86/os-support/bsd/ppc_video.c index d53f615bb..ae65c8f15 100644 --- a/hw/xfree86/os-support/bsd/ppc_video.c +++ b/hw/xfree86/os-support/bsd/ppc_video.c @@ -1,4 +1,3 @@ -/* $XFree86: ppc_video.c,v 1.5 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bsd/sparc64_video.c b/hw/xfree86/os-support/bsd/sparc64_video.c index dfd5d9f54..0cb9d4d56 100644 --- a/hw/xfree86/os-support/bsd/sparc64_video.c +++ b/hw/xfree86/os-support/bsd/sparc64_video.c @@ -1,4 +1,3 @@ -/* $XFree86: sparc64_video.c,v 1.2 2003/03/14 13:46:04 tsi Exp $ */ /* * Copyright 1992 by Rich Murphey <Rich@Rice.edu> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/bus/460gxPCI.c b/hw/xfree86/os-support/bus/460gxPCI.c index 255dfa12f..44ee97687 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.c +++ b/hw/xfree86/os-support/bus/460gxPCI.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.c,v 1.4 2003/08/29 21:08:06 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/460gxPCI.h b/hw/xfree86/os-support/bus/460gxPCI.h index 65a19b2f0..2905d4787 100644 --- a/hw/xfree86/os-support/bus/460gxPCI.h +++ b/hw/xfree86/os-support/bus/460gxPCI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/460gxPCI.h,v 1.1 2003/01/02 18:12:48 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am index 308a01b31..c56f3d717 100644 --- a/hw/xfree86/os-support/bus/Makefile.am +++ b/hw/xfree86/os-support/bus/Makefile.am @@ -53,6 +53,6 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = $(sdk_HEADERS) diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c index 15006e179..ea6ac4ec0 100644 --- a/hw/xfree86/os-support/bus/Pci.c +++ b/hw/xfree86/os-support/bus/Pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.c,v 1.82 2004/01/16 15:39:04 tsi Exp $ */ /* * Pci.c - New server PCI access functions * diff --git a/hw/xfree86/os-support/bus/Pci.h b/hw/xfree86/os-support/bus/Pci.h index a91c6b27d..0f1af2086 100644 --- a/hw/xfree86/os-support/bus/Pci.h +++ b/hw/xfree86/os-support/bus/Pci.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h,v 1.45 2004/02/02 03:55:31 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/Sbus.c b/hw/xfree86/os-support/bus/Sbus.c index 22d84be17..c864e3385 100644 --- a/hw/xfree86/os-support/bus/Sbus.c +++ b/hw/xfree86/os-support/bus/Sbus.c @@ -20,7 +20,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/Sbus.c,v 1.2tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bus/axpPci.c b/hw/xfree86/os-support/bus/axpPci.c index 660f008e1..9acc4ab5b 100644 --- a/hw/xfree86/os-support/bus/axpPci.c +++ b/hw/xfree86/os-support/bus/axpPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/axpPci.c,v 1.14 2002/12/11 02:44:28 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/e8870PCI.c b/hw/xfree86/os-support/bus/e8870PCI.c index 65b0c0474..8e0f95ac0 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.c +++ b/hw/xfree86/os-support/bus/e8870PCI.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.c,v 1.2 2003/07/17 15:08:22 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/e8870PCI.h b/hw/xfree86/os-support/bus/e8870PCI.h index 9efa0ed6d..89726270a 100644 --- a/hw/xfree86/os-support/bus/e8870PCI.h +++ b/hw/xfree86/os-support/bus/e8870PCI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/e8870PCI.h,v 1.1 2003/02/23 20:26:49 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/freebsdPci.c b/hw/xfree86/os-support/bus/freebsdPci.c index 2868dafa7..61cb405a8 100644 --- a/hw/xfree86/os-support/bus/freebsdPci.c +++ b/hw/xfree86/os-support/bus/freebsdPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/freebsdPci.c,v 1.4 2002/07/24 19:06:52 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/ix86Pci.c b/hw/xfree86/os-support/bus/ix86Pci.c index b091ec425..fd7bdf6c8 100644 --- a/hw/xfree86/os-support/bus/ix86Pci.c +++ b/hw/xfree86/os-support/bus/ix86Pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ix86Pci.c,v 1.25 2003/09/24 02:43:34 dawes Exp $ */ /* * ix86Pci.c - x86 PCI driver * diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c index 0714c9cea..a3c07f330 100644 --- a/hw/xfree86/os-support/bus/linuxPci.c +++ b/hw/xfree86/os-support/bus/linuxPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/linuxPci.c,v 1.9 2002/09/24 16:14:16 tsi Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * @@ -421,7 +420,7 @@ xf86GetPciHostConfigFromTag(PCITAG Tag) * * Please keep this table in ascending vendor/device order. */ -static struct pciSizes { +static const struct pciSizes { unsigned short vendor, device; unsigned long io_size, mem_size; } pciControllerSizes[] = { @@ -444,9 +443,12 @@ static struct pciSizes { }; #define NUM_SIZES (sizeof(pciControllerSizes) / sizeof(pciControllerSizes[0])) -static unsigned long -linuxGetIOSize(PCITAG Tag) +static const struct pciSizes * +linuxGetSizesStruct(PCITAG Tag) { + static const struct pciSizes default_size = { + 0, 0, 1U << 16, (unsigned long)(1ULL << 32) + }; pciConfigPtr pPCI; int i; @@ -454,47 +456,31 @@ linuxGetIOSize(PCITAG Tag) if ((pPCI = xf86GetPciHostConfigFromTag(Tag))) { /* Look up vendor/device */ for (i = 0; i < NUM_SIZES; i++) { - if (pPCI->pci_vendor > pciControllerSizes[i].vendor) - continue; - if (pPCI->pci_vendor < pciControllerSizes[i].vendor) - break; - if (pPCI->pci_device > pciControllerSizes[i].device) - continue; - if (pPCI->pci_device < pciControllerSizes[i].device) - break; - return pciControllerSizes[i].io_size; + if ((pPCI->pci_vendor == pciControllerSizes[i].vendor) + && (pPCI->pci_device == pciControllerSizes[i].device)) { + return & pciControllerSizes[i]; + } } } - return 1U << 16; /* Default to 64K */ + /* Default to 64KB I/O and 4GB memory. */ + return & default_size; } -static void -linuxGetSizes(PCITAG Tag, unsigned long *io_size, unsigned long *mem_size) +static __inline__ unsigned long +linuxGetIOSize(PCITAG Tag) { - pciConfigPtr pPCI; - int i; + const struct pciSizes * const sizes = linuxGetSizesStruct(Tag); + return sizes->io_size; +} - *io_size = (1U << 16); /* Default to 64K */ - *mem_size = (unsigned long)(1ULL << 32); /* Default to 4G */ +static __inline__ void +linuxGetSizes(PCITAG Tag, unsigned long *io_size, unsigned long *mem_size) +{ + const struct pciSizes * const sizes = linuxGetSizesStruct(Tag); - /* Find host bridge */ - if ((pPCI = xf86GetPciHostConfigFromTag(Tag))) { - /* Look up vendor/device */ - for (i = 0; i < NUM_SIZES; i++) { - if (pPCI->pci_vendor > pciControllerSizes[i].vendor) - continue; - if (pPCI->pci_vendor < pciControllerSizes[i].vendor) - break; - if (pPCI->pci_device > pciControllerSizes[i].device) - continue; - if (pPCI->pci_device < pciControllerSizes[i].device) - break; - *io_size = pciControllerSizes[i].io_size; - *mem_size = pciControllerSizes[i].mem_size; - break; - } - } + *io_size = sizes->io_size; + *mem_size = sizes->mem_size; } _X_EXPORT int diff --git a/hw/xfree86/os-support/bus/netbsdPci.c b/hw/xfree86/os-support/bus/netbsdPci.c index 7dbbfdec7..ee52c89cc 100644 --- a/hw/xfree86/os-support/bus/netbsdPci.c +++ b/hw/xfree86/os-support/bus/netbsdPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/netbsdPci.c,v 1.4 2003/08/24 17:37:04 dawes Exp $ */ /* * Copyright (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/ppcPci.c b/hw/xfree86/os-support/bus/ppcPci.c index 3e5ea3187..49c1a2a39 100644 --- a/hw/xfree86/os-support/bus/ppcPci.c +++ b/hw/xfree86/os-support/bus/ppcPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ppcPci.c,v 1.8 2002/07/24 19:06:52 tsi Exp $ */ /* * ppcPci.c - PowerPC PCI access functions * diff --git a/hw/xfree86/os-support/bus/sparcPci.c b/hw/xfree86/os-support/bus/sparcPci.c index 5e0ef5b18..5dd6b9369 100644 --- a/hw/xfree86/os-support/bus/sparcPci.c +++ b/hw/xfree86/os-support/bus/sparcPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/sparcPci.c,v 1.14 2003/08/24 17:37:04 dawes Exp $ */ /* * Copyright (C) 2001-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h index 69254ce8c..fdb88e832 100644 --- a/hw/xfree86/os-support/bus/xf86Pci.h +++ b/hw/xfree86/os-support/bus/xf86Pci.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v 1.39 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright 1998 by Concurrent Computer Corporation * diff --git a/hw/xfree86/os-support/bus/xf86Sbus.h b/hw/xfree86/os-support/bus/xf86Sbus.h index 21b05cba4..cff5e808a 100644 --- a/hw/xfree86/os-support/bus/xf86Sbus.h +++ b/hw/xfree86/os-support/bus/xf86Sbus.h @@ -20,7 +20,6 @@ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Sbus.h,v 1.3 2001/04/20 17:02:43 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/bus/zx1PCI.c b/hw/xfree86/os-support/bus/zx1PCI.c index b6a33d27c..d83bc9116 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.c +++ b/hw/xfree86/os-support/bus/zx1PCI.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.c,v 1.8 2004/01/16 15:39:38 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/bus/zx1PCI.h b/hw/xfree86/os-support/bus/zx1PCI.h index 2795b4459..f2b279382 100644 --- a/hw/xfree86/os-support/bus/zx1PCI.h +++ b/hw/xfree86/os-support/bus/zx1PCI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/zx1PCI.h,v 1.1 2003/02/23 20:26:49 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/drm/Makefile.am b/hw/xfree86/os-support/drm/Makefile.am index 8270f4304..53893251a 100644 --- a/hw/xfree86/os-support/drm/Makefile.am +++ b/hw/xfree86/os-support/drm/Makefile.am @@ -7,9 +7,8 @@ libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \ -I$(top_srcdir)/GL/glx \ -I$(top_srcdir)/GL/include \ -DHAVE_XORG_CONFIG_H \ - @LIBDRM_CFLAGS@ \ - @SERVER_DEFINES@ \ - @LOADER_DEFINES@ + @LIBDRM_CFLAGS@ + libdrm_la_LDFLAGS = -module -avoid-version libdrm_ladir = $(moduledir)/@XORG_OS@ libdrm_la_SOURCES = \ diff --git a/hw/xfree86/os-support/drm/xf86drm.c b/hw/xfree86/os-support/drm/xf86drm.c index a4663048b..3759920c2 100644 --- a/hw/xfree86/os-support/drm/xf86drm.c +++ b/hw/xfree86/os-support/drm/xf86drm.c @@ -31,24 +31,15 @@ * DEALINGS IN THE SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif -#ifdef XFree86Server -# include "xf86.h" -# include "xf86_OSproc.h" -# define _DRM_MALLOC xalloc -# define _DRM_FREE xfree -# ifndef XFree86LOADER -# include <sys/mman.h> -# endif -#else -# define _DRM_MALLOC malloc -# define _DRM_FREE free -#endif +#include "xf86.h" +#include "xf86_OSproc.h" +#define _DRM_MALLOC xalloc +#define _DRM_FREE xfree #include "drm.h" #include <stdio.h> @@ -124,19 +115,9 @@ drmMsg(const char *format, ...) { va_list ap; -#ifndef XFree86Server - const char *env; - if ((env = getenv("LIBGL_DEBUG")) && strstr(env, "verbose")) -#endif - { - va_start(ap, format); -#ifdef XFree86Server - xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); -#else - vfprintf(stderr, format, ap); -#endif - va_end(ap); - } + va_start(ap, format); + xf86VDrvMsgVerb(-1, X_NONE, DRM_MSG_VERBOSITY, format, ap); + va_end(ap); } static void *drmHashTable = NULL; /* Context switch callbacks */ @@ -270,19 +251,15 @@ static int drmOpenDevice(long dev, int minor) int fd; mode_t devmode = DRM_DEV_MODE; int isroot = !geteuid(); -#if defined(XFree86Server) uid_t user = DRM_DEV_UID; gid_t group = DRM_DEV_GID; -#endif sprintf(buf, DRM_DEV_NAME, DRM_DIR_NAME, minor); drmMsg("drmOpenDevice: node name is %s\n", buf); -#if defined(XFree86Server) devmode = xf86ConfigDRI.mode ? xf86ConfigDRI.mode : DRM_DEV_MODE; devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH); group = (xf86ConfigDRI.group >= 0) ? xf86ConfigDRI.group : DRM_DEV_GID; -#endif if (stat(DRM_DIR_NAME, &st)) { if (!isroot) return DRM_ERR_NOT_ROOT; @@ -297,10 +274,8 @@ static int drmOpenDevice(long dev, int minor) remove(buf); mknod(buf, S_IFCHR | devmode, dev); } -#if defined(XFree86Server) chown(buf, user, group); chmod(buf, devmode); -#endif fd = open(buf, O_RDWR, 0); drmMsg("drmOpenDevice: open result is %d, (%s)\n", @@ -314,10 +289,8 @@ static int drmOpenDevice(long dev, int minor) if (!isroot) return DRM_ERR_NOT_ROOT; remove(buf); mknod(buf, S_IFCHR | devmode, dev); -#if defined(XFree86Server) chown(buf, user, group); chmod(buf, devmode); -#endif } fd = open(buf, O_RDWR, 0); drmMsg("drmOpenDevice: open result is %d, (%s)\n", @@ -454,16 +427,12 @@ static int drmOpenByName(const char *name) char * id; if (!drmAvailable()) { -#if !defined(XFree86Server) - return -1; -#else /* try to load the kernel module now */ if (!xf86LoadKernelModule(name)) { ErrorF("[drm] failed to load kernel module \"%s\"\n", name); return -1; } -#endif } /* @@ -546,7 +515,6 @@ static int drmOpenByName(const char *name) */ int drmOpen(const char *name, const char *busid) { -#ifdef XFree86Server if (!drmAvailable() && name != NULL) { /* try to load the kernel */ if (!xf86LoadKernelModule(name)) { @@ -555,7 +523,6 @@ int drmOpen(const char *name, const char *busid) return -1; } } -#endif if (busid) { int fd; @@ -2259,7 +2226,6 @@ int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, return 0; } -#if defined(XFree86Server) static void drmSIGIOHandler(int interrupt, void *closure) { unsigned long key; @@ -2323,4 +2289,3 @@ int drmRemoveSIGIOHandler(int fd) return xf86RemoveSIGIOHandler(fd); } -#endif diff --git a/hw/xfree86/os-support/drm/xf86drmHash.c b/hw/xfree86/os-support/drm/xf86drmHash.c index a2567080a..ba81a6e8e 100644 --- a/hw/xfree86/os-support/drm/xf86drmHash.c +++ b/hw/xfree86/os-support/drm/xf86drmHash.c @@ -25,7 +25,6 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.4 2001/03/21 18:08:54 dawes Exp $ * * DESCRIPTION * @@ -81,9 +80,7 @@ #if !HASH_MAIN # include "drm.h" # include "xf86drm.h" -# ifdef XFree86LOADER -# include "xf86.h" -# endif +# include "xf86.h" #endif #define N(x) drm##x diff --git a/hw/xfree86/os-support/drm/xf86drmRandom.c b/hw/xfree86/os-support/drm/xf86drmRandom.c index cc40dccad..cd63aea4e 100644 --- a/hw/xfree86/os-support/drm/xf86drmRandom.c +++ b/hw/xfree86/os-support/drm/xf86drmRandom.c @@ -25,7 +25,6 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * @@ -84,9 +83,7 @@ #if !RANDOM_MAIN # include "drm.h" # include "xf86drm.h" -# ifdef XFree86LOADER -# include "xf86.h" -# endif +# include "xf86.h" #endif #define N(x) drm##x diff --git a/hw/xfree86/os-support/drm/xf86drmSL.c b/hw/xfree86/os-support/drm/xf86drmSL.c index 23283a950..36d8fd50e 100644 --- a/hw/xfree86/os-support/drm/xf86drmSL.c +++ b/hw/xfree86/os-support/drm/xf86drmSL.c @@ -25,7 +25,6 @@ * * Authors: Rickard E. (Rik) Faith <faith@valinux.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.3 2000/06/17 00:03:34 martin Exp $ * * DESCRIPTION * @@ -53,12 +52,7 @@ #else # include "drm.h" # include "xf86drm.h" -# ifdef XFree86LOADER -# include "xf86.h" -# else -# include <stdio.h> -# include <stdlib.h> -# endif +# include "xf86.h" #endif #define N(x) drm##x diff --git a/hw/xfree86/os-support/int10Defines.h b/hw/xfree86/os-support/int10Defines.h index 56e10cf67..d942fbdad 100644 --- a/hw/xfree86/os-support/int10Defines.h +++ b/hw/xfree86/os-support/int10Defines.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/int10Defines.h,v 1.4 2003/08/24 17:37:03 dawes Exp $ */ /* * Copyright (c) 2000-2001 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am index d492f962e..6fdc1bc42 100644 --- a/hw/xfree86/os-support/linux/Makefile.am +++ b/hw/xfree86/os-support/linux/Makefile.am @@ -34,7 +34,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \ $(APM_SOURCES) \ $(PLATFORM_PCI_SUPPORT) -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack diff --git a/hw/xfree86/os-support/linux/int10/linux.c b/hw/xfree86/os-support/linux/int10/linux.c index a91137810..6c8b230e7 100644 --- a/hw/xfree86/os-support/linux/int10/linux.c +++ b/hw/xfree86/os-support/linux/int10/linux.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/int10/linux.c,v 1.32 2004/02/05 18:24:59 eich Exp $ */ /* * linux specific part of the int10 module * Copyright 1999, 2000, 2001, 2002, 2003, 2004 Egbert Eich @@ -18,12 +17,6 @@ #else #define DEV_MEM "/dev/mem" #endif -#ifndef XFree86LOADER -#include <sys/mman.h> -#ifndef MAP_FAILED -#define MAP_FAILED ((void *)-1) -#endif -#endif #define ALLOC_ENTRIES(x) ((V_RAM / x) - 1) #define SHMERRORPTR (pointer)(-1) @@ -79,16 +72,9 @@ static Int10LinuxSubModuleState int10LinuxLoadSubModule(ScrnInfoPtr pScrn); #endif /* DoSubModules */ xf86Int10InfoPtr -xf86InitInt10(int entityIndex) -{ - return xf86ExtendedInitInt10(entityIndex, 0); -} - -xf86Int10InfoPtr xf86ExtendedInitInt10(int entityIndex, int Flags) { xf86Int10InfoPtr pInt = NULL; - CARD8 *bios_base; int screen; int fd; static void* vidMem = NULL; @@ -270,52 +256,15 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) ErrorF("done\n"); #endif } - + xf86int10ParseBiosLocation(options,&bios); if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) { - if (bios.bus == BUS_ISA && bios.location.legacy) { - xf86DrvMsg(screen, X_CONFIG, - "Overriding BIOS location: 0x%x\n", - bios.location.legacy); - cs = bios.location.legacy >> 4; - bios_base = (unsigned char *)(cs << 4); - if (!int10_check_bios(screen, cs, bios_base)) { - xf86DrvMsg(screen, X_ERROR, - "No V_BIOS at specified address 0x%lx\n",cs << 4); - goto error3; - } - } 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 = ((CARD16*)0)[(0x10<<1) + 1]; - - bios_base = (unsigned char *)(cs << 4); - - if (!int10_check_bios(screen, cs, bios_base)) { - cs = ((CARD16*)0)[(0x42 << 1) + 1]; - bios_base = (unsigned char *)(cs << 4); - if (!int10_check_bios(screen, cs, bios_base)) { - cs = V_BIOS >> 4; - bios_base = (unsigned char *)(cs << 4); - if (!int10_check_bios(screen, cs, bios_base)) { - xf86DrvMsg(screen, X_ERROR, "No V_BIOS found\n"); - goto error3; - } - } - } + if (! xf86int10GetBiosSegment(pInt, &bios, NULL)) { + goto error3; } - xf86DrvMsg(screen, X_INFO, "Primary V_BIOS segment is: 0x%lx\n", cs); - - pInt->BIOSseg = cs; set_return_trap(pInt); #ifdef _PC pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH); @@ -324,41 +273,17 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) xf86Int10SaveRestoreBIOSVars(pInt, TRUE); #endif } else { - EntityInfoPtr pEnt = xf86GetEntityInfo(pInt->entityIndex); - BusType location_type; - - 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: - 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; + const BusType location_type = xf86int10GetBiosLocationType(pInt, + &bios); switch (location_type) { - case BUS_PCI: - { - int pci_entity; + case BUS_PCI: { + const int pci_entity = (bios.bus == BUS_PCI) + ? xf86GetPciEntity(bios.location.pci.bus, + bios.location.pci.dev, + bios.location.pci.func) + : pInt->entityIndex; - if (bios.bus == BUS_PCI) - pci_entity = xf86GetPciEntity(bios.location.pci.bus, - bios.location.pci.dev, - bios.location.pci.func); - else - pci_entity = pInt->entityIndex; if (!mapPciRom(pci_entity, (unsigned char *)(V_BIOS))) { xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS\n"); goto error3; @@ -367,38 +292,14 @@ xf86ExtendedInitInt10(int entityIndex, int Flags) break; } case BUS_ISA: - if (bios.bus == BUS_ISA && bios.location.legacy) { - cs = bios.location.legacy >> 4; - bios_base = (unsigned char *)(cs << 4); - if (!int10_check_bios(screen, cs, bios_base)) { - xf86DrvMsg(screen,X_ERROR,"No V_BIOS found " - "on override address %p\n",bios_base); - goto error3; - } - } else { - cs = ((CARD16*)0)[(0x10<<1)+1]; - bios_base = (unsigned char *)(cs << 4); - - if (!int10_check_bios(screen, cs, bios_base)) { - cs = ((CARD16*)0)[(0x42<<1)+1]; - bios_base = (unsigned char *)(cs << 4); - if (!int10_check_bios(screen, cs, bios_base)) { - cs = V_BIOS >> 4; - bios_base = (unsigned char *)(cs << 4); - if (!int10_check_bios(screen, cs, bios_base)) { - xf86DrvMsg(screen,X_ERROR,"No V_BIOS found\n"); - goto error3; - } - } - } + if (! xf86int10GetBiosSegment(pInt, &bios, NULL)) { + goto error3; } - xf86DrvMsg(screen,X_INFO,"Primary V_BIOS segment is: 0x%lx\n",cs); - pInt->BIOSseg = cs; break; default: goto error3; } - xfree(pEnt); + pInt->num = 0xe6; reset_int_vect(pInt); set_return_trap(pInt); diff --git a/hw/xfree86/os-support/linux/lnx.h b/hw/xfree86/os-support/linux/lnx.h index 68ad34011..5aca9e9b1 100644 --- a/hw/xfree86/os-support/linux/lnx.h +++ b/hw/xfree86/os-support/linux/lnx.h @@ -1,4 +1,3 @@ -/* $XFree86: Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnxResource.c b/hw/xfree86/os-support/linux/lnxResource.c index d01297901..6f89cdb07 100644 --- a/hw/xfree86/os-support/linux/lnxResource.c +++ b/hw/xfree86/os-support/linux/lnxResource.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnxResource.c,v 3.18 2002/01/25 21:56:19 tsi Exp $ */ /* Resource information code */ diff --git a/hw/xfree86/os-support/linux/lnx_acpi.c b/hw/xfree86/os-support/linux/lnx_acpi.c index 6712c090f..eca76dbf3 100644 --- a/hw/xfree86/os-support/linux/lnx_acpi.c +++ b/hw/xfree86/os-support/linux/lnx_acpi.c @@ -36,6 +36,20 @@ static void lnxCloseACPI(void); static pointer ACPIihPtr = NULL; PMClose lnxACPIOpen(void); +/* in milliseconds */ +#define ACPI_REOPEN_DELAY 1000 + +static CARD32 +lnxACPIReopen(OsTimerPtr timer, CARD32 time, pointer arg) +{ + if (lnxACPIOpen()) { + TimerFree(timer); + return 0; + } + + return ACPI_REOPEN_DELAY; +} + #define LINE_LENGTH 80 static int @@ -52,8 +66,7 @@ lnxACPIGetEventFromOs(int fd, pmEvent *events, int num) if (n <= 0) { lnxCloseACPI(); - sleep(1); - lnxACPIOpen(); + TimerSet(NULL, 0, ACPI_REOPEN_DELAY, lnxACPIReopen, NULL); return 0; } @@ -171,4 +184,3 @@ lnxCloseACPI(void) ACPIihPtr = NULL; } } - diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 65a5a0ea3..ded9e0fae 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -1,13 +1,12 @@ /* * Abstraction of the AGP GART interface. * - * This version is for both Linux and FreeBSD. + * This version is for Linux and Free/Open/NetBSD. * * Copyright © 2000 VA Linux Systems, Inc. * Copyright © 2001 The XFree86 Project, Inc. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> @@ -264,7 +263,11 @@ xf86DeallocateGARTMemory(int screenNum, int key) return FALSE; } +#ifdef __linux__ if (ioctl(gartFd, AGPIOC_DEALLOCATE, (int *)key) != 0) { +#else + if (ioctl(gartFd, AGPIOC_DEALLOCATE, &key) != 0) { +#endif xf86DrvMsg(screenNum, X_WARNING,"xf86DeAllocateGARTMemory: " "deallocation gart memory with key %d failed\n\t(%s)\n", key, strerror(errno)); diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c index a0722edd7..16ac80db8 100644 --- a/hw/xfree86/os-support/linux/lnx_apm.c +++ b/hw/xfree86/os-support/linux/lnx_apm.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c,v 3.12 2001/12/24 22:54:31 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnx_axp.c b/hw/xfree86/os-support/linux/lnx_axp.c index d2aa03587..0a7612965 100644 --- a/hw/xfree86/os-support/linux/lnx_axp.c +++ b/hw/xfree86/os-support/linux/lnx_axp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_axp.c,v 1.3 2001/02/15 11:03:56 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnx_ev56.c b/hw/xfree86/os-support/linux/lnx_ev56.c index 63077e907..78756a67c 100644 --- a/hw/xfree86/os-support/linux/lnx_ev56.c +++ b/hw/xfree86/os-support/linux/lnx_ev56.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_ev56.c,v 3.5 2000/02/17 13:45:49 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c index 9933c6f7b..85b6def56 100644 --- a/hw/xfree86/os-support/linux/lnx_init.c +++ b/hw/xfree86/os-support/linux/lnx_init.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 1.5 2005/04/20 12:25:35 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_init.c,v 3.14 2001/10/31 22:50:30 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/linux/lnx_io.c b/hw/xfree86/os-support/linux/lnx_io.c index 32f660108..836aaa15b 100644 --- a/hw/xfree86/os-support/linux/lnx_io.c +++ b/hw/xfree86/os-support/linux/lnx_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_io.c,v 3.25 2003/08/19 17:32:34 tsi Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -67,25 +66,6 @@ xf86GetKbdLeds() return(leds); } -/* kbd rate stuff based on kbdrate.c from Rik Faith <faith@cs.unc.edu> et.al. - * from util-linux-2.9t package */ - -#include <linux/kd.h> -#include <linux/version.h> -#ifdef __sparc__ -#include <asm/param.h> -#include <asm/kbio.h> -#endif - -/* Deal with spurious kernel header change in struct kbd_repeat. - We undo this define after the routine using that struct is over, - so as not to interfere with other 'rate' elements. */ -#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) -# define rate period -# endif -#endif - static int KDKBDREP_ioctl_ok(int rate, int delay) { #if defined(KDKBDREP) && !defined(__sparc__) @@ -94,18 +74,18 @@ KDKBDREP_ioctl_ok(int rate, int delay) { struct kbd_repeat kbdrep_s; /* don't change, just test */ - kbdrep_s.rate = -1; + kbdrep_s.LNX_KBD_PERIOD_NAME = -1; kbdrep_s.delay = -1; if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { return 0; } /* do the change */ if (rate == 0) /* switch repeat off */ - kbdrep_s.rate = 0; + kbdrep_s.LNX_KBD_PERIOD_NAME = 0; else - kbdrep_s.rate = 10000 / rate; /* convert cps to msec */ - if (kbdrep_s.rate < 1) - kbdrep_s.rate = 1; + kbdrep_s.LNX_KBD_PERIOD_NAME = 10000 / rate; /* convert cps to msec */ + if (kbdrep_s.LNX_KBD_PERIOD_NAME < 1) + kbdrep_s.LNX_KBD_PERIOD_NAME = 1; kbdrep_s.delay = delay; if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; @@ -120,15 +100,6 @@ KDKBDREP_ioctl_ok(int rate, int delay) { #endif /* KDKBDREP */ } -#undef rate - -/* Undo the earlier define for the struct kbd_repeat problem. */ -#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) -# undef rate -# endif -#endif - static int KIOCSRATE_ioctl_ok(int rate, int delay) { #ifdef KIOCSRATE diff --git a/hw/xfree86/os-support/linux/lnx_jstk.c b/hw/xfree86/os-support/linux/lnx_jstk.c index 667586359..6ed0e44c6 100644 --- a/hw/xfree86/os-support/linux/lnx_jstk.c +++ b/hw/xfree86/os-support/linux/lnx_jstk.c @@ -23,7 +23,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_jstk.c,v 3.8.2.1 1998/06/05 16:23:12 dawes Exp $ */ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Exp"; @@ -40,9 +39,7 @@ static const char rcs_id[] = "Id: lnx_jstk.c,v 1.1 1995/12/20 14:06:09 lepied Ex #include <fcntl.h> #include <sys/ioctl.h> -#ifdef XFree86LOADER #include "xf86.h" -#endif #if !defined(JSIOCGTIMELIMIT) /* make 2.1.x joystick.h backward compatable */ @@ -172,7 +169,6 @@ xf86JoystickGetState(int fd, int *x, int *y, int *buttons) return 1; } -#ifdef XFree86LOADER /* * Entry point for XFree86 Loader */ @@ -182,6 +178,5 @@ linux_jstkModuleInit(pointer *data, INT32 *magic) *magic = MAGIC_DONE; *data = NULL; } -#endif /* end of lnx_jstk.c */ diff --git a/hw/xfree86/os-support/linux/lnx_kbd.c b/hw/xfree86/os-support/linux/lnx_kbd.c index 504c52710..a4890d2df 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.c +++ b/hw/xfree86/os-support/linux/lnx_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.c,v 1.4 2003/11/03 05:11:52 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. @@ -97,25 +96,6 @@ GetKbdLeds(InputInfoPtr pInfo) return(leds); } -/* kbd rate stuff based on kbdrate.c from Rik Faith <faith@cs.unc.edu> et.al. - * from util-linux-2.9t package */ - -#include <linux/kd.h> -#include <linux/version.h> -#ifdef __sparc__ -#include <asm/param.h> -#include <asm/kbio.h> -#endif - -/* Deal with spurious kernel header change in struct kbd_repeat. - We undo this define after the routine using that struct is over, - so as not to interfere with other 'rate' elements. */ -#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) -# define rate period -# endif -#endif - static int KDKBDREP_ioctl_ok(int rate, int delay) { #if defined(KDKBDREP) && !defined(__sparc__) @@ -124,7 +104,7 @@ KDKBDREP_ioctl_ok(int rate, int delay) { struct kbd_repeat kbdrep_s; /* don't change, just test */ - kbdrep_s.rate = -1; + kbdrep_s.LNX_KBD_PERIOD_NAME = -1; kbdrep_s.delay = -1; if (ioctl( xf86Info.consoleFd, KDKBDREP, &kbdrep_s )) { return 0; @@ -132,11 +112,11 @@ KDKBDREP_ioctl_ok(int rate, int delay) { /* do the change */ if (rate == 0) /* switch repeat off */ - kbdrep_s.rate = 0; + kbdrep_s.LNX_KBD_PERIOD_NAME = 0; else - kbdrep_s.rate = 10000 / rate; /* convert cps to msec */ - if (kbdrep_s.rate < 1) - kbdrep_s.rate = 1; + kbdrep_s.LNX_KBD_PERIOD_NAME = 10000 / rate; /* convert cps to msec */ + if (kbdrep_s.LNX_KBD_PERIOD_NAME < 1) + kbdrep_s.LNX_KBD_PERIOD_NAME = 1; kbdrep_s.delay = delay; if (kbdrep_s.delay < 1) kbdrep_s.delay = 1; @@ -151,15 +131,6 @@ KDKBDREP_ioctl_ok(int rate, int delay) { #endif /* KDKBDREP */ } -#undef rate - -/* Undo the earlier define for the struct kbd_repeat problem. */ -#if defined(LINUX_VERSION_CODE) && defined(KERNEL_VERSION) -# if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,42) -# undef rate -# endif -#endif - static int KIOCSRATE_ioctl_ok(int rate, int delay) { #ifdef KIOCSRATE diff --git a/hw/xfree86/os-support/linux/lnx_kbd.h b/hw/xfree86/os-support/linux/lnx_kbd.h index ac783bfbc..b2ae179e1 100644 --- a/hw/xfree86/os-support/linux/lnx_kbd.h +++ b/hw/xfree86/os-support/linux/lnx_kbd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kbd.h,v 1.1 2002/10/11 01:40:35 dawes Exp $ */ extern void KbdGetMapping(InputInfoPtr pInfo, KeySymsPtr pKeySyms, CARD8 *pModMap); diff --git a/hw/xfree86/os-support/linux/lnx_kmod.c b/hw/xfree86/os-support/linux/lnx_kmod.c index 5e91032d3..4e6f2d25d 100644 --- a/hw/xfree86/os-support/linux/lnx_kmod.c +++ b/hw/xfree86/os-support/linux/lnx_kmod.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_kmod.c,v 3.5 2001/10/01 13:44:14 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnx_mouse.c b/hw/xfree86/os-support/linux/lnx_mouse.c index afd216028..150547ea4 100644 --- a/hw/xfree86/os-support/linux/lnx_mouse.c +++ b/hw/xfree86/os-support/linux/lnx_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_mouse.c,v 1.2 2003/10/08 14:58:30 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. @@ -29,7 +28,7 @@ DefaultProtocol(void) return "Auto"; } -#define DEFAULT_MOUSE_DEV "/dev/mouse" +#define DEFAULT_MOUSE_DEV "/dev/input/mice" #define DEFAULT_PS2_DEV "/dev/psaux" #define DEFAULT_GPM_DATA_DEV "/dev/gpmdata" #define DEFAULT_GPM_CTL_DEV "/dev/gpmdata" diff --git a/hw/xfree86/os-support/linux/lnx_pci.c b/hw/xfree86/os-support/linux/lnx_pci.c index 72939f489..a1dbc7604 100644 --- a/hw/xfree86/os-support/linux/lnx_pci.c +++ b/hw/xfree86/os-support/linux/lnx_pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_pci.c,v 3.8 2002/04/09 15:59:37 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c index 29b7800f3..051970b23 100644 --- a/hw/xfree86/os-support/linux/lnx_video.c +++ b/hw/xfree86/os-support/linux/lnx_video.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/linux/lnx_video.c,v 1.10 2005/09/19 18:38:26 alanc Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_video.c,v 3.67 2003/06/25 18:27:07 eich Exp $ */ /* * Copyright 1992 by Orest Zborowski <obz@Kodak.com> * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/lynxos/lynx_init.c b/hw/xfree86/os-support/lynxos/lynx_init.c index 84db50127..03f72ca19 100644 --- a/hw/xfree86/os-support/lynxos/lynx_init.c +++ b/hw/xfree86/os-support/lynxos/lynx_init.c @@ -22,7 +22,6 @@ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_init.c,v 3.2 1998/07/25 16:56:45 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/lynxos/lynx_io.c b/hw/xfree86/os-support/lynxos/lynx_io.c index 761fec0e0..818104634 100644 --- a/hw/xfree86/os-support/lynxos/lynx_io.c +++ b/hw/xfree86/os-support/lynxos/lynx_io.c @@ -21,7 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_io.c,v 3.9 2002/10/11 01:40:35 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/lynxos/lynx_mmap.c b/hw/xfree86/os-support/lynxos/lynx_mmap.c index 75ed0731b..3364399aa 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mmap.c +++ b/hw/xfree86/os-support/lynxos/lynx_mmap.c @@ -21,7 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mmap.c,v 3.5 1998/08/29 05:43:58 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/lynxos/lynx_mouse.c b/hw/xfree86/os-support/lynxos/lynx_mouse.c index c04d0f71a..b48202977 100644 --- a/hw/xfree86/os-support/lynxos/lynx_mouse.c +++ b/hw/xfree86/os-support/lynxos/lynx_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_mouse.c,v 1.1 1999/05/22 08:40:14 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/lynxos/lynx_noinline.c b/hw/xfree86/os-support/lynxos/lynx_noinline.c index 0e143256a..d4db82cca 100644 --- a/hw/xfree86/os-support/lynxos/lynx_noinline.c +++ b/hw/xfree86/os-support/lynxos/lynx_noinline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_noinline.c,v 3.5 2000/07/31 23:25:18 tsi Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_ppc.c b/hw/xfree86/os-support/lynxos/lynx_ppc.c index e587b7ee0..6300f38c8 100644 --- a/hw/xfree86/os-support/lynxos/lynx_ppc.c +++ b/hw/xfree86/os-support/lynxos/lynx_ppc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_ppc.c,v 1.1 2002/12/14 04:41:14 dawes Exp $ */ /* * Copyright 1998 by Metro Link Incorporated * diff --git a/hw/xfree86/os-support/lynxos/lynx_video.c b/hw/xfree86/os-support/lynxos/lynx_video.c index 4e707a989..4602076c7 100644 --- a/hw/xfree86/os-support/lynxos/lynx_video.c +++ b/hw/xfree86/os-support/lynxos/lynx_video.c @@ -21,7 +21,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/lynxos/lynx_video.c,v 3.17 2000/10/28 01:42:27 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/misc/BUSmemcpy.c b/hw/xfree86/os-support/misc/BUSmemcpy.c index 58864e5e0..b482b867a 100644 --- a/hw/xfree86/os-support/misc/BUSmemcpy.c +++ b/hw/xfree86/os-support/misc/BUSmemcpy.c @@ -12,7 +12,6 @@ Thanks to Linus Torvalds for contributing this code. ****************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.c,v 1.3 1999/12/03 19:17:44 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/misc/Delay.c b/hw/xfree86/os-support/misc/Delay.c index 7c105a9e0..b56595377 100644 --- a/hw/xfree86/os-support/misc/Delay.c +++ b/hw/xfree86/os-support/misc/Delay.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/Delay.c,v 3.3 2000/12/08 20:13:38 eich Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/misc/IODelay.c b/hw/xfree86/os-support/misc/IODelay.c index 083cfed8a..54b7c1816 100644 --- a/hw/xfree86/os-support/misc/IODelay.c +++ b/hw/xfree86/os-support/misc/IODelay.c @@ -4,7 +4,6 @@ Stub for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.c,v 1.1.2.1 1998/06/04 17:35:59 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am index 5ce23a1f1..f546e1a92 100644 --- a/hw/xfree86/os-support/misc/Makefile.am +++ b/hw/xfree86/os-support/misc/Makefile.am @@ -18,6 +18,6 @@ libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES) INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES) diff --git a/hw/xfree86/os-support/misc/SlowBcopy.c b/hw/xfree86/os-support/misc/SlowBcopy.c index be870194a..1fda7fc10 100644 --- a/hw/xfree86/os-support/misc/SlowBcopy.c +++ b/hw/xfree86/os-support/misc/SlowBcopy.c @@ -4,7 +4,6 @@ for Alpha Linux *******************************************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.c,v 1.6tsi Exp $ */ /* * Create a dependency that should be immune from the effect of register diff --git a/hw/xfree86/os-support/misc/xf86_IlHack.c b/hw/xfree86/os-support/misc/xf86_IlHack.c index d8053f7d2..1ec0f569d 100644 --- a/hw/xfree86/os-support/misc/xf86_IlHack.c +++ b/hw/xfree86/os-support/misc/xf86_IlHack.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_IlHack.c,v 3.4.4.1 1998/06/04 17:36:01 dawes Exp $ */ /* * This file is an incredible crock to get the normally-inline functions * built into the server so that things can be debugged properly. diff --git a/hw/xfree86/os-support/misc/xf86_Util.c b/hw/xfree86/os-support/misc/xf86_Util.c index afcdd5b69..77df1e248 100644 --- a/hw/xfree86/os-support/misc/xf86_Util.c +++ b/hw/xfree86/os-support/misc/xf86_Util.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/misc/xf86_Util.c,v 3.7 1999/01/14 13:05:05 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * diff --git a/hw/xfree86/os-support/sco/VTsw_sco.c b/hw/xfree86/os-support/sco/VTsw_sco.c index beb86ccad..ba2f7adee 100644 --- a/hw/xfree86/os-support/sco/VTsw_sco.c +++ b/hw/xfree86/os-support/sco/VTsw_sco.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/VTsw_sco.c,v 1.2 1998/07/25 16:56:57 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * Copyright 1993 by David McCullough <davidm@stallion.oz.au> diff --git a/hw/xfree86/os-support/sco/sco_init.c b/hw/xfree86/os-support/sco/sco_init.c index bc1f3b56d..07f30f019 100644 --- a/hw/xfree86/os-support/sco/sco_init.c +++ b/hw/xfree86/os-support/sco/sco_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_init.c,v 3.13 2002/06/03 21:22:10 dawes Exp $ */ /* * Copyright 2001-2005 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/sco/sco_io.c b/hw/xfree86/os-support/sco/sco_io.c index 6067d51a5..eafc14cfb 100644 --- a/hw/xfree86/os-support/sco/sco_io.c +++ b/hw/xfree86/os-support/sco/sco_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_io.c,v 3.9 2002/10/11 01:40:36 dawes Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/sco/sco_mouse.c b/hw/xfree86/os-support/sco/sco_mouse.c index f9d068c24..29e1f6f3c 100644 --- a/hw/xfree86/os-support/sco/sco_mouse.c +++ b/hw/xfree86/os-support/sco/sco_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_mouse.c,v 3.12 2001/06/30 22:41:49 tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/sco/sco_video.c b/hw/xfree86/os-support/sco/sco_video.c index dd81786bb..807028f6a 100644 --- a/hw/xfree86/os-support/sco/sco_video.c +++ b/hw/xfree86/os-support/sco/sco_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sco/sco_video.c,v 3.8tsi Exp $ */ /* * Copyright 2001 by J. Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index ac8ae3b0a..fd05f399c 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_noop.c,v 3.1.4.1 1998/06/05 16:23:20 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index b38470aea..0100ae928 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/VTsw_usl.c,v 3.1.4.1 1998/06/05 16:23:21 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * diff --git a/hw/xfree86/os-support/shared/agp_noop.c b/hw/xfree86/os-support/shared/agp_noop.c index e85b1f8d4..0a7844894 100644 --- a/hw/xfree86/os-support/shared/agp_noop.c +++ b/hw/xfree86/os-support/shared/agp_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c,v 1.5 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2000-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/at_scancode.c b/hw/xfree86/os-support/shared/at_scancode.c index 8947254bc..10d3da2ba 100644 --- a/hw/xfree86/os-support/shared/at_scancode.c +++ b/hw/xfree86/os-support/shared/at_scancode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c,v 1.4 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/bios_devmem.c b/hw/xfree86/os-support/shared/bios_devmem.c index b63704cde..86d38292f 100644 --- a/hw/xfree86/os-support/shared/bios_devmem.c +++ b/hw/xfree86/os-support/shared/bios_devmem.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_devmem.c,v 3.5 1998/09/13 00:51:32 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * diff --git a/hw/xfree86/os-support/shared/bios_mmap.c b/hw/xfree86/os-support/shared/bios_mmap.c index 5f300a967..40d37e0c3 100644 --- a/hw/xfree86/os-support/shared/bios_mmap.c +++ b/hw/xfree86/os-support/shared/bios_mmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/bios_mmap.c,v 1.8 2000/11/19 16:38:06 tsi Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@goblin.org> * diff --git a/hw/xfree86/os-support/shared/ia64Pci.c b/hw/xfree86/os-support/shared/ia64Pci.c index 1fe119dcd..708840c71 100644 --- a/hw/xfree86/os-support/shared/ia64Pci.c +++ b/hw/xfree86/os-support/shared/ia64Pci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bus/ia64Pci.c,v 1.3 2003/02/23 20:26:49 tsi Exp $ */ /* * Copyright (C) 2002-2003 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/shared/ioperm_noop.c b/hw/xfree86/os-support/shared/ioperm_noop.c index 04e72fe1c..2427d1923 100644 --- a/hw/xfree86/os-support/shared/ioperm_noop.c +++ b/hw/xfree86/os-support/shared/ioperm_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/ioperm_noop.c,v 3.3 1998/07/25 16:57:00 dawes Exp $ */ /* * Copyright 1993 by David Wexelblat <dwex@XFree86.org> * diff --git a/hw/xfree86/os-support/shared/kbd.c b/hw/xfree86/os-support/shared/kbd.c index b9aeafd7b..dd6d77d82 100644 --- a/hw/xfree86/os-support/shared/kbd.c +++ b/hw/xfree86/os-support/shared/kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kbd.c,v 1.3 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2001-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/kmod_noop.c b/hw/xfree86/os-support/shared/kmod_noop.c index 935f44bbe..6525e8414 100644 --- a/hw/xfree86/os-support/shared/kmod_noop.c +++ b/hw/xfree86/os-support/shared/kmod_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/kmod_noop.c,v 1.2 2003/08/24 17:37:05 dawes Exp $ */ /* * Copyright (c) 2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/libc_wrapper.c b/hw/xfree86/os-support/shared/libc_wrapper.c index 1663893d9..4c4af4c24 100644 --- a/hw/xfree86/os-support/shared/libc_wrapper.c +++ b/hw/xfree86/os-support/shared/libc_wrapper.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c,v 1.102 2003/11/19 03:52:58 dawes Exp $ */ /* * Copyright 1997-2003 by The XFree86 Project, Inc. * @@ -89,8 +88,8 @@ extern int mmapFd; #include <stdlib.h> #endif -#define NEED_XF86_TYPES -#define NEED_XF86_PROTOTYPES +#define NEED_XF86_TYPES 1 +#define NEED_XF86_PROTOTYPES 1 #define DONT_DEFINE_WRAPPERS #include "xf86_ansic.h" diff --git a/hw/xfree86/os-support/shared/pm_noop.c b/hw/xfree86/os-support/shared/pm_noop.c index 6e24653ba..bfac4b1c8 100644 --- a/hw/xfree86/os-support/shared/pm_noop.c +++ b/hw/xfree86/os-support/shared/pm_noop.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/pm_noop.c,v 1.2 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/posix_tty.c b/hw/xfree86/os-support/shared/posix_tty.c index 3f9a82214..6e1b54331 100644 --- a/hw/xfree86/os-support/shared/posix_tty.c +++ b/hw/xfree86/os-support/shared/posix_tty.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/posix_tty.c,v 3.30 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright 1993-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index ecdc1cdd7..f6c15c28f 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigio.c,v 1.16 2003/09/04 00:21:17 dawes Exp $ */ /* sigio.c -- Support for SIGIO handler installation and removal * Created: Thu Jun 3 15:39:18 1999 by faith@precisioninsight.com @@ -58,22 +57,11 @@ #include <xorg-config.h> #endif -#ifdef XFree86Server # include <X11/X.h> # include "xf86.h" # include "xf86Priv.h" # include "xf86_OSlib.h" # include "inputstr.h" -#else -# include <unistd.h> -# include <signal.h> -# include <fcntl.h> -# include <sys/time.h> -# include <errno.h> -# include <stdio.h> -# include <string.h> -# define SYSCALL(call) while(((call) == -1) && (errno == EINTR)) -#endif /* * Linux libc5 defines FASYNC, but not O_ASYNC. Don't know if it is @@ -126,11 +114,9 @@ xf86SIGIO (int sig) xf86SigIOFuncs[i].closure); r--; } -#ifdef XFree86Server if (r > 0) { xf86Msg(X_ERROR, "SIGIO %d descriptors not handled\n", r); } -#endif } static int @@ -159,24 +145,14 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) return 0; blocked = xf86BlockSIGIO(); if (fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_ASYNC) == -1) { -#ifdef XFree86Server xf86Msg(X_WARNING, "fcntl(%d, O_ASYNC): %s\n", fd, strerror(errno)); -#else - fprintf(stderr,"fcntl(%d, O_ASYNC): %s\n", - fd, strerror(errno)); -#endif xf86UnblockSIGIO(blocked); return 0; } if (fcntl(fd, F_SETOWN, getpid()) == -1) { -#ifdef XFree86Server xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN): %s\n", fd, strerror(errno)); -#else - fprintf(stderr,"fcntl(%d, F_SETOWN): %s\n", - fd, strerror(errno)); -#endif xf86UnblockSIGIO(blocked); return 0; } @@ -289,7 +265,6 @@ xf86UnblockSIGIO (int wasset) } } -#ifdef XFree86Server void xf86AssertBlockedSIGIO (char *where) { @@ -308,5 +283,3 @@ xf86SIGIOSupported (void) { return 1; } - -#endif diff --git a/hw/xfree86/os-support/shared/sigiostubs.c b/hw/xfree86/os-support/shared/sigiostubs.c index eb5e2db2c..1a196cb30 100644 --- a/hw/xfree86/os-support/shared/sigiostubs.c +++ b/hw/xfree86/os-support/shared/sigiostubs.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sigiostubs.c,v 1.4 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * @@ -25,13 +24,11 @@ * the sale, use or other dealings in this Software without prior written * authorization from the copyright holder(s) and author(s). */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/shared/sigiostubs.c,v 1.5 2005/07/03 07:01:35 daniels Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> #endif -#ifdef XFree86Server #ifdef __UNIXOS2__ # define I_NEED_OS2_H #endif @@ -39,13 +36,6 @@ # include "xf86.h" # include "xf86Priv.h" # include "xf86_OSlib.h" -#else -# include <unistd.h> -# include <signal.h> -# include <fcntl.h> -# include <sys/time.h> -# include <errno.h> -#endif _X_EXPORT int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) @@ -70,12 +60,10 @@ xf86UnblockSIGIO (int wasset) { } -#ifdef XFree86Server void xf86AssertBlockedSIGIO (char *where) { } -#endif /* XXX This is a quick hack for the benefit of xf86SetSilkenMouse() */ Bool diff --git a/hw/xfree86/os-support/shared/stdPci.c b/hw/xfree86/os-support/shared/stdPci.c index 491406f92..e55ac77be 100644 --- a/hw/xfree86/os-support/shared/stdPci.c +++ b/hw/xfree86/os-support/shared/stdPci.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdPci.c,v 3.4 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index 83ad0bb42..ad4685605 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/stdResource.c,v 1.22 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/std_kbdEv.c b/hw/xfree86/os-support/shared/std_kbdEv.c index c678162c2..f56a5fd05 100644 --- a/hw/xfree86/os-support/shared/std_kbdEv.c +++ b/hw/xfree86/os-support/shared/std_kbdEv.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/std_kbdEv.c,v 3.2 1998/07/25 16:57:01 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/shared/sysv_kbd.c b/hw/xfree86/os-support/shared/sysv_kbd.c index 3a3544e8c..d7d75191e 100644 --- a/hw/xfree86/os-support/shared/sysv_kbd.c +++ b/hw/xfree86/os-support/shared/sysv_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/sysv_kbd.c,v 3.3 1998/07/25 16:57:02 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@XFree86.org> diff --git a/hw/xfree86/os-support/shared/vidmem.c b/hw/xfree86/os-support/shared/vidmem.c index c2618d075..4d775eb52 100644 --- a/hw/xfree86/os-support/shared/vidmem.c +++ b/hw/xfree86/os-support/shared/vidmem.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/vidmem.c,v 1.17 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 1993-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/shared/xf86Axp.c b/hw/xfree86/os-support/shared/xf86Axp.c index b8953f119..e6511dd43 100644 --- a/hw/xfree86/os-support/shared/xf86Axp.c +++ b/hw/xfree86/os-support/shared/xf86Axp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/shared/xf86Axp.c,v 1.3 2003/08/24 17:37:06 dawes Exp $ */ /* * Copyright (c) 2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am index 63b8e9a90..6b29b3080 100644 --- a/hw/xfree86/os-support/solaris/Makefile.am +++ b/hw/xfree86/os-support/solaris/Makefile.am @@ -34,7 +34,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC) sdk_HEADERS = agpgart.h nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il -AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) diff --git a/hw/xfree86/os-support/solaris/agpgart.h b/hw/xfree86/os-support/solaris/agpgart.h index 09d63ec26..566de8046 100644 --- a/hw/xfree86/os-support/solaris/agpgart.h +++ b/hw/xfree86/os-support/solaris/agpgart.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/agpgart.h,v 1.1 2005/06/09 03:11:58 alanc Exp $ */ /* * AGPGART module version 0.99 * Copyright (C) 1999 Jeff Hartmann diff --git a/hw/xfree86/os-support/solaris/apSolaris.shar b/hw/xfree86/os-support/solaris/apSolaris.shar index c8e2cfa49..a3548f7b4 100644 --- a/hw/xfree86/os-support/solaris/apSolaris.shar +++ b/hw/xfree86/os-support/solaris/apSolaris.shar @@ -1,40 +1,28 @@ #!/bin/sh -# $XFree86$ -# This is a shell archive (produced by GNU sharutils 4.2c). -# To extract the files from this archive, save it to some FILE, remove -# everything before the `!/bin/sh' line above, then type `sh FILE'. # -# Made on 2002-10-04 13:41 MDT by <root@abcyxhiz>. -# Source directory was `/archives'. +# This is a shell archive. Save it in a file, remove anything before +# this line, and then unpack it by entering "sh file". Note, it may +# create directories; files and directories will be owned by you and +# have default permissions. +# Made on Sun Jun 25 20:24:59 CEST 2006 by Martin Bochnig at martux.org # -# Existing files will *not* be overwritten unless `-c' is specified. -# This format requires very little intelligence at unshar time. -# "if test", "echo", "mkdir", and "sed" may be needed. +# This archive contains: # -# This shar contains: -# length mode name -# ------ ---------- ------------------------------------------ -# 1521 -rw-r--r-- aperture/Makefile -# 1659 -rw-r--r-- aperture/README -# 7557 -rw-r--r-- aperture/aperture.c -# 450 -rw-r--r-- aperture/aperture.conf -# 87 -rw-r--r-- aperture/devlink.tab -# 1062 -rw-r--r-- aperture/Makefile.sun4u +# ./aperture +# +# ./aperture/Makefile +# ./aperture/Makefile.amd64 +# ./aperture/Makefile.sparcv9 +# ./aperture/README +# ./aperture/aperture.c +# ./aperture/aperture.conf +# ./aperture/devlink.tab # -echo=echo -shar_tty= shar_n= shar_c=' -' -mkdir _sh09806 || ( echo 'failed to create locking directory' '_sh09806'; exit 1 ) -# ============= aperture/Makefile ============== -if test ! -d 'aperture'; then - $echo $echo_n 'x -' 'aperture: '$echo_c - if mkdir 'aperture'; then $echo 'created'; else $echo 'failed to create'; fi -fi -if test -f 'aperture/Makefile' && test "$first_param" != -c; then - $echo 'x -' SKIPPING 'aperture/Makefile' '(file already exists)' -else - $echo 'x -' extracting 'aperture/Makefile' '(text)' - sed 's/^X//' << 'SHAR_EOF' > 'aperture/Makefile' && +echo c - ./aperture +mkdir -p ./aperture > /dev/null 2>&1 +# +echo x - ./aperture/Makefile +sed 's/^X//' >./aperture/Makefile << 'END-of-./aperture/Makefile' X# X# File: makefile for aperture Framebuffer Driver X# Author: Doug Anson (danson@lgc.com) @@ -46,14 +34,22 @@ X# Modified: Marc Aurele La France (tsi@xfree86.org) X# Date: 2001.06.08 X# - SPARC support, cleanup and turf aptest. X# -X# >>NOTE<< Have a look at Makefile.sun4u for sun4u specifics. +X# >>NOTE<< Have a look at Makefile.sparcv9 for specifics. +X# +X# Modified: Martin Bochnig (martin@martux.org) +X# Date: 2006.06.24 +X# - Slightly modified to also build on Solaris 10 and 11. +X# - amd64 64 bit kernel support +X# - cosmetical changes to also support sun4v, not only sun4u +X# +X# >>NOTE<< Have a look at Makefile.amd64 for amd64 specifics. X# X# GNU gcc compiler XCC=gcc XCFLGS=-fno-builtin -Wall -O3 X X# -X# Proworks compiler +X# SUNWspro compiler X#CC=/opt/SUNWspro/bin/cc X#CFLGS=-Xa -xnolib -xO3 X @@ -75,26 +71,26 @@ X# Make rules Xall: $(DRIVER) X X$(DRIVER): $(OBJS) -X @if [ -f "Makefile.`uname -m`" ]; then \ -X make -f Makefile.`uname -m` $(DRIVER); \ +X @if [ -f "Makefile.`isainfo -k`" ]; then \ +X make -f Makefile.`isainfo -k` $(DRIVER); \ X else \ X rm -f $(DRIVER); \ X ld -r -o $(DRIVER) $(OBJS); \ X fi X Xinstall: $(DRIVER) -X @if [ -f "Makefile.`uname -m`" ]; then \ -X make -f Makefile.`uname -m` install; \ +X @if [ -f "Makefile.`isainfo -k`" ]; then \ +X make -f Makefile.`isainfo -k` install; \ X else \ X cp aperture.conf /kernel/drv; \ X cp $(DRIVER) /kernel/drv; \ X fi X Xadd_drv: -X @if [ -f "Makefile.`uname -m`" ]; then \ -X make -f Makefile.`uname -m` add_drv; \ +X @if [ -f "Makefile.`isainfo -k`" ]; then \ +X make -f Makefile.`isainfo -k` add_drv; \ X else \ -X add_drv /kernel/drv/aperture; \ +X add_drv aperture; \ X fi X Xclean: @@ -106,29 +102,156 @@ X.c.i: X $(CC) -E $(CFLAGS) $*.c > $@ X X.c.o: -X @if [ -f "Makefile.`uname -m`" ]; then \ -X make -f Makefile.`uname -m` $@; \ +X @if [ -f "Makefile.`isainfo -k`" ]; then \ +X make -f Makefile.`isainfo -k` $@; \ X else \ X rm -f $@; \ X $(CC) -c $(CFLAGS) $*.c -o $@; \ X fi -SHAR_EOF - : || $echo 'restore of' 'aperture/Makefile' 'failed' -fi -# ============= aperture/README ============== -if test -f 'aperture/README' && test "$first_param" != -c; then - $echo 'x -' SKIPPING 'aperture/README' '(file already exists)' -else - $echo 'x -' extracting 'aperture/README' '(text)' - sed 's/^X//' << 'SHAR_EOF' > 'aperture/README' && -XFramebuffer apperture driver. +END-of-./aperture/Makefile +echo x - ./aperture/Makefile.amd64 +sed 's/^X//' >./aperture/Makefile.amd64 << 'END-of-./aperture/Makefile.amd64' +X# +X# File: Makefile for aperture Framebuffer Driver +X# Author: Doug Anson (danson@lgc.com) +X# Date: 2/15/94 +X# Modified: David Holland (davidh@use.com) +X# Date: 2/23/94 +X# - Changed name, and debugging structure +X# Modified: Marc Aurele La France (tsi@xfree86.org) +X# Date: 2001.06.08 +X# - SPARC support, cleanup and turf aptest. +X# Modified: Martin Bochnig (martin@martux.org) +X# - amd64 64 bit kernel support, cosmetics and also +X# supporting sun4v (and arbitrary sparcv9) platforms +X# as well as SunOS 5.10 or higher now +X# - Changed name +X# +X +X# +X# GNU gcc compiler, version 3.2 or later +X# +XCC=gcc +XCFLGS=-fno-builtin -Wall -O3 -m64 -mcmodel=kernel +X +X# +X# SUNWspro compiler (untested, might not properly work for amd64 here) +X#CC=/opt/SUNWspro/bin/cc +X#CFLGS=-Xa -xarch=v9 -xnolib -xO3 +X +X# +X# Debug error reporting +X#DEBUG_FLG= +X#DEBUG_FLG=-DAPERTURE_DEBUG +X +X# +X# Files and object declarations +XKERNEL_FLGS=-D_KERNEL -DSUNDDI +XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG) +XCFILES= aperture.c +XOBJS= aperture.o +XDRIVER= aperture +X +X# +X# Make rules +Xall: $(DRIVER) +X +X$(DRIVER): $(OBJS) +X rm -f $(DRIVER) +X ld -r -o $(DRIVER) $(OBJS) +X +Xinstall: $(DRIVER) +X cp aperture.conf /kernel/drv +X cp $(DRIVER) /kernel/drv/amd64 +X +Xadd_drv: +X add_drv aperture +X +Xclean: +X rm -f *% *.BAK $(OBJS) $(DRIVER) core +X +X.SUFFIXES: .i +X +X.c.i: +X $(CC) -E $(CFLAGS) $*.c > $@ +END-of-./aperture/Makefile.amd64 +echo x - ./aperture/Makefile.sparcv9 +sed 's/^X//' >./aperture/Makefile.sparcv9 << 'END-of-./aperture/Makefile.sparcv9' +X# +X# File: makefile for aperture Framebuffer Driver +X# Author: Doug Anson (danson@lgc.com) +X# Date: 2/15/94 +X# Modified: David Holland (davidh@use.com) +X# Date: 2/23/94 +X# - Changed name, and debugging structure +X# Modified: Marc Aurele La France (tsi@xfree86.org) +X# Date: 2001.06.08 +X# - SPARC support, cleanup and turf aptest. +X# Modified: Martin Bochnig (martin@martux.org) +X# Date: 2006.06.24 +X# - Changed name for generic sparcv9 support +X# - updated to better work with Solaris 10 and 11 +X# +X +X# +X# GNU gcc compiler, version 3.2 or later +X# +XCC=gcc +XCFLGS=-fno-builtin -Wall -O3 -m64 +X +X# +X# SUNWspro compiler +X#CC=/opt/SUNWspro/bin/cc +X#CFLGS=-Xa -xarch=v9 -xnolib -xO3 +X +X# +X# Debug error reporting +X#DEBUG_FLG= +X#DEBUG_FLG=-DAPERTURE_DEBUG +X +X# +X# Files and object declarations +XKERNEL_FLGS=-D_KERNEL -DSUNDDI +XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG) +XCFILES= aperture.c +XOBJS= aperture.o +XDRIVER= aperture +X +X# +X# Make rules +Xall: $(DRIVER) +X +X$(DRIVER): $(OBJS) +X rm -f $(DRIVER) +X ld -r -o $(DRIVER) $(OBJS) +X +Xinstall: $(DRIVER) +X cp aperture.conf /kernel/drv +X cp $(DRIVER) /kernel/drv/sparcv9 +X +Xadd_drv: +X add_drv aperture +X +Xclean: +X rm -f *% *.BAK $(OBJS) $(DRIVER) core +X +X.SUFFIXES: .i +X +X.c.i: +X $(CC) -E $(CFLAGS) $*.c > $@ +END-of-./aperture/Makefile.sparcv9 +echo x - ./aperture/README +sed 's/^X//' >./aperture/README << 'END-of-./aperture/README' +XFramebuffer aperture driver. X XThis driver was written to provide a device that, unlike /dev/mem, allows Xmmap()'ing of ranges beyond installed memory. X -XThe original x86-based version of this driver was the corroborative work of +XThe original x86-based version of this driver was the collaborative work of XDoug Anson (danson@lgc.com), and David Holland (davidh@use.com). It has since -Xbeen rewritten to also work on sun4u machines. +Xbeen rewritten to also work on sparc machines and - later on - also on sparcv9 +Xand recently amd64 64 bit kernels. +XIt flawlessly compiles and installs on Solaris 10 and 11 now. X X XInstallation instructions: @@ -137,23 +260,23 @@ X1) Check the Makefile, for appropriate CC, and CFLAGS definitions. Compiling X with APERTURE_DEBUG defined means the driver will generate reams of X debugging output. You'll probably want to leave this off... X -X2) type 'make'. The driver and test program should compile with out any -X problems. There also should not be any warning messages. +X2) Type 'make' (or 'gmake'). Both the driver and test program should compile +X without any problems. No warning messages should be generated. X X3) Become 'root'. X -X4) type 'make install' and 'make add_drv'. The screen should look something +X4) Type 'make install' and 'make add_drv'. The screen should look something X like this: X X # make install X cp aperture aperture.conf /kernel/drv X # make add_drv -X add_drv /kernel/drv/aperture +X add_drv aperture X -X On a sun4u machine this will mention the /kernel/drv/sparcv9 directory -X instead of /kernel/drv. +X On a sparcv9 machine this will mention the /kernel/drv/sparcv9 directory +X instead of /kernel/drv. Similarily /kernel/drv/amd64 should be used on amd64. X -X This installs the driver in the system. +X This installs the driver to the system. X X5) While as root modify the file /etc/devlink.tab, adding these lines: X @@ -163,7 +286,7 @@ X X Add that line exactly as shown. You may also simply add the X contents of the devlink.tab file supplied to /etc/devlink.tab. X It contains the lines as well. (Yes, that is a tab between -X aperture, and fbs, not spaces - very important) +X aperture and fbs, not spaces - very important) X X6) Perform a reconfiguration boot of the system. X @@ -171,15 +294,9 @@ X # touch /reconfigure X # init 6 X XBug reports, questions, suggestions, etc can be sent to xfree86@xfree86.org. -SHAR_EOF - : || $echo 'restore of' 'aperture/README' 'failed' -fi -# ============= aperture/aperture.c ============== -if test -f 'aperture/aperture.c' && test "$first_param" != -c; then - $echo 'x -' SKIPPING 'aperture/aperture.c' '(file already exists)' -else - $echo 'x -' extracting 'aperture/aperture.c' '(text)' - sed 's/^X//' << 'SHAR_EOF' > 'aperture/aperture.c' && +END-of-./aperture/README +echo x - ./aperture/aperture.c +sed 's/^X//' >./aperture/aperture.c << 'END-of-./aperture/aperture.c' X/* X * Copyright (C) 2001 The XFree86 Project, Inc. All Rights Reserved. X * @@ -210,6 +327,13 @@ X/* X * Aperture driver for Solaris. X */ X +X/* +X * Modified: Martin Bochnig (martin@martux.org) +X * Log: Commented out obsolete kernel interfaces DDI_IDENTIFIED and DDI_NOT_IDENTIFIED +X * not supported by SunOS 5.10 or higher anymore, +X * see http://docs.sun.com/app/docs/doc/819-2255/6n4ibnffr?a=view +X */ +X X#include <sys/conf.h> X#include <sys/ddi.h> X#include <sys/modctl.h> @@ -412,9 +536,9 @@ X X#endif X X if (strcmp(ddi_get_name(dip), DEV_IDENT)) -X error = DDI_NOT_IDENTIFIED; +X error = 1 /* DDI_NOT_IDENTIFIED obsolete since SunOS 5.10 */ ; X else -X error = DDI_IDENTIFIED; +X error = 2 /* DDI_IDENTIFIED obsolete since SunOS 5.10 */ ; X X#ifdef APERTURE_DEBUG X @@ -465,7 +589,7 @@ X else X { X error = ddi_create_minor_node(dip, ddi_get_name(dip), S_IFCHR, X (minor_t)ddi_get_instance(dip), -X NULL, NODESPECIFIC_DEV); +X NULL, 0 /* NODESPECIFIC_DEV obsolete since SunOS 5.10 */ ); X X if (error == DDI_SUCCESS) X { @@ -653,15 +777,9 @@ X#endif X X return error; X} -SHAR_EOF - : || $echo 'restore of' 'aperture/aperture.c' 'failed' -fi -# ============= aperture/aperture.conf ============== -if test -f 'aperture/aperture.conf' && test "$first_param" != -c; then - $echo 'x -' SKIPPING 'aperture/aperture.conf' '(file already exists)' -else - $echo 'x -' extracting 'aperture/aperture.conf' '(text)' - sed 's/^X//' << 'SHAR_EOF' > 'aperture/aperture.conf' && +END-of-./aperture/aperture.c +echo x - ./aperture/aperture.conf +sed 's/^X//' >./aperture/aperture.conf << 'END-of-./aperture/aperture.conf' X# X# Copyright 1994 Doug Anson, danson@lgc.com & David Holland, davidh@use.com X# @@ -678,91 +796,11 @@ X# X# Purpose: This conf file is used by the aperture driver. X# Xname="aperture" parent="pseudo"; -SHAR_EOF - : || $echo 'restore of' 'aperture/aperture.conf' 'failed' -fi -# ============= aperture/devlink.tab ============== -if test -f 'aperture/devlink.tab' && test "$first_param" != -c; then - $echo 'x -' SKIPPING 'aperture/devlink.tab' '(file already exists)' -else - $echo 'x -' extracting 'aperture/devlink.tab' '(text)' - sed 's/^X//' << 'SHAR_EOF' > 'aperture/devlink.tab' && +END-of-./aperture/aperture.conf +echo x - ./aperture/devlink.tab +sed 's/^X//' >./aperture/devlink.tab << 'END-of-./aperture/devlink.tab' X# The following entry is for the aperture driver Xtype=ddi_pseudo;name=aperture fbs/\M0 -SHAR_EOF - : || $echo 'restore of' 'aperture/devlink.tab' 'failed' -fi -# ============= aperture/Makefile.sun4u ============== -if test -f 'aperture/Makefile.sun4u' && test "$first_param" != -c; then - $echo 'x -' SKIPPING 'aperture/Makefile.sun4u' '(file already exists)' -else - $echo 'x -' extracting 'aperture/Makefile.sun4u' '(text)' - sed 's/^X//' << 'SHAR_EOF' > 'aperture/Makefile.sun4u' && -X# -X# File: makefile for aperture Framebuffer Driver -X# Author: Doug Anson (danson@lgc.com) -X# Date: 2/15/94 -X# Modified: David Holland (davidh@use.com) -X# Date: 2/23/94 -X# - Changed name, and debugging structure -X# Modified: Marc Aurele La France (tsi@xfree86.org) -X# Date: 2001.06.08 -X# - SPARC support, cleanup and turf aptest. -X# -X -X# -X# GNU gcc compiler, version 3.2 or later -X# -XCC=gcc -XCFLGS=-fno-builtin -Wall -O3 -m64 -X -X# -X# Proworks compiler -X#CC=/opt/SUNWspro/bin/cc -X#CFLGS=-Xa -xarch=v9 -xnolib -xO3 -X -X# -X# Debug error reporting -X#DEBUG_FLG= -X#DEBUG_FLG=-DAPERTURE_DEBUG -X -X# -X# Files and object declarations -XKERNEL_FLGS=-D_KERNEL -DSUNDDI -XCFLAGS= $(CFLGS) $(KERNEL_FLGS) $(DEBUG_FLG) -XCFILES= aperture.c -XOBJS= aperture.o -XDRIVER= aperture -X -X# -X# Make rules -Xall: $(DRIVER) -X -X$(DRIVER): $(OBJS) -X rm -f $(DRIVER) -X ld -r -o $(DRIVER) $(OBJS) -X -Xinstall: $(DRIVER) -X cp aperture.conf /kernel/drv -X cp $(DRIVER) /kernel/drv/sparcv9 -X -Xadd_drv: -X add_drv /kernel/drv/sparcv9/aperture -X -Xclean: -X rm -f *% *.BAK $(OBJS) $(DRIVER) core -X -X.SUFFIXES: .i -X -X.c.i: -X $(CC) -E $(CFLAGS) $*.c > $@ -SHAR_EOF - : || $echo 'restore of' 'aperture/Makefile.sun4u' 'failed' -fi -$echo $shar_n 'x -' 'lock directory' "\`_sh09806': " $shar_c -if rm -fr _sh09806; then - $echo 'removed' -else - $echo 'failed to remove' -fi -exit 0 +END-of-./aperture/devlink.tab +exit + diff --git a/hw/xfree86/os-support/solaris/sun_agp.c b/hw/xfree86/os-support/solaris/sun_agp.c index 9db2b86ba..e97ab9ef9 100644 --- a/hw/xfree86/os-support/solaris/sun_agp.c +++ b/hw/xfree86/os-support/solaris/sun_agp.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_agp.c,v 1.5 2005/08/24 22:37:15 alanc Exp $ */ /* * Abstraction of the AGP GART interface. * diff --git a/hw/xfree86/os-support/solaris/sun_bios.c b/hw/xfree86/os-support/solaris/sun_bios.c index 18f6558f3..6a132f5a3 100644 --- a/hw/xfree86/os-support/solaris/sun_bios.c +++ b/hw/xfree86/os-support/solaris/sun_bios.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_bios.c,v 1.2tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/solaris/sun_init.c b/hw/xfree86/os-support/solaris/sun_init.c index 40c264ce0..691cb3f9e 100644 --- a/hw/xfree86/os-support/solaris/sun_init.c +++ b/hw/xfree86/os-support/solaris/sun_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.5 2001/11/25 13:51:24 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> @@ -22,7 +21,6 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_init.c,v 1.3 2005/05/21 07:46:37 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/solaris/sun_io.c b/hw/xfree86/os-support/solaris/sun_io.c index 96344033f..3d8292e72 100644 --- a/hw/xfree86/os-support/solaris/sun_io.c +++ b/hw/xfree86/os-support/solaris/sun_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_io.c,v 1.2 2002/10/11 01:40:37 dawes Exp $ */ /* $XdotOrg: $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany diff --git a/hw/xfree86/os-support/solaris/sun_kbd.c b/hw/xfree86/os-support/solaris/sun_kbd.c index 55ab46722..2cb1d13a8 100644 --- a/hw/xfree86/os-support/solaris/sun_kbd.c +++ b/hw/xfree86/os-support/solaris/sun_kbd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.1 2001/05/28 02:42:31 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@XFree86.org> @@ -50,7 +49,6 @@ * or other dealings in this Software without prior written authorization * of the copyright holder. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbd.c,v 1.3 2004/06/13 04:50:21 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/solaris/sun_kbdEv.c b/hw/xfree86/os-support/solaris/sun_kbdEv.c index 8eee962ef..df8b6fac5 100644 --- a/hw/xfree86/os-support/solaris/sun_kbdEv.c +++ b/hw/xfree86/os-support/solaris/sun_kbdEv.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_kbdEv.c,v 1.5 2003/08/26 19:00:36 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * Copyright 1993 by David Dawes <dawes@xfree86.org> @@ -23,7 +22,6 @@ */ /* [JCH-96/01/21] Extended std reverse map to four buttons. */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_kbdEv.c,v 1.10 2005/12/12 23:33:55 alanc Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/os-support/solaris/sun_mouse.c b/hw/xfree86/os-support/solaris/sun_mouse.c index c8efa8dbe..aa509d08b 100644 --- a/hw/xfree86/os-support/solaris/sun_mouse.c +++ b/hw/xfree86/os-support/solaris/sun_mouse.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_mouse.c,v 1.4 2002/01/25 21:56:21 tsi Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/solaris/sun_mouse.c,v 1.8 2005/07/28 02:38:23 alanc Exp $ */ /* * Copyright 1999-2001 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/os-support/solaris/sun_vid.c b/hw/xfree86/os-support/solaris/sun_vid.c index f3409dcb2..4f2ab871f 100644 --- a/hw/xfree86/os-support/solaris/sun_vid.c +++ b/hw/xfree86/os-support/solaris/sun_vid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sunos/sun_vid.c,v 1.2 2001/10/28 03:34:03 tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/sysv/sysv_init.c b/hw/xfree86/os-support/sysv/sysv_init.c index 3edffd446..6d0045f9b 100644 --- a/hw/xfree86/os-support/sysv/sysv_init.c +++ b/hw/xfree86/os-support/sysv/sysv_init.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_init.c,v 3.4.4.3 1998/07/18 17:53:57 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/sysv/sysv_io.c b/hw/xfree86/os-support/sysv/sysv_io.c index d10c40fa4..d6c8ca037 100644 --- a/hw/xfree86/os-support/sysv/sysv_io.c +++ b/hw/xfree86/os-support/sysv/sysv_io.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_io.c,v 3.10 2002/10/11 01:40:37 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Dawes <dawes@xfree86.org> diff --git a/hw/xfree86/os-support/sysv/sysv_mouse.c b/hw/xfree86/os-support/sysv/sysv_mouse.c index e3c084e14..581ed58e8 100644 --- a/hw/xfree86/os-support/sysv/sysv_mouse.c +++ b/hw/xfree86/os-support/sysv/sysv_mouse.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_mouse.c,v 1.3 1999/09/04 13:04:49 dawes Exp $ */ /* * Copyright 1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/sysv/sysv_video.c b/hw/xfree86/os-support/sysv/sysv_video.c index 2b491be0e..fd6d61321 100644 --- a/hw/xfree86/os-support/sysv/sysv_video.c +++ b/hw/xfree86/os-support/sysv/sysv_video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/sysv_video.c,v 3.20tsi Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993 by David Wexelblat <dwex@goblin.org> diff --git a/hw/xfree86/os-support/sysv/xqueue.c b/hw/xfree86/os-support/sysv/xqueue.c index e9cab1588..f0032111f 100644 --- a/hw/xfree86/os-support/sysv/xqueue.c +++ b/hw/xfree86/os-support/sysv/xqueue.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/sysv/xqueue.c,v 3.19 2000/02/10 22:33:45 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany * Copyright 1993-1999 by The XFree86 Project, Inc. diff --git a/hw/xfree86/os-support/usl/usl_io.c b/hw/xfree86/os-support/usl/usl_io.c index 45c511f42..4cb23d40e 100644 --- a/hw/xfree86/os-support/usl/usl_io.c +++ b/hw/xfree86/os-support/usl/usl_io.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_io.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2001-2005 by Kean Johnston <jkj@sco.com> * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany diff --git a/hw/xfree86/os-support/usl/usl_iop.c b/hw/xfree86/os-support/usl/usl_iop.c index ae30655f8..23c36fbf7 100644 --- a/hw/xfree86/os-support/usl/usl_iop.c +++ b/hw/xfree86/os-support/usl/usl_iop.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_iop.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2001,2005 by Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/usl/usl_kbd.c b/hw/xfree86/os-support/usl/usl_kbd.c index 5f96fa676..d6e6af212 100644 --- a/hw/xfree86/os-support/usl/usl_kbd.c +++ b/hw/xfree86/os-support/usl/usl_kbd.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_kbd.c,v 1.2 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright 2005 by Kean Johnston <jkj@sco.com> * diff --git a/hw/xfree86/os-support/usl/usl_mouse.c b/hw/xfree86/os-support/usl/usl_mouse.c index f70a0b89e..15a0ac5ac 100644 --- a/hw/xfree86/os-support/usl/usl_mouse.c +++ b/hw/xfree86/os-support/usl/usl_mouse.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/usl/usl_mouse.c,v 1.3 2005/11/10 02:41:20 jkj Exp $ */ /* * Copyright 2005 Kean Johnston diff --git a/hw/xfree86/os-support/xf86OSKbd.h b/hw/xfree86/os-support/xf86OSKbd.h index 344f7e901..4ab722ca3 100644 --- a/hw/xfree86/os-support/xf86OSKbd.h +++ b/hw/xfree86/os-support/xf86OSKbd.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSKbd.h,v 1.5tsi Exp $ */ /* * Copyright (c) 2002-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86OSmouse.h b/hw/xfree86/os-support/xf86OSmouse.h index 9db1bac19..600683866 100644 --- a/hw/xfree86/os-support/xf86OSmouse.h +++ b/hw/xfree86/os-support/xf86OSmouse.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h,v 1.24 2003/11/03 05:11:51 tsi Exp $ */ /* * Copyright (c) 1999-2003 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86OSpriv.h b/hw/xfree86/os-support/xf86OSpriv.h index 449e8ddd0..754128de9 100644 --- a/hw/xfree86/os-support/xf86OSpriv.h +++ b/hw/xfree86/os-support/xf86OSpriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86OSpriv.h,v 1.6 2003/08/24 17:37:03 dawes Exp $ */ /* * Copyright (c) 1999-2000 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h index 8ff324e70..e04854729 100644 --- a/hw/xfree86/os-support/xf86_OSlib.h +++ b/hw/xfree86/os-support/xf86_OSlib.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h,v 3.94 2003/11/03 05:11:51 tsi Exp $ */ /* * Copyright 1990, 1991 by Thomas Roell, Dinkelscherben, Germany * Copyright 1992 by David Dawes <dawes@XFree86.org> @@ -67,7 +66,6 @@ */ /* $XConsortium: xf86_OSlib.h /main/22 1996/10/27 11:06:31 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/xf86_OSlib.h,v 1.14 2005/12/29 08:42:49 airlied Exp $ */ /* * This is private, and should not be included by any drivers. Drivers diff --git a/hw/xfree86/os-support/xf86_OSproc.h b/hw/xfree86/os-support/xf86_OSproc.h index 83ce9ed2b..89a33013f 100644 --- a/hw/xfree86/os-support/xf86_OSproc.h +++ b/hw/xfree86/os-support/xf86_OSproc.h @@ -64,7 +64,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h,v 3.56 2003/08/24 17:37:03 dawes Exp $ */ #ifndef _XF86_OSPROC_H #define _XF86_OSPROC_H @@ -212,9 +211,7 @@ extern int xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *); extern int xf86RemoveSIGIOHandler(int fd); extern int xf86BlockSIGIO (void); extern void xf86UnblockSIGIO (int); -#ifdef XFree86Server extern void xf86AssertBlockedSIGIO (char *); -#endif extern Bool xf86SIGIOSupported (void); #ifdef XF86_OS_PRIVS diff --git a/hw/xfree86/os-support/xf86_ansic.h b/hw/xfree86/os-support/xf86_ansic.h index 25dabfe89..c1d62ed9f 100644 --- a/hw/xfree86/os-support/xf86_ansic.h +++ b/hw/xfree86/os-support/xf86_ansic.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.53 2003/10/28 18:36:37 tsi Exp $ */ /* * Copyright 1997-2003 by The XFree86 Project, Inc * @@ -28,33 +27,27 @@ /* Handle <stdarg.h> */ -#ifndef IN_MODULE +#ifndef __OS2ELF__ # include <stdarg.h> -#else /* !IN_MODULE */ -# ifndef __OS2ELF__ -# include <stdarg.h> -# else /* __OS2ELF__ */ - /* EMX/gcc_elf under OS/2 does not have native header files */ -# if !defined (_VA_LIST) -# define _VA_LIST - typedef char *va_list; -# endif -# define _VA_ROUND(t) ((sizeof (t) + 3) & -4) -# if !defined (va_start) -# define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4) -# define va_end(ap) (ap = 0, (void)0) -# define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t))) -# endif -# endif /* __OS2ELF__ */ -#endif /* IN_MODULE */ +#else /* __OS2ELF__ */ + /* EMX/gcc_elf under OS/2 does not have native header files */ +# if !defined (_VA_LIST) +# define _VA_LIST + typedef char *va_list; +# endif +# define _VA_ROUND(t) ((sizeof (t) + 3) & -4) +# if !defined (va_start) +# define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4) +# define va_end(ap) (ap = 0, (void)0) +# define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t))) +# endif +#endif /* __OS2ELF__ */ /* * The first set of definitions are required both for modules and * libc_wrapper.c. */ -#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES) - #if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || \ defined(__SCO__) || defined(__UNIXWARE__) #define HAVE_VSSCANF @@ -133,9 +126,6 @@ #define MAXLONG LONG_MAX #endif -#endif /* XFree86LOADER || NEED_XF86_TYPES */ - -#if defined(XFree86LOADER) || defined(NEED_XF86_PROTOTYPES) /* * ANSI C compilers only. */ @@ -321,21 +311,6 @@ extern void xf86longjmp(xf86jmp_buf env, int val); (xf86getjmptype() == 1 ? xf86setjmp1((env), xf86setjmp1_arg2()) : \ xf86setjmperror((env)))) -#else /* XFree86LOADER || NEED_XF86_PROTOTYPES */ -#include <unistd.h> -#include <stdio.h> -#include <sys/ioctl.h> -#include <errno.h> -#include <fcntl.h> -#include <ctype.h> -#ifdef HAVE_SYSV_IPC -#include <sys/ipc.h> -#include <sys/shm.h> -#endif -#include <sys/stat.h> -#define stat_t struct stat -#endif /* XFree86LOADER || NEED_XF86_PROTOTYPES */ - /* * These things are always required by drivers (but not by libc_wrapper.c), * even for a static server because some OSs don't provide them. diff --git a/hw/xfree86/os-support/xf86_libc.h b/hw/xfree86/os-support/xf86_libc.h index 5a6056ba9..df78d5351 100644 --- a/hw/xfree86/os-support/xf86_libc.h +++ b/hw/xfree86/os-support/xf86_libc.h @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/os-support/xf86_libc.h,v 1.9 2005/08/24 11:18:31 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h,v 3.63 2003/12/08 21:46:55 alanh Exp $ */ /* * Copyright (c) 1997-2003 by The XFree86 Project, Inc. * @@ -53,8 +51,6 @@ * libc_wrapper.c. */ -#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES) - /* * First, the new data types * @@ -215,14 +211,12 @@ typedef int xf86jmp_buf[1024]; /* xf86shmclt() */ #define XF86IPC_RMID 0 -#endif /* defined(XFree86LOADER) || defined(NEED_XF86_TYPES) */ - /* * the rest of this file should only be included for code that is supposed * to go into modules */ -#if defined(XFree86LOADER) && !defined(DONT_DEFINE_WRAPPERS) +#if !defined(DONT_DEFINE_WRAPPERS) #undef abort #define abort() xf86abort() @@ -713,10 +707,9 @@ typedef int xf86jmp_buf[1024]; # define _FILEDEFED /* Already have FILE defined, don't redefine it */ #endif -#endif /* XFree86LOADER && !DONT_DEFINE_WRAPPERS */ +#endif /* !DONT_DEFINE_WRAPPERS */ -#if defined(XFree86LOADER) && \ - (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS)) +#if (!defined(DONT_DEFINE_WRAPPERS) || defined(DEFINE_SETJMP_WRAPPERS)) #undef setjmp #define setjmp(a) xf86setjmp_macro(a) #undef longjmp diff --git a/hw/xfree86/os-support/xf86drm.h b/hw/xfree86/os-support/xf86drm.h index 4be417a62..88f5e0ffc 100644 --- a/hw/xfree86/os-support/xf86drm.h +++ b/hw/xfree86/os-support/xf86drm.h @@ -31,7 +31,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.26 2003/08/16 19:26:37 dawes Exp $ */ #ifndef _XF86DRM_H_ #define _XF86DRM_H_ diff --git a/hw/xfree86/os-support/xf86drmCompat.h b/hw/xfree86/os-support/xf86drmCompat.h index bdca46626..8ac6ee429 100644 --- a/hw/xfree86/os-support/xf86drmCompat.h +++ b/hw/xfree86/os-support/xf86drmCompat.h @@ -32,7 +32,6 @@ * Backwards compatability modules broken out by: * Jens Owen <jens@tungstengraphics.com> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drmCompat.h,v 1.1 2002/10/30 12:52:23 alanh Exp $ * */ diff --git a/hw/xfree86/parser/Configint.h b/hw/xfree86/parser/Configint.h index a51116b55..c20c1958c 100644 --- a/hw/xfree86/parser/Configint.h +++ b/hw/xfree86/parser/Configint.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Configint.h,v 1.21 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/DRI.c b/hw/xfree86/parser/DRI.c index 93d0d4b52..dc75cd23f 100644 --- a/hw/xfree86/parser/DRI.c +++ b/hw/xfree86/parser/DRI.c @@ -24,7 +24,6 @@ * 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/parser/DRI.c,v 1.13 2003/01/01 19:22:20 paulo Exp $ * */ diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index 6eb2857f0..6ad5601b5 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Device.c,v 1.27 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index cbbcc74c8..2688bb100 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Files.c,v 1.16 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index bda24df1b..7ab70d1a8 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Flags.c,v 1.23 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 9f9323f05..3e2186a9d 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Input.c,v 1.14 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Keyboard.c b/hw/xfree86/parser/Keyboard.c index 62031f629..9749a1a21 100644 --- a/hw/xfree86/parser/Keyboard.c +++ b/hw/xfree86/parser/Keyboard.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Keyboard.c,v 1.17 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index 3f6c4fbde..b9f4e9e6a 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Layout.c,v 1.24 2003/08/24 17:37:07 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c index 378d4acdc..f3ed9d19f 100644 --- a/hw/xfree86/parser/Module.c +++ b/hw/xfree86/parser/Module.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Module.c,v 1.12 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index f8e42d09b..4a8575049 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Monitor.c,v 1.28 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Pointer.c b/hw/xfree86/parser/Pointer.c index c17aa5846..eeb0834bf 100644 --- a/hw/xfree86/parser/Pointer.c +++ b/hw/xfree86/parser/Pointer.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Pointer.c,v 1.13 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index d572af56c..b7a64b035 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Screen.c,v 1.28 2003/11/07 23:41:41 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Vendor.c b/hw/xfree86/parser/Vendor.c index 9c6469bb8..3e9358b3b 100644 --- a/hw/xfree86/parser/Vendor.c +++ b/hw/xfree86/parser/Vendor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Vendor.c,v 1.17 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index 88788aea8..fa0ff7833 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/Video.c,v 1.13 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/configProcs.h b/hw/xfree86/parser/configProcs.h index bb5f4e9b2..832437cd2 100644 --- a/hw/xfree86/parser/configProcs.h +++ b/hw/xfree86/parser/configProcs.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/configProcs.h,v 1.17 2003/08/24 17:37:08 dawes Exp $ */ /* * Copyright (c) 1997-2001 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/parser/cpconfig.c b/hw/xfree86/parser/cpconfig.c index d16a242da..46a5a8b56 100644 --- a/hw/xfree86/parser/cpconfig.c +++ b/hw/xfree86/parser/cpconfig.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/cpconfig.c,v 1.6 2000/10/20 14:59:03 alanh Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index 59b0ea6fb..598a12666 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/read.c,v 1.24 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index ce3cda128..5b29ab855 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/scan.c,v 1.30 2003/11/03 05:11:52 tsi Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index 82baa5a04..1869f56a6 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/write.c,v 1.18 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated @@ -170,7 +169,7 @@ xf86writeConfigFile (const char *filename, XF86ConfigPtr cptr) strerror(errno)); return 0; case 0: /* child */ - if (setuid(getuid() == -1) + if (setuid(getuid()) == -1) FatalError("xf86writeConfigFile(): " "setuid failed(%s)\n", strerror(errno)); diff --git a/hw/xfree86/parser/xf86Optrec.h b/hw/xfree86/parser/xf86Optrec.h index c38f2c219..183b85720 100644 --- a/hw/xfree86/parser/xf86Optrec.h +++ b/hw/xfree86/parser/xf86Optrec.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Optrec.h,v 1.11 2003/08/24 17:37:08 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index 75ee27337..a6829273c 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86Parser.h,v 1.33 2003/10/08 14:58:30 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/parser/xf86tokens.h b/hw/xfree86/parser/xf86tokens.h index 3c7e68ece..d5948dd5b 100644 --- a/hw/xfree86/parser/xf86tokens.h +++ b/hw/xfree86/parser/xf86tokens.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/parser/xf86tokens.h,v 1.20 2003/08/24 17:37:09 dawes Exp $ */ /* * * Copyright (c) 1997 Metro Link Incorporated diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am index 0e7cc72b5..328ed197d 100644 --- a/hw/xfree86/rac/Makefile.am +++ b/hw/xfree86/rac/Makefile.am @@ -5,4 +5,4 @@ sdk_HEADERS = xf86RAC.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/rac/xf86RAC.h b/hw/xfree86/rac/xf86RAC.h index 783d79b93..366c21485 100644 --- a/hw/xfree86/rac/xf86RAC.h +++ b/hw/xfree86/rac/xf86RAC.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.h,v 1.2 1999/05/15 12:10:33 dawes Exp $ */ #ifndef __XF86RAC_H #define __XF86RAC_H 1 diff --git a/hw/xfree86/ramdac/BT.c b/hw/xfree86/ramdac/BT.c index 5c3139d91..5aa27a1f8 100644 --- a/hw/xfree86/ramdac/BT.c +++ b/hw/xfree86/ramdac/BT.c @@ -23,7 +23,6 @@ * * BT RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.c,v 1.7 2000/10/20 12:57:27 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/BT.h b/hw/xfree86/ramdac/BT.h index c52b5a745..b3426bada 100644 --- a/hw/xfree86/ramdac/BT.h +++ b/hw/xfree86/ramdac/BT.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BT.h,v 1.2 1998/07/25 16:57:17 dawes Exp $ */ #include "xf86RamDac.h" diff --git a/hw/xfree86/ramdac/BTPriv.h b/hw/xfree86/ramdac/BTPriv.h index 17edaefdc..184b4811c 100644 --- a/hw/xfree86/ramdac/BTPriv.h +++ b/hw/xfree86/ramdac/BTPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/BTPriv.h,v 1.1.2.1 1998/07/18 17:54:00 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/IBM.c b/hw/xfree86/ramdac/IBM.c index 42bff44a9..2d9fe4d8f 100644 --- a/hw/xfree86/ramdac/IBM.c +++ b/hw/xfree86/ramdac/IBM.c @@ -23,7 +23,6 @@ * * IBM RAMDAC routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.c,v 1.12 2003/02/17 16:08:29 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/IBM.h b/hw/xfree86/ramdac/IBM.h index eb211883c..fdb0f5ad1 100644 --- a/hw/xfree86/ramdac/IBM.h +++ b/hw/xfree86/ramdac/IBM.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBM.h,v 1.7 1999/02/12 22:52:11 hohndel Exp $ */ #include <xf86RamDac.h> diff --git a/hw/xfree86/ramdac/IBMPriv.h b/hw/xfree86/ramdac/IBMPriv.h index 994296517..a33da9106 100644 --- a/hw/xfree86/ramdac/IBMPriv.h +++ b/hw/xfree86/ramdac/IBMPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/IBMPriv.h,v 1.1.2.2 1998/07/18 17:54:01 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am index 136bc7c57..c9afdad60 100644 --- a/hw/xfree86/ramdac/Makefile.am +++ b/hw/xfree86/ramdac/Makefile.am @@ -13,7 +13,7 @@ EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h \ CURSOR.NOTES AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE \ - $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ + $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) xf86BitOrder.c: diff --git a/hw/xfree86/ramdac/TI.c b/hw/xfree86/ramdac/TI.c index 390bc6b7b..f421fc39a 100644 --- a/hw/xfree86/ramdac/TI.c +++ b/hw/xfree86/ramdac/TI.c @@ -24,7 +24,6 @@ * Modified from IBM.c to support TI RAMDAC routines * by Jens Owen, <jens@tungstengraphics.com>. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.c,v 1.7 2003/02/17 16:08:29 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/TI.h b/hw/xfree86/ramdac/TI.h index f33247cfc..bc807f40c 100644 --- a/hw/xfree86/ramdac/TI.h +++ b/hw/xfree86/ramdac/TI.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TI.h,v 1.4 2000/05/02 21:04:46 alanh Exp $ */ #include <xf86RamDac.h> diff --git a/hw/xfree86/ramdac/TIPriv.h b/hw/xfree86/ramdac/TIPriv.h index d66149dcf..191c9b5ce 100644 --- a/hw/xfree86/ramdac/TIPriv.h +++ b/hw/xfree86/ramdac/TIPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/TIPriv.h,v 1.2 1998/07/25 16:57:19 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c index 17a49669d..a903f7f02 100644 --- a/hw/xfree86/ramdac/xf86Cursor.c +++ b/hw/xfree86/ramdac/xf86Cursor.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.c,v 1.19tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/xf86Cursor.h b/hw/xfree86/ramdac/xf86Cursor.h index ac88f4e5f..08cca6b96 100644 --- a/hw/xfree86/ramdac/xf86Cursor.h +++ b/hw/xfree86/ramdac/xf86Cursor.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86Cursor.h,v 1.10tsi Exp $ */ #ifndef _XF86CURSOR_H #define _XF86CURSOR_H diff --git a/hw/xfree86/ramdac/xf86CursorPriv.h b/hw/xfree86/ramdac/xf86CursorPriv.h index 9829f34e3..472e2b06b 100644 --- a/hw/xfree86/ramdac/xf86CursorPriv.h +++ b/hw/xfree86/ramdac/xf86CursorPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86CursorPriv.h,v 1.4tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/xf86HWCurs.c b/hw/xfree86/ramdac/xf86HWCurs.c index aef1c8bb1..91caea047 100644 --- a/hw/xfree86/ramdac/xf86HWCurs.c +++ b/hw/xfree86/ramdac/xf86HWCurs.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86HWCurs.c,v 1.12 2003/02/13 20:28:41 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/xf86RamDac.c b/hw/xfree86/ramdac/xf86RamDac.c index e0314f6b7..1dd3daf1b 100644 --- a/hw/xfree86/ramdac/xf86RamDac.c +++ b/hw/xfree86/ramdac/xf86RamDac.c @@ -23,7 +23,6 @@ * * Generic RAMDAC access routines. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.c,v 1.6tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/xf86RamDac.h b/hw/xfree86/ramdac/xf86RamDac.h index 319a7b577..1f03dfb99 100644 --- a/hw/xfree86/ramdac/xf86RamDac.h +++ b/hw/xfree86/ramdac/xf86RamDac.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDac.h,v 1.9 1999/03/28 15:33:02 dawes Exp $ */ #ifndef _XF86RAMDAC_H #define _XF86RAMDAC_H 1 diff --git a/hw/xfree86/ramdac/xf86RamDacCmap.c b/hw/xfree86/ramdac/xf86RamDacCmap.c index 04f50f166..600fe3f07 100644 --- a/hw/xfree86/ramdac/xf86RamDacCmap.c +++ b/hw/xfree86/ramdac/xf86RamDacCmap.c @@ -23,7 +23,6 @@ * * Generic RAMDAC access to colormaps. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacCmap.c,v 1.6 2000/03/21 21:15:28 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/ramdac/xf86RamDacPriv.h b/hw/xfree86/ramdac/xf86RamDacPriv.h index ae5fc72c5..f68e588f5 100644 --- a/hw/xfree86/ramdac/xf86RamDacPriv.h +++ b/hw/xfree86/ramdac/xf86RamDacPriv.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/ramdac/xf86RamDacPriv.h,v 1.3 1998/12/06 06:08:37 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am index d473833ed..7e5671aa1 100644 --- a/hw/xfree86/scanpci/Makefile.am +++ b/hw/xfree86/scanpci/Makefile.am @@ -8,7 +8,7 @@ libscanpci_la_SOURCES = xf86ScanPci.c INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) BUILT_SOURCES = xf86PciIds.h diff --git a/hw/xfree86/scanpci/xf86PciData.h b/hw/xfree86/scanpci/xf86PciData.h index 7cc81b755..5f92a7d03 100644 --- a/hw/xfree86/scanpci/xf86PciData.h +++ b/hw/xfree86/scanpci/xf86PciData.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciData.h,v 1.3 2003/08/24 17:37:10 dawes Exp $ */ /* * Copyright (c) 2000-2002 by The XFree86 Project, Inc. diff --git a/hw/xfree86/scanpci/xf86PciStdIds.h b/hw/xfree86/scanpci/xf86PciStdIds.h index 178b9aaa0..7b0c3cbc6 100644 --- a/hw/xfree86/scanpci/xf86PciStdIds.h +++ b/hw/xfree86/scanpci/xf86PciStdIds.h @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/scanpci/xf86PciStdIds.h,v 1.10 2006/01/27 12:27:34 alanh Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED -- DO NOT EDIT diff --git a/hw/xfree86/scanpci/xf86PciStr.h b/hw/xfree86/scanpci/xf86PciStr.h index 307dfacdf..41b039c2c 100644 --- a/hw/xfree86/scanpci/xf86PciStr.h +++ b/hw/xfree86/scanpci/xf86PciStr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86PciStr.h,v 1.2 2003/08/24 17:37:10 dawes Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/scanpci/xf86ScanPci.h b/hw/xfree86/scanpci/xf86ScanPci.h index 9107b9e32..93ecee8dc 100644 --- a/hw/xfree86/scanpci/xf86ScanPci.h +++ b/hw/xfree86/scanpci/xf86ScanPci.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/scanpci/xf86ScanPci.h,v 1.3 2003/08/24 17:37:10 dawes Exp $ */ /* * Copyright (c) 2000-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am index c373e8178..cb5ebb14a 100644 --- a/hw/xfree86/shadowfb/Makefile.am +++ b/hw/xfree86/shadowfb/Makefile.am @@ -6,4 +6,4 @@ sdk_HEADERS = shadowfb.h INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index cea2571b3..2fc02a7b8 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -6,7 +6,6 @@ Pre-fb-write callbacks and RENDER support - Nolan Leake (nolan@vmware.com) */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadow.c,v 1.20tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/shadowfb/shadowfb.h b/hw/xfree86/shadowfb/shadowfb.h index e42822600..6c9635879 100644 --- a/hw/xfree86/shadowfb/shadowfb.h +++ b/hw/xfree86/shadowfb/shadowfb.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/shadowfb/shadowfb.h,v 1.3 2002/10/16 22:12:54 alanh Exp $ */ #ifndef _SHADOWFB_H #define _SHADOWFB_H diff --git a/hw/xfree86/utils/cvt/Makefile.am b/hw/xfree86/utils/cvt/Makefile.am index 9dcff80a3..ff3c1f7bc 100644 --- a/hw/xfree86/utils/cvt/Makefile.am +++ b/hw/xfree86/utils/cvt/Makefile.am @@ -31,9 +31,10 @@ bin_PROGRAMS = cvt INCLUDES = $(XORG_INCS) DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib -cvt_SOURCES = cvt.c +# gah +cvt_SOURCES = cvt.c $(top_srcdir)/hw/xfree86/common/xf86cvt.c cvt_CFLAGS = $(XORG_CFLAGS) -cvt_LDADD = ../../dummylib/libdummy-nonserver.a +cvt_LDADD = $(top_builddir)/hw/xfree86/dummylib/libdummy-nonserver.a man1_MANS = cvt.man diff --git a/hw/xfree86/utils/cvt/cvt.c b/hw/xfree86/utils/cvt/cvt.c index b039ae6a0..fee4f7c3e 100644 --- a/hw/xfree86/utils/cvt/cvt.c +++ b/hw/xfree86/utils/cvt/cvt.c @@ -26,269 +26,6 @@ #include "xf86.h" /* - * Generate a CVT standard mode from HDisplay, VDisplay and VRefresh. - * - * These calculations are stolen from the CVT calculation spreadsheet written - * by Graham Loveridge. He seems to be claiming no copyright and there seems to - * be no license attached to this. He apparently just wants to see his name - * mentioned. - * - * This file can be found at http://www.vesa.org/Public/CVT/CVTd6r1.xls - * - * Comments and structure corresponds to the comments and structure of the xls. - * This should ease importing of future changes to the standard (not very - * likely though). - * - * About margins; i'm sure that they are to be the bit between HDisplay and - * HBlankStart, HBlankEnd and HTotal, VDisplay and VBlankStart, VBlankEnd and - * VTotal, where the overscan colour is shown. FB seems to call _all_ blanking - * outside sync "margin" for some reason. Since we prefer seeing proper - * blanking instead of the overscan colour, and since the Crtc* values will - * probably get altered after us, we will disable margins altogether. With - * these calculations, Margins will plainly expand H/VDisplay, and we don't - * want that. -- libv - * - */ -static DisplayModePtr -xf86CVTMode(int HDisplay, int VDisplay, float VRefresh, Bool Reduced, - Bool Interlaced) -{ - DisplayModeRec *Mode = xnfalloc(sizeof(DisplayModeRec)); - - /* 1) top/bottom margin size (% of height) - default: 1.8 */ -#define CVT_MARGIN_PERCENTAGE 1.8 - - /* 2) character cell horizontal granularity (pixels) - default 8 */ -#define CVT_H_GRANULARITY 8 - - /* 4) Minimum vertical porch (lines) - default 3 */ -#define CVT_MIN_V_PORCH 3 - - /* 4) Minimum number of vertical back porch lines - default 6 */ -#define CVT_MIN_V_BPORCH 6 - - /* Pixel Clock step (kHz) */ -#define CVT_CLOCK_STEP 250 - - Bool Margins = FALSE; - float VFieldRate, HPeriod; - int HDisplayRnd, HMargin; - int VDisplayRnd, VMargin, VSync; - float Interlace; /* Please rename this */ - - memset(Mode, 0, sizeof(DisplayModeRec)); - - /* CVT default is 60.0Hz */ - if (!VRefresh) - VRefresh = 60.0; - - /* 1. Required field rate */ - if (Interlaced) - VFieldRate = VRefresh * 2; - else - VFieldRate = VRefresh; - - /* 2. Horizontal pixels */ - HDisplayRnd = HDisplay - (HDisplay % CVT_H_GRANULARITY); - - /* 3. Determine left and right borders */ - if (Margins) { - /* right margin is actually exactly the same as left */ - HMargin = (((float) HDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0); - HMargin -= HMargin % CVT_H_GRANULARITY; - } else - HMargin = 0; - - /* 4. Find total active pixels */ - Mode->HDisplay = HDisplayRnd + 2*HMargin; - - /* 5. Find number of lines per field */ - if (Interlaced) - VDisplayRnd = VDisplay / 2; - else - VDisplayRnd = VDisplay; - - /* 6. Find top and bottom margins */ - /* nope. */ - if (Margins) - /* top and bottom margins are equal again. */ - VMargin = (((float) VDisplayRnd) * CVT_MARGIN_PERCENTAGE / 100.0); - else - VMargin = 0; - - Mode->VDisplay = VDisplay + 2*VMargin; - - /* 7. Interlace */ - if (Interlaced) - Interlace = 0.5; - else - Interlace = 0.0; - - /* Determine VSync Width from aspect ratio */ - if (!(VDisplay % 3) && ((VDisplay * 4 / 3) == HDisplay)) - VSync = 4; - else if (!(VDisplay % 9) && ((VDisplay * 16 / 9) == HDisplay)) - VSync = 5; - else if (!(VDisplay % 10) && ((VDisplay * 16 / 10) == HDisplay)) - VSync = 6; - else if (!(VDisplay % 4) && ((VDisplay * 5 / 4) == HDisplay)) - VSync = 7; - else if (!(VDisplay % 9) && ((VDisplay * 15 / 9) == HDisplay)) - VSync = 7; - else /* Custom */ - VSync = 10; - - if (!Reduced) { /* simplified GTF calculation */ - - /* 4) Minimum time of vertical sync + back porch interval (µs) - * default 550.0 */ -#define CVT_MIN_VSYNC_BP 550.0 - - /* 3) Nominal HSync width (% of line period) - default 8 */ -#define CVT_HSYNC_PERCENTAGE 8 - - float HBlankPercentage; - int VSyncAndBackPorch, VBackPorch; - int HBlank; - - /* 8. Estimated Horizontal period */ - HPeriod = ((float) (1000000.0 / VFieldRate - CVT_MIN_VSYNC_BP)) / - (VDisplayRnd + 2 * VMargin + CVT_MIN_V_PORCH + Interlace); - - /* 9. Find number of lines in sync + backporch */ - if (((int)(CVT_MIN_VSYNC_BP / HPeriod) + 1) < (VSync + CVT_MIN_V_PORCH)) - VSyncAndBackPorch = VSync + CVT_MIN_V_PORCH; - else - VSyncAndBackPorch = (int)(CVT_MIN_VSYNC_BP / HPeriod) + 1; - - /* 10. Find number of lines in back porch */ - VBackPorch = VSyncAndBackPorch - VSync; - - /* 11. Find total number of lines in vertical field */ - Mode->VTotal = VDisplayRnd + 2 * VMargin + VSyncAndBackPorch + Interlace - + CVT_MIN_V_PORCH; - - /* 5) Definition of Horizontal blanking time limitation */ - /* Gradient (%/kHz) - default 600 */ -#define CVT_M_FACTOR 600 - - /* Offset (%) - default 40 */ -#define CVT_C_FACTOR 40 - - /* Blanking time scaling factor - default 128 */ -#define CVT_K_FACTOR 128 - - /* Scaling factor weighting - default 20 */ -#define CVT_J_FACTOR 20 - -#define CVT_M_PRIME CVT_M_FACTOR * CVT_K_FACTOR / 256 -#define CVT_C_PRIME (CVT_C_FACTOR - CVT_J_FACTOR) * CVT_K_FACTOR / 256 + \ - CVT_J_FACTOR - - /* 12. Find ideal blanking duty cycle from formula */ - HBlankPercentage = CVT_C_PRIME - CVT_M_PRIME * HPeriod/1000.0; - - /* 13. Blanking time */ - if (HBlankPercentage < 20) - HBlankPercentage = 20; - - HBlank = Mode->HDisplay * HBlankPercentage/(100.0 - HBlankPercentage); - HBlank -= HBlank % (2*CVT_H_GRANULARITY); - - /* 14. Find total number of pixels in a line. */ - Mode->HTotal = Mode->HDisplay + HBlank; - - /* Fill in HSync values */ - Mode->HSyncEnd = Mode->HDisplay + HBlank / 2; - - Mode->HSyncStart = Mode->HSyncEnd - - (Mode->HTotal * CVT_HSYNC_PERCENTAGE) / 100; - Mode->HSyncStart += CVT_H_GRANULARITY - - Mode->HSyncStart % CVT_H_GRANULARITY; - - /* Fill in VSync values */ - Mode->VSyncStart = Mode->VDisplay + CVT_MIN_V_PORCH; - Mode->VSyncEnd = Mode->VSyncStart + VSync; - - } else { /* Reduced blanking */ - /* Minimum vertical blanking interval time (µs) - default 460 */ -#define CVT_RB_MIN_VBLANK 460.0 - - /* Fixed number of clocks for horizontal sync */ -#define CVT_RB_H_SYNC 32.0 - - /* Fixed number of clocks for horizontal blanking */ -#define CVT_RB_H_BLANK 160.0 - - /* Fixed number of lines for vertical front porch - default 3 */ -#define CVT_RB_VFPORCH 3 - - int VBILines; - - /* 8. Estimate Horizontal period. */ - HPeriod = ((float) (1000000.0 / VFieldRate - CVT_RB_MIN_VBLANK)) / - (VDisplayRnd + 2*VMargin); - - /* 9. Find number of lines in vertical blanking */ - VBILines = ((float) CVT_RB_MIN_VBLANK) / HPeriod + 1; - - /* 10. Check if vertical blanking is sufficient */ - if (VBILines < (CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH)) - VBILines = CVT_RB_VFPORCH + VSync + CVT_MIN_V_BPORCH; - - /* 11. Find total number of lines in vertical field */ - Mode->VTotal = VDisplayRnd + 2 * VMargin + Interlace + VBILines; - - /* 12. Find total number of pixels in a line */ - Mode->HTotal = Mode->HDisplay + CVT_RB_H_BLANK; - - /* Fill in HSync values */ - Mode->HSyncEnd = Mode->HDisplay + CVT_RB_H_BLANK / 2; - Mode->HSyncStart = Mode->HSyncEnd - CVT_RB_H_SYNC; - - /* Fill in VSync values */ - Mode->VSyncStart = Mode->VDisplay + CVT_RB_VFPORCH; - Mode->VSyncEnd = Mode->VSyncStart + VSync; - } - - /* 15/13. Find pixel clock frequency (kHz for xf86) */ - Mode->Clock = Mode->HTotal * 1000.0 / HPeriod; - Mode->Clock -= Mode->Clock % CVT_CLOCK_STEP; - - /* 16/14. Find actual Horizontal Frequency (kHz) */ - Mode->HSync = ((float) Mode->Clock) / ((float) Mode->HTotal); - - /* 17/15. Find actual Field rate */ - Mode->VRefresh = (1000.0 * ((float) Mode->Clock)) / - ((float) (Mode->HTotal * Mode->VTotal)); - - /* 18/16. Find actual vertical frame frequency */ - /* ignore - just set the mode flag for interlaced */ - if (Interlaced) - Mode->VTotal *= 2; - - { - char Name[256]; - Name[0] = 0; - - snprintf(Name, 256, "%dx%d", HDisplay, VDisplay); - - Mode->name = xnfalloc(strlen(Name) + 1); - memcpy(Mode->name, Name, strlen(Name) + 1); - } - - if (Reduced) - Mode->Flags |= V_PHSYNC | V_NVSYNC; - else - Mode->Flags |= V_NHSYNC | V_PVSYNC; - - if (Interlaced) - Mode->Flags |= V_INTERLACE; - - return Mode; -} - -/* * Quickly check wether this is a CVT standard mode. */ static Bool diff --git a/hw/xfree86/utils/gtf/gtf.c b/hw/xfree86/utils/gtf/gtf.c index 109e2bbb3..fd4a4f23c 100644 --- a/hw/xfree86/utils/gtf/gtf.c +++ b/hw/xfree86/utils/gtf/gtf.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2004/04/23 19:53:57 eich Exp $ */ /* gtf.c Generate mode timings using the GTF Timing Standard * * gcc gtf.c -o gtf -lm -Wall @@ -103,7 +102,6 @@ * o Error checking. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/gtf.c,v 1.2 2002/11/15 17:01:53tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H # include <xorg-config.h> diff --git a/hw/xfree86/utils/ioport/ioport.c b/hw/xfree86/utils/ioport/ioport.c index bd42f637f..32213642e 100644 --- a/hw/xfree86/utils/ioport/ioport.c +++ b/hw/xfree86/utils/ioport/ioport.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/ioport.c,v 1.4 2003/01/01 19:16:41 tsi Exp $ */ /* * Copyright 2002 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org * diff --git a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c index 865a59113..afa8510b0 100644 --- a/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/bsd-kbd_mode.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/kbd_mode.c,v 3.5 1996/12/23 06:47:13 dawes Exp $ */ /* Keyboard mode control program for 386BSD */ diff --git a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c index c96839c0a..96a4644a0 100644 --- a/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c +++ b/hw/xfree86/utils/kbd_mode/sun-kbd_mode.c @@ -1,4 +1,3 @@ -/* $Xorg: kbd_mode.c,v 1.3 2000/08/17 19:48:29 cpqbld Exp $ */ /* $XdotOrg: $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. @@ -28,7 +27,6 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: kbd_mode.c,v 3.11 2002/10/23 16:23:36 tsi Exp $ */ /* static char sccsid[] = "@(#)kbd_mode.c 7.1 87/04/13"; diff --git a/hw/xfree86/utils/pcitweak/pcitweak.c b/hw/xfree86/utils/pcitweak/pcitweak.c index a7c6a3263..5648e796d 100644 --- a/hw/xfree86/utils/pcitweak/pcitweak.c +++ b/hw/xfree86/utils/pcitweak/pcitweak.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/pcitweak.c,v 1.17 2003/08/24 17:37:01 dawes Exp $ */ /* * Copyright (c) 1999-2002 by The XFree86 Project, Inc. * diff --git a/hw/xfree86/utils/scanpci/scanpci.c b/hw/xfree86/utils/scanpci/scanpci.c index dac7d45af..609f1faaf 100644 --- a/hw/xfree86/utils/scanpci/scanpci.c +++ b/hw/xfree86/utils/scanpci/scanpci.c @@ -23,7 +23,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/etc/scanpci.c,v 3.91tsi Exp $ */ #include <X11/X.h> #include "os.h" diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index 0705eb5bb..73e4042ae 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -33,7 +33,7 @@ INCLUDES = $(XORG_INCS) -I$(top_srcdir)/hw/xfree86/parser OPTIONSPATH=$(libdir)/X11 -xorgcfg_CFLAGS = @SERVER_DEFINES@ $(XORG_CFLAGS) $(CURSESDEFINES) \ +xorgcfg_CFLAGS = $(XORG_CFLAGS) $(CURSESDEFINES) \ $(XORGCFG_DEP_CFLAGS) -DXKB_RULES_DIR=\"$(XKB_BASE_DIRECTORY)/rules\" \ -DPROJECT_ROOT=\"$(PROJECTROOT)\" -DOPTIONSPATH=\"$(OPTIONSPATH)\" xorgcfg_LDADD = $(XORGCFG_DEP_LIBS) ../../parser/libxf86config.a $(LOADERLIB) \ diff --git a/hw/xfree86/utils/xorgcfg/accessx.c b/hw/xfree86/utils/xorgcfg/accessx.c index cb8929b81..38bda383a 100644 --- a/hw/xfree86/utils/xorgcfg/accessx.c +++ b/hw/xfree86/utils/xorgcfg/accessx.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/accessx.c,v 1.8 2001/01/26 21:17:40 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/card-cfg.c b/hw/xfree86/utils/xorgcfg/card-cfg.c index 3970f02c8..1f3b7555e 100644 --- a/hw/xfree86/utils/xorgcfg/card-cfg.c +++ b/hw/xfree86/utils/xorgcfg/card-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/card-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/cards.c b/hw/xfree86/utils/xorgcfg/cards.c index 62bcfbbda..dcd5828cb 100644 --- a/hw/xfree86/utils/xorgcfg/cards.c +++ b/hw/xfree86/utils/xorgcfg/cards.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.c,v 1.14 2002/09/12 15:19:07 tsi Exp $ */ #define CARDS_PRIVATE diff --git a/hw/xfree86/utils/xorgcfg/cards.h b/hw/xfree86/utils/xorgcfg/cards.h index 913d9c8b8..8557e96df 100644 --- a/hw/xfree86/utils/xorgcfg/cards.h +++ b/hw/xfree86/utils/xorgcfg/cards.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/cards.h,v 1.2 2001/07/06 02:04:10 paulo Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/xorgcfg/config.c b/hw/xfree86/utils/xorgcfg/config.c index 4d656a53d..8c985bf34 100644 --- a/hw/xfree86/utils/xorgcfg/config.c +++ b/hw/xfree86/utils/xorgcfg/config.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.c,v 1.8tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/config.h b/hw/xfree86/utils/xorgcfg/config.h index 6cbdc5e30..62187b0d4 100644 --- a/hw/xfree86/utils/xorgcfg/config.h +++ b/hw/xfree86/utils/xorgcfg/config.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/config.h,v 1.21 2004/02/13 23:58:52 dawes Exp $ */ #ifdef HAVE_CONFIG_H diff --git a/hw/xfree86/utils/xorgcfg/expert.c b/hw/xfree86/utils/xorgcfg/expert.c index 06bffb79a..5c22a6e70 100644 --- a/hw/xfree86/utils/xorgcfg/expert.c +++ b/hw/xfree86/utils/xorgcfg/expert.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/expert.c,v 1.14tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/help.c b/hw/xfree86/utils/xorgcfg/help.c index c6bfcbad2..cd5c2c2f4 100644 --- a/hw/xfree86/utils/xorgcfg/help.c +++ b/hw/xfree86/utils/xorgcfg/help.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/help.c,v 1.7tsi Exp $ */ #include <X11/IntrinsicP.h> diff --git a/hw/xfree86/utils/xorgcfg/interface.c b/hw/xfree86/utils/xorgcfg/interface.c index b6ac82a06..b98d6ce73 100644 --- a/hw/xfree86/utils/xorgcfg/interface.c +++ b/hw/xfree86/utils/xorgcfg/interface.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/interface.c,v 1.8 2005/11/08 06:33:30 jkj Exp $ */ /* * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) * @@ -27,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v 1.36 2002/10/19 20:04:21 herrb Exp $ */ #include <X11/IntrinsicP.h> diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c index 2e82323be..4856c5247 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.c +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.c,v 1.21 2002/12/05 20:24:21 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h index 64438bd71..512a19d7a 100644 --- a/hw/xfree86/utils/xorgcfg/keyboard-cfg.h +++ b/hw/xfree86/utils/xorgcfg/keyboard-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/keyboard-cfg.h,v 1.2 2000/06/13 23:15:51 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.c b/hw/xfree86/utils/xorgcfg/loader.c index 37378701e..8a9ad1aef 100644 --- a/hw/xfree86/utils/xorgcfg/loader.c +++ b/hw/xfree86/utils/xorgcfg/loader.c @@ -26,8 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/loader.c,v 1.5 2005/12/08 17:54:40 kem Exp $ - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.c,v 1.19 2002/06/06 21:03:32 paulo Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/loader.h b/hw/xfree86/utils/xorgcfg/loader.h index 92ca70485..16c527327 100644 --- a/hw/xfree86/utils/xorgcfg/loader.h +++ b/hw/xfree86/utils/xorgcfg/loader.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loader.h,v 1.6 2001/07/07 01:43:58 paulo Exp $ */ #ifdef USE_MODULES @@ -36,9 +35,6 @@ #else -#ifndef XFree86LOADER -#define XFree86LOADER /* not really */ -#endif #define IN_LOADER #include "xf86.h" diff --git a/hw/xfree86/utils/xorgcfg/loadmod.c b/hw/xfree86/utils/xorgcfg/loadmod.c index 8f970cb72..598d0c06a 100644 --- a/hw/xfree86/utils/xorgcfg/loadmod.c +++ b/hw/xfree86/utils/xorgcfg/loadmod.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/loadmod.c,v 1.16 2003/03/12 16:40:28 tsi Exp $ */ #ifdef USE_MODULES diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.c b/hw/xfree86/utils/xorgcfg/monitor-cfg.c index abe3cbf28..a443c54c2 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.c +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.c,v 1.6 2001/02/21 23:37:03 paulo Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/monitor-cfg.h b/hw/xfree86/utils/xorgcfg/monitor-cfg.h index b480358f7..48fc804bf 100644 --- a/hw/xfree86/utils/xorgcfg/monitor-cfg.h +++ b/hw/xfree86/utils/xorgcfg/monitor-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/monitor-cfg.h,v 1.1 2000/04/04 22:37:00 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/mouse-cfg.c b/hw/xfree86/utils/xorgcfg/mouse-cfg.c index 49bfc61a2..6c29c1f07 100644 --- a/hw/xfree86/utils/xorgcfg/mouse-cfg.c +++ b/hw/xfree86/utils/xorgcfg/mouse-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/mouse-cfg.c,v 1.11tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/options.c b/hw/xfree86/utils/xorgcfg/options.c index 4187c1c3d..d229bb17f 100644 --- a/hw/xfree86/utils/xorgcfg/options.c +++ b/hw/xfree86/utils/xorgcfg/options.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.c,v 1.11 2001/10/28 03:34:08 tsi Exp $ */ #include "options.h" diff --git a/hw/xfree86/utils/xorgcfg/options.h b/hw/xfree86/utils/xorgcfg/options.h index 066de7d3a..2d08ca448 100644 --- a/hw/xfree86/utils/xorgcfg/options.h +++ b/hw/xfree86/utils/xorgcfg/options.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/options.h,v 1.6 2001/06/01 18:43:50 tsi Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.c b/hw/xfree86/utils/xorgcfg/screen-cfg.c index c20c84cba..4c67d725a 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.c +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.c,v 1.13tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen-cfg.h b/hw/xfree86/utils/xorgcfg/screen-cfg.h index 6098c71fe..07e9bc3ee 100644 --- a/hw/xfree86/utils/xorgcfg/screen-cfg.h +++ b/hw/xfree86/utils/xorgcfg/screen-cfg.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen-cfg.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/screen.c b/hw/xfree86/utils/xorgcfg/screen.c index 6ee6f0241..6b411de15 100644 --- a/hw/xfree86/utils/xorgcfg/screen.c +++ b/hw/xfree86/utils/xorgcfg/screen.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.c,v 1.8 2001/10/28 03:34:08 tsi Exp $ */ #include <X11/IntrinsicP.h> diff --git a/hw/xfree86/utils/xorgcfg/screen.h b/hw/xfree86/utils/xorgcfg/screen.h index 135eeb51a..293820db4 100644 --- a/hw/xfree86/utils/xorgcfg/screen.h +++ b/hw/xfree86/utils/xorgcfg/screen.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/screen.h,v 1.1 2000/04/04 22:37:02 dawes Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/startx.c b/hw/xfree86/utils/xorgcfg/startx.c index 8d12ff802..7b730c9aa 100644 --- a/hw/xfree86/utils/xorgcfg/startx.c +++ b/hw/xfree86/utils/xorgcfg/startx.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/startx.c,v 1.7 2002/01/07 20:38:29 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgcfg/stubs.c b/hw/xfree86/utils/xorgcfg/stubs.c index a8b0566de..47b2c2d5a 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.c +++ b/hw/xfree86/utils/xorgcfg/stubs.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.c,v 1.3 2002/11/09 11:12:53 herrb Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/xorgcfg/stubs.h b/hw/xfree86/utils/xorgcfg/stubs.h index 9b661f3d8..c2f9f76b0 100644 --- a/hw/xfree86/utils/xorgcfg/stubs.h +++ b/hw/xfree86/utils/xorgcfg/stubs.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/stubs.h,v 1.2 2000/10/23 21:16:52 tsi Exp $ */ #ifndef _xf86cfg_stubs_h diff --git a/hw/xfree86/utils/xorgcfg/text-mode.c b/hw/xfree86/utils/xorgcfg/text-mode.c index 8537252e6..10f4b698f 100644 --- a/hw/xfree86/utils/xorgcfg/text-mode.c +++ b/hw/xfree86/utils/xorgcfg/text-mode.c @@ -1,4 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgcfg/text-mode.c,v 1.8 2006/05/03 17:50:10 ajax Exp $ */ /* * Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) * @@ -27,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/text-mode.c,v 1.25 2003/11/12 00:10:30 dawes Exp $ */ #include <stdio.h> diff --git a/hw/xfree86/utils/xorgcfg/vidmode.c b/hw/xfree86/utils/xorgcfg/vidmode.c index 5226a5fc4..2d613b6df 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.c +++ b/hw/xfree86/utils/xorgcfg/vidmode.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.c,v 1.7tsi Exp $ */ /* diff --git a/hw/xfree86/utils/xorgcfg/vidmode.h b/hw/xfree86/utils/xorgcfg/vidmode.h index 4f2058cea..d0c71d5c6 100644 --- a/hw/xfree86/utils/xorgcfg/vidmode.h +++ b/hw/xfree86/utils/xorgcfg/vidmode.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/vidmode.h,v 1.1 2000/05/18 16:30:00 dawes Exp $ */ #ifndef _xf86cfg_vidmode_h diff --git a/hw/xfree86/utils/xorgcfg/xf86config.c b/hw/xfree86/utils/xorgcfg/xf86config.c index 6d93afe34..2c667dcde 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.c +++ b/hw/xfree86/utils/xorgcfg/xf86config.c @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.c,v 1.5tsi Exp $ */ #include "xf86config.h" diff --git a/hw/xfree86/utils/xorgcfg/xf86config.h b/hw/xfree86/utils/xorgcfg/xf86config.h index 6c198cde0..9387d782f 100644 --- a/hw/xfree86/utils/xorgcfg/xf86config.h +++ b/hw/xfree86/utils/xorgcfg/xf86config.h @@ -26,7 +26,6 @@ * * Author: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> * - * $XFree86: xc/programs/Xserver/hw/xfree86/xf86cfg/xf86config.h,v 1.2 2000/05/18 16:30:01 dawes Exp $ */ #include "config.h" diff --git a/hw/xfree86/utils/xorgconfig/Makefile.am b/hw/xfree86/utils/xorgconfig/Makefile.am index ec0b01fe1..dabfc3214 100644 --- a/hw/xfree86/utils/xorgconfig/Makefile.am +++ b/hw/xfree86/utils/xorgconfig/Makefile.am @@ -31,7 +31,7 @@ bin_PROGRAMS = xorgconfig X11dir = $(libdir)/X11 dist_X11_DATA = Cards -xorgconfig_CFLAGS = @SERVER_DEFINES@ @XORGCONFIG_DEP_CFLAGS@ \ +xorgconfig_CFLAGS = @XORGCONFIG_DEP_CFLAGS@ \ -DCARD_DATABASE_FILE='"$(X11dir)/Cards"' \ -DPROJECTROOT='"$(PROJECTROOT)"' \ -DFILEMANSUFFIX='"$(FILE_MAN_SUFFIX)"' \ diff --git a/hw/xfree86/utils/xorgconfig/cards.c b/hw/xfree86/utils/xorgconfig/cards.c index b5f23a00f..f903d7f9c 100644 --- a/hw/xfree86/utils/xorgconfig/cards.c +++ b/hw/xfree86/utils/xorgconfig/cards.c @@ -1,11 +1,9 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/cards.c,v 1.4 2005/07/01 22:43:35 daniels Exp $ */ /* $XConsortium: cards.c /main/9 1996/10/19 18:15:32 kaleb $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.c,v 3.16 2001/07/25 15:05:09 dawes Exp $ */ /* * Functions to manipulate card database. diff --git a/hw/xfree86/utils/xorgconfig/cards.h b/hw/xfree86/utils/xorgconfig/cards.h index 1d9892491..b667ec685 100644 --- a/hw/xfree86/utils/xorgconfig/cards.h +++ b/hw/xfree86/utils/xorgconfig/cards.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/cards.h,v 3.4 1999/03/28 15:33:07 dawes Exp $ */ diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c index ab3c1d03c..f00eea038 100644 --- a/hw/xfree86/utils/xorgconfig/xorgconfig.c +++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf86config/xf86config.c,v 3.69 2003/02/20 04:05:15 dawes Exp $ */ /* * This is a configuration program that will create a base XF86Config @@ -93,7 +92,6 @@ * Chisato Yamauchi(cyamauch@phyas.aichi-edu.ac.jp) */ /* $XConsortium: xf86config.c /main/21 1996/10/28 05:43:57 kaleb $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/utils/xorgconfig/xorgconfig.c,v 1.20 2006/04/18 17:28:44 spyderous Exp $ */ #ifdef HAVE_CONFIG_H # include "xorg-server.h" diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am index 7da8f124b..02fdb4837 100644 --- a/hw/xfree86/vbe/Makefile.am +++ b/hw/xfree86/vbe/Makefile.am @@ -4,7 +4,7 @@ libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c sdk_HEADERS = vbe.h vbeModes.h -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \ -I$(srcdir)/../int10 diff --git a/hw/xfree86/vbe/vbe.c b/hw/xfree86/vbe/vbe.c index 7528ad164..3ca985167 100644 --- a/hw/xfree86/vbe/vbe.c +++ b/hw/xfree86/vbe/vbe.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.c,v 1.2tsi Exp $ */ /* * XFree86 vbe module @@ -40,11 +39,6 @@ static unsigned char * vbeReadEDID(vbeInfoPtr pVbe); static Bool vbeProbeDDC(vbeInfoPtr pVbe); -const char *vbe_ddcSymbols[] = { - "xf86InterpretEDID", - NULL -}; - static const char vbeVersionString[] = "VBE2"; vbeInfoPtr @@ -328,8 +322,6 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule) xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc"); if (!pModule) return NULL; - - xf86LoaderReqSymLists(vbe_ddcSymbols, NULL); } DDC_data = vbeReadEDID(pVbe); diff --git a/hw/xfree86/vbe/vbe.h b/hw/xfree86/vbe/vbe.h index c7970abd0..83b5a99b1 100644 --- a/hw/xfree86/vbe/vbe.h +++ b/hw/xfree86/vbe/vbe.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbe.h,v 1.4 2004/01/07 04:28:06 dawes Exp $ */ /* * XFree86 vbe module diff --git a/hw/xfree86/vbe/vbeModes.c b/hw/xfree86/vbe/vbeModes.c index 436a8a8dd..ef2c728f4 100644 --- a/hw/xfree86/vbe/vbeModes.c +++ b/hw/xfree86/vbe/vbeModes.c @@ -27,7 +27,6 @@ * * Authors: David Dawes <dawes@xfree86.org> * - * $XFree86: xc/programs/Xserver/hw/xfree86/vbe/vbeModes.c,v 1.3tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/vbe/vbeModes.h b/hw/xfree86/vbe/vbeModes.h index 2a8d1b33a..c28cdaa37 100644 --- a/hw/xfree86/vbe/vbeModes.h +++ b/hw/xfree86/vbe/vbeModes.h @@ -26,7 +26,6 @@ * * Authors: David Dawes <dawes@xfree86.org> * - * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/vbe/vbeModes.h,v 1.1 2002/08/06 13:46:28 dawes Exp $ */ #ifndef _VBE_MODES_H diff --git a/hw/xfree86/vbe/vbe_module.c b/hw/xfree86/vbe/vbe_module.c index 7c7d87660..cf37ef951 100644 --- a/hw/xfree86/vbe/vbe_module.c +++ b/hw/xfree86/vbe/vbe_module.c @@ -6,8 +6,6 @@ #include "xf86str.h" #include "vbe.h" -extern const char *vbe_ddcSymbols[]; - static MODULESETUPPROTO(vbeSetup); static XF86ModuleVersionInfo vbeVersRec = @@ -29,19 +27,5 @@ _X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL }; static pointer vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin) { - static Bool setupDone = FALSE; - - if (!setupDone) { - setupDone = TRUE; - LoaderRefSymLists(vbe_ddcSymbols,NULL); - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - } - /* - * The return value must be non-NULL on success even though there - * is no TearDownProc. - */ return (pointer)1; } diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am index 6c7fe1b28..2aa27fa41 100644 --- a/hw/xfree86/vgahw/Makefile.am +++ b/hw/xfree86/vgahw/Makefile.am @@ -2,7 +2,7 @@ module_LTLIBRARIES = libvgahw.la libvgahw_la_LDFLAGS = -avoid-version libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) sdk_HEADERS = vgaHW.h diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c index d3f6d427d..c7c58d582 100644 --- a/hw/xfree86/vgahw/vgaCmap.c +++ b/hw/xfree86/vgahw/vgaCmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaCmap.c,v 1.5 1998/11/22 10:37:38 dawes Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c index 6df7dee18..36fd0099d 100644 --- a/hw/xfree86/vgahw/vgaHW.c +++ b/hw/xfree86/vgahw/vgaHW.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.c,v 1.59 2004/02/11 22:06:22 tsi Exp $ */ /* * diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h index c200aee9a..0879f9641 100644 --- a/hw/xfree86/vgahw/vgaHW.h +++ b/hw/xfree86/vgahw/vgaHW.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/vgahw/vgaHW.h,v 1.31 2002/04/04 14:05:56 eich Exp $ */ /* diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am index 39f0155a6..23b7e16b1 100644 --- a/hw/xfree86/xaa/Makefile.am +++ b/hw/xfree86/xaa/Makefile.am @@ -68,4 +68,4 @@ EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \ INCLUDES = $(XORG_INCS) -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/xaa/xaa.h b/hw/xfree86/xaa/xaa.h index d4ff7bbd8..c8d0467e9 100644 --- a/hw/xfree86/xaa/xaa.h +++ b/hw/xfree86/xaa/xaa.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaa.h,v 1.38 2002/10/21 01:54:04 mvojkovi Exp $ */ #ifndef _XAA_H #define _XAA_H diff --git a/hw/xfree86/xaa/xaaBitBlt.c b/hw/xfree86/xaa/xaaBitBlt.c index 3639ec787..6c81f6413 100644 --- a/hw/xfree86/xaa/xaaBitBlt.c +++ b/hw/xfree86/xaa/xaaBitBlt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitBlt.c,v 1.3tsi Exp $ */ /* This is a lighter version of cfbBitBlt. We calculate the boxes diff --git a/hw/xfree86/xaa/xaaBitOrder.c b/hw/xfree86/xaa/xaaBitOrder.c index eda0b02ca..9dbd00f3c 100644 --- a/hw/xfree86/xaa/xaaBitOrder.c +++ b/hw/xfree86/xaa/xaaBitOrder.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitOrder.c,v 1.7 2001/05/18 20:22:31 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaBitmap.c b/hw/xfree86/xaa/xaaBitmap.c index 940525927..f7ae78d3f 100644 --- a/hw/xfree86/xaa/xaaBitmap.c +++ b/hw/xfree86/xaa/xaaBitmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaBitmap.c,v 1.9 2000/06/29 10:55:41 alanh Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaCpyArea.c b/hw/xfree86/xaa/xaaCpyArea.c index 2fe3ab1c3..89b4441ab 100644 --- a/hw/xfree86/xaa/xaaCpyArea.c +++ b/hw/xfree86/xaa/xaaCpyArea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyArea.c,v 1.12 2000/09/28 20:47:59 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c index 95a22adf5..cd9e9d47f 100644 --- a/hw/xfree86/xaa/xaaCpyPlane.c +++ b/hw/xfree86/xaa/xaaCpyPlane.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyPlane.c,v 1.13tsi Exp $ */ /* A CopyPlane function that handles bitmap->screen copies and diff --git a/hw/xfree86/xaa/xaaCpyWin.c b/hw/xfree86/xaa/xaaCpyWin.c index 198f8e95c..1ff955c6c 100644 --- a/hw/xfree86/xaa/xaaCpyWin.c +++ b/hw/xfree86/xaa/xaaCpyWin.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaCpyWin.c,v 1.3tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaDashLine.c b/hw/xfree86/xaa/xaaDashLine.c index 22645ea1b..2a94a9e6c 100644 --- a/hw/xfree86/xaa/xaaDashLine.c +++ b/hw/xfree86/xaa/xaaDashLine.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaDashLine.c,v 1.4 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index 111bd45e3..7ab4031f8 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFallback.c,v 1.4 1999/03/14 11:18:09 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaFillArc.c b/hw/xfree86/xaa/xaaFillArc.c index d8e2739c6..d3ebc22fc 100644 --- a/hw/xfree86/xaa/xaaFillArc.c +++ b/hw/xfree86/xaa/xaaFillArc.c @@ -21,7 +21,6 @@ * * Written by Harm Hanemaayer (H.Hanemaayer@inter.nl.net). */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillArc.c,v 1.3 1998/10/25 07:12:12 dawes Exp $ */ /* * Filled solid arcs, based on cfbfillarc.c. diff --git a/hw/xfree86/xaa/xaaFillPoly.c b/hw/xfree86/xaa/xaaFillPoly.c index 26a2646e7..23c27818e 100644 --- a/hw/xfree86/xaa/xaaFillPoly.c +++ b/hw/xfree86/xaa/xaaFillPoly.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillPoly.c,v 1.15 2001/10/28 03:34:04 tsi Exp $ */ /* * Copyright 1996 The XFree86 Project diff --git a/hw/xfree86/xaa/xaaFillRect.c b/hw/xfree86/xaa/xaaFillRect.c index 1bd7bd14d..55a30bbd6 100644 --- a/hw/xfree86/xaa/xaaFillRect.c +++ b/hw/xfree86/xaa/xaaFillRect.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaFillRect.c,v 1.15tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index ab46e9b4b..e22081103 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGC.c,v 1.18 2000/09/28 20:48:00 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaGCmisc.c b/hw/xfree86/xaa/xaaGCmisc.c index 5a6a0abce..f7bd576f1 100644 --- a/hw/xfree86/xaa/xaaGCmisc.c +++ b/hw/xfree86/xaa/xaaGCmisc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaGCmisc.c,v 1.14 2000/05/03 00:44:23 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaImage.c b/hw/xfree86/xaa/xaaImage.c index a0d7bfb7a..910c7e1e2 100644 --- a/hw/xfree86/xaa/xaaImage.c +++ b/hw/xfree86/xaa/xaaImage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaImage.c,v 1.20tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c index f29a2eb3a..1542fc26e 100644 --- a/hw/xfree86/xaa/xaaInit.c +++ b/hw/xfree86/xaa/xaaInit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaInit.c,v 1.34 2001/07/19 14:19:42 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaLine.c b/hw/xfree86/xaa/xaaLine.c index c6b78307a..7469de179 100644 --- a/hw/xfree86/xaa/xaaLine.c +++ b/hw/xfree86/xaa/xaaLine.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLine.c,v 1.5 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaLineMisc.c b/hw/xfree86/xaa/xaaLineMisc.c index 7bb312971..d786737af 100644 --- a/hw/xfree86/xaa/xaaLineMisc.c +++ b/hw/xfree86/xaa/xaaLineMisc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaLineMisc.c,v 1.4 1998/09/27 04:43:45 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaNonTEGlyph.c b/hw/xfree86/xaa/xaaNonTEGlyph.c index 881707396..556650fb0 100644 --- a/hw/xfree86/xaa/xaaNonTEGlyph.c +++ b/hw/xfree86/xaa/xaaNonTEGlyph.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEGlyph.c,v 1.4 1998/09/13 05:23:55 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaNonTEText.c b/hw/xfree86/xaa/xaaNonTEText.c index 8c62af477..a5608c922 100644 --- a/hw/xfree86/xaa/xaaNonTEText.c +++ b/hw/xfree86/xaa/xaaNonTEText.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaNonTEText.c,v 1.12 2000/04/07 19:11:10 mvojkovi Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaOffscreen.c b/hw/xfree86/xaa/xaaOffscreen.c index d1c737c06..7c9d53270 100644 --- a/hw/xfree86/xaa/xaaOffscreen.c +++ b/hw/xfree86/xaa/xaaOffscreen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOffscreen.c,v 1.5 1999/07/04 06:39:17 dawes Exp $ */ /* Copyright (c) 1999 - The XFree86 Project Inc. diff --git a/hw/xfree86/xaa/xaaOverlay.c b/hw/xfree86/xaa/xaaOverlay.c index 53a0827e2..016459091 100644 --- a/hw/xfree86/xaa/xaaOverlay.c +++ b/hw/xfree86/xaa/xaaOverlay.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaOverlay.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlay.c,v 1.14tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaOverlayDF.c b/hw/xfree86/xaa/xaaOverlayDF.c index 883e94e6e..cfdac380e 100644 --- a/hw/xfree86/xaa/xaaOverlayDF.c +++ b/hw/xfree86/xaa/xaaOverlayDF.c @@ -3,7 +3,6 @@ Written by Mark Vojkovich */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaOverlayDF.c,v 1.1tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaPCache.c b/hw/xfree86/xaa/xaaPCache.c index b8dd77465..441788cd8 100644 --- a/hw/xfree86/xaa/xaaPCache.c +++ b/hw/xfree86/xaa/xaaPCache.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPCache.c,v 1.32tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaPaintWin.c b/hw/xfree86/xaa/xaaPaintWin.c index 4a82b49c5..af5680c67 100644 --- a/hw/xfree86/xaa/xaaPaintWin.c +++ b/hw/xfree86/xaa/xaaPaintWin.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaPaintWin.c,v 1.6 2005/07/03 08:53:49 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPaintWin.c,v 1.10 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaPict.c b/hw/xfree86/xaa/xaaPict.c index a1ff51087..55f0f6e99 100644 --- a/hw/xfree86/xaa/xaaPict.c +++ b/hw/xfree86/xaa/xaaPict.c @@ -1,5 +1,4 @@ /* - * $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaPict.c,v 1.18 2003/04/23 18:35:34 eich Exp $ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -218,7 +217,13 @@ XAADoComposite ( if (pDst->alphaMap || pSrc->alphaMap || (pMask && pMask->alphaMap)) return FALSE; - + + if ((pSrc->repeat && pSrc->repeatType != RepeatNormal) || + (pMask && pMask->repeat && pMask->repeatType != RepeatNormal)) + { + return FALSE; + } + xDst += pDst->pDrawable->x; yDst += pDst->pDrawable->y; xSrc += pSrc->pDrawable->x; diff --git a/hw/xfree86/xaa/xaaRect.c b/hw/xfree86/xaa/xaaRect.c index 1c56d80dc..0a7e174b7 100644 --- a/hw/xfree86/xaa/xaaRect.c +++ b/hw/xfree86/xaa/xaaRect.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaRect.c,v 1.2 1998/07/25 16:58:51 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaSpans.c b/hw/xfree86/xaa/xaaSpans.c index 150991d7b..7d0943d72 100644 --- a/hw/xfree86/xaa/xaaSpans.c +++ b/hw/xfree86/xaa/xaaSpans.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaSpans.c,v 1.14 2000/03/28 01:21:05 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaStateChange.c b/hw/xfree86/xaa/xaaStateChange.c index 86c12cc7e..a614fe28c 100644 --- a/hw/xfree86/xaa/xaaStateChange.c +++ b/hw/xfree86/xaa/xaaStateChange.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStateChange.c,v 3.1 2000/06/20 05:08:49 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaStipple.c b/hw/xfree86/xaa/xaaStipple.c index 7ea9a2dc2..0dd8e9fcf 100644 --- a/hw/xfree86/xaa/xaaStipple.c +++ b/hw/xfree86/xaa/xaaStipple.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaStipple.c,v 1.11 2001/10/28 03:34:04 tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xaa/xaaTEGlyph.c b/hw/xfree86/xaa/xaaTEGlyph.c index f755ed9a9..c8d65968b 100644 --- a/hw/xfree86/xaa/xaaTEGlyph.c +++ b/hw/xfree86/xaa/xaaTEGlyph.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEGlyph.c,v 1.7 1999/11/06 23:14:46 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaaTEText.c b/hw/xfree86/xaa/xaaTEText.c index 72e1858f6..fc445726f 100644 --- a/hw/xfree86/xaa/xaaTEText.c +++ b/hw/xfree86/xaa/xaaTEText.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTEText.c,v 1.6 1998/12/20 11:57:52 dawes Exp $ */ /******************************************************************** diff --git a/hw/xfree86/xaa/xaaTables.c b/hw/xfree86/xaa/xaaTables.c index 6c16f11d3..829527dd6 100644 --- a/hw/xfree86/xaa/xaaTables.c +++ b/hw/xfree86/xaa/xaaTables.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaTables.c,v 1.1.2.1 1998/07/12 09:43:04 dawes Exp $ */ /* * This is a table of 24-bit values, indexed with an 8-bit byte value, then diff --git a/hw/xfree86/xaa/xaaWideLine.c b/hw/xfree86/xaa/xaaWideLine.c index fbec29e7d..9479b0d7a 100644 --- a/hw/xfree86/xaa/xaaWideLine.c +++ b/hw/xfree86/xaa/xaaWideLine.c @@ -1,5 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaaWideLine.c,v 1.10 2001/11/16 16:47:56 dawes Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xfree86/xaa/xaaWideLine.c,v 1.7 2005/07/03 08:53:49 daniels Exp $ */ /* XAAPolylinesWideSolid does not maintain a span list and subsequently does @@ -818,20 +816,6 @@ XAAPolylinesWideSolid ( return; } - if (mode == CoordModePrevious) { - pPts->x += xorg; - pPts->y += yorg; - } else if(xorg | yorg) { - register int n = npt; - register DDXPointPtr pts = pPts; - - while(n--) { - pts->x += xorg; - pts->y += yorg; - pts++; - } - } - x2 = pPts->x; y2 = pPts->y; if (npt > 1) { @@ -869,6 +853,8 @@ XAAPolylinesWideSolid ( infoRec->ClipBox->x2 - 1, infoRec->ClipBox->y2 - 1); } + x2 += xorg; + y2 += yorg; while (--npt) { x1 = x2; y1 = y2; @@ -878,6 +864,9 @@ XAAPolylinesWideSolid ( if (mode == CoordModePrevious) { x2 += x1; y2 += y1; + } else { + x2 += xorg; + y2 += yorg; } if ((x1 != x2) || (y1 != y2)) { somethingDrawn = TRUE; diff --git a/hw/xfree86/xaa/xaacexp.h b/hw/xfree86/xaa/xaacexp.h index 9decdc594..56bcda69a 100644 --- a/hw/xfree86/xaa/xaacexp.h +++ b/hw/xfree86/xaa/xaacexp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaacexp.h,v 1.3 2000/01/21 02:30:06 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xaa/xaalocal.h b/hw/xfree86/xaa/xaalocal.h index 883e64d5b..7210d8492 100644 --- a/hw/xfree86/xaa/xaalocal.h +++ b/hw/xfree86/xaa/xaalocal.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaalocal.h,v 1.36tsi Exp $ */ #ifndef _XAALOCAL_H #define _XAALOCAL_H diff --git a/hw/xfree86/xaa/xaawrap.h b/hw/xfree86/xaa/xaawrap.h index 3ba0c1699..32c17a60c 100644 --- a/hw/xfree86/xaa/xaawrap.h +++ b/hw/xfree86/xaa/xaawrap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xaa/xaawrap.h,v 1.3 1998/10/25 07:12:14 dawes Exp $ */ #define XAA_SCREEN_PROLOGUE(pScreen, field)\ ((pScreen)->field = \ diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am index b8e4c3d53..e7c873ae8 100644 --- a/hw/xfree86/xf1bpp/Makefile.am +++ b/hw/xfree86/xf1bpp/Makefile.am @@ -60,8 +60,7 @@ libxf1bppmfb_a_SOURCES = \ libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES) -AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) \ - @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = -DXF86MONO -include mfbmap.h $(DIX_CFLAGS) $(XORG_CFLAGS) INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb mfbseg.c: diff --git a/hw/xfree86/xf1bpp/mfbmap.h b/hw/xfree86/xf1bpp/mfbmap.h index 12695003c..5825c1cf4 100644 --- a/hw/xfree86/xf1bpp/mfbmap.h +++ b/hw/xfree86/xf1bpp/mfbmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbmap.h,v 1.1.2.2 1998/06/08 15:13:15 dawes Exp $ */ #ifndef _MFBMAP_H #define _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/mfbunmap.h b/hw/xfree86/xf1bpp/mfbunmap.h index 454091538..16237a163 100644 --- a/hw/xfree86/xf1bpp/mfbunmap.h +++ b/hw/xfree86/xf1bpp/mfbunmap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/mfbunmap.h,v 1.1.2.1 1998/06/27 14:48:24 dawes Exp $ */ #ifdef _MFBMAP_H #undef _MFBMAP_H diff --git a/hw/xfree86/xf1bpp/xf1bpp.h b/hw/xfree86/xf1bpp/xf1bpp.h index 18104a77e..33e5818c3 100644 --- a/hw/xfree86/xf1bpp/xf1bpp.h +++ b/hw/xfree86/xf1bpp/xf1bpp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf1bpp/xf1bpp.h,v 1.2 1998/07/25 16:59:25 dawes Exp $ */ /* * Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. * diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am index 56b690f4b..7cb4ac235 100644 --- a/hw/xfree86/xf4bpp/Makefile.am +++ b/hw/xfree86/xf4bpp/Makefile.am @@ -57,6 +57,6 @@ mfbseg.c: echo "#define POLYSEGMENT" > $@ echo "#include \"$(srcdir)/mfbline.c\"" >> $@ -INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb +INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) diff --git a/hw/xfree86/xf4bpp/OScompiler.h b/hw/xfree86/xf4bpp/OScompiler.h index cc4266c3a..65f002000 100644 --- a/hw/xfree86/xf4bpp/OScompiler.h +++ b/hw/xfree86/xf4bpp/OScompiler.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/OScompiler.h,v 1.3 1999/01/31 12:22:15 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulOpStip.c b/hw/xfree86/xf4bpp/emulOpStip.c index 2f63b1435..22ba90c2b 100644 --- a/hw/xfree86/xf4bpp/emulOpStip.c +++ b/hw/xfree86/xf4bpp/emulOpStip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulOpStip.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulRepAre.c b/hw/xfree86/xf4bpp/emulRepAre.c index 9ae62149f..235bf9bd0 100644 --- a/hw/xfree86/xf4bpp/emulRepAre.c +++ b/hw/xfree86/xf4bpp/emulRepAre.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulRepAre.c,v 1.2 1998/07/25 16:59:27 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/emulTile.c b/hw/xfree86/xf4bpp/emulTile.c index c4f15cad6..ddce1dab0 100644 --- a/hw/xfree86/xf4bpp/emulTile.c +++ b/hw/xfree86/xf4bpp/emulTile.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/emulTile.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ibmTrace.h b/hw/xfree86/xf4bpp/ibmTrace.h index 15231a653..1bed6759f 100644 --- a/hw/xfree86/xf4bpp/ibmTrace.h +++ b/hw/xfree86/xf4bpp/ibmTrace.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ibmTrace.h,v 1.1.2.1 1998/06/27 14:48:30 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/mfbbres.c b/hw/xfree86/xf4bpp/mfbbres.c index b54e23965..f0c3f7e7b 100644 --- a/hw/xfree86/xf4bpp/mfbbres.c +++ b/hw/xfree86/xf4bpp/mfbbres.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbres.c,v 1.2 1998/07/25 16:59:28 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbbresd.c b/hw/xfree86/xf4bpp/mfbbresd.c index d28a6c2a3..ef800871e 100644 --- a/hw/xfree86/xf4bpp/mfbbresd.c +++ b/hw/xfree86/xf4bpp/mfbbresd.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbbresd.c,v 1.3 1999/06/06 08:48:55 dawes Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbfillarc.c b/hw/xfree86/xf4bpp/mfbfillarc.c index e2cab12f5..88d4f72d9 100644 --- a/hw/xfree86/xf4bpp/mfbfillarc.c +++ b/hw/xfree86/xf4bpp/mfbfillarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbfillarc.c,v 1.5tsi Exp $ */ /************************************************************ Copyright (c) 1989 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbhrzvert.c b/hw/xfree86/xf4bpp/mfbhrzvert.c index eb510c0fb..82a205e1b 100644 --- a/hw/xfree86/xf4bpp/mfbhrzvert.c +++ b/hw/xfree86/xf4bpp/mfbhrzvert.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbhrzvert.c,v 1.2 1998/07/25 16:59:29 dawes Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbimggblt.c b/hw/xfree86/xf4bpp/mfbimggblt.c index 03107bbf3..b1f0b9f72 100644 --- a/hw/xfree86/xf4bpp/mfbimggblt.c +++ b/hw/xfree86/xf4bpp/mfbimggblt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbimggblt.c,v 1.8 2003/11/03 05:11:56 tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/mfbline.c b/hw/xfree86/xf4bpp/mfbline.c index 5df58a7e4..82d8bd1c5 100644 --- a/hw/xfree86/xf4bpp/mfbline.c +++ b/hw/xfree86/xf4bpp/mfbline.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbline.c,v 1.5 2003/11/03 05:11:56 tsi Exp $ */ /*********************************************************** Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/mfbzerarc.c b/hw/xfree86/xf4bpp/mfbzerarc.c index 54aa3b0c9..921993196 100644 --- a/hw/xfree86/xf4bpp/mfbzerarc.c +++ b/hw/xfree86/xf4bpp/mfbzerarc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/mfbzerarc.c,v 1.4tsi Exp $ */ /************************************************************ diff --git a/hw/xfree86/xf4bpp/offscreen.c b/hw/xfree86/xf4bpp/offscreen.c index 1bf634c80..f35bde7dd 100644 --- a/hw/xfree86/xf4bpp/offscreen.c +++ b/hw/xfree86/xf4bpp/offscreen.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/offscreen.c,v 1.4 1999/10/13 20:04:26 alanh Exp $ */ /* * Copyright 1993 Gerrit Jan Akkerman * diff --git a/hw/xfree86/xf4bpp/ppcArea.c b/hw/xfree86/xf4bpp/ppcArea.c index 56cab0d64..9c693e836 100644 --- a/hw/xfree86/xf4bpp/ppcArea.c +++ b/hw/xfree86/xf4bpp/ppcArea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcArea.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcBStore.c b/hw/xfree86/xf4bpp/ppcBStore.c index 7686b6f9b..947602ef3 100644 --- a/hw/xfree86/xf4bpp/ppcBStore.c +++ b/hw/xfree86/xf4bpp/ppcBStore.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcBStore.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCReduce.c b/hw/xfree86/xf4bpp/ppcCReduce.c index f937aac34..ab46f85ab 100644 --- a/hw/xfree86/xf4bpp/ppcCReduce.c +++ b/hw/xfree86/xf4bpp/ppcCReduce.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCReduce.c,v 1.2 1998/07/25 16:59:32 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcClip.c b/hw/xfree86/xf4bpp/ppcClip.c index 9166bf256..acfd5bd00 100644 --- a/hw/xfree86/xf4bpp/ppcClip.c +++ b/hw/xfree86/xf4bpp/ppcClip.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcClip.c,v 1.4 1999/06/06 08:48:58 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcCpArea.c b/hw/xfree86/xf4bpp/ppcCpArea.c index e33795c77..2242074c1 100644 --- a/hw/xfree86/xf4bpp/ppcCpArea.c +++ b/hw/xfree86/xf4bpp/ppcCpArea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcCpArea.c,v 1.6tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * @@ -56,8 +55,7 @@ SOFTWARE. #include "xf4bpp.h" #include "mfbmap.h" #define PSZ 8 -#include "cfb.h" -#include "cfbmskbits.h" +#include "mfb.h" #include "mergerop.h" #include "mi.h" #include "pixmapstr.h" @@ -88,8 +86,8 @@ vga16DoBitblt int w, h; int careful; - widthSrc = cfbGetLongWidth(pSrc); - widthDst = cfbGetLongWidth(pDst); + widthSrc = mfbGetPixelWidth(pSrc); + widthDst = mfbGetPixelWidth(pDst); /* XXX we have to err on the side of safety when both are windows, * because we don't know if IncludeInferiors is being used. diff --git a/hw/xfree86/xf4bpp/ppcDepth.c b/hw/xfree86/xf4bpp/ppcDepth.c index 8a67cdd30..26a53de86 100644 --- a/hw/xfree86/xf4bpp/ppcDepth.c +++ b/hw/xfree86/xf4bpp/ppcDepth.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcDepth.c,v 1.2 1998/07/25 16:59:33 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcFillRct.c b/hw/xfree86/xf4bpp/ppcFillRct.c index 28c7acb6c..e501f65fb 100644 --- a/hw/xfree86/xf4bpp/ppcFillRct.c +++ b/hw/xfree86/xf4bpp/ppcFillRct.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcFillRct.c,v 1.5tsi Exp $ */ /* Combined Purdue/PurduePlus patches, level 2.0, 1/17/89 */ /*********************************************************** diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 4aafb706b..8153051f0 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGC.c,v 1.7tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcGCstr.h b/hw/xfree86/xf4bpp/ppcGCstr.h index 12a573c9d..fd064d1c1 100644 --- a/hw/xfree86/xf4bpp/ppcGCstr.h +++ b/hw/xfree86/xf4bpp/ppcGCstr.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGCstr.h,v 1.3 2003/02/18 21:29:59 tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcGetSp.c b/hw/xfree86/xf4bpp/ppcGetSp.c index 0c48de4c8..dc31741f3 100644 --- a/hw/xfree86/xf4bpp/ppcGetSp.c +++ b/hw/xfree86/xf4bpp/ppcGetSp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcGetSp.c,v 1.2 1998/07/25 16:59:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcIO.c b/hw/xfree86/xf4bpp/ppcIO.c index 20b08ce9a..0d5afafa5 100644 --- a/hw/xfree86/xf4bpp/ppcIO.c +++ b/hw/xfree86/xf4bpp/ppcIO.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcIO.c,v 1.5tsi Exp $ */ /* Copyright (c) 1990 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcImg.c b/hw/xfree86/xf4bpp/ppcImg.c index ab8774216..6ff7e8fef 100644 --- a/hw/xfree86/xf4bpp/ppcImg.c +++ b/hw/xfree86/xf4bpp/ppcImg.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcImg.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixFS.c b/hw/xfree86/xf4bpp/ppcPixFS.c index c8801fd32..08b09e9c7 100644 --- a/hw/xfree86/xf4bpp/ppcPixFS.c +++ b/hw/xfree86/xf4bpp/ppcPixFS.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixFS.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPixmap.c b/hw/xfree86/xf4bpp/ppcPixmap.c index 0ccefcbd6..9f4cdc99a 100644 --- a/hw/xfree86/xf4bpp/ppcPixmap.c +++ b/hw/xfree86/xf4bpp/ppcPixmap.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c,v 1.3 1999/01/14 13:05:34 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPntWin.c b/hw/xfree86/xf4bpp/ppcPntWin.c index 11195e033..85ac22e6c 100644 --- a/hw/xfree86/xf4bpp/ppcPntWin.c +++ b/hw/xfree86/xf4bpp/ppcPntWin.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPntWin.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcPolyPnt.c b/hw/xfree86/xf4bpp/ppcPolyPnt.c index c78622482..399ba3bda 100644 --- a/hw/xfree86/xf4bpp/ppcPolyPnt.c +++ b/hw/xfree86/xf4bpp/ppcPolyPnt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyPnt.c,v 1.3 1999/06/06 08:49:01 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/ppcPolyRec.c b/hw/xfree86/xf4bpp/ppcPolyRec.c index 085cb4b25..d7f866232 100644 --- a/hw/xfree86/xf4bpp/ppcPolyRec.c +++ b/hw/xfree86/xf4bpp/ppcPolyRec.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcPolyRec.c,v 1.2 1998/07/25 16:59:36 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcQuery.c b/hw/xfree86/xf4bpp/ppcQuery.c index 95914846d..810b81f24 100644 --- a/hw/xfree86/xf4bpp/ppcQuery.c +++ b/hw/xfree86/xf4bpp/ppcQuery.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcQuery.c,v 1.2 1998/07/25 16:59:37 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcRslvC.c b/hw/xfree86/xf4bpp/ppcRslvC.c index ce00a8799..e4601e2af 100644 --- a/hw/xfree86/xf4bpp/ppcRslvC.c +++ b/hw/xfree86/xf4bpp/ppcRslvC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcRslvC.c,v 1.4 1999/06/06 08:49:01 dawes Exp $ */ /************************************************************ Copyright 1987 by Sun Microsystems, Inc. Mountain View, CA. diff --git a/hw/xfree86/xf4bpp/ppcSetSp.c b/hw/xfree86/xf4bpp/ppcSetSp.c index ffdc5d970..350cb9b14 100644 --- a/hw/xfree86/xf4bpp/ppcSetSp.c +++ b/hw/xfree86/xf4bpp/ppcSetSp.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSetSp.c,v 1.2 1998/07/25 16:59:41 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcSpMcro.h b/hw/xfree86/xf4bpp/ppcSpMcro.h index bc56ca1fc..41245ceb3 100644 --- a/hw/xfree86/xf4bpp/ppcSpMcro.h +++ b/hw/xfree86/xf4bpp/ppcSpMcro.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcSpMcro.h,v 1.1.2.1 1998/06/27 14:48:49 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWinFS.c b/hw/xfree86/xf4bpp/ppcWinFS.c index 820b80e53..bd9b1289f 100644 --- a/hw/xfree86/xf4bpp/ppcWinFS.c +++ b/hw/xfree86/xf4bpp/ppcWinFS.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWinFS.c,v 1.3tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/ppcWindow.c b/hw/xfree86/xf4bpp/ppcWindow.c index a2e910b1c..11c5e343e 100644 --- a/hw/xfree86/xf4bpp/ppcWindow.c +++ b/hw/xfree86/xf4bpp/ppcWindow.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/ppcWindow.c,v 1.3 1999/06/06 08:49:06 dawes Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaBitBlt.c b/hw/xfree86/xf4bpp/vgaBitBlt.c index e13312233..e51e0dc1a 100644 --- a/hw/xfree86/xf4bpp/vgaBitBlt.c +++ b/hw/xfree86/xf4bpp/vgaBitBlt.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaBitBlt.c,v 1.5 2003/11/03 05:11:57 tsi Exp $ */ /* GJA -- span move routines */ diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index 64b4dae48..fd33727b9 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaGC.c,v 1.3tsi Exp $ */ /* Copyright (c) 1987 X Consortium diff --git a/hw/xfree86/xf4bpp/vgaImages.c b/hw/xfree86/xf4bpp/vgaImages.c index 4806b9461..22f8d8f8e 100644 --- a/hw/xfree86/xf4bpp/vgaImages.c +++ b/hw/xfree86/xf4bpp/vgaImages.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaImages.c,v 1.4tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaReg.h b/hw/xfree86/xf4bpp/vgaReg.h index 552f07140..c5165256c 100644 --- a/hw/xfree86/xf4bpp/vgaReg.h +++ b/hw/xfree86/xf4bpp/vgaReg.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaReg.h,v 1.3 1999/06/06 08:49:07 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaSolid.c b/hw/xfree86/xf4bpp/vgaSolid.c index 5cb47173c..562b1ebc4 100644 --- a/hw/xfree86/xf4bpp/vgaSolid.c +++ b/hw/xfree86/xf4bpp/vgaSolid.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaSolid.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaStipple.c b/hw/xfree86/xf4bpp/vgaStipple.c index a7bfa13d2..b81305bd4 100644 --- a/hw/xfree86/xf4bpp/vgaStipple.c +++ b/hw/xfree86/xf4bpp/vgaStipple.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaStipple.c,v 1.5tsi Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/vgaVideo.h b/hw/xfree86/xf4bpp/vgaVideo.h index ba0aae662..14e85ef79 100644 --- a/hw/xfree86/xf4bpp/vgaVideo.h +++ b/hw/xfree86/xf4bpp/vgaVideo.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/vgaVideo.h,v 1.1.2.1 1998/06/27 14:48:54 dawes Exp $ */ /* * Copyright IBM Corporation 1987,1988,1989 * diff --git a/hw/xfree86/xf4bpp/wm3.c b/hw/xfree86/xf4bpp/wm3.c index 6b501b570..24ecf3dd2 100644 --- a/hw/xfree86/xf4bpp/wm3.c +++ b/hw/xfree86/xf4bpp/wm3.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.c,v 1.3 1999/06/06 08:49:08 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/wm3.h b/hw/xfree86/xf4bpp/wm3.h index 1def6f607..2d66557fc 100644 --- a/hw/xfree86/xf4bpp/wm3.h +++ b/hw/xfree86/xf4bpp/wm3.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/wm3.h,v 1.2 1998/07/25 16:59:46 dawes Exp $ */ diff --git a/hw/xfree86/xf4bpp/xf4bpp.h b/hw/xfree86/xf4bpp/xf4bpp.h index 1f465374e..8d2da35a5 100644 --- a/hw/xfree86/xf4bpp/xf4bpp.h +++ b/hw/xfree86/xf4bpp/xf4bpp.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf4bpp/xf4bpp.h,v 1.9 2003/11/03 05:11:57 tsi Exp $ */ #ifndef __XF4BPP_H__ #define __XF4BPP_H__ diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am index 6538d1fab..5b30f45ed 100644 --- a/hw/xfree86/xf8_16bpp/Makefile.am +++ b/hw/xfree86/xf8_16bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_16.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/fb -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) libxf8_16bpp_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am index 1212fc0de..3050b81d1 100644 --- a/hw/xfree86/xf8_32bpp/Makefile.am +++ b/hw/xfree86/xf8_32bpp/Makefile.am @@ -4,7 +4,7 @@ sdk_HEADERS = cfb8_32.h INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb -AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(XORG_CFLAGS) libxf8_32bpp_la_LDFLAGS = -avoid-version diff --git a/hw/xfree86/xf8_32bpp/cfb8_32.h b/hw/xfree86/xf8_32bpp/cfb8_32.h index 2785fa252..969fa290f 100644 --- a/hw/xfree86/xf8_32bpp/cfb8_32.h +++ b/hw/xfree86/xf8_32bpp/cfb8_32.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfb8_32.h,v 1.5 2000/03/02 02:32:52 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf8_32bpp/cfbbstore.c b/hw/xfree86/xf8_32bpp/cfbbstore.c index 842b872d7..f4d570f8b 100644 --- a/hw/xfree86/xf8_32bpp/cfbbstore.c +++ b/hw/xfree86/xf8_32bpp/cfbbstore.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbbstore.c,v 1.2 1999/01/31 12:22:17 dawes Exp $ */ #define PSZ 8 #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xf8_32bpp/cfbcpyarea.c b/hw/xfree86/xf8_32bpp/cfbcpyarea.c index 6958861ec..c2eb1a04e 100644 --- a/hw/xfree86/xf8_32bpp/cfbcpyarea.c +++ b/hw/xfree86/xf8_32bpp/cfbcpyarea.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbcpyarea.c,v 1.5 2000/02/29 00:17:16 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index 0ffafd048..a7787caa9 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v 1.3 2000/02/11 06:33:46 mvojkovi Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index 3f45a85d1..d90321355 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v 1.5 2001/12/14 19:59:52 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xfree86/xf8_32bpp/cfbimage.c b/hw/xfree86/xf8_32bpp/cfbimage.c index 629d6bf6a..01a5a5eb6 100644 --- a/hw/xfree86/xf8_32bpp/cfbimage.c +++ b/hw/xfree86/xf8_32bpp/cfbimage.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbimage.c,v 1.2 2000/02/25 00:21:40 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 30ddb0c4b..a1b988716 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,5 +1,3 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.3 2005/04/20 12:25:40 daniels Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ #ifdef HAVE_XORG_CONFIG_H #include <xorg-config.h> diff --git a/hw/xfree86/xf8_32bpp/cfbscrinit.c b/hw/xfree86/xf8_32bpp/cfbscrinit.c index 2e4dd7296..7cbdb5a66 100644 --- a/hw/xfree86/xf8_32bpp/cfbscrinit.c +++ b/hw/xfree86/xf8_32bpp/cfbscrinit.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbscrinit.c,v 1.11 2001/04/14 21:17:49 mvojkovi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xf8_32bpp/cfbwindow.c b/hw/xfree86/xf8_32bpp/cfbwindow.c index d2d4cfb6b..ce741cb55 100644 --- a/hw/xfree86/xf8_32bpp/cfbwindow.c +++ b/hw/xfree86/xf8_32bpp/cfbwindow.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbwindow.c,v 1.8tsi Exp $ */ #ifdef HAVE_XORG_CONFIG_H diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index 2316db05f..c5585ca6d 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/xf86overlay.c,v 1.8 2000/03/25 20:14:43 mvojkovi Exp $ */ /* Copyright (C) 1998. The XFree86 Project Inc. diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am index 0aa94f9a5..48a9825d2 100644 --- a/hw/xgl/Makefile.am +++ b/hw/xgl/Makefile.am @@ -19,7 +19,7 @@ SUBDIRS = \ $(XEGL_SUBDIRS) AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ -I$(top_srcdir)/GL/glx \ diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am index 701320de5..ded4a15e2 100644 --- a/hw/xgl/egl/Makefile.am +++ b/hw/xgl/egl/Makefile.am @@ -9,7 +9,7 @@ SUBDIRS = \ $(XGL_MODULE_DIRS) AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XEGLMODULES_CFLAGS) diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am index 492921210..10a831f94 100644 --- a/hw/xgl/glx/Makefile.am +++ b/hw/xgl/glx/Makefile.am @@ -15,7 +15,7 @@ AM_CFLAGS = \ -I$(top_srcdir)/GL/include \ -I@MESA_SOURCE@/include \ -I@MESA_SOURCE@/src/mesa/glapi \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLXMODULES_CFLAGS) diff --git a/hw/xgl/glxext/Makefile.am b/hw/xgl/glxext/Makefile.am index f9b9c0d68..c400f364a 100644 --- a/hw/xgl/glxext/Makefile.am +++ b/hw/xgl/glxext/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = module AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLMODULES_CFLAGS) \ diff --git a/hw/xgl/glxext/module/Makefile.am b/hw/xgl/glxext/module/Makefile.am index 660838dd9..82c4211d8 100644 --- a/hw/xgl/glxext/module/Makefile.am +++ b/hw/xgl/glxext/module/Makefile.am @@ -1,5 +1,5 @@ AM_CFLAGS = \ - @SERVER_DEFINES@ \ + \ -DHAVE_XGL_CONFIG_H \ -DHAVE_DIX_CONFIG_H \ $(XGLMODULES_CFLAGS) \ diff --git a/hw/xnest/Args.c b/hw/xnest/Args.c index a36677491..0aa0ca478 100644 --- a/hw/xnest/Args.c +++ b/hw/xnest/Args.c @@ -1,4 +1,3 @@ -/* $Xorg: Args.c,v 1.3 2000/08/17 19:53:26 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Args.h b/hw/xnest/Args.h index a0c586bcb..38090fd0e 100644 --- a/hw/xnest/Args.h +++ b/hw/xnest/Args.h @@ -1,4 +1,3 @@ -/* $Xorg: Args.h,v 1.3 2000/08/17 19:53:27 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Color.c b/hw/xnest/Color.c index 779633a96..2dd60971f 100644 --- a/hw/xnest/Color.c +++ b/hw/xnest/Color.c @@ -1,4 +1,3 @@ -/* $Xorg: Color.c,v 1.3 2000/08/17 19:53:27 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Color.h b/hw/xnest/Color.h index 9ce72a946..aec0a248c 100644 --- a/hw/xnest/Color.h +++ b/hw/xnest/Color.h @@ -1,4 +1,3 @@ -/* $Xorg: Color.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Cursor.c b/hw/xnest/Cursor.c index f95860022..134276e7b 100644 --- a/hw/xnest/Cursor.c +++ b/hw/xnest/Cursor.c @@ -1,4 +1,3 @@ -/* $Xorg: Cursor.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Cursor.c,v 1.3 2002/11/23 19:27:50 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c index fa8457651..57f3a688f 100644 --- a/hw/xnest/Display.c +++ b/hw/xnest/Display.c @@ -1,4 +1,3 @@ -/* $Xorg: Display.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.c,v 3.4 2001/10/28 03:34:10 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H diff --git a/hw/xnest/Display.h b/hw/xnest/Display.h index 85aedc583..d0eefd57c 100644 --- a/hw/xnest/Display.h +++ b/hw/xnest/Display.h @@ -1,4 +1,3 @@ -/* $Xorg: Display.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Display.h,v 1.6 2001/01/17 22:36:55 dawes Exp $ */ #ifndef XNESTCOMMON_H #define XNESTCOMMON_H diff --git a/hw/xnest/Drawable.h b/hw/xnest/Drawable.h index 7b96bdfee..61159c9ba 100644 --- a/hw/xnest/Drawable.h +++ b/hw/xnest/Drawable.h @@ -1,4 +1,3 @@ -/* $Xorg: Drawable.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c index 3d520279c..e5cf99e2c 100644 --- a/hw/xnest/Events.c +++ b/hw/xnest/Events.c @@ -1,4 +1,3 @@ -/* $Xorg: Events.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Events.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Events.h b/hw/xnest/Events.h index c61b26c0d..cdad9f398 100644 --- a/hw/xnest/Events.h +++ b/hw/xnest/Events.h @@ -1,4 +1,3 @@ -/* $Xorg: Events.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Font.c b/hw/xnest/Font.c index d86816e8f..72edcee9a 100644 --- a/hw/xnest/Font.c +++ b/hw/xnest/Font.c @@ -1,4 +1,3 @@ -/* $Xorg: Font.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Font.c,v 3.6 2003/07/16 01:38:51 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/GC.c b/hw/xnest/GC.c index e46b48f11..a52ce1f35 100644 --- a/hw/xnest/GC.c +++ b/hw/xnest/GC.c @@ -1,4 +1,3 @@ -/* $Xorg: GC.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GC.c,v 3.6 2001/10/28 03:34:11 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/GCOps.c b/hw/xnest/GCOps.c index 233424823..ad9668ec1 100644 --- a/hw/xnest/GCOps.c +++ b/hw/xnest/GCOps.c @@ -1,4 +1,3 @@ -/* $Xorg: GCOps.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/GCOps.c,v 3.5 2003/07/16 01:38:51 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/GCOps.h b/hw/xnest/GCOps.h index ccdc40ebe..fce9d6cb3 100644 --- a/hw/xnest/GCOps.h +++ b/hw/xnest/GCOps.h @@ -1,4 +1,3 @@ -/* $Xorg: GCOps.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/GetTime.c b/hw/xnest/GetTime.c deleted file mode 100644 index bdcc6beae..000000000 --- a/hw/xnest/GetTime.c +++ /dev/null @@ -1,51 +0,0 @@ -/* $Xorg: GetTime.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ -/* - -Copyright (c) 1993 X Consortium - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the X Consortium shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from the X Consortium. - -*/ -/* $XFree86$ */ - - -#ifdef HAVE_XNEST_CONFIG_H -#include <xnest-config.h> -#endif - -#include <X11/Xos.h> -#include "os.h" -#include <time.h> - -#ifdef DDXTIME -CARD32 -GetTimeInMillis() -{ - struct timeval tp; - - X_GETTIMEOFDAY(&tp); - return(tp.tv_sec * 1000) + (tp.tv_usec / 1000); -} -#endif diff --git a/hw/xnest/Handlers.c b/hw/xnest/Handlers.c index 9915502c4..a113f488a 100644 --- a/hw/xnest/Handlers.c +++ b/hw/xnest/Handlers.c @@ -1,4 +1,3 @@ -/* $Xorg: Handlers.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Handlers.c,v 1.2 2001/08/01 00:44:57 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Handlers.h b/hw/xnest/Handlers.h index 9a1e809cc..fe064213e 100644 --- a/hw/xnest/Handlers.h +++ b/hw/xnest/Handlers.h @@ -1,4 +1,3 @@ -/* $Xorg: Handlers.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Init.c b/hw/xnest/Init.c index dcbd724fd..8c397a7bb 100644 --- a/hw/xnest/Init.c +++ b/hw/xnest/Init.c @@ -1,4 +1,3 @@ -/* $Xorg: Init.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Init.c,v 3.24 2003/01/15 02:34:14 torrey Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Init.h b/hw/xnest/Init.h index 8fb9956eb..4bed0ee67 100644 --- a/hw/xnest/Init.h +++ b/hw/xnest/Init.h @@ -1,4 +1,3 @@ -/* $Xorg: Init.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index a6fabf5a5..f18cc9760 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -1,5 +1,3 @@ -/* $Xorg: Keyboard.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ -/* $XdotOrg: xserver/xorg/hw/xnest/Keyboard.c,v 1.9 2006/03/27 22:25:56 daniels Exp $ */ /* Copyright 1993 by Davor Matic @@ -13,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Keyboard.c,v 1.9 2003/09/13 21:33:09 dawes Exp $ */ #define NEED_EVENTS #ifdef HAVE_XNEST_CONFIG_H diff --git a/hw/xnest/Keyboard.h b/hw/xnest/Keyboard.h index 8237dac14..d87866c73 100644 --- a/hw/xnest/Keyboard.h +++ b/hw/xnest/Keyboard.h @@ -1,4 +1,3 @@ -/* $Xorg: Keyboard.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Makefile.am b/hw/xnest/Makefile.am index 67a2e981c..b237788bc 100644 --- a/hw/xnest/Makefile.am +++ b/hw/xnest/Makefile.am @@ -14,7 +14,6 @@ SRCS = Args.c \ GC.c \ GCOps.c \ GCOps.h \ - GetTime.c \ Handlers.c \ Handlers.h \ Init.c \ @@ -52,7 +51,7 @@ Xnest_LDFLAGS = AM_CFLAGS = -DHAVE_XNEST_CONFIG_H \ -DNO_HW_ONLY_EXTS \ - @SERVER_DEFINES@ \ + \ $(XNESTMODULES_CFLAGS) EXTRA_DIST = os2Stub.c \ diff --git a/hw/xnest/Pixmap.c b/hw/xnest/Pixmap.c index 046b73976..aa8bed933 100644 --- a/hw/xnest/Pixmap.c +++ b/hw/xnest/Pixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: Pixmap.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Pixmap.c,v 3.7 2003/07/16 01:38:51 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Pointer.c b/hw/xnest/Pointer.c index 1533a06d8..454449732 100644 --- a/hw/xnest/Pointer.c +++ b/hw/xnest/Pointer.c @@ -1,4 +1,3 @@ -/* $Xorg: Pointer.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Pointer.h b/hw/xnest/Pointer.h index 872dfb8ee..2012db4c3 100644 --- a/hw/xnest/Pointer.h +++ b/hw/xnest/Pointer.h @@ -1,4 +1,3 @@ -/* $Xorg: Pointer.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c index 660e54fe7..8e86efbdb 100644 --- a/hw/xnest/Screen.c +++ b/hw/xnest/Screen.c @@ -1,4 +1,3 @@ -/* $Xorg: Screen.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Screen.c,v 3.12 2003/11/14 22:25:59 dawes Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/Screen.h b/hw/xnest/Screen.h index f35a2872d..db298e300 100644 --- a/hw/xnest/Screen.h +++ b/hw/xnest/Screen.h @@ -1,4 +1,3 @@ -/* $Xorg: Screen.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Visual.c b/hw/xnest/Visual.c index bbdb71ec6..628e22a7d 100644 --- a/hw/xnest/Visual.c +++ b/hw/xnest/Visual.c @@ -1,4 +1,3 @@ -/* $Xorg: Visual.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Visual.h b/hw/xnest/Visual.h index dfa74dbdc..c2d715a65 100644 --- a/hw/xnest/Visual.h +++ b/hw/xnest/Visual.h @@ -1,4 +1,3 @@ -/* $Xorg: Visual.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/Window.c b/hw/xnest/Window.c index f652c342a..f87a1baa7 100644 --- a/hw/xnest/Window.c +++ b/hw/xnest/Window.c @@ -1,4 +1,3 @@ -/* $Xorg: Window.c,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/Window.c,v 3.7 2001/10/28 03:34:11 tsi Exp $ */ #ifdef HAVE_XNEST_CONFIG_H #include <xnest-config.h> diff --git a/hw/xnest/XNCursor.h b/hw/xnest/XNCursor.h index 8684a5e7f..ffec9eb0a 100644 --- a/hw/xnest/XNCursor.h +++ b/hw/xnest/XNCursor.h @@ -1,4 +1,3 @@ -/* $Xorg: Cursor.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNCursor.h,v 1.2 2002/11/23 19:27:50 tsi Exp $ */ #ifndef XNESTCURSOR_H #define XNESTCURSOR_H @@ -29,6 +27,7 @@ typedef struct { Bool xnestRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); Bool xnestUnrealizeCursor(ScreenPtr pScreen, CursorPtr pCursor); +void xnestRecolorCursor(ScreenPtr pScreen, CursorPtr pCursor, Bool displayed); void xnestSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y); void xnestMoveCursor (ScreenPtr pScreen, int x, int y); diff --git a/hw/xnest/XNFont.h b/hw/xnest/XNFont.h index 7fb4017bd..f7b9e38c0 100644 --- a/hw/xnest/XNFont.h +++ b/hw/xnest/XNFont.h @@ -1,4 +1,3 @@ -/* $Xorg: XNFont.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/XNGC.h b/hw/xnest/XNGC.h index 56939cceb..a59508739 100644 --- a/hw/xnest/XNGC.h +++ b/hw/xnest/XNGC.h @@ -1,4 +1,3 @@ -/* $Xorg: XNGC.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic diff --git a/hw/xnest/XNPixmap.h b/hw/xnest/XNPixmap.h index fab1843d1..77cba24af 100644 --- a/hw/xnest/XNPixmap.h +++ b/hw/xnest/XNPixmap.h @@ -1,4 +1,3 @@ -/* $Xorg: Pixmap.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNPixmap.h,v 1.3 2003/01/10 13:29:40 eich Exp $ */ #ifndef XNESTPIXMAP_H #define XNESTPIXMAP_H diff --git a/hw/xnest/XNWindow.h b/hw/xnest/XNWindow.h index 3a57646a7..21be5f5e3 100644 --- a/hw/xnest/XNWindow.h +++ b/hw/xnest/XNWindow.h @@ -1,4 +1,3 @@ -/* $Xorg: XNWindow.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright 1993 by Davor Matic @@ -12,7 +11,6 @@ the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. */ -/* $XFree86: xc/programs/Xserver/hw/xnest/XNWindow.h,v 1.3 2003/11/03 05:36:34 tsi Exp $ */ #ifndef XNESTWINDOW_H #define XNESTWINDOW_H diff --git a/hw/xnest/Xnest.h b/hw/xnest/Xnest.h index ade73833f..8ed3f8902 100644 --- a/hw/xnest/Xnest.h +++ b/hw/xnest/Xnest.h @@ -1,4 +1,3 @@ -/* $Xorg: Xnest.h,v 1.3 2000/08/17 19:53:28 cpqbld Exp $ */ /* Copyright (c) 1995 X Consortium diff --git a/hw/xnest/os2Stub.c b/hw/xnest/os2Stub.c index 0868b4480..33675ec75 100644 --- a/hw/xnest/os2Stub.c +++ b/hw/xnest/os2Stub.c @@ -26,7 +26,6 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xnest/os2Stub.c,v 3.1 2002/05/31 18:46:04 dawes Exp $ */ /* This below implements select() for calls in xnest. It has been */ /* somewhat optimized for improved performance, but assumes a few */ diff --git a/hw/xnest/xnest-config.h b/hw/xnest/xnest-config.h index 8b477767a..4889f1fdd 100644 --- a/hw/xnest/xnest-config.h +++ b/hw/xnest/xnest-config.h @@ -32,6 +32,5 @@ #include <xkb-config.h> #undef MITSHM -#undef XFree86LOADER #endif /* XNEST_CONFIG_H */ diff --git a/hw/xprint/AttrValid.c b/hw/xprint/AttrValid.c index cf9476003..f8c292faa 100644 --- a/hw/xprint/AttrValid.c +++ b/hw/xprint/AttrValid.c @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.c,v 1.4 2001/03/14 18:43:17 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/AttrValid.h b/hw/xprint/AttrValid.h index fab3a7f5e..7bb7ce1c8 100644 --- a/hw/xprint/AttrValid.h +++ b/hw/xprint/AttrValid.h @@ -1,4 +1,3 @@ -/* $Xorg: AttrValid.h,v 1.4 2001/03/14 18:43:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/DiPrint.h b/hw/xprint/DiPrint.h index 6801ce046..22cbf0d43 100644 --- a/hw/xprint/DiPrint.h +++ b/hw/xprint/DiPrint.h @@ -1,4 +1,3 @@ -/* $Xorg: DiPrint.h,v 1.3 2000/08/17 19:48:04 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Init.c b/hw/xprint/Init.c index 0f1be6791..69100d390 100644 --- a/hw/xprint/Init.c +++ b/hw/xprint/Init.c @@ -1,4 +1,3 @@ -/* $Xorg: Init.c,v 1.5 2001/03/07 17:31:33 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am index 46647a519..27a7e30d1 100644 --- a/hw/xprint/Makefile.am +++ b/hw/xprint/Makefile.am @@ -2,9 +2,9 @@ SUBDIRS = doc pcl pcl-mono raster ps etc config bin_PROGRAMS = Xprt -Xprt_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ +Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ -DXPRINT -DPRINT_ONLY_SERVER -D_XP_PRINT_SERVER_ \ - -DXPRINTDIR=\"$(prefix)/X11/xserver\" \ + -DXPRINTDIR=\"$(libdir)/X11/xserver\" \ -DXPRASTERDDX -DXPPCLDDX -DXPMONOPCLDDX -DXPPSDDX Xprt_LDFLAGS = -L$(top_srcdir) diff --git a/hw/xprint/Oid.c b/hw/xprint/Oid.c index e4dadd519..a2af00108 100644 --- a/hw/xprint/Oid.c +++ b/hw/xprint/Oid.c @@ -1,4 +1,3 @@ -/* $Xorg: Oid.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Oid.h b/hw/xprint/Oid.h index fc9f12a5b..79e85ec64 100644 --- a/hw/xprint/Oid.h +++ b/hw/xprint/Oid.h @@ -1,4 +1,3 @@ -/* $Xorg: Oid.h,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/OidDefs.h b/hw/xprint/OidDefs.h index 55b6568f0..a3b37eaaf 100644 --- a/hw/xprint/OidDefs.h +++ b/hw/xprint/OidDefs.h @@ -1,4 +1,3 @@ -/* $Xorg: OidDefs.h,v 1.4 2001/03/14 18:45:13 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/OidStrs.h b/hw/xprint/OidStrs.h index 1792a6e16..5ed2089e0 100644 --- a/hw/xprint/OidStrs.h +++ b/hw/xprint/OidStrs.h @@ -1,4 +1,3 @@ -/* $Xorg: OidStrs.h,v 1.4 2001/03/14 18:45:40 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/Util.c b/hw/xprint/Util.c index 12a2562a4..eb7f839c9 100644 --- a/hw/xprint/Util.c +++ b/hw/xprint/Util.c @@ -1,4 +1,3 @@ -/* $Xorg: Util.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/Util.c,v 1.12 2001/08/01 00:44:45 tsi Exp $ */ /* To get the tempnam() prototype in <stdio.h> */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/ValTree.c b/hw/xprint/ValTree.c index 6fa631617..60e340dc1 100644 --- a/hw/xprint/ValTree.c +++ b/hw/xprint/ValTree.c @@ -1,4 +1,3 @@ -/* $Xorg: ValTree.c,v 1.3 2000/08/17 19:48:06 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/attributes.c b/hw/xprint/attributes.c index 8e4c811cb..a24c1076b 100644 --- a/hw/xprint/attributes.c +++ b/hw/xprint/attributes.c @@ -1,4 +1,3 @@ -/* $Xorg: attributes.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/attributes.h b/hw/xprint/attributes.h index 40df4fd0b..26864a2f0 100644 --- a/hw/xprint/attributes.h +++ b/hw/xprint/attributes.h @@ -1,4 +1,3 @@ -/* $Xorg: attributes.h,v 1.4 2001/03/14 18:42:44 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am index 7cdfd8ee9..e7ddb6c0f 100644 --- a/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am +++ b/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.am @@ -17,7 +17,6 @@ dist_xpc_DATA = \ LubalinGraph-Book.pmf \ LubalinGraph-DemiOblique.pmf \ LubalinGraph-Demi.pmf \ - NewCenturySchlbk-BoldItalic.pmf \ NewCenturySchlbk-Bold.pmf \ NewCenturySchlbk-Italic.pmf \ NewCenturySchlbk-Roman.pmf \ diff --git a/hw/xprint/ddxInit.c b/hw/xprint/ddxInit.c index d4c0b9a4c..6cd3cfd3c 100644 --- a/hw/xprint/ddxInit.c +++ b/hw/xprint/ddxInit.c @@ -1,4 +1,3 @@ -/* $Xorg: ddxInit.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -245,17 +244,6 @@ ddxBeforeReset(void) } #endif -#ifdef DDXTIME -CARD32 -GetTimeInMillis(void) -{ - struct timeval tp; - - X_GETTIMEOFDAY(&tp); - return(tp.tv_sec * 1000) + (tp.tv_usec / 1000); -} -#endif - /* ddxInitGlobals - called by |InitGlobals| from os/util.c */ void ddxInitGlobals(void) { diff --git a/hw/xprint/etc/init.d/Makefile.am b/hw/xprint/etc/init.d/Makefile.am index cc03cfab4..0cf1adc92 100644 --- a/hw/xprint/etc/init.d/Makefile.am +++ b/hw/xprint/etc/init.d/Makefile.am @@ -1 +1,12 @@ +include $(top_srcdir)/cpprules.in + +noinst_PRE = xprint +BUILT_SOURCES = $(noinst_PRE) +CLEANFILES = $(noinst_PRE) xprint.pre + +CPP_FILES_FLAGS = -DProjectRoot='"$(PROJECTROOT)"' -DOS_LINUX + +xprint.pre: xprint.cpp + $(SED) -e 's/^\(\s\+\)#/\1XCOMM/' ${srcdir}/xprint.cpp > $@ + EXTRA_DIST = xprint.cpp diff --git a/hw/xprint/mediaSizes.c b/hw/xprint/mediaSizes.c index 7f582199d..7acc70679 100644 --- a/hw/xprint/mediaSizes.c +++ b/hw/xprint/mediaSizes.c @@ -1,4 +1,3 @@ -/* $Xorg: mediaSizes.c,v 1.4 2001/03/14 18:44:37 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/pcl/Makefile.am.inc b/hw/xprint/pcl/Makefile.am.inc index 38a784e13..c3af606ee 100644 --- a/hw/xprint/pcl/Makefile.am.inc +++ b/hw/xprint/pcl/Makefile.am.inc @@ -1,7 +1,6 @@ INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 $(PCL_DRIVER) +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ $(PCL_DRIVER) libpcl_la_SOURCES = \ $(srcdir)/../pcl/PclArc.c \ diff --git a/hw/xprint/pcl/Pcl.h b/hw/xprint/pcl/Pcl.h index bb1f52b2c..217e30438 100644 --- a/hw/xprint/pcl/Pcl.h +++ b/hw/xprint/pcl/Pcl.h @@ -1,4 +1,3 @@ -/* $Xorg: Pcl.h,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pcl.h,v 1.12 2001/12/21 21:02:05 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclArc.c b/hw/xprint/pcl/PclArc.c index d675e1699..0d8289e33 100644 --- a/hw/xprint/pcl/PclArc.c +++ b/hw/xprint/pcl/PclArc.c @@ -1,4 +1,3 @@ -/* $Xorg: PclArc.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArc.c,v 1.4 1999/12/13 02:12:53 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclArea.c b/hw/xprint/pcl/PclArea.c index dc9156b17..59ae5e3cc 100644 --- a/hw/xprint/pcl/PclArea.c +++ b/hw/xprint/pcl/PclArea.c @@ -1,4 +1,3 @@ -/* $Xorg: PclArea.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclArea.c,v 1.8 2001/01/17 22:36:30 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclAttVal.c b/hw/xprint/pcl/PclAttVal.c index adbd197fd..f0f204764 100644 --- a/hw/xprint/pcl/PclAttVal.c +++ b/hw/xprint/pcl/PclAttVal.c @@ -1,5 +1,4 @@ /* - * $Xorg: PclAttVal.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company diff --git a/hw/xprint/pcl/PclAttr.c b/hw/xprint/pcl/PclAttr.c index 3cde053f1..b27bf4fce 100644 --- a/hw/xprint/pcl/PclAttr.c +++ b/hw/xprint/pcl/PclAttr.c @@ -1,4 +1,3 @@ -/* $Xorg: PclAttr.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclColor.c b/hw/xprint/pcl/PclColor.c index 37d42a521..8b05da056 100644 --- a/hw/xprint/pcl/PclColor.c +++ b/hw/xprint/pcl/PclColor.c @@ -1,4 +1,3 @@ -/* $Xorg: PclColor.c,v 1.3 2000/08/17 19:48:07 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclColor.c,v 1.9tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclCursor.c b/hw/xprint/pcl/PclCursor.c index f50c355e9..a3eeb1610 100644 --- a/hw/xprint/pcl/PclCursor.c +++ b/hw/xprint/pcl/PclCursor.c @@ -1,4 +1,3 @@ -/* $Xorg: PclCursor.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclCursor.c,v 1.3 1999/12/16 02:26:27 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclDef.h b/hw/xprint/pcl/PclDef.h index 275bd63ec..dcd54c4fe 100644 --- a/hw/xprint/pcl/PclDef.h +++ b/hw/xprint/pcl/PclDef.h @@ -1,4 +1,3 @@ -/* $Xorg: PclDef.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclFonts.c b/hw/xprint/pcl/PclFonts.c index 591435faa..716c48d6d 100644 --- a/hw/xprint/pcl/PclFonts.c +++ b/hw/xprint/pcl/PclFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PclFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* diff --git a/hw/xprint/pcl/PclGC.c b/hw/xprint/pcl/PclGC.c index c47986eed..ba82c566a 100644 --- a/hw/xprint/pcl/PclGC.c +++ b/hw/xprint/pcl/PclGC.c @@ -1,4 +1,3 @@ -/* $Xorg: PclGC.c,v 1.4 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclGC.c,v 1.9 2001/01/19 18:34:28 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclInit.c b/hw/xprint/pcl/PclInit.c index 272f4da9a..734ec5f27 100644 --- a/hw/xprint/pcl/PclInit.c +++ b/hw/xprint/pcl/PclInit.c @@ -1,4 +1,3 @@ -/* $Xorg: PclInit.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -76,7 +75,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclInit.c,v 1.11 2001/12/21 21:02:05 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclLine.c b/hw/xprint/pcl/PclLine.c index f2b564df8..52a586d17 100644 --- a/hw/xprint/pcl/PclLine.c +++ b/hw/xprint/pcl/PclLine.c @@ -1,4 +1,3 @@ -/* $Xorg: PclLine.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclLine.c,v 1.6 1999/12/13 02:12:55 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclMisc.c b/hw/xprint/pcl/PclMisc.c index 3a958e783..e0b7dced9 100644 --- a/hw/xprint/pcl/PclMisc.c +++ b/hw/xprint/pcl/PclMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: PclMisc.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclMisc.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclPixel.c b/hw/xprint/pcl/PclPixel.c index bfad618ed..f41af272f 100644 --- a/hw/xprint/pcl/PclPixel.c +++ b/hw/xprint/pcl/PclPixel.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPixel.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPixel.c,v 1.6tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclPolygon.c b/hw/xprint/pcl/PclPolygon.c index 41ba4b1c0..9867758bb 100644 --- a/hw/xprint/pcl/PclPolygon.c +++ b/hw/xprint/pcl/PclPolygon.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPolygon.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPolygon.c,v 1.6 1999/12/13 02:12:56 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclPrint.c b/hw/xprint/pcl/PclPrint.c index 701710253..176a0025a 100644 --- a/hw/xprint/pcl/PclPrint.c +++ b/hw/xprint/pcl/PclPrint.c @@ -1,4 +1,3 @@ -/* $Xorg: PclPrint.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -43,7 +42,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclPrint.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclSFonts.c b/hw/xprint/pcl/PclSFonts.c index 287c5c14f..2474d90d7 100644 --- a/hw/xprint/pcl/PclSFonts.c +++ b/hw/xprint/pcl/PclSFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -45,7 +44,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSFonts.c,v 1.7tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclSFonts.h b/hw/xprint/pcl/PclSFonts.h index fdd62f651..c991263df 100644 --- a/hw/xprint/pcl/PclSFonts.h +++ b/hw/xprint/pcl/PclSFonts.h @@ -1,4 +1,3 @@ -/* $Xorg: PclSFonts.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif diff --git a/hw/xprint/pcl/PclSpans.c b/hw/xprint/pcl/PclSpans.c index 51c0137fc..4951899ab 100644 --- a/hw/xprint/pcl/PclSpans.c +++ b/hw/xprint/pcl/PclSpans.c @@ -1,4 +1,3 @@ -/* $Xorg: PclSpans.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclSpans.c,v 1.5 1999/12/13 02:12:57 robin Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/PclText.c b/hw/xprint/pcl/PclText.c index be794772c..246c0195b 100644 --- a/hw/xprint/pcl/PclText.c +++ b/hw/xprint/pcl/PclText.c @@ -1,4 +1,3 @@ -/* $Xorg: PclText.c,v 1.5 2001/03/06 16:28:48 pookie Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclText.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/pcl/PclWindow.c b/hw/xprint/pcl/PclWindow.c index cac5826e9..adf03da8d 100644 --- a/hw/xprint/pcl/PclWindow.c +++ b/hw/xprint/pcl/PclWindow.c @@ -1,4 +1,3 @@ -/* $Xorg: PclWindow.c,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /******************************************************************* ** ** ********************************************************* @@ -44,7 +43,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/PclWindow.c,v 1.10tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H diff --git a/hw/xprint/pcl/Pclmap.h b/hw/xprint/pcl/Pclmap.h index 5224fd9e3..ae88b5a42 100644 --- a/hw/xprint/pcl/Pclmap.h +++ b/hw/xprint/pcl/Pclmap.h @@ -1,4 +1,3 @@ -/* $Xorg: Pclmap.h,v 1.3 2000/08/17 19:48:08 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/pcl/Pclmap.h,v 1.5 2001/07/25 15:05:00 dawes Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/ps/Makefile.am b/hw/xprint/ps/Makefile.am index 90872d9da..08638b19d 100644 --- a/hw/xprint/ps/Makefile.am +++ b/hw/xprint/ps/Makefile.am @@ -2,8 +2,8 @@ noinst_LTLIBRARIES = libps.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 -DXP_PSTEXT +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ @FREETYPE_CFLAGS@ \ + -D_XP_PRINT_SERVER_ -DXP_PSTEXT libps_la_SOURCES = \ PsArc.c \ diff --git a/hw/xprint/ps/Ps.h b/hw/xprint/ps/Ps.h index 4effc2066..3adad39e4 100644 --- a/hw/xprint/ps/Ps.h +++ b/hw/xprint/ps/Ps.h @@ -1,4 +1,3 @@ -/* $Xorg: Ps.h,v 1.5 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsArc.c b/hw/xprint/ps/PsArc.c index 511971e7a..0684307dd 100644 --- a/hw/xprint/ps/PsArc.c +++ b/hw/xprint/ps/PsArc.c @@ -1,4 +1,3 @@ -/* $Xorg: PsArc.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsArea.c b/hw/xprint/ps/PsArea.c index bf6f8f42a..6ab9fa25c 100644 --- a/hw/xprint/ps/PsArea.c +++ b/hw/xprint/ps/PsArea.c @@ -1,4 +1,3 @@ -/* $Xorg: PsArea.c,v 1.6 2001/03/14 18:27:44 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsAttVal.c b/hw/xprint/ps/PsAttVal.c index fc23ffef5..de2e6c8e4 100644 --- a/hw/xprint/ps/PsAttVal.c +++ b/hw/xprint/ps/PsAttVal.c @@ -1,5 +1,4 @@ /* - * $Xorg: PsAttVal.c,v 1.5 2001/03/13 18:45:31 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company diff --git a/hw/xprint/ps/PsAttr.c b/hw/xprint/ps/PsAttr.c index 74da5a0e1..0925716f5 100644 --- a/hw/xprint/ps/PsAttr.c +++ b/hw/xprint/ps/PsAttr.c @@ -1,4 +1,3 @@ -/* $Xorg: PsAttr.c,v 1.4 2001/02/09 02:04:35 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsColor.c b/hw/xprint/ps/PsColor.c index 91a44f85a..a91272db0 100644 --- a/hw/xprint/ps/PsColor.c +++ b/hw/xprint/ps/PsColor.c @@ -1,4 +1,3 @@ -/* $Xorg: PsColor.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsDef.h b/hw/xprint/ps/PsDef.h index cf45c8516..5af274dec 100644 --- a/hw/xprint/ps/PsDef.h +++ b/hw/xprint/ps/PsDef.h @@ -1,4 +1,3 @@ -/* $Xorg: PsDef.h,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsFonts.c b/hw/xprint/ps/PsFonts.c index c4d5b03e2..8ab631441 100644 --- a/hw/xprint/ps/PsFonts.c +++ b/hw/xprint/ps/PsFonts.c @@ -1,4 +1,3 @@ -/* $Xorg: PsFonts.c,v 1.6 2001/03/06 16:30:15 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsGC.c b/hw/xprint/ps/PsGC.c index ada0b8c65..3ec07a77a 100644 --- a/hw/xprint/ps/PsGC.c +++ b/hw/xprint/ps/PsGC.c @@ -1,4 +1,3 @@ -/* $Xorg: PsGC.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsImageUtil.c b/hw/xprint/ps/PsImageUtil.c index f3052bebb..668a23f65 100644 --- a/hw/xprint/ps/PsImageUtil.c +++ b/hw/xprint/ps/PsImageUtil.c @@ -1,5 +1,4 @@ -/* $Xorg: PsImageUtil.c,v 1.1 2005/03/25 1:19:56 gisburn Exp $ */ /* Copyright (c) 2005 Roland Mainz <roland.mainz@nrubsig.org> diff --git a/hw/xprint/ps/PsInit.c b/hw/xprint/ps/PsInit.c index 06c5d11a8..639908f73 100644 --- a/hw/xprint/ps/PsInit.c +++ b/hw/xprint/ps/PsInit.c @@ -1,4 +1,3 @@ -/* $Xorg: PsInit.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsLine.c b/hw/xprint/ps/PsLine.c index 2524769c8..aca186642 100644 --- a/hw/xprint/ps/PsLine.c +++ b/hw/xprint/ps/PsLine.c @@ -1,4 +1,3 @@ -/* $Xorg: PsLine.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsMisc.c b/hw/xprint/ps/PsMisc.c index b8a3ba854..0df039e0b 100644 --- a/hw/xprint/ps/PsMisc.c +++ b/hw/xprint/ps/PsMisc.c @@ -1,4 +1,3 @@ -/* $Xorg: PsMisc.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPixel.c b/hw/xprint/ps/PsPixel.c index 2197f0ab9..d51cb6ecf 100644 --- a/hw/xprint/ps/PsPixel.c +++ b/hw/xprint/ps/PsPixel.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPixel.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPixmap.c b/hw/xprint/ps/PsPixmap.c index f2d05d023..c3259c98c 100644 --- a/hw/xprint/ps/PsPixmap.c +++ b/hw/xprint/ps/PsPixmap.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPixmap.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPolygon.c b/hw/xprint/ps/PsPolygon.c index c4c30bc79..fe4626085 100644 --- a/hw/xprint/ps/PsPolygon.c +++ b/hw/xprint/ps/PsPolygon.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPolygon.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsPrint.c b/hw/xprint/ps/PsPrint.c index 8a4f0ade8..4571c07d7 100644 --- a/hw/xprint/ps/PsPrint.c +++ b/hw/xprint/ps/PsPrint.c @@ -1,4 +1,3 @@ -/* $Xorg: PsPrint.c,v 1.7 2001/03/14 18:28:18 pookie Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsSpans.c b/hw/xprint/ps/PsSpans.c index d7652f8fb..c0e66ee7a 100644 --- a/hw/xprint/ps/PsSpans.c +++ b/hw/xprint/ps/PsSpans.c @@ -1,4 +1,3 @@ -/* $Xorg: PsSpans.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group @@ -73,7 +72,6 @@ in this Software without prior written authorization from The Open Group. ** ********************************************************* ** ********************************************************************/ -/* $XFree86: xc/programs/Xserver/Xprint/ps/PsSpans.c,v 1.8 2001/10/28 03:32:56 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/ps/PsText.c b/hw/xprint/ps/PsText.c index 37463ba1a..98cf15345 100644 --- a/hw/xprint/ps/PsText.c +++ b/hw/xprint/ps/PsText.c @@ -1,4 +1,3 @@ -/* $Xorg: PsText.c,v 1.7 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/PsWindow.c b/hw/xprint/ps/PsWindow.c index d889dda9a..1317fd704 100644 --- a/hw/xprint/ps/PsWindow.c +++ b/hw/xprint/ps/PsWindow.c @@ -1,4 +1,3 @@ -/* $Xorg: PsWindow.c,v 1.4 2001/02/09 02:04:36 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/psout.c b/hw/xprint/ps/psout.c index dccd692ba..c24f88b3d 100644 --- a/hw/xprint/ps/psout.c +++ b/hw/xprint/ps/psout.c @@ -1,4 +1,3 @@ -/* $Xorg: psout.c,v 1.9 2001/03/26 15:25:12 coskrey Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/ps/psout.h b/hw/xprint/ps/psout.h index d998e2a09..3e19d5a67 100644 --- a/hw/xprint/ps/psout.h +++ b/hw/xprint/ps/psout.h @@ -1,4 +1,3 @@ -/* $Xorg: psout.h,v 1.6 2001/02/09 02:04:37 xorgcvs Exp $ */ /* Copyright 1996, 1998 The Open Group diff --git a/hw/xprint/raster/Makefile.am b/hw/xprint/raster/Makefile.am index fcd1e7334..1ee1122f2 100644 --- a/hw/xprint/raster/Makefile.am +++ b/hw/xprint/raster/Makefile.am @@ -2,8 +2,7 @@ noinst_LTLIBRARIES = libraster.la INCLUDES = -I$(top_srcdir)/hw/xprint -AM_CFLAGS = @SERVER_DEFINES@ @DIX_CFLAGS@ @XPRINT_CFLAGS@ \ - -D_XP_PRINT_SERVER_ -DPSZ=8 +AM_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ -D_XP_PRINT_SERVER_ libraster_la_SOURCES = \ RasterAttVal.c \ diff --git a/hw/xprint/raster/Raster.c b/hw/xprint/raster/Raster.c index 7ad30b446..0286a18fa 100644 --- a/hw/xprint/raster/Raster.c +++ b/hw/xprint/raster/Raster.c @@ -1,4 +1,3 @@ -/* $Xorg: Raster.c,v 1.4 2001/03/14 18:46:12 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -31,7 +30,6 @@ dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/Raster.c,v 1.11tsi Exp $ */ /******************************************************************* ** diff --git a/hw/xprint/raster/Raster.h b/hw/xprint/raster/Raster.h index 25da756e5..7a613f0b0 100644 --- a/hw/xprint/raster/Raster.h +++ b/hw/xprint/raster/Raster.h @@ -1,4 +1,3 @@ -/* $Xorg: Raster.h,v 1.3 2000/08/17 19:48:12 cpqbld Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. diff --git a/hw/xprint/raster/RasterAttVal.c b/hw/xprint/raster/RasterAttVal.c index fc00cde5a..8189be47c 100644 --- a/hw/xprint/raster/RasterAttVal.c +++ b/hw/xprint/raster/RasterAttVal.c @@ -1,4 +1,3 @@ -/* $Xorg: RasterAttVal.c,v 1.4 2001/03/14 18:46:34 pookie Exp $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. @@ -30,7 +29,6 @@ not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from said copyright holders. */ -/* $XFree86: xc/programs/Xserver/Xprint/raster/RasterAttVal.c,v 1.3 2001/10/31 22:50:29 tsi Exp $ */ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> diff --git a/hw/xprint/spooler.c b/hw/xprint/spooler.c index f709c57ab..e3022b0c4 100644 --- a/hw/xprint/spooler.c +++ b/hw/xprint/spooler.c @@ -1,5 +1,4 @@ -/* $Xorg: spooler.c,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */ /* Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org> Copyright (c) 2004 Sun Microsystems, Inc. diff --git a/hw/xprint/spooler.h b/hw/xprint/spooler.h index 4e9b4aefc..4e056ceeb 100644 --- a/hw/xprint/spooler.h +++ b/hw/xprint/spooler.h @@ -6,7 +6,6 @@ #ifndef SPOOLER_H #define SPOOLER_H 1 -/* $Xorg: spooler.h,v 1.1 2003/09/14 1:19:56 gisburn Exp $ */ /* Copyright (c) 2003-2004 Roland Mainz <roland.mainz@nrubsig.org> diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c index 3be84efc6..f4796e079 100644 --- a/hw/xwin/InitInput.c +++ b/hw/xwin/InitInput.c @@ -26,7 +26,6 @@ from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitInput.c,v 1.11 2002/07/05 09:19:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index c5242cc6f..b64eee9c7 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -26,7 +26,6 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/Xserver/hw/xwin/InitOutput.c,v 1.34 2003/10/02 13:30:09 eich Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> @@ -944,15 +943,6 @@ void ddxInitGlobals(void) { } -#ifdef DDXTIME /* from ServerOSDefines */ -CARD32 -GetTimeInMillis (void) -{ - return GetTickCount (); -} -#endif /* DDXTIME */ - - /* See Porting Layer Definition - p. 20 */ /* * Do any global initialization, then initialize each screen. diff --git a/hw/xwin/win.h b/hw/xwin/win.h index 9baee9b05..09a9fb295 100644 --- a/hw/xwin/win.h +++ b/hw/xwin/win.h @@ -31,7 +31,6 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/win.h,v 1.37 2003/10/02 13:30:09 eich Exp $ */ #ifndef _WIN_H_ #define _WIN_H_ diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c index 7b4814b9b..f4decfb59 100644 --- a/hw/xwin/winallpriv.c +++ b/hw/xwin/winallpriv.c @@ -28,7 +28,6 @@ * Authors: Keith Packard, MIT X Consortium * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winallpriv.c,v 1.11 2002/10/17 08:18:21 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index b3b99b1b5..7ebe00244 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincmap.c,v 1.9 2002/07/05 09:19:26 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winconfig.c b/hw/xwin/winconfig.c index 514dfdc84..e3d18083e 100644 --- a/hw/xwin/winconfig.c +++ b/hw/xwin/winconfig.c @@ -27,7 +27,6 @@ * * Authors: Alexander Gottwald */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winconfig.c,v 1.3 2003/10/02 13:30:10 eich Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/wincursor.c b/hw/xwin/wincursor.c index 2036267b8..c1e619bf8 100644 --- a/hw/xwin/wincursor.c +++ b/hw/xwin/wincursor.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wincursor.c,v 1.5 2002/07/05 09:19:26 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index 43ccde67c..7e3966965 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winfillsp.c,v 1.9 2001/11/01 12:19:40 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/wingetsp.c b/hw/xwin/wingetsp.c index ec9d51a17..03f7f1012 100644 --- a/hw/xwin/wingetsp.c +++ b/hw/xwin/wingetsp.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/wingetsp.c,v 1.7 2001/11/01 12:19:40 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winkeybd.c b/hw/xwin/winkeybd.c index 3161e1f82..164e39160 100644 --- a/hw/xwin/winkeybd.c +++ b/hw/xwin/winkeybd.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.c,v 1.12 2002/10/17 08:18:22 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H diff --git a/hw/xwin/winkeybd.h b/hw/xwin/winkeybd.h index f42e09fd7..09eed1491 100644 --- a/hw/xwin/winkeybd.h +++ b/hw/xwin/winkeybd.h @@ -29,7 +29,6 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winkeybd.h,v 1.1 2001/09/26 13:00:34 alanh Exp $ */ /* * We need symbols for the scan codes of keys. diff --git a/hw/xwin/winkeymap.h b/hw/xwin/winkeymap.h index 31e6cf21b..0c633cdfc 100755..100644 --- a/hw/xwin/winkeymap.h +++ b/hw/xwin/winkeymap.h @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Keymap.h,v 3.19 2002/05/31 18:45:58 dawes Exp $ */ /* * * For Scancodes see notes in winkeynames.h !!!! diff --git a/hw/xwin/winkeynames.h b/hw/xwin/winkeynames.h index f3af1907e..6d480a3f9 100755..100644 --- a/hw/xwin/winkeynames.h +++ b/hw/xwin/winkeynames.h @@ -1,6 +1,5 @@ #ifndef _WINKEYNAMES_H #define _WINKEYNAMES_H -/* $XFree86: xc/programs/Xserver/hw/xfree86/common/atKeynames.h,v 3.18 2001/09/29 20:40:30 herrb Exp $ */ /* * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. * diff --git a/hw/xwin/winmouse.c b/hw/xwin/winmouse.c index 818652da6..f0092e9a8 100644 --- a/hw/xwin/winmouse.c +++ b/hw/xwin/winmouse.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmouse.c,v 1.3 2001/05/08 08:14:09 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winmultiwindowicons.c b/hw/xwin/winmultiwindowicons.c index 5692b29c7..45ed093ec 100755..100644 --- a/hw/xwin/winmultiwindowicons.c +++ b/hw/xwin/winmultiwindowicons.c @@ -27,7 +27,6 @@ * * Authors: Earle F. Philhower, III */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c index 0b9650e98..33deae337 100755..100644 --- a/hw/xwin/winmultiwindowshape.c +++ b/hw/xwin/winmultiwindowshape.c @@ -28,7 +28,6 @@ * Authors: Kensuke Matsuzaki * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowshape.c,v 1.2 2003/11/10 18:22:44 tsi Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winmultiwindowwindow.c b/hw/xwin/winmultiwindowwindow.c index f1ab55252..dc8e38bae 100644 --- a/hw/xwin/winmultiwindowwindow.c +++ b/hw/xwin/winmultiwindowwindow.c @@ -29,7 +29,6 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c index 03f179345..1918e54d1 100644 --- a/hw/xwin/winmultiwindowwm.c +++ b/hw/xwin/winmultiwindowwm.c @@ -27,7 +27,6 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.5 2002/11/07 10:31:32 alanh Exp $ */ /* X headers */ #ifdef HAVE_XWIN_CONFIG_H diff --git a/hw/xwin/winmultiwindowwndproc.c b/hw/xwin/winmultiwindowwndproc.c index e12b7f42c..045adbac6 100755..100644 --- a/hw/xwin/winmultiwindowwndproc.c +++ b/hw/xwin/winmultiwindowwndproc.c @@ -29,7 +29,6 @@ * Earle F. Philhower, III * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winmultiwindowwndproc.c,v 1.2 2003/10/02 13:30:11 eich Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index c67f1c7e5..48a467a2c 100644 --- a/hw/xwin/winnativegdi.c +++ b/hw/xwin/winnativegdi.c @@ -27,7 +27,6 @@ * * Authors: Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winnativegdi.c,v 1.14 2003/07/29 21:25:18 dawes Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index d9d69039d..13fc1058d 100644 --- a/hw/xwin/winpfbdd.c +++ b/hw/xwin/winpfbdd.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpfbdd.c,v 1.17 2002/10/17 08:18:22 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c index 2780a3921..baff60c92 100644 --- a/hw/xwin/winpixmap.c +++ b/hw/xwin/winpixmap.c @@ -28,7 +28,6 @@ * Authors: drewry, september 1986 * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winpixmap.c,v 1.10 2002/10/17 08:18:24 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winpushpxl.c b/hw/xwin/winpushpxl.c index 594933986..72ef2d559 100644 --- a/hw/xwin/winpushpxl.c +++ b/hw/xwin/winpushpxl.c @@ -1,4 +1,3 @@ -/* $XFree86: xc/programs/Xserver/mi/mipushpxl.c,v 3.11 2001/01/17 22:37:07 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index a18139c28..a9b061af6 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -31,7 +31,6 @@ * Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winscrinit.c,v 1.27 2003/07/29 21:25:18 dawes Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winsetsp.c b/hw/xwin/winsetsp.c index 65b90ea39..8a3faee93 100644 --- a/hw/xwin/winsetsp.c +++ b/hw/xwin/winsetsp.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Alan Hourihane <alanh@fairlite.demon.co.uk> */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winsetsp.c,v 1.7 2001/11/01 12:19:42 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index 607a0674a..a2c1dc9b0 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshaddd.c,v 1.22 2002/10/17 08:18:24 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index 960cd2d70..47cc382e9 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winshadddnl.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winwakeup.c b/hw/xwin/winwakeup.c index c0200ab53..e1eece34a 100644 --- a/hw/xwin/winwakeup.c +++ b/hw/xwin/winwakeup.c @@ -30,7 +30,6 @@ * Peter Busch * Harold L Hunt II */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwakeup.c,v 1.6 2002/10/17 08:18:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c index be160196a..e844dbfb3 100644 --- a/hw/xwin/winwindow.c +++ b/hw/xwin/winwindow.c @@ -28,7 +28,6 @@ * Authors: Harold L Hunt II * Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.c,v 1.9 2003/11/10 18:22:44 tsi Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> diff --git a/hw/xwin/winwindow.h b/hw/xwin/winwindow.h index d0499bcbb..9c49d6482 100644 --- a/hw/xwin/winwindow.h +++ b/hw/xwin/winwindow.h @@ -29,7 +29,6 @@ * * Authors: Kensuke Matsuzaki */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwindow.h,v 1.3 2003/10/02 13:30:11 eich Exp $ */ #ifndef NO #define NO 0 diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 14893f6d3..2974c41ed 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -31,7 +31,6 @@ * Harold L Hunt II * MATSUZAKI Kensuke */ -/* $XFree86: xc/programs/Xserver/hw/xwin/winwndproc.c,v 1.23 2002/10/17 08:18:25 alanh Exp $ */ #ifdef HAVE_XWIN_CONFIG_H #include <xwin-config.h> |