Module Name: xsrc
Committed By: tsutsui
Date: Thu May 19 21:29:12 UTC 2011
Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips: ews4800mips.h
ews4800mipsColormap.c ews4800mipsFB.c ews4800mipsInit.c
ews4800mipsIo.c ews4800mipsKbd.c ews4800mipsMouse.c
Log Message:
- fix builds with -std=gnu99
- ANSIfy
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mips.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsColormap.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsInit.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mips.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mips.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mips.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mips.h:1.1 Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mips.h Thu May 19 21:29:12 2011
@@ -152,6 +152,11 @@
}
/*
+ * ews4800mipsColormap.c
+ */
+void ews4800mipsColormapInit(ScreenPtr);
+
+/*
* ews4800mipsInit.c
*/
ews4800mipsFbPtr ews4800mipsGetScreenFb(ScreenPtr);
@@ -183,6 +188,7 @@
pointer ews4800mipsMemoryMap(size_t, off_t, int);
Bool ews4800mipsScreenInit(ScreenPtr);
ews4800mipsScreenPtr ews4800mipsGetScreenPrivate(ScreenPtr);
+Bool ews4800mipsAllocateScreenPrivate(ScreenPtr);
/*
* ews4800mipsFB.c
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsColormap.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsColormap.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsColormap.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsColormap.c:1.1 Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsColormap.c Thu May 19 21:29:12 2011
@@ -89,10 +89,8 @@
#include <stdio.h>
static void
-ews4800mipsUpdateColormap(pScreen, dex, count, rmap, gmap, bmap)
- ScreenPtr pScreen;
- int dex, count;
- u_char *rmap, *gmap, *bmap;
+ews4800mipsUpdateColormap(ScreenPtr pScreen, int dex, int count, u_char *rmap,
+ u_char *gmap, u_char *bmap)
{
struct wsdisplay_cmap cmap;
ews4800mipsFbPtr pFb = ews4800mipsGetScreenFb(pScreen);
@@ -110,8 +108,7 @@
}
static void
-ews4800mipsInstallColormap(cmap)
- ColormapPtr cmap;
+ews4800mipsInstallColormap(ColormapPtr cmap)
{
ews4800mipsScreenPtr pPrivate = ews4800mipsGetScreenPrivate(cmap->pScreen);
ews4800mipsFbPtr pFb = ews4800mipsGetScreenFb(cmap->pScreen);
@@ -165,8 +162,7 @@
}
static void
-ews4800mipsUninstallColormap(cmap)
- ColormapPtr cmap;
+ews4800mipsUninstallColormap(ColormapPtr cmap)
{
ews4800mipsScreenPtr pPrivate = ews4800mipsGetScreenPrivate(cmap->pScreen);
@@ -185,9 +181,7 @@
}
static int
-ews4800mipsListInstalledColormaps(pScreen, pCmapList)
- ScreenPtr pScreen;
- Colormap *pCmapList;
+ews4800mipsListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapList)
{
ews4800mipsScreenPtr pPrivate = ews4800mipsGetScreenPrivate(pScreen);
@@ -196,10 +190,7 @@
}
static void
-ews4800mipsStoreColors(pmap, ndef, pdefs)
- ColormapPtr pmap;
- int ndef;
- xColorItem *pdefs;
+ews4800mipsStoreColors(ColormapPtr pmap, int ndef, xColorItem *pdefs)
{
ews4800mipsScreenPtr pPrivate = ews4800mipsGetScreenPrivate(pmap->pScreen);
u_char rmap[256], gmap[256], bmap[256];
@@ -223,8 +214,7 @@
}
Bool
-ews4800mipsInitializeColormap(pmap)
- register ColormapPtr pmap;
+ews4800mipsInitializeColormap(register ColormapPtr pmap)
{
int i;
VisualPtr pVisual;
@@ -270,8 +260,7 @@
}
void
-ews4800mipsColormapInit (pScreen)
- ScreenPtr pScreen;
+ews4800mipsColormapInit(ScreenPtr pScreen)
{
ews4800mipsScreenPtr pPrivate = ews4800mipsGetScreenPrivate(pScreen);
ews4800mipsFbPtr pFb = ews4800mipsGetScreenFb(pScreen);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c:1.1 Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c Thu May 19 21:29:12 2011
@@ -32,6 +32,7 @@
#define FORCE_SEPARATE_PRIVATE
#include "cfb.h"
#include <stdio.h>
+#include <mi/mi.h>
extern BSFuncRec cfbBSFuncRec;
Bool ews4800mips8ScreenInit(ScreenPtr, pointer, int, int, int, int, int);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsInit.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsInit.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsInit.c:1.1 Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsInit.c Thu May 19 21:29:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ews4800mipsInit.c,v 1.1 2005/12/29 15:43:40 tsutsui Exp $ */
+/* $NetBSD: ews4800mipsInit.c,v 1.2 2011/05/19 21:29:12 tsutsui Exp $ */
#include "ews4800mips.h"
#include "gcstruct.h"
@@ -173,12 +173,12 @@
}
void
-OsVendorPreInit()
+OsVendorPreInit(void)
{
}
void
-OsVendorInit()
+OsVendorInit(void)
{
}
@@ -394,7 +394,7 @@
}
Bool
-DPMSSupported ()
+DPMSSupported(void)
{
return FALSE;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c:1.1 Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c Thu May 19 21:29:12 2011
@@ -47,6 +47,7 @@
********************************************************/
#include <stdio.h>
+#include <mi/mi.h>
#define NEED_EVENTS
#include "ews4800mips.h"
@@ -75,7 +76,7 @@
* Events are passed to the DIX layer.
*/
void
-ProcessInputEvents ()
+ProcessInputEvents(void)
{
(void) mieqProcessInputEvents ();
miPointerUpdate ();
@@ -87,7 +88,7 @@
* enqueue them using the mi event queue
*/
void
-ews4800mipsEnqueueEvents ()
+ews4800mipsEnqueueEvents(void)
{
ews4800mipsEvent *ptrEvents; /* Current pointer event */
ews4800mipsEvent *kbdEvents; /* Current keyboard event */
@@ -167,7 +168,7 @@
* DDX - specific abort routine. Called by AbortServer().
*/
void
-AbortDDX()
+AbortDDX(void)
{
int i;
ScreenPtr pScreen;
@@ -187,7 +188,7 @@
/* Called by GiveUp(). */
void
-ddxGiveUp()
+ddxGiveUp(void)
{
AbortDDX ();
@@ -210,7 +211,7 @@
}
void
-ddxUseMsg()
+ddxUseMsg(void)
{
ews4800mipsErrorF(("-debug disable non-blocking"
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.2 Sun Oct 10 05:35:33 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c Thu May 19 21:29:12 2011
@@ -46,6 +46,7 @@
#include <stdio.h>
#include <sys/time.h>
#include <X11/extensions/XKB.h>
+#include <mi/mi.h>
extern KeySymsRec ews4800mipsKeySyms[];
extern ews4800mipsModmapRec *ews4800mipsModMaps[];
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.3 Sun Oct 10 05:28:50 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c Thu May 19 21:29:12 2011
@@ -54,6 +54,7 @@
#define NEED_EVENTS
#include "ews4800mips.h"
#include <stdio.h>
+#include <mi/mi.h>
static Bool ews4800mipsCursorOffScreen();
static void ews4800mipsCrossScreen();
