[xserver-commit] xserver/hw/kdrive/src kaa.c,1.14.2.4,1.14.2.5 kcmap.c,1.8,1.8.2.1 kcurscol.c,1.7,1.7.2.1 kdrive.c,1.35.2.2,1.35.2.3 kdrive.h,1.40.2.2,1.40.2.3 kinput.c,1.35,1.35.2.1 knoop.c,1.4,1.4.2.1 vga.c,1.7,1.7.2.1 vga.h,1.5,1.5.2.1
Keith Packard
xserver-commit@pdx.freedesktop.org
Wed, 29 Oct 2003 08:27:20 -0800
- Previous message: [xserver-commit] xserver/hw/kdrive/smi smi.c,1.6.2.1,1.6.2.2 smi.h,1.5.2.1,1.5.2.2 smidraw.c,1.6,1.6.2.1 smistub.c,1.4,1.4.2.1
- Next message: [xserver-commit] xserver/hw/kdrive/vesa vesa.h,1.16.2.2,1.16.2.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: keithp
Update of /cvs/xserver/xserver/hw/kdrive/src
In directory pdx:/tmp/cvs-serv23305/hw/kdrive/src
Modified Files:
Tag: xfixes_2_branch
kaa.c kcmap.c kcurscol.c kdrive.c kdrive.h kinput.c knoop.c
vga.c vga.h
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: kaa.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kaa.c,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -d -r1.14.2.4 -r1.14.2.5
--- kaa.c 22 Oct 2003 07:08:02 -0000 1.14.2.4
+++ kaa.c 29 Oct 2003 16:26:47 -0000 1.14.2.5
@@ -334,7 +334,7 @@
return kaaPixmapIsOffscreen (pPixmap);
}
-void
+static void
kaaFillSpans(DrawablePtr pDrawable, GCPtr pGC, int n,
DDXPointPtr ppt, int *pwidth, int fSorted)
{
@@ -416,7 +416,7 @@
KdMarkSync(pDrawable->pScreen);
}
-void
+static void
kaaCopyNtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
GCPtr pGC,
@@ -471,7 +471,7 @@
}
}
-RegionPtr
+static RegionPtr
kaaCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
int srcx, int srcy, int width, int height, int dstx, int dsty)
{
@@ -480,7 +480,7 @@
dstx, dsty, kaaCopyNtoN, 0, 0);
}
-void
+static void
kaaPolyFillRect(DrawablePtr pDrawable,
GCPtr pGC,
int nrect,
@@ -576,7 +576,7 @@
KdMarkSync(pDrawable->pScreen);
}
-void
+static void
kaaSolidBoxClipped (DrawablePtr pDrawable,
RegionPtr pClip,
FbBits pm,
@@ -636,7 +636,7 @@
KdMarkSync(pDrawable->pScreen);
}
-void
+static void
kaaImageGlyphBlt (DrawablePtr pDrawable,
GCPtr pGC,
int x,
@@ -793,7 +793,7 @@
#endif
};
-void
+static void
kaaValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
{
fbValidateGC (pGC, changes, pDrawable);
@@ -814,7 +814,7 @@
miCopyClip
};
-int
+static int
kaaCreateGC (GCPtr pGC)
{
if (!fbCreateGC (pGC))
@@ -826,7 +826,7 @@
}
-void
+static void
kaaCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
{
RegionRec rgnDst;
@@ -850,7 +850,7 @@
REGION_UNINIT(pWin->drawable.pScreen, &rgnDst);
}
-void
+static void
kaaFillRegionSolid (DrawablePtr pDrawable,
RegionPtr pRegion,
Pixel pixel)
@@ -882,7 +882,7 @@
}
}
-void
+static void
kaaPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what)
{
Index: kcmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kcmap.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- kcmap.c 14 Oct 2003 05:07:39 -0000 1.8
+++ kcmap.c 29 Oct 2003 16:26:47 -0000 1.8.2.1
@@ -130,7 +130,7 @@
}
}
-int
+static int
KdColormapFb (ColormapPtr pCmap)
{
ScreenPtr pScreen = pCmap->pScreen;
Index: kcurscol.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kcurscol.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- kcurscol.c 11 Sep 2003 05:15:08 -0000 1.7
+++ kcurscol.c 29 Oct 2003 16:26:47 -0000 1.7.2.1
@@ -28,7 +28,7 @@
#include "kdrive.h"
#include "cursorstr.h"
-int
+static int
KdComputeCmapShift (unsigned long mask)
{
int shift;
Index: kdrive.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.c,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- kdrive.c 24 Oct 2003 09:34:33 -0000 1.35.2.2
+++ kdrive.c 29 Oct 2003 16:26:47 -0000 1.35.2.3
@@ -225,7 +225,7 @@
(*pScreenPriv->card->cfuncs->disable) (pScreen);
}
-void
+static void
KdDoSwitchCmd (char *reason)
{
if (kdSwitchCmd)
@@ -382,7 +382,7 @@
Bool kdDumbDriver;
Bool kdSoftCursor;
-char *
+static char *
KdParseFindNext (char *cur, char *delim, char *save, char *last)
{
while (*cur && !strchr (delim, *cur))
@@ -836,7 +836,6 @@
KdCreateScreenResources (ScreenPtr pScreen)
{
KdScreenPriv(pScreen);
- KdScreenInfo *screen = pScreenPriv->screen;
KdCardInfo *card = pScreenPriv->card;
Bool ret;
@@ -947,7 +946,7 @@
return TRUE;
}
-Bool
+static Bool
KdCreateWindow (WindowPtr pWin)
{
#ifndef PHOENIX
@@ -1263,7 +1262,7 @@
screen->softCursor = TRUE;
}
-Bool
+static Bool
KdSetPixmapFormats (ScreenInfo *pScreenInfo)
{
CARD8 depthToBpp[33]; /* depth -> bpp map */
@@ -1328,7 +1327,7 @@
return TRUE;
}
-void
+static void
KdAddScreen (ScreenInfo *pScreenInfo,
KdScreenInfo *screen,
int argc,
Index: kdrive.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kdrive.h,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -u -d -r1.40.2.2 -r1.40.2.3
--- kdrive.h 24 Oct 2003 09:34:33 -0000 1.40.2.2
+++ kdrive.h 29 Oct 2003 16:26:47 -0000 1.40.2.3
@@ -219,6 +219,7 @@
extern int KdCurScreen;
KdMouseInfo *KdMouseInfoAdd (void);
+void KdMouseInfoDispose (KdMouseInfo *mi);
void KdParseMouse (char *);
typedef struct _KdMouseFuncs {
@@ -698,7 +699,7 @@
KdEnableInput (void);
void
-ProcessInputEvents ();
+ProcessInputEvents (void);
extern KdMouseFuncs LinuxMouseFuncs;
extern KdMouseFuncs Ps2MouseFuncs;
Index: kinput.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/kinput.c,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- kinput.c 14 Oct 2003 05:07:39 -0000 1.35
+++ kinput.c 29 Oct 2003 16:26:47 -0000 1.35.2.1
@@ -92,7 +92,7 @@
int kdNumInputFds;
int kdInputTypeSequence;
-void
+static void
KdSigio (int sig)
{
int i;
@@ -101,7 +101,7 @@
(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
}
-void
+static void
KdBlockSigio (void)
{
sigset_t set;
@@ -111,7 +111,7 @@
sigprocmask (SIG_BLOCK, &set, 0);
}
-void
+static void
KdUnblockSigio (void)
{
sigset_t set;
@@ -158,7 +158,7 @@
fcntl (fd, F_SETFL, flags);
}
-void
+static void
KdAddFd (int fd)
{
struct sigaction act;
@@ -179,7 +179,7 @@
sigprocmask (SIG_SETMASK, &set, 0);
}
-void
+static void
KdRemoveFd (int fd)
{
struct sigaction act;
@@ -915,7 +915,7 @@
#define EventX(e) ((e)->u.keyButtonPointer.rootX)
#define EventY(e) ((e)->u.keyButtonPointer.rootY)
-int
+static int
KdInsideEmulationWindow (KdMouseInfo *mi, xEvent *ev)
{
if (ev->u.keyButtonPointer.pad1)
@@ -932,7 +932,7 @@
abs (mi->emulationDy) < EMULATION_WINDOW);
}
-KdInputClass
+static KdInputClass
KdClassifyInput (KdMouseInfo *mi, xEvent *ev)
{
switch (ev->u.u.type) {
@@ -1083,7 +1083,7 @@
}
}
-void
+static void
KdHandleMouseEvent (KdMouseInfo *mi, xEvent *ev)
{
if (mi->emulateMiddleButton)
@@ -1092,7 +1092,7 @@
KdQueueEvent (ev);
}
-void
+static void
KdReceiveTimeout (KdMouseInfo *mi)
{
KdRunMouseMachine (mi, timeout, 0);
@@ -1122,7 +1122,7 @@
extern int nClients;
-void
+static void
KdCheckSpecialKeys(xEvent *xE)
{
KeySym sym = KEYCOL1(xE->u.u.detail);
@@ -1195,7 +1195,7 @@
*
*/
-void
+static void
KdHandleKeyboardEvent (xEvent *ev)
{
int key = ev->u.u.detail;
@@ -1236,7 +1236,7 @@
KdUnblockSigio ();
}
-void
+static void
KdCheckLock (void)
{
KeyClassPtr keyc = pKdKeyboard->key;
Index: knoop.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/knoop.c,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -d -r1.4 -r1.4.2.1
--- knoop.c 11 Sep 2003 05:15:08 -0000 1.4
+++ knoop.c 29 Oct 2003 16:26:47 -0000 1.4.2.1
@@ -255,14 +255,14 @@
#endif
);
-RegionPtr
+static RegionPtr
KdNoopCopyArea(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
int srcx, int srcy, int width, int height, int dstx, int dsty)
{
return NullRegion;
}
-RegionPtr
+static RegionPtr
KdNoopCopyPlane(DrawablePtr pSrcDrawable, DrawablePtr pDstDrawable, GCPtr pGC,
int srcx, int srcy, int width, int height,
int dstx, int dsty, unsigned long bitPlane)
Index: vga.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/vga.c,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- vga.c 14 Oct 2003 05:07:39 -0000 1.7
+++ vga.c 29 Oct 2003 16:26:47 -0000 1.7.2.1
@@ -210,7 +210,7 @@
}
-void
+static void
_VgaSync (VgaCard *card, VGA16 id)
{
if (!(card->values[id].flags & VGA_VALUE_VALID))
Index: vga.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/src/vga.h,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -d -r1.5 -r1.5.2.1
--- vga.h 7 Jul 2003 19:12:57 -0000 1.5
+++ vga.h 29 Oct 2003 16:26:47 -0000 1.5.2.1
@@ -126,6 +126,12 @@
void
VgaRestore (VgaCard *card);
+void
+VgaFinish (VgaCard *card);
+
+void
+VgaFlushReg (VgaCard *card, VgaReg *reg);
+
VGA8
VgaFetch (VgaCard *card, VGA16 id);
- Previous message: [xserver-commit] xserver/hw/kdrive/smi smi.c,1.6.2.1,1.6.2.2 smi.h,1.5.2.1,1.5.2.2 smidraw.c,1.6,1.6.2.1 smistub.c,1.4,1.4.2.1
- Next message: [xserver-commit] xserver/hw/kdrive/vesa vesa.h,1.16.2.2,1.16.2.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]