[xserver-commit] xserver/hw/kdrive/linux agp.c,1.6,1.6.2.1 bus.c,1.8,1.8.2.1 keyboard.c,1.13,1.13.2.1 linux.c,1.13,1.13.2.1 mouse.c,1.11,1.11.2.1 ms.c,1.6,1.6.2.1 ps2.c,1.12,1.12.2.1
Keith Packard
xserver-commit@pdx.freedesktop.org
Wed, 29 Oct 2003 08:27:07 -0800
Committed by: keithp
Update of /cvs/xserver/xserver/hw/kdrive/linux
In directory pdx:/tmp/cvs-serv23305/hw/kdrive/linux
Modified Files:
Tag: xfixes_2_branch
agp.c bus.c keyboard.c linux.c mouse.c ms.c ps2.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: agp.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/agp.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- agp.c 11 Sep 2003 05:12:51 -0000 1.6
+++ agp.c 29 Oct 2003 16:26:35 -0000 1.6.2.1
@@ -87,7 +87,7 @@
*/
static Bool
-GARTInit()
+GARTInit(void)
{
static Bool initDone = FALSE;
struct _agp_info agpinf;
Index: bus.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/bus.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- bus.c 14 Oct 2003 05:05:28 -0000 1.8
+++ bus.c 29 Oct 2003 16:26:35 -0000 1.8.2.1
@@ -35,7 +35,7 @@
/* /dev/adbmouse is a busmouse */
-void
+static void
BusRead (int adbPort, void *closure)
{
unsigned char buf[3];
@@ -68,7 +68,7 @@
int BusInputType;
-int
+static int
BusInit (void)
{
int i;
@@ -89,7 +89,7 @@
return n;
}
-void
+static void
BusFini (void)
{
KdUnregisterFds (BusInputType, TRUE);
Index: keyboard.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/keyboard.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- keyboard.c 14 Oct 2003 05:05:28 -0000 1.13
+++ keyboard.c 29 Oct 2003 16:26:35 -0000 1.13.2.1
@@ -112,7 +112,7 @@
};
static void
-readKernelMapping()
+readKernelMapping(void)
{
KeySym *k;
int i, j;
@@ -373,13 +373,13 @@
kdMaxScanCode = maxKeyCode;
}
-void
+static void
LinuxKeyboardLoad (void)
{
readKernelMapping ();
}
-void
+static void
LinuxKeyboardRead (int fd, void *closure)
{
unsigned char buf[256], *b;
@@ -400,7 +400,7 @@
static struct termios LinuxTermios;
static int LinuxKbdType;
-int
+static int
LinuxKeyboardEnable (int fd, void *closure)
{
struct termios nTty;
@@ -429,14 +429,14 @@
return fd;
}
-void
+static void
LinuxKeyboardDisable (int fd, void *closure)
{
ioctl(LinuxConsoleFd, KDSKBMODE, LinuxKbdTrans);
tcsetattr(LinuxConsoleFd, TCSANOW, &LinuxTermios);
}
-int
+static int
LinuxKeyboardInit (void)
{
if (!LinuxKbdType)
@@ -450,20 +450,20 @@
return 1;
}
-void
+static void
LinuxKeyboardFini (void)
{
LinuxKeyboardDisable (LinuxConsoleFd, 0);
KdUnregisterFds (LinuxKbdType, FALSE);
}
-void
+static void
LinuxKeyboardLeds (int leds)
{
ioctl (LinuxConsoleFd, KDSETLED, leds & 7);
}
-void
+static void
LinuxKeyboardBell (int volume, int pitch, int duration)
{
if (volume && pitch)
Index: linux.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/linux.c,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- linux.c 14 Oct 2003 05:05:28 -0000 1.13
+++ linux.c 29 Oct 2003 16:26:35 -0000 1.13.2.1
@@ -65,7 +65,7 @@
}
static int
-LinuxInit ()
+LinuxInit (void)
{
int fd = -1;
char vtname[11];
Index: mouse.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/mouse.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- mouse.c 14 Oct 2003 05:05:28 -0000 1.11
+++ mouse.c 29 Oct 2003 16:26:35 -0000 1.11.2.1
@@ -46,7 +46,7 @@
int used;
} Kbufio;
-Bool
+static Bool
MouseWaitForReadable (int fd, int timeout)
{
fd_set set;
@@ -69,7 +69,7 @@
return FALSE;
}
-int
+static int
MouseReadByte (Kbufio *b, int timeout)
{
int n;
@@ -89,7 +89,8 @@
return b->buf[b->used++];
}
-int
+#if NOTUSED
+static int
MouseFlush (Kbufio *b, char *buf, int size)
{
CARD32 now = GetTimeInMillis ();
@@ -115,7 +116,7 @@
return n;
}
-int
+static int
MousePeekByte (Kbufio *b, int timeout)
{
int c;
@@ -125,8 +126,9 @@
--b->used;
return c;
}
+#endif /* NOTUSED */
-Bool
+static Bool
MouseWaitForWritable (int fd, int timeout)
{
fd_set set;
@@ -149,7 +151,7 @@
return FALSE;
}
-Bool
+static Bool
MouseWriteByte (int fd, unsigned char c, int timeout)
{
int ret;
@@ -171,7 +173,7 @@
}
}
-Bool
+static Bool
MouseWriteBytes (int fd, unsigned char *c, int n, int timeout)
{
while (n--)
@@ -708,7 +710,7 @@
#define NUM_PROT (sizeof (kmouseProts) / sizeof (kmouseProts[0]))
-void
+static void
MouseInitProtocol (Kmouse *km)
{
int ret;
@@ -736,7 +738,7 @@
km->state = km->prot->state;
}
-void
+static void
MouseFirstProtocol (Kmouse *km, char *prot)
{
if (prot)
@@ -772,7 +774,7 @@
MouseInitProtocol (km);
}
-void
+static void
MouseNextProtocol (Kmouse *km)
{
do
@@ -787,7 +789,7 @@
ErrorF ("Switching to mouse protocol \"%s\"\n", km->prot->name);
}
-void
+static void
MouseRead (int mousePort, void *closure)
{
KdMouseInfo *mi = closure;
@@ -911,7 +913,7 @@
#define NUM_DEFAULT_MOUSE (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
-Bool
+static Bool
MouseInit (void)
{
int i;
@@ -968,7 +970,7 @@
return TRUE;
}
-void
+static void
MouseFini (void)
{
KdMouseInfo *mi;
Index: ms.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/ms.c,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- ms.c 11 Sep 2003 05:12:51 -0000 1.6
+++ ms.c 29 Oct 2003 16:26:35 -0000 1.6.2.1
@@ -35,7 +35,7 @@
#include "scrnintstr.h"
#include "kdrive.h"
-int
+static int
MsReadBytes (int fd, char *buf, int len, int min)
{
int n, tot;
@@ -65,7 +65,7 @@
return tot;
}
-void
+static void
MsRead (int port, void *closure)
{
unsigned char buf[3 * 200];
@@ -97,7 +97,7 @@
int MsInputType;
-int
+static int
MsInit (void)
{
int port;
@@ -151,7 +151,7 @@
return 0;
}
-void
+static void
MsFini (void)
{
KdUnregisterFds (MsInputType, TRUE);
Index: ps2.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/linux/ps2.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -d -r1.12 -r1.12.2.1
--- ps2.c 14 Oct 2003 05:05:28 -0000 1.12
+++ ps2.c 29 Oct 2003 16:26:35 -0000 1.12.2.1
@@ -33,7 +33,7 @@
#include "scrnintstr.h"
#include "kdrive.h"
-int
+static int
Ps2ReadBytes (int fd, char *buf, int len, int min)
{
int n, tot;
@@ -71,7 +71,7 @@
#define NUM_PS2_NAMES (sizeof (Ps2Names) / sizeof (Ps2Names[0]))
-void
+static void
Ps2Read (int ps2Port, void *closure)
{
unsigned char buf[3 * 200];
@@ -119,7 +119,7 @@
int Ps2InputType;
-int
+static int
Ps2Init (void)
{
int i;
@@ -141,7 +141,7 @@
return n;
}
-void
+static void
Ps2Fini (void)
{
KdUnregisterFds (Ps2InputType, TRUE);