[xserver-commit] xserver/hw/kdrive/r128 r128.c,1.1.2.1,1.1.2.2 r128draw.c,1.2.2.1,1.2.2.2 r128stub.c,1.1,1.1.2.1

Keith Packard xserver-commit@pdx.freedesktop.org
Wed, 29 Oct 2003 08:27:15 -0800 

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/r128
In directory pdx:/tmp/cvs-serv23305/hw/kdrive/r128

Modified Files:
      Tag: xfixes_2_branch
	r128.c r128draw.c r128stub.c 
Log Message:
	* Xext/bigreq.c: (BigReqExtensionInit):
	* Xext/mitmisc.c: (MITMiscExtensionInit):
	* Xext/saver.c: (ScreenSaverExtensionInit):
	* Xext/shm.c: (ShmExtensionInit), (ShmRegisterFuncs),
	(ShmSetPixmapFormat):
	* Xext/shmint.h:
	* Xext/sleepuntil.c: (ClientSleepUntil):
	* Xext/sleepuntil.h:
	* Xext/sync.c: (SyncCreateSystemCounter), (SyncExtensionInit):
	* Xext/syncint.h:
	* Xext/xcmisc.c: (XCMiscExtensionInit):
	* Xext/xext.h:
	* Xext/xres.c:
	* Xext/xtest.c: (XTestExtensionInit):
	* Xext/xtest1di.c: (XTestExtension1Init):
	* Xext/xvmc.c: (XvMCFindXvImage):
	* Xext/xvmcext.h:
	* configure.ac:
	* dix/dispatch.c:
	* dix/extension.c: (CloseDownExtensions):
	* dix/property.c: (NullPropertyReply):
	* dix/xpstubs.c: (XpClientIsBitmapClient), (XpClientIsPrintClient),
	(XprintOptions):
	* hw/kdrive/fbdev/fbdev.c: (fbdevUnmapFramebuffer),
	(fbdevRandRSetConfig):
	* hw/kdrive/fbdev/fbdev.h:
	* hw/kdrive/linux/agp.c: (GARTInit):
	* hw/kdrive/linux/bus.c:
	* hw/kdrive/linux/keyboard.c: (readKernelMapping):
	* hw/kdrive/linux/linux.c: (LinuxInit):
	* hw/kdrive/linux/mouse.c:
	* hw/kdrive/linux/ms.c:
	* hw/kdrive/linux/ps2.c:
	* hw/kdrive/mach64/mach64.c:
	* hw/kdrive/mach64/mach64draw.c:
	* hw/kdrive/mga/mga.c:
	* hw/kdrive/mga/mgadraw.c: (mgaPrepareSolid), (mgaPrepareCopy):
	* hw/kdrive/nvidia/nvidia.c: (nvidiaLockUnlock):
	* hw/kdrive/nvidia/nvidia.h:
	* hw/kdrive/nvidia/nvidiadraw.c: (nvidiaPrepareSolid),
	(nvidiaPrepareCopy), (nvidiaDrawInit), (nvidiaDrawEnable):
	* hw/kdrive/r128/r128.c: (r128ScreenInit), (r128Preserve),
	(r128DPMS):
	* hw/kdrive/r128/r128draw.c: (r128WaitAvail), (r128Setup),
	(r128DrawInit):
	* hw/kdrive/r128/r128stub.c:
	* hw/kdrive/smi/smi.c: (smiRandRSetConfig), (smiPreserve),
	(smiDPMS), (smiRestore):
	* hw/kdrive/smi/smi.h:
	* hw/kdrive/smi/smidraw.c: (smiPrepareSolid), (smiPrepareCopy),
	(smiDrawInit):
	* hw/kdrive/smi/smistub.c:
	* hw/kdrive/src/kaa.c:
	* hw/kdrive/src/kcmap.c:
	* hw/kdrive/src/kcurscol.c:
	* hw/kdrive/src/kdrive.c: (KdCreateScreenResources):
	* hw/kdrive/src/kdrive.h:
	* hw/kdrive/src/kinput.c:
	* hw/kdrive/src/knoop.c:
	* hw/kdrive/src/vga.c:
	* hw/kdrive/src/vga.h:
	* hw/kdrive/vesa/vesa.h:
	* hw/xnest/Color.c: (xnestCreateColormap), (xnestDestroyColormap),
	(xnestCountInstalledColormapWindows),
	(xnestGetInstalledColormapWindows),
	(xnestSameInstalledColormapWindows),
	(xnestSetInstalledColormapWindows),
	(xnestSetScreenSaverColormapWindow), (xnestDirectInstallColormaps),
	(xnestDirectUninstallColormaps), (xnestInstallColormap),
	(xnestUninstallColormap), (xnestListInstalledColormaps),
	(xnestStoreColors), (xnestResolveColor),
	(xnestCreateDefaultColormap):
	* hw/xnest/Color.h:
	* hw/xnest/Cursor.c: (xnestConstrainCursor), (xnestCursorLimits),
	(xnestDisplayCursor), (xnestRealizeCursor), (xnestUnrealizeCursor),
	(xnestRecolorCursor), (xnestSetCursorPosition):
	* hw/xnest/Display.c: (xnestOpenDisplay):
	* hw/xnest/Display.h:
	* hw/xnest/Events.c: (xnestExposurePredicate),
	(xnestNotExposurePredicate), (xnestCollectExposures),
	(xnestCollectEvents):
	* hw/xnest/Events.h:
	* hw/xnest/Font.c: (xnestRealizeFont), (xnestUnrealizeFont):
	* hw/xnest/GC.c: (xnestValidateGC), (xnestChangeGC), (xnestCopyGC),
	(xnestDestroyGC), (xnestDestroyClipHelper), (xnestChangeClip),
	(xnestDestroyClip), (xnestCopyClip), (xnestCreateGC):
	* hw/xnest/GCOps.c: (xnestFillSpans), (xnestSetSpans),
	(xnestGetSpans), (xnestQueryBestSize), (xnestPutImage),
	(xnestGetImage), (xnestBitBlitPredicate), (xnestBitBlitHelper),
	(xnestCopyArea), (xnestCopyPlane), (xnestPolyPoint),
	(xnestPolylines), (xnestPolySegment), (xnestPolyRectangle),
	(xnestPolyArc), (xnestFillPolygon), (xnestPolyFillRect),
	(xnestPolyFillArc), (xnestPolyText8), (xnestPolyText16),
	(xnestImageText8), (xnestImageText16), (xnestImageGlyphBlt),
	(xnestPolyGlyphBlt), (xnestPushPixels):
	* hw/xnest/GCOps.h:
	* hw/xnest/Keyboard.h:
	* hw/xnest/Screen.c: (xnestScreen):
	* hw/xnest/Screen.h:
	* hw/xnest/Visual.c: (xnestVisual), (xnestVisualFromID):
	* hw/xnest/Visual.h:
	* hw/xnest/Window.c: (xnestWindowPtr):
	* hw/xnest/XNCursor.h:
	* hw/xnest/XNFont.h:
	* hw/xnest/XNGC.h:
	* hw/xnest/XNPixmap.h:
	* hw/xnest/XNWindow.h:
	* include/extnsionst.h:
	* mi/Makefile.am:
	* mi/miinitext.c:
	* os/Makefile.am:
	* os/connection.c: (ClientAuthorized):
	* os/hpsocket.c: (set_socket_option), (unset_socket_option):
	* os/xdmauth.c: (XdmCheckCookie), (XdmToID):
	Prototype fixes (various)
	Add GCC warnings (including -Werror.  clean up your code)
	Other warning fixes (unused variables, etc)
	Get rid of unused extension interfaces (aux screen procs)
	Make lots of functions in kdrive static
	Eliminate unused code from os library


