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
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
+#include
extern BSFuncRec cfbBSFuncRec;
Bool ews4800mips8S