xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/Makefile.am         |    1 +
 hw/xfree86/common/xf86Bus.c    |   32 ++++++--------------------------
 hw/xfree86/rac/Makefile.am     |    5 ++---
 hw/xfree86/rac/xf86RAC.c       |   12 +++++-------
 hw/xfree86/rac/xf86RACmodule.c |   21 ---------------------
 5 files changed, 14 insertions(+), 57 deletions(-)

New commits:
diff-tree 98a602fab1f307a07a96868d7dae12b6f8d7f405 (from 76aaf7eae7409162c5ed2963f2e27d019cb30263)
Author: Adam Jackson <ajax at theobromine.nwnk.net>
Date:   Sun Jun 18 23:54:04 2006 -0400

    Don't bother building RAC as a module, that's just absurd.

diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 77d1dd8..b50b6ab 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -38,6 +38,7 @@ XORG_LIBS = \
             common/libinit.a \
             loader/libloader.a \
             libosandcommon.la \
+	    rac/librac.a \
             parser/libxf86config.a \
             dummylib/libdummy.a \
 	    dixmods/libdixmods.la \
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index d935037..057dfb0 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Bus.c,v 1.80 2004/02/05 18:24:59 eich Exp $ */
 /*
  * Copyright (c) 1997-2003 by The XFree86 Project, Inc.
  *
@@ -2571,17 +2570,13 @@ xf86PostPreInit()
     if (xf86NumScreens > 1)
 	needRAC = TRUE;
 
-#ifdef XFree86LOADER
     xf86MsgVerb(X_INFO, 3, "do I need RAC?");
     
     if (needRAC) {
 	xf86ErrorFVerb(3, "  Yes, I do.\n");
-	
-	if (!xf86LoadOneModule("rac",NULL))
-	    FatalError("Cannot load RAC module\n");
-    } else
+    } else {
 	xf86ErrorFVerb(3, "  No, I don't.\n");
-#endif    
+    }
  	
     xf86MsgVerb(X_INFO, 3, "resource ranges after preInit:\n");
     xf86PrintResList(3, Acc);
@@ -2594,22 +2589,12 @@ xf86PostScreenInit(void)
     ScreenPtr pScreen;
     unsigned int flags;
     int nummem = 0, numio = 0;
-#ifdef XFree86LOADER
-	pointer xf86RACInit = NULL;
-#endif
 
-	if (doFramebufferMode) {
-	    SetSIGIOForState(OPERATING);
-	    return;
-	}
+    if (doFramebufferMode) {
+	SetSIGIOForState(OPERATING);
+	return;
+    }
 
-#ifdef XFree86LOADER
-	if (needRAC) {
-	    xf86RACInit = LoaderSymbol("xf86RACInit");
-	    if (!xf86RACInit)
-		FatalError("Cannot resolve symbol \"xf86RACInit\"\n");
-	}
-#endif
 #ifdef DEBUG
     ErrorF("PostScreenInit  generation: %i\n",serverGeneration);
 #endif
@@ -2688,12 +2673,7 @@ xf86PostScreenInit(void)
 		xf86ErrorFVerb(3, "Screen %d is using RAC for io\n", i);
 	    }
 	    
-#ifdef XFree86LOADER
-		((Bool(*)(ScreenPtr,unsigned int))xf86RACInit)
-		    (pScreen,flags);
-#else
 	    xf86RACInit(pScreen,flags);
-#endif
 	}
     }
     
diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am
index 144159d..0e7cc72 100644
--- a/hw/xfree86/rac/Makefile.am
+++ b/hw/xfree86/rac/Makefile.am
@@ -1,6 +1,5 @@
-module_LTLIBRARIES = librac.la
-librac_la_LDFLAGS = -avoid-version
-librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
+module_LIBRARIES = librac.a
+librac_a_SOURCES = xf86RAC.c
 
 sdk_HEADERS = xf86RAC.h
 
diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c
index 1f2d3a1..aba8622 100644
--- a/hw/xfree86/rac/xf86RAC.c
+++ b/hw/xfree86/rac/xf86RAC.c
@@ -1,5 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/rac/xf86RAC.c,v 1.5 1999/06/12 17:30:21 dawes Exp $ */
-
 #ifdef HAVE_XORG_CONFIG_H
 #include <xorg-config.h>
 #endif
@@ -243,12 +241,12 @@ static void RACCompositeRects(CARD8 op, 
 			      int nRect, xRectangle *rects);
 #endif
 
-GCFuncs RACGCFuncs = {
+static GCFuncs RACGCFuncs = {
     RACValidateGC, RACChangeGC, RACCopyGC, RACDestroyGC,
     RACChangeClip, RACDestroyClip, RACCopyClip
 };
 
-GCOps RACGCOps = {
+static GCOps RACGCOps = {
     RACFillSpans, RACSetSpans, RACPutImage, RACCopyArea, 
     RACCopyPlane, RACPolyPoint, RACPolylines, RACPolySegment, 
     RACPolyRectangle, RACPolyArc, RACFillPolygon, RACPolyFillRect, 
@@ -257,13 +255,13 @@ GCOps RACGCOps = {
     {NULL}		/* devPrivate */
 };
 
-miPointerSpriteFuncRec RACSpriteFuncs = {
+static miPointerSpriteFuncRec RACSpriteFuncs = {
     RACSpriteRealizeCursor, RACSpriteUnrealizeCursor, RACSpriteSetCursor,
     RACSpriteMoveCursor
 };
 
-int RACScreenIndex = -1;
-int RACGCIndex = -1;
+static int RACScreenIndex = -1;
+static int RACGCIndex = -1;
 static unsigned long RACGeneration = 0;
 
 
diff --git a/hw/xfree86/rac/xf86RACmodule.c b/hw/xfree86/rac/xf86RACmodule.c
deleted file mode 100644
index 7b1bdac..0000000
--- a/hw/xfree86/rac/xf86RACmodule.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "xf86Module.h"
-
-static XF86ModuleVersionInfo racVersRec =
-{
-    "rac",
-    MODULEVENDORSTRING,
-    MODINFOSTRING1,
-    MODINFOSTRING2,
-    XORG_VERSION_CURRENT,
-    1, 0, 0,
-    ABI_CLASS_VIDEODRV,		/* requires the video driver ABI */
-    ABI_VIDEODRV_VERSION,
-    MOD_CLASS_NONE,
-    {0,0,0,0}
-};
-
-_X_EXPORT XF86ModuleData racModuleData = { &racVersRec, NULL, NULL };