Index: r128.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/r128/r128.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- r128.c	24 Oct 2003 09:34:33 -0000	1.1.2.1
+++ r128.c	29 Oct 2003 16:26:43 -0000	1.1.2.2
@@ -27,7 +27,7 @@
 #endif
 #include "r128.h"
 
-Bool
+static Bool
 r128CardInit (KdCardInfo *card)
 {
     R128CardInfo *r128c;
@@ -51,10 +51,9 @@
     return TRUE;
 }
 
-Bool
+static Bool
 r128ScreenInit (KdScreenInfo *screen)
 {
-    R128CardInfo *r128c = screen->card->driver;
     R128ScreenInfo *r128s;
     int screen_size, memory;
 
@@ -96,13 +95,13 @@
     return TRUE;
 }
 
-Bool
+static Bool
 r128InitScreen (ScreenPtr pScreen)
 {
     return vesaInitScreen (pScreen);
 }
 
-Bool
+static Bool
 r128FinishInitScreen (ScreenPtr pScreen)
 {
     Bool ret;
@@ -112,11 +111,9 @@
     return ret;
 }
 
-void
+static void
 r128Preserve (KdCardInfo *card)
 {
-    R128CardInfo *r128c = card->driver;
-
     vesaPreserve (card);
 }
 
@@ -164,7 +161,15 @@
     r128UnmapReg (card, r128c);
 }
 
-Bool
+
+static Bool
+r128DPMS (ScreenPtr pScreen, int mode)
+{
+    /* XXX */
+    return TRUE;
+}
+
+static Bool
 r128Enable (ScreenPtr pScreen)
 {
     KdScreenPriv (pScreen);
@@ -179,7 +184,7 @@
     return TRUE;
 }
 
-void
+static void
 r128Disable (ScreenPtr pScreen)
 {
     KdScreenPriv (pScreen);
@@ -189,14 +194,7 @@
     vesaDisable (pScreen);
 }
 
-Bool
-r128DPMS (ScreenPtr pScreen, int mode)
-{
-    /* XXX */
-    return TRUE;
-}
-
-void
+static void
 r128Restore (KdCardInfo *card)
 {
     R128CardInfo *r128c = card->driver;
@@ -205,7 +203,7 @@
     vesaRestore (card);
 }
 
-void
+static void
 r128ScreenFini (KdScreenInfo *screen)
 {
     R128ScreenInfo *r128s = (R128ScreenInfo *) screen->driver;
@@ -215,7 +213,7 @@
     screen->driver = 0;
 }
 
-void
+static void
 r128CardFini (KdCardInfo *card)
 {
     R128CardInfo *r128c = (R128CardInfo *)card->driver;

Index: r128draw.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/r128/r128draw.c,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- r128draw.c	24 Oct 2003 09:34:33 -0000	1.2.2.1
+++ r128draw.c	29 Oct 2003 16:26:43 -0000	1.2.2.2
@@ -69,11 +69,9 @@
 int fifo_size;
 char *mmio;
 
-void
+static void
 r128WaitAvail (int n)
 {
-    int i;
-
     if (fifo_size < n)
     {
 	while ((fifo_size = R128_IN32 (mmio, R128_REG_GUI_STAT) & 0xfff) < n)
@@ -83,7 +81,7 @@
     fifo_size -= n;
 }
 
-void
+static void
 r128WaitIdle (void)
 {
     int tries;
@@ -126,10 +124,10 @@
   r128WaitAvail (2);
   R128_OUT32 (mmio, R128_REG_DEFAULT_OFFSET, 0);
   R128_OUT32 (mmio, R128_REG_DEFAULT_PITCH, r128s->pitch);
-
+  return TRUE;
 }
 
-Bool
+static Bool
 r128PrepareSolid (PixmapPtr pPixmap, int alu, Pixel pm, Pixel fg)
 {
     KdScreenPriv (pPixmap->drawable.pScreen);
@@ -148,7 +146,7 @@
     return TRUE;
 }
 
-void
+static void
 r128Solid (int x1, int y1, int x2, int y2)
 {
     r128WaitAvail (2);
@@ -157,12 +155,12 @@
     
 }
 
-void
+static void
 r128DoneSolid (void)
 {
 }
 
-Bool
+static Bool
 r128PrepareCopy (PixmapPtr pSrc, PixmapPtr pDst, int dx, int dy, int alu, Pixel pm)
 {
     KdScreenPriv (pSrc->drawable.pScreen);
@@ -186,7 +184,7 @@
     return TRUE;
 }
 
-void
+static void
 r128Copy (int srcX, int srcY, int dstX, int dstY, int w, int h)
 {
     if (copydx < 0)
@@ -207,7 +205,7 @@
     R128_OUT32 (mmio, R128_REG_DST_HEIGHT_WIDTH, (h << 16) | w);
 }
 
-void
+static void
 r128DoneCopy (void)
 {
 }
@@ -225,8 +223,6 @@
 Bool
 r128DrawInit (ScreenPtr pScreen)
 {
-    KdScreenPriv(pScreen);
-
     if (!kaaDrawInit (pScreen, &r128Kaa))
 	return FALSE;
 

Index: r128stub.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/r128/r128stub.c,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- r128stub.c	11 Oct 2003 19:36:13 -0000	1.1
+++ r128stub.c	29 Oct 2003 16:26:43 -0000	1.1.2.1
@@ -26,6 +26,7 @@
 #include <config.h>
 #endif
 #include "r128.h"
+#include "klinux.h"
 
 void
 InitCard (char *name)