subject:"CVS commit\: xsrc\/xfree\/xc\/programs\/Xserver"

CVS commit: xsrc/xfree/xc/programs/Xserver

2014-12-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Thu Dec 11 09:46:17 UTC 2014

Modified Files:
xsrc/xfree/xc/programs/Xserver/GL/glx: glxcmds.c glxcmdsswap.c
glxserver.h rensize.c single2.c single2swap.c singlepix.c
singlepixswap.c unpack.h
xsrc/xfree/xc/programs/Xserver/Xext: xcmisc.c xvdisp.c
xsrc/xfree/xc/programs/Xserver/Xi: chgdctl.c chgfctl.c sendexev.c
xsrc/xfree/xc/programs/Xserver/dbe: dbe.c
xsrc/xfree/xc/programs/Xserver/dix: dispatch.c
xsrc/xfree/xc/programs/Xserver/include: dix.h misc.h
xsrc/xfree/xc/programs/Xserver/os: access.c rpcauth.c
xsrc/xfree/xc/programs/Xserver/randr: randr.c
xsrc/xfree/xc/programs/Xserver/render: render.c

Log Message:
pull over from xorg-server, porting as necessary.

--
apply fixes for:

X.Org Security Advisory:  Dec. 9, 2014
Protocol handling issues in X Window System servers

backported to 1.10.x by myself.

included are fixes for:

denial of service due to unchecked malloc in client authentication
CVE-2014-8091
integer overflows calculating memory needs for requests
CVE-2014-8092
CVE-2014-8093
CVE-2014-8094
out of bounds access due to not validating length or offset values in requests
CVE-2014-8095
CVE-2014-8096
CVE-2014-8097
CVE-2014-8098
CVE-2014-8099
CVE-2014-8100
CVE-2014-8101
CVE-2014-8102
CVE-2014-8103
--
apply two more parts of CVE-2014-8092:
  Missing parens in REQUEST_FIXED_SIZE macro [CVE-2014-8092 pt. 5]
  dix: GetHosts bounds check using wrong pointer value [CVE-2014-8092 pt. 6]
--


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmdsswap.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/glxserver.h \
xsrc/xfree/xc/programs/Xserver/GL/glx/single2.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/single2swap.c \
xsrc/xfree/xc/programs/Xserver/GL/glx/unpack.h
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/xfree/xc/programs/Xserver/GL/glx/rensize.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/xfree/xc/programs/Xserver/GL/glx/singlepix.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/xfree/xc/programs/Xserver/GL/glx/singlepixswap.c
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/Xext/xcmisc.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/Xext/xvdisp.c
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/programs/Xserver/Xi/chgdctl.c \
xsrc/xfree/xc/programs/Xserver/Xi/chgfctl.c \
xsrc/xfree/xc/programs/Xserver/Xi/sendexev.c
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/dbe/dbe.c
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/xfree/xc/programs/Xserver/dix/dispatch.c
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/xfree/xc/programs/Xserver/include/dix.h \
xsrc/xfree/xc/programs/Xserver/include/misc.h
cvs rdiff -u -r1.6 -r1.7 xsrc/xfree/xc/programs/Xserver/os/access.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/xfree/xc/programs/Xserver/randr/randr.c
cvs rdiff -u -r1.3 -r1.4 xsrc/xfree/xc/programs/Xserver/render/render.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/GL/glx/glxcmds.c
diff -u xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c:1.1.1.6 xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c:1.2
--- xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c:1.1.1.6	Fri Mar 18 13:09:55 2005
+++ xsrc/xfree/xc/programs/Xserver/GL/glx/glxcmds.c	Thu Dec 11 09:46:16 2014
@@ -1427,7 +1427,7 @@ int __glXRender(__GLXclientState *cl, GL
 left = (req-length  2) - sz_xGLXRenderReq;
 while (left  0) {
 __GLXrenderSizeData *entry;
-int extra;
+int extra = 0;
 	void (* proc)(GLbyte *);
 
 	/*
@@ -1464,22 +1464,19 @@ int __glXRender(__GLXclientState *cl, GL
 client-errorValue = commandsDone;
 return __glXBadRenderRequest;
 }
+if (cmdlen  entry-bytes) {
+return BadLength;
+}
 if (entry-varsize) {
 /* variable size command */
-extra = (*entry-varsize)(pc + __GLX_RENDER_HDR_SIZE, False);
+extra = (*entry-varsize)(pc + __GLX_RENDER_HDR_SIZE, False,
+  left - __GLX_RENDER_LARGE_HDR_SIZE);
 if (extra  0) {
-extra = 0;
-}
-if (cmdlen != __GLX_PAD(entry-bytes + extra)) {
-return BadLength;
-}
-} else {
-/* constant size command */
-if (cmdlen != __GLX_PAD(entry-bytes)) {
 return BadLength;
 }
 }
-	if (left  cmdlen) {
+
+if (cmdlen != safe_pad(safe_add(entry-bytes, extra))) {
 	return BadLength;
 	}
 
@@ -1513,6 +1510,8 @@ int __glXRenderLarge(__GLXclientState *c
 int error;

CVS commit: xsrc/xfree/xc/programs/Xserver

2011-12-30 Thread Ignatios Souvatzis

Module Name:xsrc
Committed By:   is
Date:   Fri Dec 30 16:48:04 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/fb: fbpict.c
xsrc/xfree/xc/programs/Xserver/mi: miarc.c misprite.c

Log Message:
This fix is taken from xorg-server 1.9.2.

mod(a,b) used to be defined with a - in front of naked a, such that uses
of mod with certain arithmetic expressions as a led to surprising results,
namely the one in Xrender praised in CVE-2010-1166.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/xfree/xc/programs/Xserver/fb/fbpict.c
cvs rdiff -u -r1.1.1.5 -r1.2 xsrc/xfree/xc/programs/Xserver/mi/miarc.c \
xsrc/xfree/xc/programs/Xserver/mi/misprite.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/fb/fbpict.c
diff -u xsrc/xfree/xc/programs/Xserver/fb/fbpict.c:1.4 xsrc/xfree/xc/programs/Xserver/fb/fbpict.c:1.5
--- xsrc/xfree/xc/programs/Xserver/fb/fbpict.c:1.4	Sat Apr 19 19:00:39 2008
+++ xsrc/xfree/xc/programs/Xserver/fb/fbpict.c	Fri Dec 30 16:48:04 2011
@@ -908,7 +908,7 @@ fbCompositeSolidMask_nx1xn (CARD8  o
 	  0x0);
 }
 
-# define mod(a,b)	((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-a) % (b))
+# define mod(a,b)	((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-(a)) % (b))
 
 void
 fbComposite (CARD8  op,

Index: xsrc/xfree/xc/programs/Xserver/mi/miarc.c
diff -u xsrc/xfree/xc/programs/Xserver/mi/miarc.c:1.1.1.5 xsrc/xfree/xc/programs/Xserver/mi/miarc.c:1.2
--- xsrc/xfree/xc/programs/Xserver/mi/miarc.c:1.1.1.5	Fri Mar  5 14:29:39 2004
+++ xsrc/xfree/xc/programs/Xserver/mi/miarc.c	Fri Dec 30 16:48:04 2011
@@ -1554,7 +1554,7 @@ miRoundCap(
 
 # define Dsin(d)	((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 : sin(d*M_PI/180.0)))
 # define Dcos(d)	((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 : cos(d*M_PI/180.0)))
-# define mod(a,b)	((a) = 0 ? (a) % (b) : (b) - (-a) % (b))
+# define mod(a,b)	((a) = 0 ? (a) % (b) : (b) - (-(a)) % (b))
 
 static double
 miDcos (double a)
Index: xsrc/xfree/xc/programs/Xserver/mi/misprite.c
diff -u xsrc/xfree/xc/programs/Xserver/mi/misprite.c:1.1.1.5 xsrc/xfree/xc/programs/Xserver/mi/misprite.c:1.2
--- xsrc/xfree/xc/programs/Xserver/mi/misprite.c:1.1.1.5	Fri Feb 28 13:20:27 2003
+++ xsrc/xfree/xc/programs/Xserver/mi/misprite.c	Fri Dec 30 16:48:04 2011
@@ -1978,7 +1978,7 @@ miSpriteLineHelper()
 
 #ifdef RENDER
 
-# define mod(a,b)	((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-a) % (b))
+# define mod(a,b)	((b) == 1 ? 0 : (a) = 0 ? (a) % (b) : (b) - (-(a)) % (b))
 
 static void
 miSpritePictureOverlap (PicturePtr  pPict,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga

2011-05-30 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 30 06:42:41 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaCursor.c
amigaFbs.c amigaKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h
amigaCVCursor.c amigaCVblt.c amigaCVbstor.c amigaCVfrect.c
amigaCVim.c amigaCVscrin.c

Log Message:
Ok, s3 is fixed. Now retina and cirrus


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVblt.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVbstor.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVscrin.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVfrect.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.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/amiga/amiga.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2	Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h	Mon May 30 02:42:40 2011
@@ -465,7 +465,7 @@
 extern void amigaBlockHandler(
 int,
 pointer,
-struct timeval **,
+pointer,
 pointer
 );
 
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c:1.2	Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c	Mon May 30 02:42:40 2011
@@ -41,7 +41,22 @@
 #define NEED_EVENTS
 #include amiga.h
 #ifdef CV64_SUPPORT
-#include s3/amigaCV.h
+#include	Xmd.h
+#include	gcstruct.h
+#include	scrnintstr.h
+#include	pixmapstr.h
+#include	regionstr.h
+#include	mistruct.h
+#include	mifillarc.h
+#include	fontstruct.h
+#include	dixfontstr.h
+#include	cfb.h
+#include	cfbmskbits.h
+#include	cfb8bit.h
+#include	fastblt.h
+#include	mergerop.h
+#include	s3/amigaCV.h
+#include	migc.h
 #endif
 
 #define GetCursorPrivate(s) ((GetScreenPrivate(s)-hardwareCursor))
@@ -86,7 +101,6 @@
 PixmapPtr	src, dst;
 BoxRec	box;
 RegionRec	rgnDst;
-extern int mfbDoBitblt();
 
 if (!(src = GetScratchPixmapHeader(pScreen, bits-width, bits-height,
    /*bpp*/ 1, /*depth*/ 1,
@@ -103,7 +117,7 @@
 box.x2 = w;
 box.y2 = h;
 REGION_INIT(pScreen, rgnDst, box, 1);
-mfbDoBitblt(src, dst, GXcopy, rgnDst, ptSrc);
+mfbDoBitblt(src-drawable, dst-drawable, GXcopy, rgnDst, ptSrc);
 REGION_UNINIT(pScreen, rgnDst);
 FreeScratchPixmapHeader(src);
 FreeScratchPixmapHeader(dst);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c:1.3	Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c	Mon May 30 02:42:40 2011
@@ -162,8 +162,6 @@
 ScreenPtr	pScreen)
 {
 SetupScreen(pScreen);
-extern void   amigaBlockHandler();
-extern void   amigaWakeupHandler();
 static ScreenPtr autoRepeatScreen;
 extern miPointerScreenFuncRec   amigaPointerScreenFuncs;
 
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.3	Sat Jan 17 17:23:28 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c	Mon May 30 02:42:40 2011
@@ -795,14 +795,15 @@
 }
 
 /*ARGSUSED*/
-void amigaBlockHandler(nscreen, pbdata, pptv, pReadmask)
-int nscreen;
-pointer pbdata;
-struct timeval **pptv;
-pointer pReadmask;
+void amigaBlockHandler(
+int nscreen,
+pointer pbdata,
+pointer pv,
+pointer pReadmask)
 {
 KeybdCtrl* ctrl = ((DeviceIntPtr)LookupKeyboardDevice())-kbdfeed-ctrl;
 static struct timeval artv = { 0, 0 };	/* autorepeat timeval */
+struct timeval **pptv = pv;
 
 if (!autoRepeatKeyDown)
 	return;

Index:

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga

2011-05-30 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 30 11:00:18 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaInit.c
amigaIo.c amigaKbd.c amigaMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.h
clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c clstuff.h
clwindow.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina: amigaGX.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h s3bcach.c
s3fcach.c s3ss.c s3text.c

Log Message:
finish making this compile, with a few warnings. Mainly fix prototypes,
remove duplicate struct decls, add includes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clstuff.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/retina/amigaGX.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3bcach.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3fcach.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3ss.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/s3text.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/amiga/amiga.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.3	Mon May 30 02:42:40 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h	Mon May 30 07:00:17 2011
@@ -26,12 +26,12 @@
 #include sys/fcntl.h
 #include sys/ioctl.h
 #include sys/device.h
-#include dev/kbdreg.h
-#include dev/vuid_event.h
-#include dev/grfabs_reg.h
-#include dev/viewioctl.h
-#include dev/grfioctl.h
-#include dev/grfvar.h
+#include dev/kbdreg.h
+#include dev/vuid_event.h
+#include dev/grfabs_reg.h
+#include dev/viewioctl.h
+#include dev/grfioctl.h
+#include dev/grfvar.h
 
 /* X headers */
 #include Xos.h
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c:1.3	Sat Jan 17 17:23:28 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaMouse.c	Mon May 30 07:00:17 2011
@@ -55,6 +55,7 @@
 
 #define NEED_EVENTS
 #includeamiga.h
+#includemi.h
 
 Bool amigaActiveZaphod = TRUE;
 

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c:1.2	Wed Mar 30 04:50:44 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaInit.c	Mon May 30 07:00:17 2011
@@ -52,6 +52,10 @@
 #includesys/resource.h
 #includeunistd.h
 #includemipointer.h
+#includemfb.h
+#includecfb.h
+#includecfb16.h
+#includecfb32.h
 
 /* maximum pixmap depth */
 #ifndef AMIGAMAXDEPTH

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c:1.1	Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaIo.c	Mon May 30 07:00:17 2011
@@ -47,6 +47,7 @@
 
 #define NEED_EVENTS
 #includeamiga.h
+#includemi.h
 
 BoolamigaEmulateMiddleButton = FALSE;
 BoolamigaEmulateRightButton = FALSE;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaKbd.c:1.4

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc

2011-05-30 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 30 15:31:56 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c wscons.c
wscons.h

Log Message:
make this compile.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h

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/arm32vidc/vidc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.11
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10	Sat May 28 09:24:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c	Mon May 30 11:31:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.c,v 1.10 2011/05/28 13:24:04 christos Exp $	*/
+/*	$NetBSD: vidc.c,v 1.11 2011/05/30 15:31:56 christos Exp $	*/
 
 /*
  * Copyright (c) 1999 Neil A. Carson  Mark Brinicombe
@@ -50,24 +50,38 @@
 #include unistd.h
 #include errno.h
 
+
 /* X11 headers
  */
 #include Xos.h
 #include X.h
 #include Xproto.h
-#include mi.h
+#include Xmd.h
+#ifndef PSZ
+#define PSZ 8
+#endif
 #include cfb.h
-#include screenint.h
+#undef PSZ
+#include cfb16.h
+#include cfb32.h
+#include colormap.h
+#include colormapst.h
+#include cursor.h
+#include dixfontstr.h
+#include fontstruct.h
+#include gcstruct.h
 #include input.h
 #include inputstr.h
-#include cursor.h
+#include mi.h
+#include mifillarc.h 
+#include mipointer.h
 #include misc.h
+#include mistruct.h
+#include pixmapstr.h
+#include regionstr.h
+#include resource.h
 #include scrnintstr.h
 #include servermd.h
-#include mipointer.h
-#include colormap.h
-#include colormapst.h
-#include resource.h
 #include wscons.h
 
 /* #define DEBUG */
@@ -482,7 +496,7 @@
 	RegisterPointerDevice(mouse);
 	RegisterKeyboardDevice(keyboard);
 	miRegisterPointerDevice(screenInfo.screens[0], mouse);
-	if (!mieqInit(keyboard, mouse))
+	if (!mieqInit((DevicePtr)keyboard, (DevicePtr)mouse))
 		FatalError(mieqInit failed!!\n);
 
 	/* Start taking some SIGIOs on input device file descriptors. */

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5	Thu May 19 21:22:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c	Mon May 30 11:31:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: wscons.c,v 1.5 2011/05/20 01:22:37 christos Exp $	*/
+/*	$NetBSD: wscons.c,v 1.6 2011/05/30 15:31:56 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -47,6 +47,7 @@
 #include input.h
 #include cursor.h
 #include misc.h
+#include mi.h
 #include scrnintstr.h
 #include servermd.h
 #include mipointer.h

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2	Mon May 23 15:58:56 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h	Mon May 30 11:31:56 2011
@@ -12,3 +12,5 @@
 
 void wsdisplay_closedown(void);
 void wskbd_closedown(void);
+
+int mouse_accel(DeviceIntPtr, int);

CVS commit: xsrc/xfree/xc/programs/Xserver/os

2011-05-29 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sun May 29 22:57:41 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/os: utils.c

Log Message:
add memleak.h for CheckMemory


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/xfree/xc/programs/Xserver/os/utils.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/os/utils.c
diff -u xsrc/xfree/xc/programs/Xserver/os/utils.c:1.8 xsrc/xfree/xc/programs/Xserver/os/utils.c:1.9
--- xsrc/xfree/xc/programs/Xserver/os/utils.c:1.8	Sun Jan 27 15:31:16 2008
+++ xsrc/xfree/xc/programs/Xserver/os/utils.c	Sun May 29 18:57:41 2011
@@ -204,6 +204,7 @@
 #define MEM_FAIL_SCALE 10
 long Memory_fail = 0;
 #include stdlib.h  /* for random() */
+#includeutil/memleak/memleak.h
 #endif
 
 #ifdef sgi

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3

2011-05-28 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sat May 28 13:20:37 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h
amigaCVCursor.c

Log Message:
fix prototypes, KNF, and missing include


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.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/amiga/s3/amigaCV.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3	Fri May 27 17:32:49 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h	Sat May 28 09:20:37 2011
@@ -504,7 +504,7 @@
 Bool amigaCVCursorInit(ScreenPtr);
 void amigaCVRestoreCursor(ScreenPtr);
 void amigaCVRepositionCursor(ScreenPtr);
-void amigaCVSetPanning2(fbFd *, unsigned int, unsigned int);
+void amigaCVSetPanning2(fbFd *, unsigned short, unsigned short);
 void amigaCVRenewCursorColor(ScreenPtr);
 void s3WarpCursor(ScreenPtr, int, int );
 

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c:1.2	Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c	Sat May 28 09:20:37 2011
@@ -38,15 +38,16 @@
 #define NEED_EVENTS
 #include X.h
 #include Xproto.h
-#include misc.h
-#include input.h
-#include cursorstr.h
-#include regionstr.h
-#include scrnintstr.h
-#include servermd.h
-#include windowstr.h
+#include misc.h
+#include input.h
+#include cursorstr.h
+#include regionstr.h
+#include scrnintstr.h
+#include servermd.h
+#include windowstr.h
 #include inputstr.h
 #include mfb.h
+#include migc.h
 #include amiga.h
 #include amigaCV.h
 
@@ -56,7 +57,7 @@
 static void amigaCVSetCursor();
 static void amigaCVMoveCursor();
 static void amigaCVRecolorCursor();
-static void amigaQueryBestSize ();
+static void amigaQueryBestSize();
 void amigaCVRestoreCursor();
 
 extern miPointerScreenFuncRec   amigaPointerScreenFuncs;
@@ -117,7 +118,7 @@
 
 
 
-__inline short swap16 (unsigned short x)
+__inline short swap16(unsigned short x)
 {
 	unsigned short r;
 
@@ -129,10 +130,9 @@
 
 
 Bool
-amigaCVCursorInit(pScr)
- ScreenPtr pScr;
+amigaCVCursorInit(ScreenPtr pScr)
 {
-   SetupCursor (pScr);
+   SetupCursor(pScr);
 
s3hotX = 0;
s3hotY = 0;
@@ -156,12 +156,10 @@
 }
 
 static void
-amigaQueryBestSize (class, pwidth, pheight, pScreen)
-int class;
-unsigned short   *pwidth, *pheight;
-ScreenPtr   pScreen;
+amigaQueryBestSize(int class, unsigned short *pwidth, unsigned short *pheight,
+ScreenPtr pScreen)
 {
-SetupCursor (pScreen);
+SetupCursor(pScreen);
 
 switch (class)
 {
@@ -176,16 +174,13 @@
 *pheight = pScreen-height;
 break;
 default:
-mfbQueryBestSize (class, pwidth, pheight, pScreen);
+mfbQueryBestSize(class, pwidth, pheight, pScreen);
 break;
 }
 }
 
 static Bool
-amigaCVRealizeCursor(pScr, pCurs)
- ScreenPtr pScr;
- CursorPtr pCurs;
-
+amigaCVRealizeCursor(ScreenPtr pScr, CursorPtr pCurs)
 {
register int i, j;
unsigned short *pServMsk;
@@ -251,9 +246,7 @@
 }
 
 static Bool
-amigaCVUnrealizeCursor(pScr, pCurs)
- ScreenPtr pScr;
- CursorPtr pCurs;
+amigaCVUnrealizeCursor(ScreenPtr pScr, CursorPtr pCurs)
 {
pointer priv;
 
@@ -264,10 +257,7 @@
 }
 
 static void 
-amigaCVLoadCursor(pScr, pCurs, x, y)
- ScreenPtr pScr;
- CursorPtr pCurs;
- int x, y;
+amigaCVLoadCursor(ScreenPtr pScr, CursorPtr pCurs, int x, int y)
 {
int   index = pScr-myNum;
int   i, j;
@@ -290,24 +280,24 @@
 
/* turn cursor off */
 
-   WCrt (vgaBase, CRT_ID_HWGC_MODE, 0x00);
+   WCrt(vgaBase, CRT_ID_HWGC_MODE, 0x00);
 
/* move cursor off-screen */
 
-   WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_X_HI, 0x7);
-   WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_X_LO,  0xff);
-   WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_Y_LO, 0xff);
-   WCrt (vgaBase, CRT_ID_HWGC_DSTART_X, 0x3f);
-   WCrt (vgaBase, CRT_ID_HWGC_DSTART_Y, 0x3f);
-   WCrt (vgaBase, CRT_ID_HWGC_ORIGIN_Y_HI, 0x7);
+   WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_X_HI, 0x7);
+   WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_X_LO,  0xff);
+   WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_Y_LO, 0xff);
+   WCrt(vgaBase, CRT_ID_HWGC_DSTART_X, 0x3f);
+   WCrt(vgaBase, CRT_ID_HWGC_DSTART_Y, 0x3f);
+   WCrt(vgaBase, CRT_ID_HWGC_ORIGIN_Y_HI, 0x7);
 
 
/* Load storage location.  */
cpos = (inf-info.gd_fbsize - 2*1024)/1024;
 
 
-   WCrt (vgaBase,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc

2011-05-28 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sat May 28 13:24:04 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c

Log Message:
maybe include Xos.h will help.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.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/arm32vidc/vidc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.9 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.10
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.9	Wed May 25 12:55:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c	Sat May 28 09:24:04 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.c,v 1.9 2011/05/25 16:55:44 christos Exp $	*/
+/*	$NetBSD: vidc.c,v 1.10 2011/05/28 13:24:04 christos Exp $	*/
 
 /*
  * Copyright (c) 1999 Neil A. Carson  Mark Brinicombe
@@ -52,6 +52,7 @@
 
 /* X11 headers
  */
+#include Xos.h
 #include X.h
 #include Xproto.h
 #include mi.h

CVS commit: xsrc/xfree/xc/programs/Xserver/dix

2011-05-27 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 27 21:29:26 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/dix: dixfonts.c

Log Message:
missing type


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/dix/dixfonts.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/dix/dixfonts.c
diff -u xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c:1.2 xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c:1.3
--- xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c:1.2	Sun Jul  2 15:17:56 2006
+++ xsrc/xfree/xc/programs/Xserver/dix/dixfonts.c	Fri May 27 17:29:26 2011
@@ -2197,6 +2197,7 @@
 #define GLYPH_SIZE(ch, nbytes)  \
 	GLWIDTHBYTESPADDED((ch)-metrics.rightSideBearing - \
 			(ch)-metrics.leftSideBearing, (nbytes))
+void
 dump_char_ascii(cip)
 CharInfoPtr cip;
 {

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3

2011-05-27 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 27 21:32:50 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.h

Log Message:
deal with amiga_membarrier being a macro.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h

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/amiga/s3/amigaCV.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h:1.2	Wed May 25 13:38:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h	Fri May 27 17:32:49 2011
@@ -296,9 +296,11 @@
 #endif
 }
 
-static __inline void amiga_membarrier() {
+#ifndef amiga_membarrier
+static __inline void amiga_membarrier(void) {
 	abort();
 }
+#endif
 
 /* don't forget to init vgaBase and inf before using these macros! */

CVS commit: xsrc/xfree/xc/programs/Xserver/mi

2011-05-26 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 27 01:05:05 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/mi: mi.h

Log Message:
add miPrintRegion prototype.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 xsrc/xfree/xc/programs/Xserver/mi/mi.h

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/mi/mi.h
diff -u xsrc/xfree/xc/programs/Xserver/mi/mi.h:1.1.1.4 xsrc/xfree/xc/programs/Xserver/mi/mi.h:1.2
--- xsrc/xfree/xc/programs/Xserver/mi/mi.h:1.1.1.4	Sat Jan 19 10:14:05 2002
+++ xsrc/xfree/xc/programs/Xserver/mi/mi.h	Thu May 26 21:05:05 2011
@@ -632,4 +632,10 @@
 xArc * /*parcs*/
 );
 
+#ifdef DEBUG
+extern int miPrintRegion(
+RegionPtr /* rgn */
+);
+#endif
+
 #endif /* MI_H */

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc

2011-05-25 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Wed May 25 16:55:44 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c

Log Message:
move cfb higher.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.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/arm32vidc/vidc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.8 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.9
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.8	Sat May 21 10:30:33 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c	Wed May 25 12:55:44 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.c,v 1.8 2011/05/21 14:30:33 christos Exp $	*/
+/*	$NetBSD: vidc.c,v 1.9 2011/05/25 16:55:44 christos Exp $	*/
 
 /*
  * Copyright (c) 1999 Neil A. Carson  Mark Brinicombe
@@ -54,6 +54,8 @@
  */
 #include X.h
 #include Xproto.h
+#include mi.h
+#include cfb.h
 #include screenint.h
 #include input.h
 #include inputstr.h
@@ -66,8 +68,6 @@
 #include colormapst.h
 #include resource.h
 #include wscons.h
-#include mi.h
-#include cfb.h
 
 /* #define DEBUG */

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga

2011-05-25 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Wed May 25 17:38:44 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga: amiga.h amigaCursor.c
amigaFbs.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3: amigaCV.c amigaCV.h
amigaCVCursor.c amigaCVim.c xf86bcache.c xf86bcache.h xf86fcache.c
xf86fcache.h

Log Message:
more prototype work.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaCursor.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amigaFbs.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCV.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVCursor.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/amigaCVim.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86bcache.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/s3/xf86fcache.h

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/amiga/amiga.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h:1.1	Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/amiga.h	Wed May 25 13:38:44 2011
@@ -194,73 +194,120 @@
 
 extern int 		amigaXdebug;  /* Flag for debugging output to /tmp/xlog */
 
-extern Bool amigaCursorInitialize(
-#if NeedFunctionPrototypes
-ScreenPtr /* pScreen */
-#endif
+
+/*-
+ * TVTOMILLI(tv)
+ *	Given a struct timeval, convert its time into milliseconds...
+ */
+#define TVTOMILLI(tv)	(((tv).tv_usec/1000)+((tv).tv_sec*1000))
+#define TRACE(f)	do { ErrorF([%s #%d] ,__FILE__,__LINE__); ErrorF f; } while(0)
+
+/* amigaC.c */
+extern Bool amigaCInit(
+int,
+ScreenPtr,
+int,
+char **
 );
 
-extern void amigaDisableCursor(
-#if NeedFunctionPrototypes
-ScreenPtr /* pScreen */
-#endif
+extern int xopen_view(
+void
 );
 
-extern int amigaChangeKbdTranslation(
-#if NeedFunctionPrototypes
-int /* fd */,
-Bool /* makeTranslated */
-#endif
+extern Bool amigaCProbe(
+ScreenInfo *,
+int,
+int,
+int,
+char **
 );
 
-extern void amigaNonBlockConsoleOff(
-#if NeedFunctionPrototypes
-void /* no args */
-#endif
+extern Bool amigaCCreate(
+ScreenInfo *,
+int,
+char **
 );
 
-extern void amigaEnqueueEvents(
-#if NeedFunctionPrototypes
-void
-#endif
+/* amigaCfb.c */
+extern void amigaInstallColormap(
+ColormapPtr /* cmap */
+);
+
+extern void amigaUninstallColormap(
+ColormapPtr /* cmap */
+);
+
+extern int amigaListInstalledColormaps(
+ScreenPtr /* pScreen */,
+Colormap* /* pCmapList */
+);
+
+extern void CGScreenInit(
+ScreenPtr
+);
+
+extern Bool amigaGRFInit(
+int,
+ScreenPtr,
+int,
+char **
+);
+
+extern Bool amigaRZ3Init(
+int,
+ScreenPtr,
+int,
+char **
+);
+
+extern Bool amigaCLInit(
+int,
+ScreenPtr,
+int,
+char **
 );
 
 extern int amigaGXInit(
-#if NeedFunctionPrototypes
 ScreenPtr /* pScreen */,
 fbFd* /* fb */
-#endif
 );
 
-extern Bool amigaSaveScreen(
-#if NeedFunctionPrototypes
-ScreenPtr /* pScreen */,
-int /* on */
-#endif
+/* amigaCursor.c */
+extern void amigaCVSetPanning(
+fbFd *,
+unsigned short,
+unsigned short
 );
 
-extern Bool amigaScreenInit(
-#if NeedFunctionPrototypes
+extern Bool amigaCursorInitialize(
 ScreenPtr /* pScreen */
-#endif
 );
 
+extern void amigaDisableCursor(
+ScreenPtr /* pScreen */
+);
+
+/* amigaFbs.c */
 extern pointer amigaMemoryMap(
-#if NeedFunctionPrototypes
 size_t /* len */,
 off_t /* off */,
 int /* fd */
-#endif
 );
 
 extern Bool amigaScreenAllocate(
-#if NeedFunctionPrototypes
 ScreenPtr /* pScreen */
-#endif
+);
+
+extern Bool amigaSaveScreen(
+ScreenPtr /* pScreen */,
+int /* on */
+);
+
+extern Bool amigaScreenInit(
+ScreenPtr /* pScreen */
 );
 
 extern Bool amigaInitCommon(
-#if NeedFunctionPrototypes
 int /* scrn */,
 ScreenPtr /* pScrn */,
 Bool (* /* init1 */)(),
@@ -268,80 +315,33 @@
 Bool (* /* cr_cm */)(),
 Bool (* /* save */)(),
 int /* fb_off */
-#endif
 );
 
-extern Firm_event* amigaKbdGetEvents(
-#if NeedFunctionPrototypes
-int /* fd */,
-Bool /* on */,
-int* /* pNumEvents */,
-Bool* /* pAgain */
-#endif
-);
-
-extern Firm_event* amigaMouseGetEvents(
-#if NeedFunctionPrototypes
-int /* fd */,
-Bool /* on */,
-

CVS commit: xsrc/xfree/xc/programs/Xserver/dix

2011-05-25 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Thu May 26 00:24:33 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/dix: events.c

Log Message:
add missing type.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.7 -r1.2 xsrc/xfree/xc/programs/Xserver/dix/events.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/dix/events.c
diff -u xsrc/xfree/xc/programs/Xserver/dix/events.c:1.1.1.7 xsrc/xfree/xc/programs/Xserver/dix/events.c:1.2
--- xsrc/xfree/xc/programs/Xserver/dix/events.c:1.1.1.7	Fri Mar 18 08:10:48 2005
+++ xsrc/xfree/xc/programs/Xserver/dix/events.c	Wed May 25 20:24:33 2011
@@ -152,7 +152,7 @@
 static int DontPropagateRefCnts[DNPMCOUNT];
 
 #ifdef DEBUG
-static debug_events = 0;
+static int debug_events = 0;
 #endif
 InputInfo inputInfo;

CVS commit: xsrc/xfree/xc/programs/Xserver/dix

2011-05-25 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Thu May 26 02:13:49 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/dix: window.c

Log Message:
missing include and type for DEBUG


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/xfree/xc/programs/Xserver/dix/window.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/dix/window.c
diff -u xsrc/xfree/xc/programs/Xserver/dix/window.c:1.1.1.6 xsrc/xfree/xc/programs/Xserver/dix/window.c:1.2
--- xsrc/xfree/xc/programs/Xserver/dix/window.c:1.1.1.6	Fri Mar  5 09:28:12 2004
+++ xsrc/xfree/xc/programs/Xserver/dix/window.c	Wed May 25 22:13:49 2011
@@ -91,6 +91,7 @@
 #endif
 #include dixevents.h
 #include globals.h
+#include mi.h
 
 #ifdef XAPPGROUP
 #include Xagsrv.h
@@ -179,7 +180,8 @@
 }
 }
 
-PrintWindowTree()
+void
+PrintWindowTree(void)
 {
 int i;
 WindowPtr pWin, p1;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 15:42:25 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaMouse.c

Log Message:
Needs mi.h.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.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/alpha/alphaMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.3	Sun Oct 10 05:28:49 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c	Tue May 24 15:42:25 2011
@@ -52,7 +52,8 @@
  */
 
 #define NEED_EVENTS
-#includealpha.h
+#include mi.h
+#include alpha.h
 #include stdio.h
 
 Bool alphaActiveZaphod = TRUE;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 17:26:49 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaKbd.c

Log Message:
Needs mi.h.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.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/alpha/alphaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.2	Sun Oct 10 05:35:32 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c	Tue May 24 17:26:49 2011
@@ -41,6 +41,7 @@
 /
 
 #define NEED_EVENTS
+#include mi.h
 #include alpha.h
 #include keysym.h
 #include stdio.h

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-24 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Tue May 24 19:37:25 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decCursor.c

Log Message:
need DrawablePtr not Drawable


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.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/dec/decCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.4	Mon May 23 15:48:14 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c	Tue May 24 15:37:25 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decCursor.c,v 1.4 2011/05/23 19:48:14 christos Exp $	*/
+/*	$NetBSD: decCursor.c,v 1.5 2011/05/24 19:37:25 christos Exp $	*/
 
 /* XConsortium: sunCursor.c,v 5.19 94/04/17 20:29:35 gildea Exp */
 /*
@@ -112,7 +112,7 @@
 box.x2 = w;
 box.y2 = h;
 REGION_INIT(pScreen, rgnDst, box, 1);
-mfbDoBitblt((Drawable)src, (Drawable)dst, GXcopy, rgnDst, ptSrc);
+mfbDoBitblt((DrawablePtr)src, (DrawablePtr)dst, GXcopy, rgnDst, ptSrc);
 REGION_UNINIT(pScreen, rgnDst);
 FreeScratchPixmapHeader(src);
 FreeScratchPixmapHeader(dst);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 21:21:55 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decInit.c

Log Message:
#include err.h for warn(3).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decInit.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/dec/decInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decInit.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decInit.c:1.2	Mon Mar 28 00:07:41 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decInit.c	Tue May 24 21:21:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: decInit.c,v 1.2 2005/03/28 00:07:41 tron Exp $ */
+/* $NetBSD: decInit.c,v 1.3 2011/05/24 21:21:55 jakllsch Exp $ */
 
 #includedec.h
 #includegcstruct.h
@@ -7,6 +7,7 @@
 #includecfb.h
 
 #include stdio.h
+#include err.h
 
 Bool decTGAInit(int, ScreenPtr, int, char **);
 Bool decSFBInit(int, ScreenPtr, int, char **);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 21:22:28 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decIo.c

Log Message:
Needs mi.h.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decIo.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/dec/decIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decIo.c:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decIo.c	Tue May 24 21:22:28 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decIo.c,v 1.1 2004/01/18 05:21:41 rtr Exp $	*/
+/*	$NetBSD: decIo.c,v 1.2 2011/05/24 21:22:28 jakllsch Exp $	*/
 
 /* XConsortium: sunIo.c,v 5.26.1.3 95/01/25 23:02:33 kaleb Exp */
 /* XFree86: xc/programs/Xserver/hw/sun/sunIo.c,v 3.1 1995/01/28 15:46:06 dawes Exp */
@@ -49,6 +49,7 @@
 /
 
 #define NEED_EVENTS
+#includemi.h
 #includedec.h
 
 /*-

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 21:23:52 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decKbd.c decMouse.c

Log Message:
Needs mi.h.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.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/dec/decKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.2	Sun Oct 10 05:35:33 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c	Tue May 24 21:23:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decKbd.c,v 1.2 2010/10/10 05:35:33 tsutsui Exp $	*/
+/*	$NetBSD: decKbd.c,v 1.3 2011/05/24 21:23:52 jakllsch Exp $	*/
 
 /* XConsortium: sunKbd.c,v 5.47 94/08/16 13:45:30 dpw Exp */
 /*-
@@ -43,6 +43,7 @@
 /
 
 #define NEED_EVENTS
+#include mi.h
 #include dec.h
 #include keysym.h
 #include stdio.h

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.3	Sun Oct 10 05:28:49 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c	Tue May 24 21:23:52 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decMouse.c,v 1.3 2010/10/10 05:28:49 tsutsui Exp $	*/
+/*	$NetBSD: decMouse.c,v 1.4 2011/05/24 21:23:52 jakllsch Exp $	*/
 
 /* XConsortium: sunMouse.c,v 5.21 94/04/17 20:29:47 kaleb Exp */
 /*-
@@ -54,6 +54,7 @@
  */
 
 #define NEED_EVENTS
+#includemi.h
 #includedec.h
 #include stdio.h

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 21:27:01 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decCursor.c

Log Message:
Take address of structure element rather than casting,
like is done in the amiga version of this code.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.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/dec/decCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.5	Tue May 24 19:37:25 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c	Tue May 24 21:27:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decCursor.c,v 1.5 2011/05/24 19:37:25 christos Exp $	*/
+/*	$NetBSD: decCursor.c,v 1.6 2011/05/24 21:27:00 jakllsch Exp $	*/
 
 /* XConsortium: sunCursor.c,v 5.19 94/04/17 20:29:35 gildea Exp */
 /*
@@ -112,7 +112,7 @@
 box.x2 = w;
 box.y2 = h;
 REGION_INIT(pScreen, rgnDst, box, 1);
-mfbDoBitblt((DrawablePtr)src, (DrawablePtr)dst, GXcopy, rgnDst, ptSrc);
+mfbDoBitblt(src-drawable, dst-drawable, GXcopy, rgnDst, ptSrc);
 REGION_UNINIT(pScreen, rgnDst);
 FreeScratchPixmapHeader(src);
 FreeScratchPixmapHeader(dst);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 21:52:04 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alpha.h

Log Message:
Add prototype for alphaCloseScreen().


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alpha.h

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/alpha/alpha.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alpha.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alpha.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alpha.h:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alpha.h	Tue May 24 21:52:04 2011
@@ -268,6 +268,13 @@
 #endif
 );
 
+extern Bool alphaCloseScreen(
+#if NeedFunctionPrototypes
+int /* i */,
+ScreenPtr /* pScreen */
+#endif
+);
+
 extern pointer alphaMemoryMap(
 #if NeedFunctionPrototypes
 size_t /* len */,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 22:16:45 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: dec.h

Log Message:
Add prototype for decCloseScreen().


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/dec.h

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/dec/dec.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/dec.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/dec.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/dec.h:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/dec.h	Tue May 24 22:16:45 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: dec.h,v 1.1 2004/01/18 05:21:41 rtr Exp $	*/
+/*	$NetBSD: dec.h,v 1.2 2011/05/24 22:16:45 jakllsch Exp $	*/
 
 /* XConsortium: sun.h,v 5.39.1.1 95/01/05 19:58:43 kaleb Exp */
 /* XFree86: xc/programs/Xserver/hw/sun/sun.h,v 3.2 1995/02/12 02:36:21 dawes Exp */
@@ -271,6 +271,13 @@
 #endif
 );
 
+extern Bool decCloseScreen(
+#if NeedFunctionPrototypes
+int /* i */,
+ScreenPtr /* pScreen */
+#endif
+);
+
 extern pointer decMemoryMap(
 #if NeedFunctionPrototypes
 size_t /* len */,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 23:08:43 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga: alphaTGA.c tgamap.h
tgasimpleblt.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga: decTGA.c tgamap.h
tgasimpleblt.c

Log Message:
Build fixes for TGA driver.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/alphaTGA.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/decTGA.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/tgamap.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/tgasimpleblt.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/alpha/tga/alphaTGA.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/alphaTGA.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/alphaTGA.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/alphaTGA.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/alphaTGA.c	Tue May 24 23:08:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: alphaTGA.c,v 1.1 2004/01/18 04:13:22 rtr Exp $ */
+/* $NetBSD: alphaTGA.c,v 1.2 2011/05/24 23:08:42 jakllsch Exp $ */
 
 /* $XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.2 1995/02/12 02:36:22 dawes Exp $ */
@@ -88,11 +88,17 @@
 
 #include alpha.h
 #include cfb.h
+#include cfb32.h
 #include dev/pci/tgareg.h
 
 /* XXX */
 #include stdio.h
 
+static Bool alphaTgaScreenInit(
+register ScreenPtr, pointer, int, int, int, int, int, int);
+static Bool alphaTgaFinishScreenInit(
+register ScreenPtr, pointer, int, int, int, int, int, int);
+
 static void CGUpdateColormap(pScreen, dex, count, rmap, gmap, bmap)
 ScreenPtr	pScreen;
 int		dex, count;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.3	Sat May 21 14:34:56 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h	Tue May 24 23:08:42 2011
@@ -18,11 +18,11 @@
 #define alphaTgaTEOps		alphaTga32TEOps
 #define alphaTgaNonTEOps	alphaTga32NonTEOps
 
+#else
+#error Unsupported PSZ
+#endif
+
 #include dev/pci/tgareg.h
 
 void alphaTgaDoBitbltSimple(unsigned int *, unsigned int *, unsigned int,
 unsigned int, tga_reg_t **, int, int, int, int, int, int, int, int, int);
-
-#else
-#error Unsupported PSZ
-#endif

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.2	Tue Oct 27 23:17:12 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c	Tue May 24 23:08:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tgasimpleblt.c,v 1.2 2009/10/27 23:17:12 elric Exp $ */
+/* $NetBSD: tgasimpleblt.c,v 1.3 2011/05/24 23:08:42 jakllsch Exp $ */
 
 /*
  * tga simple rops
@@ -52,6 +52,7 @@
 #include	stdio.h
 
 #include alpha.h
+#include tgamap.h
 #include dev/pci/tgareg.h
 
 void

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/decTGA.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/decTGA.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/decTGA.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/decTGA.c:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/decTGA.c	Tue May 24 23:08:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: decTGA.c,v 1.1 2004/01/18 05:21:41 rtr Exp $ */
+/* $NetBSD: decTGA.c,v 1.2 2011/05/24 23:08:43 jakllsch Exp $ */
 
 /* $XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.2 1995/02/12 02:36:22 dawes Exp $ */
@@ -88,8 +88,14 @@
 
 #include dec.h
 #include cfb.h
+#include cfb32.h
 #include tga.h
 
+static Bool decTgaScreenInit(
+register ScreenPtr, pointer, int, int, int, int, int, int);
+static Bool decTgaScreenInit(
+register ScreenPtr, pointer, int, int, int, int, int, int);
+
 Bool decTGAInit (screen, pScreen, argc, argv)
 int		  screen;	/* what screen am I going to be */
 ScreenPtr	  pScreen;  	/* The Screen to initialize */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/tgamap.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/tgamap.h:1.1

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 23:10:03 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb: alphaSFB.c sfbmap.h
sfbsimpleblt.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb: decSFB.c sfbmap.h
sfbsimpleblt.c

Log Message:
Build fixes for SFB driver.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/alphaSFB.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbmap.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/decSFB.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbmap.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.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/alpha/sfb/alphaSFB.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/alphaSFB.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/alphaSFB.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/alphaSFB.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/alphaSFB.c	Tue May 24 23:10:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: alphaSFB.c,v 1.1 2004/01/18 04:13:22 rtr Exp $ */
+/* $NetBSD: alphaSFB.c,v 1.2 2011/05/24 23:10:03 jakllsch Exp $ */
 
 /* $XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp $ */
 /* $XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.2 1995/02/12 02:36:22 dawes Exp $ */
@@ -88,11 +88,15 @@
 
 #include alpha.h
 #include cfb.h
+#include cfb32.h
 #include dev/tc/sfbreg.h
 
 /* XXX */
 #include stdio.h
 
+static Bool alphaSfbScreenInit(
+register ScreenPtr, pointer, int, int, int, int, int, int);
+
 static void CGUpdateColormap(pScreen, dex, count, rmap, gmap, bmap)
 ScreenPtr	pScreen;
 int		dex, count;
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbmap.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbmap.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbmap.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbmap.h:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbmap.h	Tue May 24 23:10:03 2011
@@ -21,3 +21,8 @@
 #else
 #error Unsupported PSZ
 #endif
+
+#include dev/tc/sfbreg.h
+
+void alphaSfbDoBitbltSimple(unsigned int *, unsigned int *, unsigned int,
+unsigned int, sfb_reg_t **, int, int, int, int, int, int, int, int, int);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.2	Tue Oct 27 23:17:12 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c	Tue May 24 23:10:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sfbsimpleblt.c,v 1.2 2009/10/27 23:17:12 elric Exp $ */
+/* $NetBSD: sfbsimpleblt.c,v 1.3 2011/05/24 23:10:03 jakllsch Exp $ */
 
 /*
  * sfb simple rops
@@ -52,6 +52,7 @@
 #include	stdio.h
 
 #include alpha.h
+#include sfbmap.h
 #include dev/tc/sfbreg.h
 
 void

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/decSFB.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/decSFB.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/decSFB.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/decSFB.c:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/decSFB.c	Tue May 24 23:10:03 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: decSFB.c,v 1.1 2004/01/18 05:21:41 rtr Exp $ */
+/* $NetBSD: decSFB.c,v 1.2 2011/05/24 23:10:03 jakllsch Exp $ */
 
 /* XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp */
 /* XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.2 1995/02/12 02:36:22 dawes Exp */
@@ -89,10 +89,14 @@
 #include dec.h
 #include sfb.h
 #include cfb.h
+#include cfb32.h
 
 /* XXX */
 #include stdio.h
 
+static Bool decSfbScreenInit(
+register ScreenPtr, pointer, int, int, int, int, int, int);
+
 /*
  * Restore color map to white-on-black, and call decCloseScreen
  */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbmap.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbmap.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbmap.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbmap.h:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbmap.h	Tue May 24 23:10:03 2011
@@ -21,3 +21,8 @@
 #else
 #error Unsupported PSZ
 #endif
+
+#include dev/tc/sfbreg.h
+
+void decSfbDoBitbltSimple(unsigned int *, unsigned int *, unsigned int,
+unsigned int, sfb_reg_t **, int, int, int, int, int, int, int, int,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px

2011-05-24 Thread Jonathan A. Kollasch

Module Name:xsrc
Committed By:   jakllsch
Date:   Tue May 24 23:12:36 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px: decPX.c pxgc.c
pxgetsp.c

Log Message:
Build fixes for PX driver.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/decPX.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgc.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgetsp.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/dec/px/decPX.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/decPX.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/decPX.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/decPX.c:1.3	Mon Apr 28 20:57:37 2008
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/decPX.c	Tue May 24 23:12:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decPX.c,v 1.3 2008/04/28 20:57:37 martin Exp $	*/
+/*	$NetBSD: decPX.c,v 1.4 2011/05/24 23:12:36 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -81,6 +81,7 @@
 #include px.h
 
 #include cfb.h
+#include cfb32.h
 #include mi.h
 
 #include sys/mman.h
@@ -113,6 +114,21 @@
 #endif
 );
 
+/*
+ * XXX
+ */
+extern Bool cfbFinishScreenInit(
+#if NeedFunctionPrototypes
+		ScreenPtr /*pScreen*/,
+		pointer /*pbits*/,
+		int /*xsize*/,
+		int /*ysize*/,
+		int /*dpix*/,
+		int /*dpiy*/,
+		int /*width*/
+#endif
+);
+
 Bool	cfbCreateScreenResources(ScreenPtr);
 Bool	cfb32CreateScreenResources(ScreenPtr);
 

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgc.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgc.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgc.c:1.2	Mon Apr 28 20:57:37 2008
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgc.c	Tue May 24 23:12:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxgc.c,v 1.2 2008/04/28 20:57:37 martin Exp $	*/
+/*	$NetBSD: pxgc.c,v 1.3 2011/05/24 23:12:36 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
 #include Xmd.h
 #include Xproto.h
 #include cfb.h
+#include cfbmap.h
 #include cfbmskbits.h
 #include fontstruct.h
 #include dixfontstr.h
@@ -45,10 +46,12 @@
 #include mibstore.h
 #include migc.h
 
+#if 0
 /* XXX */
 #undef cfbNonTEOps
 #undef cfbCreateGC
 #undef cfbValidateGC
+#endif
 
 void	pxValidateGC(GCPtr, u_long, DrawablePtr);
 
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgetsp.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgetsp.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgetsp.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgetsp.c:1.2	Mon Apr 28 20:57:37 2008
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/px/pxgetsp.c	Tue May 24 23:12:36 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxgetsp.c,v 1.2 2008/04/28 20:57:37 martin Exp $	*/
+/*	$NetBSD: pxgetsp.c,v 1.3 2011/05/24 23:12:36 jakllsch Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -38,7 +38,9 @@
 #include scrnintstr.h
 #include cfb.h
 
+#if 0
 #undef cfbGetSpans
+#endif
 
 #define myBitsPerPixel(d) (\
 (1  PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha

2011-05-23 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 18:48:45 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaInit.c

Log Message:
need err.h for warn


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.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/alpha/alphaInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c:1.2	Sun Mar 27 19:08:16 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaInit.c	Mon May 23 14:48:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: alphaInit.c,v 1.2 2005/03/28 00:08:16 tron Exp $ */
+/* $NetBSD: alphaInit.c,v 1.3 2011/05/23 18:48:44 christos Exp $ */
 
 #includealpha.h
 #includegcstruct.h
@@ -7,6 +7,7 @@
 #includecfb.h
 
 #include stdio.h
+#include err.h
 
 #define TGASUPPORT
 #define SFBSUPPORT

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus

2011-05-23 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 19:42:53 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus: amigaCL.c
amigaCL.h clbitblt.c clblt.c clfillrct.c clgc.c clsolid.c
clwindow.c

Log Message:
more prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clblt.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clfillrct.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clgc.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clsolid.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clwindow.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/amiga/cirrus/amigaCL.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c:1.1	Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.c	Mon May 23 15:42:53 2011
@@ -49,19 +49,8 @@
 #includemigc.h
 
 
-Bool clCreateGC();
-void clCopyWindow();
-
-
-#if NeedFunctionPrototypes
-amigaCLGXInit (
-ScreenPtr   pScreen,
-fbFd*fb)
-#else
-amigaCLGXInit (pScreen, fb)
-ScreenPtr   pScreen;
-fbFd*fb;
-#endif
+Bool
+amigaCLGXInit(ScreenPtr pScreen, fbFd *fb)
 {
 #if 0
 if (serverGeneration != amigaCLGeneration)
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h:1.1	Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/amigaCL.h	Mon May 23 15:42:53 2011
@@ -253,3 +253,22 @@
 
 
 #define amigaInfo(s) (amigaFbs[(s)-myNum])
+
+/* amigaCL.c */
+Bool amigaCLGXInit(ScreenPtr, fbFd *);
+/* clgc.c */
+void clValidateGC(GCPtr, unsigned long, DrawablePtr);
+Bool clCreateGC(GCPtr);
+GCOps *clMatchCommon(GCPtr, cfbPrivGCPtr);
+/* clbitblt.c */
+void clDoBitblt(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr,
+unsigned long);
+RegionPtr clCopyArea(DrawablePtr, DrawablePtr, GC *, int, int, int, int, int,
+int);
+/* clfillrct.c */
+void clPolyFillRect(DrawablePtr, GCPtr, int, xRectangle	*);
+/* clwindow.c */
+void clCopyWindow(WindowPtr, DDXPointRec, RegionPtr);
+
+void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr,
+DDXPointPtr, unsigned long);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c:1.1	Thu Jan 15 07:07:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/amiga/cirrus/clbitblt.c	Mon May 23 15:42:53 2011
@@ -46,20 +46,18 @@
 #include	fastblt.h
 #define MFB_CONSTS_ONLY
 #include	maskbits.h
-
-void clDoBitbltCopy(DrawablePtr, DrawablePtr, int, RegionPtr,  
-DDXPointPtr, unsigned long);
-
+#include	amigaCL.h
 
 void
-clDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc, planemask)
-DrawablePtr	pSrc, pDst;
-int		alu;
-RegionPtr	prgnDst;
-DDXPointPtr	pptSrc;
-unsigned long   planemask;
+clDoBitblt(
+DrawablePtr	pSrc, DrawablePtr pDst,
+int		alu,
+RegionPtr	prgnDst,
+DDXPointPtr	pptSrc,
+unsigned long   planemask)
 {
-void (*blt)() = cfbDoBitbltGeneral;
+void (*blt)(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr,
+	unsigned long) = cfbDoBitbltGeneral;
 if ((planemask  PMSK) == PMSK) {
 	switch (alu) {
 	case GXcopy:
@@ -77,16 +75,16 @@
 }
 
 RegionPtr
-clCopyArea(pSrcDrawable, pDstDrawable,
-pGC, srcx, srcy, width, height, dstx, dsty)
-register DrawablePtr pSrcDrawable;
-register DrawablePtr pDstDrawable;
-GC *pGC;
-int srcx, srcy;
-int width, height;
-int dstx, dsty;
+clCopyArea(
+DrawablePtr pSrcDrawable,
+DrawablePtr pDstDrawable,
+GC *pGC,
+int srcx, int srcy,
+int width, int height,
+int dstx, int dsty)
 {
-void (*doBitBlt) ();
+void (*doBitBlt)(DrawablePtr, DrawablePtr, int, RegionPtr, DDXPointPtr,
+	unsigned long) = cfbDoBitbltGeneral;
 
 doBitBlt = clDoBitbltCopy;
 if (pGC-alu != GXcopy || (pGC-planemask  PMSK) != PMSK)
Index:

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k

2011-05-23 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 19:46:41 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k: mac68k.h mac68kMouse.c

Log Message:
change prototype to avoid casts.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.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/mac68k/mac68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.7
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6	Sun May 22 22:40:13 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h	Mon May 23 15:46:41 2011
@@ -94,7 +94,7 @@
 
 
 void mac68k_processkbd(DeviceIntPtr, adb_event_t *);
-void mac68k_processmouse(DevicePtr, adb_event_t *);
+void mac68k_processmouse(DeviceIntPtr, adb_event_t *);
 void mac68k_getmouse(void);
 void mac68k_getkbd(void);
 Bool mac68k_screeninit(ScreenPtr);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c:1.1	Fri Jan  9 22:02:43 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kMouse.c	Mon May 23 15:46:41 2011
@@ -143,14 +143,14 @@
 
 
 static int accel_mouse (
-	DevicePtr mouse,
+	DeviceIntPtr mouse,
 	int delta)
 {
 register int sgn = sign(delta);
 register PtrCtrl *ctrlptr;
 
 delta = abs(delta);
-ctrlptr = ((DeviceIntPtr) mouse)-ptrfeed-ctrl;
+ctrlptr = mouse-ptrfeed-ctrl;
 
 if (delta  ctrlptr-threshold)
 	return (sgn * (ctrlptr-threshold + ((delta - ctrlptr-threshold) *
@@ -161,7 +161,7 @@
 
 
 void mac68k_processmouse(
-	DevicePtr	mouse,
+	DeviceIntPtr	mouse,
 	adb_event_t	*event)
 {
 	xEvent	xev;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-23 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 19:48:14 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decCursor.c

Log Message:
Add missing casts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.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/dec/decCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.3	Sun May 22 22:40:56 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c	Mon May 23 15:48:14 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decCursor.c,v 1.3 2011/05/23 02:40:56 christos Exp $	*/
+/*	$NetBSD: decCursor.c,v 1.4 2011/05/23 19:48:14 christos Exp $	*/
 
 /* XConsortium: sunCursor.c,v 5.19 94/04/17 20:29:35 gildea Exp */
 /*
@@ -112,7 +112,7 @@
 box.x2 = w;
 box.y2 = h;
 REGION_INIT(pScreen, rgnDst, box, 1);
-mfbDoBitblt(src, dst, GXcopy, rgnDst, ptSrc);
+mfbDoBitblt((Drawable)src, (Drawable)dst, GXcopy, rgnDst, ptSrc);
 REGION_UNINIT(pScreen, rgnDst);
 FreeScratchPixmapHeader(src);
 FreeScratchPixmapHeader(dst);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc

2011-05-23 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 19:58:56 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: wscons.h

Log Message:
more prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h

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/arm32vidc/wscons.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.1	Thu May 19 21:22:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h	Mon May 23 15:58:56 2011
@@ -1,5 +1,14 @@
 void wsdisplay_write_palette(int, int, int, int);
 void wsmouse_io(void);
-int wsmouse_init(void);
+void wskbd_io(void);
+
+void wscons_bell(int, DeviceIntPtr, pointer, int);
+
 int wskbd_init(void);
+int wsmouse_init(void);
+int wsdisplay_init(ScreenPtr, int, char **);
+
 void wsdisplay_shutdown(void);
+
+void wsdisplay_closedown(void);
+void wskbd_closedown(void);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha

2011-05-22 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sun May 22 15:34:52 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaIo.c

Log Message:
include mi.h and KNF a bit.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.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/alpha/alphaIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c:1.1	Sat Jan 17 23:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c	Sun May 22 11:34:52 2011
@@ -48,6 +48,7 @@
 
 #define NEED_EVENTS
 #includealpha.h
+#includemi.h
 
 /*-
  *---
@@ -65,10 +66,10 @@
  *---
  */
 void
-ProcessInputEvents ()
+ProcessInputEvents(void)
 {
-(void) mieqProcessInputEvents ();
-miPointerUpdate ();
+(void) mieqProcessInputEvents();
+miPointerUpdate();
 }
 
 /*
@@ -78,10 +79,7 @@
  *	enqueue them using the mi event queue
  */
 
-void alphaEnqueueEvents (
-#if NeedFunctionPrototypes
-void
-#endif
+void alphaEnqueueEvents(void)
 )
 {
 struct wscons_event *ptrEvents,
@@ -122,31 +120,31 @@
 	 * in pE and kE
 	 */
 	if ((numPtrEvents == 0)  PtrAgain) {
-	ptrEvents = alphaMouseGetEvents (ptrPriv-fd, nPE, PtrAgain);
+	ptrEvents = alphaMouseGetEvents(ptrPriv-fd, nPE, PtrAgain);
 	numPtrEvents = nPE;
 	}
 	if ((numKbdEvents == 0)  KbdAgain) {
-	kbdEvents = alphaKbdGetEvents (kbdPriv-fd, nKE, KbdAgain);
+	kbdEvents = alphaKbdGetEvents(kbdPriv-fd, nKE, KbdAgain);
 	numKbdEvents = nKE;
 	}
 	if ((numPtrEvents == 0)  (numKbdEvents == 0))
 	break;
 	if (numPtrEvents  numKbdEvents) {
-	if (timespeccmp (kbdEvents-time, ptrEvents-time, )) {
-		alphaKbdEnqueueEvent (pKeyboard, kbdEvents);
+	if (timespeccmp(kbdEvents-time, ptrEvents-time, )) {
+		alphaKbdEnqueueEvent(pKeyboard, kbdEvents);
 		numKbdEvents--;
 		kbdEvents++;
 	} else {
-		alphaMouseEnqueueEvent (pPointer, ptrEvents);
+		alphaMouseEnqueueEvent(pPointer, ptrEvents);
 		numPtrEvents--;
 		ptrEvents++;
 	}
 	} else if (numKbdEvents) {
-	alphaKbdEnqueueEvent (pKeyboard, kbdEvents);
+	alphaKbdEnqueueEvent(pKeyboard, kbdEvents);
 	numKbdEvents--;
 	kbdEvents++;
 	} else {
-	alphaMouseEnqueueEvent (pPointer, ptrEvents);
+	alphaMouseEnqueueEvent(pPointer, ptrEvents);
 	numPtrEvents--;
 	ptrEvents++;
 	}
@@ -156,39 +154,36 @@
 /*
  * DDX - specific abort routine.  Called by AbortServer().
  */
-void AbortDDX()
+void AbortDDX(void)
 {
 int		i;
 ScreenPtr	pScreen;
 DevicePtr	devPtr;
 
-(void) OsSignal (SIGIO, SIG_IGN);
+(void) OsSignal(SIGIO, SIG_IGN);
 #if 0 /* XXX */
 devPtr = LookupKeyboardDevice();
 if (devPtr)
-	(void) sunChangeKbdTranslation (((sunKbdPrivPtr)(devPtr-devicePrivate))-fd, FALSE);
-sunNonBlockConsoleOff ();
+	(void) sunChangeKbdTranslation(((sunKbdPrivPtr)(devPtr-devicePrivate))-fd, FALSE);
+sunNonBlockConsoleOff();
 #endif
 for (i = 0; i  screenInfo.numScreens; i++)
 {
 	pScreen = screenInfo.screens[i];
-	(*pScreen-SaveScreen) (pScreen, SCREEN_SAVER_OFF);
-	alphaDisableCursor (pScreen);
+	(*pScreen-SaveScreen)(pScreen, SCREEN_SAVER_OFF);
+	alphaDisableCursor(pScreen);
 }
 }
 
 /* Called by GiveUp(). */
 void
-ddxGiveUp()
+ddxGiveUp(void)
 {
-AbortDDX ();
+AbortDDX();
 }
 
 int
-ddxProcessArgument (argc, argv, i)
-int	argc;
-char *argv[];
-int	i;
+ddxProcessArgument(int argc, char *argv[], int i)
 {
 extern void UseMsg();
 
@@ -198,64 +193,64 @@
 }
 #if 0 /* XXX */
 #ifndef XKB
-if (strcmp (argv[i], -ar1) == 0) {	/* -ar1 int */
-	if (++i = argc) UseMsg ();
+if (strcmp(argv[i], -ar1) == 0) {	/* -ar1 int */
+	if (++i = argc) UseMsg();
 	sunAutoRepeatInitiate = 1000 * (long)atoi(argv[i]);
 	if (sunAutoRepeatInitiate  100)
 	sunAutoRepeatInitiate =  999000;
 	return 2;
 }
-if (strcmp (argv[i], -ar2) == 0) {	/* -ar2 int */
-	if (++i = argc) UseMsg ();
+if (strcmp(argv[i], -ar2) == 0) {	/* -ar2 int */
+	if (++i = argc) UseMsg();
 	sunAutoRepeatDelay = 1000 * (long)atoi(argv[i]);
 	if (sunAutoRepeatDelay  100)
 	sunAutoRepeatDelay =  999000;
 	return 2;
 }
 #endif
-if (strcmp (argv[i], -swapLkeys) == 0) {	/* -swapLkeys */
+if (strcmp(argv[i], -swapLkeys) == 0) {	/* -swapLkeys */
 	sunSwapLkeys = TRUE;
 	return 1;
 }
 #endif /* 0 XXX */
-if (strcmp (argv[i], -debug) == 0) {	/* -debug */
+if (strcmp(argv[i], -debug) == 0) {	/* -debug */
 	return 1;
 }
-if (strcmp (argv[i], -dev) == 0) {	/* -dev /dev/mumble */
-	if (++i =

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha

2011-05-22 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 02:36:33 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaIo.c

Log Message:
remove extra paren.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.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/alpha/alphaIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c:1.2	Sun May 22 11:34:52 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaIo.c	Sun May 22 22:36:33 2011
@@ -80,7 +80,6 @@
  */
 
 void alphaEnqueueEvents(void)
-)
 {
 struct wscons_event *ptrEvents,
 			*kbdEvents;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k

2011-05-22 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 02:40:13 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k: mac68k.h

Log Message:
fix mouse prototype


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h

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/mac68k/mac68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.5	Sun May 22 11:49:44 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h	Sun May 22 22:40:13 2011
@@ -94,7 +94,7 @@
 
 
 void mac68k_processkbd(DeviceIntPtr, adb_event_t *);
-void mac68k_processmouse(DeviceIntPtr, adb_event_t *);
+void mac68k_processmouse(DevicePtr, adb_event_t *);
 void mac68k_getmouse(void);
 void mac68k_getkbd(void);
 Bool mac68k_screeninit(ScreenPtr);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec

2011-05-22 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Mon May 23 02:40:56 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decCursor.c

Log Message:
remove bogus extern


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.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/dec/decCursor.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c:1.2	Sun May 22 11:51:07 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decCursor.c	Sun May 22 22:40:56 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: decCursor.c,v 1.2 2011/05/22 15:51:07 christos Exp $	*/
+/*	$NetBSD: decCursor.c,v 1.3 2011/05/23 02:40:56 christos Exp $	*/
 
 /* XConsortium: sunCursor.c,v 5.19 94/04/17 20:29:35 gildea Exp */
 /*
@@ -96,7 +96,6 @@
 PixmapPtr	src, dst;
 BoxRec	box;
 RegionRec	rgnDst;
-extern int mfbDoBitblt();
 
 if (!(src = GetScratchPixmapHeader(pScreen, bits-width, bits-height,
    /*bpp*/ 1, /*depth*/ 1,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc

2011-05-21 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sat May 21 14:30:33 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c

Log Message:
find cfb.h in the correct place.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.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/arm32vidc/vidc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.7 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.8
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.7	Thu May 19 21:22:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c	Sat May 21 10:30:33 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.c,v 1.7 2011/05/20 01:22:37 christos Exp $	*/
+/*	$NetBSD: vidc.c,v 1.8 2011/05/21 14:30:33 christos Exp $	*/
 
 /*
  * Copyright (c) 1999 Neil A. Carson  Mark Brinicombe
@@ -67,7 +67,7 @@
 #include resource.h
 #include wscons.h
 #include mi.h
-#include cfb/cfb.h
+#include cfb.h
 
 /* #define DEBUG */

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga

2011-05-21 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sat May 21 14:34:56 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga: tgamap.h

Log Message:
include file for tga_map_t


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h

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/alpha/tga/tgamap.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.2	Thu May 19 21:28:02 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h	Sat May 21 10:34:56 2011
@@ -18,6 +18,8 @@
 #define alphaTgaTEOps		alphaTga32TEOps
 #define alphaTgaNonTEOps	alphaTga32NonTEOps
 
+#include dev/pci/tgareg.h
+
 void alphaTgaDoBitbltSimple(unsigned int *, unsigned int *, unsigned int,
 unsigned int, tga_reg_t **, int, int, int, int, int, int, int, int, int);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k

2011-05-21 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sat May 21 14:52:52 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k: mac68k.h mac68kInit.c

Log Message:
add prototypes and missing return types.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kInit.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/mac68k/mac68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.3	Thu May 19 21:39:25 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h	Sat May 21 10:52:52 2011
@@ -95,3 +95,5 @@
 
 void mac68k_processkbd(DeviceIntPtr, adb_event_t *);
 void mac68k_processmouse(DeviceIntPtr, adb_event_t *);
+void mac68k_getmouse(void);
+void mac68k_getkbd(void);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kInit.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kInit.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kInit.c:1.4	Wed Mar 30 14:12:12 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68kInit.c	Sat May 21 10:52:52 2011
@@ -127,7 +127,8 @@
 	signal(SIGIO, handle_sigio);
 }
 
-choose_best_depths()
+void
+choose_best_depths(void)
 {
 #if 0
 	int scr, mode, best;
@@ -175,6 +176,7 @@
 
 
 
+void
 parse_args(
 	int argc,
 	char **argv)
@@ -185,6 +187,7 @@
 }
 
 
+void
 setup_screens(
 	ScreenInfo *xsi,
 	int argc,

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb

2011-05-21 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Sat May 21 14:59:35 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb: decCfb.c

Log Message:
add prototype and include


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.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/dec/cfb/decCfb.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c:1.2	Thu May 19 21:48:17 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c	Sat May 21 10:59:34 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: decCfb.c,v 1.2 2011/05/20 01:48:17 christos Exp $ */
+/* $NetBSD: decCfb.c,v 1.3 2011/05/21 14:59:34 christos Exp $ */
 
 /* XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp */
 /* XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.2 1995/02/12 02:36:22 dawes Exp */
@@ -88,6 +88,9 @@
 
 #include dec.h
 #include cfb.h
+#include cfb32.h
+
+static Bool decCfbScreenInit(ScreenPtr, pointer, int, int, int, int, int, int);
 
 Bool decCFBInit (
 int		  screen,	/* what screen am I going to be */
@@ -208,7 +211,7 @@
 return retval;
 }
 
-Bool
+static Bool
 decCfbScreenInit(
 ScreenPtr pScreen,
 pointer pbits,		/* pointer to screen bitmap */

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips

2011-05-19 Thread Izumi Tsutsui

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;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc

2011-05-19 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 20 01:22:37 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: vidc.c wscons.c
Added Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc: wscons.h

Log Message:
add missing includes and prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c
cvs rdiff -u -r0 -r1.1 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h

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/arm32vidc/vidc.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.6 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.7
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c:1.6	Mon Aug 14 18:12:59 2006
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/vidc.c	Thu May 19 21:22:37 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.c,v 1.6 2006/08/14 22:12:59 bjh21 Exp $	*/
+/*	$NetBSD: vidc.c,v 1.7 2011/05/20 01:22:37 christos Exp $	*/
 
 /*
  * Copyright (c) 1999 Neil A. Carson  Mark Brinicombe
@@ -65,6 +65,9 @@
 #include colormap.h
 #include colormapst.h
 #include resource.h
+#include wscons.h
+#include mi.h
+#include cfb/cfb.h
 
 /* #define DEBUG */
 

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c:1.4	Sun Mar 14 08:36:48 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.c	Thu May 19 21:22:37 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: wscons.c,v 1.4 2004/03/14 13:36:48 bjh21 Exp $	*/
+/*	$NetBSD: wscons.c,v 1.5 2011/05/20 01:22:37 christos Exp $	*/
 
 /*-
  * Copyright (c) 2001 Ben Harris
@@ -53,6 +53,7 @@
 #include colormap.h
 #include colormapst.h
 #include resource.h
+#include wscons.h
 
 /* NetBSD headers wscons specific */
 #include dev/wscons/wsconsio.h

Added files:

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h
diff -u /dev/null xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h:1.1
--- /dev/null	Thu May 19 21:22:37 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/arm32vidc/wscons.h	Thu May 19 21:22:37 2011
@@ -0,0 +1,5 @@
+void wsdisplay_write_palette(int, int, int, int);
+void wsmouse_io(void);
+int wsmouse_init(void);
+int wskbd_init(void);
+void wsdisplay_shutdown(void);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga

2011-05-19 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 20 01:28:03 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga: tgamap.h

Log Message:
add missing prototype


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h

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/alpha/tga/tgamap.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h:1.1	Sat Jan 17 23:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgamap.h	Thu May 19 21:28:02 2011
@@ -18,6 +18,9 @@
 #define alphaTgaTEOps		alphaTga32TEOps
 #define alphaTgaNonTEOps	alphaTga32NonTEOps
 
+void alphaTgaDoBitbltSimple(unsigned int *, unsigned int *, unsigned int,
+unsigned int, tga_reg_t **, int, int, int, int, int, int, int, int, int);
+
 #else
 #error Unsupported PSZ
 #endif

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k

2011-05-19 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 20 01:39:25 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k: mac68k.h

Log Message:
add prototypes.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h

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/mac68k/mac68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h:1.2	Fri Jan  9 22:13:08 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/mac68k/mac68k.h	Thu May 19 21:39:25 2011
@@ -91,3 +91,7 @@
 extern int mac_scrs;
 
 extern miPointerScreenFuncRec mac_mousefuncs;
+
+
+void mac68k_processkbd(DeviceIntPtr, adb_event_t *);
+void mac68k_processmouse(DeviceIntPtr, adb_event_t *);

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips

2011-05-19 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 20 01:45:36 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmips.h
newsmipsFB.c

Log Message:
Add include files and missing prototypes


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmips.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsFB.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/newsmips/newsmips.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmips.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmips.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmips.h:1.1	Sun Aug  1 14:46:49 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmips.h	Thu May 19 21:45:36 2011
@@ -151,6 +151,11 @@
 	FatalError a;			\
 }
 
+void newsmipsColormapInit(ScreenPtr);
+
+/*
+ * newsmipsColormap.c
+ */
 /*
  * newsmipsInit.c
  */
@@ -183,6 +188,7 @@
 pointer newsmipsMemoryMap(size_t, off_t, int);
 Bool newsmipsScreenInit(ScreenPtr);
 newsmipsScreenPtr newsmipsGetScreenPrivate(ScreenPtr);
+Bool newsmipsAllocateScreenPrivate(ScreenPtr);
 
 /*
  * newsmipsFB.c
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsFB.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsFB.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsFB.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsFB.c:1.1	Sun Aug  1 14:46:49 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsFB.c	Thu May 19 21:45:36 2011
@@ -31,6 +31,7 @@
 
 #define	FORCE_SEPARATE_PRIVATE
 #include cfb.h
+#include mi.h
 #include stdio.h
 
 extern BSFuncRec cfbBSFuncRec;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb

2011-05-19 Thread Christos Zoulas

Module Name:xsrc
Committed By:   christos
Date:   Fri May 20 01:48:17 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb: decCfb.c

Log Message:
ansify


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.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/dec/cfb/decCfb.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c:1.1	Sun Jan 18 00:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/cfb/decCfb.c	Thu May 19 21:48:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: decCfb.c,v 1.1 2004/01/18 05:21:41 rtr Exp $ */
+/* $NetBSD: decCfb.c,v 1.2 2011/05/20 01:48:17 christos Exp $ */
 
 /* XConsortium: sunCfb.c,v 1.15.1.2 95/01/12 18:54:42 kaleb Exp */
 /* XFree86: xc/programs/Xserver/hw/sun/sunCfb.c,v 3.2 1995/02/12 02:36:22 dawes Exp */
@@ -89,11 +89,11 @@
 #include dec.h
 #include cfb.h
 
-Bool decCFBInit (screen, pScreen, argc, argv)
-int		  screen;	/* what screen am I going to be */
-ScreenPtr	  pScreen;  	/* The Screen to initialize */
-int		  argc;		/* The number of the Server's arguments. */
-char	  **argv;   	/* The arguments themselves. Don't change! */
+Bool decCFBInit (
+int		  screen,	/* what screen am I going to be */
+ScreenPtr	  pScreen,  	/* The Screen to initialize */
+int		  argc,		/* The number of the Server's arguments. */
+char	  **argv)   	/* The arguments themselves. Don't change! */
 {
 	unsigned char *fb;
 	size_t sz;
@@ -144,13 +144,13 @@
 }
 
 Bool
-decCfbSetupScreen(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp)
-register ScreenPtr pScreen;
-pointer pbits;		/* pointer to screen bitmap */
-int xsize, ysize;		/* in pixels */
-int dpix, dpiy;		/* dots per inch */
-int width;			/* pixel width of frame buffer */
-int	bpp;			/* bits per pixel of root */
+decCfbSetupScreen(
+ScreenPtr pScreen,
+pointer pbits,		/* pointer to screen bitmap */
+int xsize, int ysize,	/* in pixels */
+int dpix, int dpiy,		/* dots per inch */
+int width,			/* pixel width of frame buffer */
+int	bpp)			/* bits per pixel of root */
 {
 switch (bpp) {
 case 32:
@@ -172,13 +172,13 @@
 }
 
 Bool
-decCfbFinishScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp)
-register ScreenPtr pScreen;
-pointer pbits;		/* pointer to screen bitmap */
-int xsize, ysize;		/* in pixels */
-int dpix, dpiy;		/* dots per inch */
-int width;			/* pixel width of frame buffer */
-int bpp;			/* bits per pixel of root */
+decCfbFinishScreenInit(
+ScreenPtr pScreen,
+pointer pbits,		/* pointer to screen bitmap */
+int xsize, int ysize,	/* in pixels */
+int dpix, int dpiy,		/* dots per inch */
+int width,			/* pixel width of frame buffer */
+int bpp)			/* bits per pixel of root */
 {
 Bool retval;
 
@@ -209,13 +209,13 @@
 }
 
 Bool
-decCfbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width, bpp)
-register ScreenPtr pScreen;
-pointer pbits;		/* pointer to screen bitmap */
-int xsize, ysize;		/* in pixels */
-int dpix, dpiy;		/* dots per inch */
-int width;			/* pixel width of frame buffer */
-int bpp;			/* bits per pixel of root */
+decCfbScreenInit(
+ScreenPtr pScreen,
+pointer pbits,		/* pointer to screen bitmap */
+int xsize, int ysize,	/* in pixels */
+int dpix, int dpiy,		/* dots per inch */
+int width,			/* pixel width of frame buffer */
+int bpp)			/* bits per pixel of root */
 {
 if (!decCfbSetupScreen(pScreen, pbits, xsize, ysize, dpix,
 	dpiy, width, bpp))

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips

2011-05-19 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri May 20 04:28:40 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmipsIo.c
newsmipsKbd.c newsmipsMouse.c

Log Message:
Include mi.h for more prototype decls.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsIo.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.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/newsmips/newsmipsIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsIo.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsIo.c:1.1	Sun Aug  1 18:46:49 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsIo.c	Fri May 20 04:28:40 2011
@@ -50,6 +50,7 @@
 
 #define	NEED_EVENTS
 #include newsmips.h
+#include mi.h
 
 void
 newsmipsCleanupFd(int fd)

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.2	Sun Oct 10 05:35:33 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c	Fri May 20 04:28:40 2011
@@ -43,6 +43,7 @@
 #define	NEED_EVENTS
 #include newsmips.h
 #include keysym.h
+#include mi.h
 #include stdio.h
 #include sys/time.h
 #include X11/extensions/XKB.h

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.c:1.3	Sun Oct 10 05:28:50 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.c	Fri May 20 04:28:40 2011
@@ -53,6 +53,7 @@
 
 #define	NEED_EVENTS
 #include newsmips.h
+#include mi.h
 #include stdio.h
 
 static Bool newsmipsCursorOffScreen();

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips

2011-05-19 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri May 20 04:29:27 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips: ews4800mipsFB.c
ews4800mipsIo.c ews4800mipsKbd.c ews4800mipsMouse.c

Log Message:
Use mi.h as other sources rather than mi/mi.h.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
cvs rdiff -u -r1.4 -r1.5 \
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/ews4800mipsFB.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c:1.2	Thu May 19 21:29:12 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsFB.c	Fri May 20 04:29:27 2011
@@ -31,8 +31,8 @@
 
 #define	FORCE_SEPARATE_PRIVATE
 #include cfb.h
+#include mi.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/ews4800mipsIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c:1.2	Thu May 19 21:29:12 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsIo.c	Fri May 20 04:29:27 2011
@@ -47,10 +47,10 @@
 /
 
 #include stdio.h
-#include mi/mi.h
 
 #define	NEED_EVENTS
 #include ews4800mips.h
+#include mi.h
 
 void
 ews4800mipsCleanupFd(int fd)

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.3	Thu May 19 21:29:12 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c	Fri May 20 04:29:27 2011
@@ -43,10 +43,10 @@
 #define	NEED_EVENTS
 #include ews4800mips.h
 #include keysym.h
+#include mi.h
 #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.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.4	Thu May 19 21:29:12 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c	Fri May 20 04:29:27 2011
@@ -53,8 +53,8 @@
 
 #define	NEED_EVENTS
 #include ews4800mips.h
+#include mi.h
 #include stdio.h
-#include mi/mi.h
 
 static Bool ews4800mipsCursorOffScreen();
 static void ews4800mipsCrossScreen();

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k

2011-05-19 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri May 20 04:30:01 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k: x68kGraph.c x68kInit.c
x68kIo.c x68kKbd.c x68kMouse.c

Log Message:
Use mi.h as other sources rather than mi/mi.h.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.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/x68k/x68kGraph.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c:1.3	Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c	Fri May 20 04:30:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kGraph.c,v 1.3 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kGraph.c,v 1.4 2011/05/20 04:30:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -118,7 +118,7 @@
 /* cfb */
 #define PSZ 16
 #include cfb.h
-#include mi/mi.h
+#include mi.h
 
 /* in x68kConfig.c */
 X68kScreenRec *x68kGetScreenRecByType(int type);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c:1.3	Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c	Fri May 20 04:30:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.3 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.4 2011/05/20 04:30:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -71,7 +71,7 @@
 /
 
 #include x68k.h
-#include mi/mi.h
+#include mi.h
 
 #ifdef XKB
 #include X11/extensions/XKB.h

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.5 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.6
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c:1.5	Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.c	Fri May 20 04:30:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.5 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.6 2011/05/20 04:30:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -75,7 +75,7 @@
 
 #include Xos.h
 #include x68k.h
-#include mi/mi.h
+#include mi.h
 
 static int nscreens;
 

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.2	Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c	Fri May 20 04:30:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kIo.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kIo.c,v 1.3 2011/05/20 04:30:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -73,8 +73,8 @@
 
 /
 
-#includex68k.h
-#include mi/mi.h
+#include x68k.h
+#include mi.h
 
 static void x68kEnqueueEvents();
 extern Firm_event* x68kMouseGetEvents( int fd, int *pNumEvents, Bool *pAgain );
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.2	Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c	Fri May 20 04:30:00 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.3 2011/05/20 04:30:00 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -81,8 +81,8 @@
  * implied warranty.
  */
 
-#includex68k.h
-#include mi/mi.h
+#include x68k.h
+#include mi.h

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k

2011-05-19 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri May 20 05:12:42 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k: x68k.h x68kConfig.c
x68kFb.c x68kGraph.c x68kInit.c x68kIo.c x68kKbd.c x68kMouse.c
x68kText.c

Log Message:
More WARNSfy.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.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/x68k/x68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.2	Wed May 18 21:51:04 2011
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h	Fri May 20 05:12:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
+/* $NetBSD: x68k.h,v 1.3 2011/05/20 05:12:42 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -94,17 +94,18 @@
  * frame buffer procedures
  */
 typedef struct _X68kFbProcRec {
-Bool (*open)( X68kScreenRec *fb );/* open procedure   */
-Bool (*init)( int screen, ScreenPtr pScreen,  /* initialize procedure */
-  int argc, char *argv[] );
-void (*close)( X68kScreenRec *fb );   /* close procedure  */
+Bool (*open)(X68kScreenRec *);		 /* open procedure   */
+Bool (*init)(int, ScreenPtr, int, char *[]); /* initialize procedure */
+void (*close)(X68kScreenRec *);		 /* close procedure  */
 } X68kFbProcRec;
 
 /* frame buffer types */
 #define X68K_FB_NULL0
 #define X68K_FB_TEXT1   /* text VRAM frame buffer */
 #define X68K_FB_GRAPHIC 2   /* graphic VRAM frame buffer */
-/* #define X68K_FB_CIRRUS  3   /* not yet */
+#if 0
+#define X68K_FB_CIRRUS  3   /* not yet */
+#endif
 #define X68K_FB_TYPES   2
 
 typedef struct _X68kMousePriv {
@@ -125,24 +126,51 @@
 #define MAXEVENTS 32
 #define TVTOMILLI(tv) (((tv).tv_usec/1000)+((tv).tv_sec*1000))
 
-int x68kScreenIndex;
-int x68kGeneration;
 #define GetScreenPrivate(s) ((X68kScreenRec *) \
 ((s)-devPrivates[x68kScreenIndex].ptr))
 #define SetupScreen(s) X68kScreenRec *pPriv = GetScreenPrivate(s)
 
+/* in x68kConfig.c */
+X68kScreenRec *x68kGetScreenRec(int);
+X68kScreenRec *x68kGetScreenRecByType(int);
+X68kFbProcRec *x68kGetFbProcRec(int index);
+void x68kRegisterPixmapFormats(ScreenInfo *);
+int x68kConfig(void);
+extern char *configFilename;
+
 /* x68kFB.c */
 Bool x68kFbCommonOpen(X68kScreenRec *, char *);
 void x68kFbCommonClose(X68kScreenRec *);
+Bool x68kSaveScreen(ScreenPtr, Bool);
+extern int x68kScreenIndex;
+extern int x68kGeneration;
+
+/* x68kGraph.c */
+Bool x68kGraphOpen(X68kScreenRec *);
+Bool x68kGraphInit(int, ScreenPtr, int, char *[]);
+void x68kGraphClose(X68kScreenRec *);
+
+/* in x68kIo.c */
+void x68kSigIOHandler(int);
+
+/* in x68kMouse.c */
+int x68kMouseProc(DeviceIntPtr, int);
+Firm_event *x68kMouseGetEvents(int, int *, Bool *);
+void x68kMouseEnqueueEvent(DeviceIntPtr, Firm_event *);
+extern miPointerScreenFuncRec x68kPointerScreenFuncs;
+
+/* in x68kKbd.c */
+int x68kKbdProc(DeviceIntPtr, int);
+Firm_event *x68kKbdGetEvents(int, int *, Bool *);
+void x68kKbdEnqueueEvent(DeviceIntPtr, Firm_event *);
+extern X68kKbdPriv x68kKbdPriv;
+
+/* in x68kKeyMap.c */
+extern KeySymsRec jisKeySyms, asciiKeySyms, *x68kKeySyms;
 
 /* x68kText.c */
-Bool x68kTextOpen(X68kScreenRec *fb);
-Bool x68kTextInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
-void x68kTextClose(X68kScreenRec *fb);
+Bool x68kTextOpen(X68kScreenRec *);
+Bool x68kTextInit(int, ScreenPtr, int, char *[]);
+void x68kTextClose(X68kScreenRec *);
 
-/* x68kGraph.c */
-Bool x68kGraphOpen(X68kScreenRec *fb);
-Bool x68kGraphInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
-void x68kGraphClose(X68kScreenRec *fb);
-
 /* EOF x68k.h */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kFb.c:1.2	Fri Dec  9 05:44:51 2005

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k

2011-05-18 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Wed May 18 21:51:04 UTC 2011

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k: x68k.h x68kConfig.c
x68kGraph.c x68kInit.c x68kIo.c x68kKbd.c x68kMouse.c x68kText.c

Log Message:
Dumb fixes to build with -std=gnu99.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kGraph.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kKbd.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kInit.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/x68k/x68k.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h:1.1.1.1	Wed Jan  7 12:51:46 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68k.h	Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68k.h,v 1.1.1.1 2004/01/07 12:51:46 minoura Exp $ */
+/* $NetBSD: x68k.h,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -131,4 +131,18 @@
 ((s)-devPrivates[x68kScreenIndex].ptr))
 #define SetupScreen(s) X68kScreenRec *pPriv = GetScreenPrivate(s)
 
+/* x68kFB.c */
+Bool x68kFbCommonOpen(X68kScreenRec *, char *);
+void x68kFbCommonClose(X68kScreenRec *);
+
+/* x68kText.c */
+Bool x68kTextOpen(X68kScreenRec *fb);
+Bool x68kTextInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
+void x68kTextClose(X68kScreenRec *fb);
+
+/* x68kGraph.c */
+Bool x68kGraphOpen(X68kScreenRec *fb);
+Bool x68kGraphInit(int screen, ScreenPtr pScreen, int arg, char *argv[]);
+void x68kGraphClose(X68kScreenRec *fb);
+
 /* EOF x68k.h */
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c:1.1.1.1	Wed Jan  7 12:51:45 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kIo.c	Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kIo.c,v 1.1.1.1 2004/01/07 12:51:45 minoura Exp $ */
+/* $NetBSD: x68kIo.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -74,6 +74,7 @@
 /
 
 #includex68k.h
+#include mi/mi.h
 
 static void x68kEnqueueEvents();
 extern Firm_event* x68kMouseGetEvents( int fd, int *pNumEvents, Bool *pAgain );
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c:1.1.1.1	Wed Jan  7 12:51:44 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kMouse.c	Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.1.1.1 2004/01/07 12:51:44 minoura Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -82,6 +82,7 @@
  */
 
 #includex68k.h
+#include mi/mi.h
 
 static Bool x68kCursorOffScreen();
 static void x68kCrossScreen();
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c:1.1.1.1	Wed Jan  7 12:51:45 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kText.c	Wed May 18 21:51:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kText.c,v 1.1.1.1 2004/01/07 12:51:45 minoura Exp $ */
+/* $NetBSD: x68kText.c,v 1.2 2011/05/18 21:51:04 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -30,6 +30,7 @@
  *---*/
 
 #include x68k.h
+#include mfb.h
 
 /* in x68kConfig.c */
 X68kScreenRec *x68kGetScreenRecByType(int type);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/x68k/x68kConfig.c

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast

2010-10-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Oct 10 05:21:44 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcastKbd.c

Log Message:
Fix indent.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.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/dreamcast/dreamcastKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.4 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.5
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.4	Fri Oct  8 18:53:11 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c	Sun Oct 10 05:21:43 2010
@@ -159,13 +159,13 @@
 	pPriv = (dreamcastKbdPrivPtr)pKeyboard-devicePrivate;
 	dreamcastCleanupFd(pPriv-fd);
 #ifdef WSKBDIO_SETVERSION
-	   {
-		int version = WSKBDIO_EVENT_VERSION;
-		if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
-		Error (dreamcastKbdProc ioctl WSKBDIO_SETVERSION);
-		return !Success;
-		}
-   }
+	{
+	int version = WSKBDIO_EVENT_VERSION;
+	if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
+		Error (dreamcastKbdProc ioctl WSKBDIO_SETVERSION);
+		return !Success;
+	}
+	}
 #endif
 	AddEnabledDevice(pPriv-fd);
 	pKeyboard-on = TRUE;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2010-10-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Oct 10 05:28:51 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcastMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips:
ews4800mipsMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc: hpcMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc: macppcMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmipsMouse.c

Log Message:
Fix indent.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/hpc/hpcMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcMouse.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.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/alpha/alphaMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.2	Fri Oct  8 17:49:25 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c	Sun Oct 10 05:28:49 2010
@@ -156,13 +156,13 @@
 #endif
 
 #ifdef WSMOUSEIO_SETVERSION
-	   {
-   int version = WSMOUSE_EVENT_VERSION;
-   if (ioctl(alphaPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
-   Error (alphaMouseProc ioctl WSMOUSEIO_SETVERSION);
-   return !Success;
-   }
-   }
+	{
+		int version = WSMOUSE_EVENT_VERSION;
+		if (ioctl(alphaPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
+		Error (alphaMouseProc ioctl WSMOUSEIO_SETVERSION);
+		return !Success;
+		}
+	}
 #endif
 
 #if 0

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.2	Fri Oct  8 17:49:25 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c	Sun Oct 10 05:28:49 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: decMouse.c,v 1.2 2010/10/08 17:49:25 tsutsui Exp $	*/
+/*	$NetBSD: decMouse.c,v 1.3 2010/10/10 05:28:49 tsutsui Exp $	*/
 
 /* XConsortium: sunMouse.c,v 5.21 94/04/17 20:29:47 kaleb Exp */
 /*-
@@ -134,13 +134,13 @@
 #endif
 
 #ifdef WSMOUSEIO_SETVERSION
-	   {
-   int version = WSMOUSE_EVENT_VERSION;
-   if (ioctl(decPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
-   Error (decMouseProc ioctl WSMOUSEIO_SETVERSION);
-   return !Success;
-   }
-   }
+	{
+		int version = WSMOUSE_EVENT_VERSION;
+		if (ioctl(decPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
+		Error (decMouseProc ioctl WSMOUSEIO_SETVERSION);
+		return !Success;
+		}
+	}
 #endif
 
 #if 0

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.2	Fri Oct  8 17:49:25 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c	Sun Oct 10 05:28:49 2010
@@ -132,13 +132,13 @@
 
 	case DEVICE_ON:
 #ifdef WSMOUSEIO_SETVERSION
-	   {
-   int version = WSMOUSE_EVENT_VERSION;
-   if (ioctl(dreamcastPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
-   Error (dreamcastMouseProc ioctl WSMOUSEIO_SETVERSION);
-   return !Success;
-   }
-   }
+	{
+		int version = WSMOUSE_EVENT_VERSION;
+		if (ioctl(dreamcastPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
+		Error (dreamcastMouseProc ioctl WSMOUSEIO_SETVERSION);
+		return !Success;
+		}
+	}
 #endif
 
 	dreamcastPtrPriv.bmask = 0;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.2	Fri Oct  8 17:49:25 2010
+++

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast

2010-10-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Oct 10 05:33:32 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcast.h
dreamcastColormap.c dreamcastFB.c dreamcastInit.c dreamcastIo.c
dreamcastKbd.c dreamcastKeymap.c dreamcastMouse.c dreamcastScreen.c

Log Message:
WARNSfy and misc cleanup. (done for bug tracking but no fatal one)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastColormap.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastFB.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastIo.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKeymap.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastInit.c \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastScreen.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.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/dreamcast/dreamcast.h
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h:1.1	Sat Feb  7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcast.h	Sun Oct 10 05:33:32 2010
@@ -31,12 +31,11 @@
 #include sys/filio.h
 #include sys/ioctl.h
 #include sys/resource.h
+#include sys/time.h
 
 #include dev/wscons/wsconsio.h
 #include dev/wscons/wsdisplay_usl_io.h
 
-extern int gettimeofday();
-
 /*
  * Server specific headers
  */
@@ -58,13 +57,6 @@
 #include servermd.h
 #include windowstr.h
 
-#undef __P
-#if NeedFunctionPrototypes
-#   define __P(p) p
-#else
-#   define __P(p) ()
-#endif
-
 /*
  * ddx specific headers
  */
@@ -129,14 +121,14 @@
 unsigned char*  fb;		/* Frame buffer itself */
 int		fd;		/* frame buffer for ioctl()s, */
 struct wsdisplay_fbinfo info; /* */
-void	(*EnterLeave)();/* screen switch */
+void	(*EnterLeave)(ScreenPtr, int);/* screen switch */
 char*   devname;	/* device name (e.g. /dev/ttyE0) */
 } dreamcastFbRec, *dreamcastFbPtr;
 
 typedef struct {
 ColormapPtr		installedMap;
 CloseScreenProcPtr	CloseScreen;
-void		(*UpdateColormap)();
+void		(*UpdateColormap)(ScreenPtr, int, int, u_char *, u_char *, u_char *);
 Bool		hasHardwareCursor;
 } dreamcastScreenRec, *dreamcastScreenPtr;
 
@@ -144,62 +136,68 @@
 extern Bool		noXkbExtension;
 #endif
 
-#define dreamcastError(str)	{ \
-	int mode; \
-	dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, mode); \
+#define dreamcastError(str)	do { \
+	int __m; \
+	dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, __m); \
 	Error(str); \
-	dreamcastSetDisplayMode(fileno(stderr), mode, NULL); \
-}
+	dreamcastSetDisplayMode(fileno(stderr), __m, NULL); \
+} while (/*CONSTCOND*/0)
 
-#define dreamcastErrorF(a)	{ \
-	int mode; \
-	dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, mode); \
+#define dreamcastErrorF(a)	do { \
+	int __m; \
+	dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, __m); \
 	ErrorF a; \
-	dreamcastSetDisplayMode(fileno(stderr), mode, NULL); \
-}
+	dreamcastSetDisplayMode(fileno(stderr), __m, NULL); \
+} while (/*CONSTCOND*/0)
 
-#define dreamcastFatalError(a)	{ \
-	int mode; \
-	dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, mode); \
+#define dreamcastFatalError(a)	do { \
+	int __m; \
+	dreamcastSetDisplayMode(fileno(stderr), WSDISPLAYIO_MODE_EMUL, __m); \
 	FatalError a; \
-}
+} while (/*CONSTCOND*/0)
+
+/*
+ * dreamcastColormap.c
+ */
+void dreamcastColormapInit(ScreenPtr pScreen);
 
 /*
  * dreamcastInit.c
  */
-dreamcastFbPtr dreamcastGetScreenFb __P((ScreenPtr	pScreen));
+dreamcastFbPtr dreamcastGetScreenFb(ScreenPtr pScreen);
 
 /*
  * dreamcastIo.c
  */
-void dreamcastCleanupFd __P((int));
-void dreamcastEnqueueEvents __P((void));
+void dreamcastCleanupFd(int);
+void dreamcastEnqueueEvents(void);
 
 /*
  * dreamcastKbd.c
  */
-int dreamcastKbdProc __P((DeviceIntPtr pKeyboard, int what));
-dreamcastEvent* dreamcastKbdGetEvents __P((dreamcastKbdPrivPtr, int*, Bool*));
-void dreamcastKbdEnqueueEvent __P((DeviceIntPtr dev, dreamcastEvent* fe));
+int dreamcastKbdProc(DeviceIntPtr pKeyboard, int what);
+dreamcastEvent* dreamcastKbdGetEvents(dreamcastKbdPrivPtr, int*, Bool*);
+void dreamcastKbdEnqueueEvent(DeviceIntPtr dev, dreamcastEvent* fe);
 
 /*
  * dreamcastMouse.c
  */
-int dreamcastMouseProc __P((DeviceIntPtr pMouse, int what));
-dreamcastEvent*

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2010-10-09 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Sun Oct 10 05:35:34 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips: ews4800mipsKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc: macppcKbd.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmipsKbd.c

Log Message:
Handle WSKBDIO_SETVERSION. Untested, but better than silently obsolete...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.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/alpha/alphaKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaKbd.c	Sun Oct 10 05:35:32 2010
@@ -521,6 +521,15 @@
 	if (alphaChangeKbdTranslation(pPriv-fd,TRUE) == -1)
 	FatalError(Can't set keyboard translation\n);
 #endif /* 0 XXX */
+#ifdef WSKBDIO_SETVERSION
+	{
+	int version = WSKBDIO_EVENT_VERSION;
+	if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
+		Error (alphaKbdProc ioctl WSKBDIO_SETVERSION);
+		return !Success;
+	}
+	}
+#endif
 	(void) AddEnabledDevice(pPriv-fd);
 	pKeyboard-on = TRUE;
 	break;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decKbd.c	Sun Oct 10 05:35:33 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: decKbd.c,v 1.1 2004/01/18 05:21:41 rtr Exp $	*/
+/*	$NetBSD: decKbd.c,v 1.2 2010/10/10 05:35:33 tsutsui Exp $	*/
 
 /* XConsortium: sunKbd.c,v 5.47 94/08/16 13:45:30 dpw Exp */
 /*-
@@ -519,6 +519,15 @@
 	 * Save the original keyclick volume.
 	 */
 	ioctl(pPriv-fd, WSKBDIO_GETKEYCLICK, pPriv-prevClick);
+#ifdef WSKBDIO_SETVERSION
+	{
+	int version = WSKBDIO_EVENT_VERSION;
+	if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
+		Error (decKbdProc ioctl WSKBDIO_SETVERSION);
+		return !Success;
+	}
+	}
+#endif
 
 	(void) AddEnabledDevice(pPriv-fd);
 	pKeyboard-on = TRUE;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c:1.1	Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsKbd.c	Sun Oct 10 05:35:33 2010
@@ -154,6 +154,15 @@
 	case DEVICE_ON:
 		pPriv = (ews4800mipsKbdPrivPtr)pKeyboard-devicePrivate;
 		ews4800mipsCleanupFd(pPriv-fd);
+#ifdef WSKBDIO_SETVERSION
+		{
+			int version = WSKBDIO_EVENT_VERSION;
+			if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
+Error (ews4800mipsKbdProc ioctl WSKBDIO_SETVERSION);
+return !Success;
+			}
+		}
+#endif
 		AddEnabledDevice(pPriv-fd);
 		pKeyboard-on = TRUE;
 		break;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c:1.1.1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c:1.1.1.1	Sat Dec 27 05:41:21 2003
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcKbd.c	Sun Oct 10 05:35:33 2010
@@ -482,6 +482,15 @@
 	if (macppcChangeKbdTranslation(pPriv-fd,TRUE) == -1)
 	FatalError(Can't set keyboard translation\n);
 #endif /* 0 XXX */
+#ifdef WSKBDIO_SETVERSION
+	{
+	int version = WSKBDIO_EVENT_VERSION;
+	if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
+		Error (macppcKbdProc ioctl WSKBDIO_SETVERSION);
+		return !Success;
+	}
+	}
+#endif
 	(void) AddEnabledDevice(pPriv-fd);
 	pKeyboard-on = TRUE;
 	break;

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsKbd.c:1.1	Sun Aug  1 18:46:49 2004

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2010-10-08 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct  8 17:49:26 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha: alphaMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec: decMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcastMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips:
ews4800mipsMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc: macppcMouse.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips: newsmipsMouse.c

Log Message:
Handle WSMOUSEIO_SETVERSION in legacy XFree based MD servers
for workaround until eventual Xorg migration.
Taken from Xhpc as noted in PR xsrc/41619, but tested only on dreamcast.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/macppc/macppcMouse.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/newsmips/newsmipsMouse.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/alpha/alphaMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/alphaMouse.c	Fri Oct  8 17:49:25 2010
@@ -153,6 +153,19 @@
 		Error (alphaMouseProc ioctl VUIDSFORMAT);
 		return !Success;
 	}
+#endif
+
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(alphaPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
+   Error (alphaMouseProc ioctl WSMOUSEIO_SETVERSION);
+   return !Success;
+   }
+   }
+#endif
+
+#if 0
 	alphaPtrPriv.bmask = 0;
 	AddEnabledDevice (alphaPtrPriv.fd);
 #endif

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c:1.1	Sun Jan 18 05:21:41 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/decMouse.c	Fri Oct  8 17:49:25 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: decMouse.c,v 1.1 2004/01/18 05:21:41 rtr Exp $	*/
+/*	$NetBSD: decMouse.c,v 1.2 2010/10/08 17:49:25 tsutsui Exp $	*/
 
 /* XConsortium: sunMouse.c,v 5.21 94/04/17 20:29:47 kaleb Exp */
 /*-
@@ -131,6 +131,19 @@
 		Error (decMouseProc ioctl VUIDSFORMAT);
 		return !Success;
 	}
+#endif
+
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(decPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
+   Error (decMouseProc ioctl WSMOUSEIO_SETVERSION);
+   return !Success;
+   }
+   }
+#endif
+
+#if 0
 	decPtrPriv.bmask = 0;
 #endif
 	AddEnabledDevice (decPtrPriv.fd);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c:1.1	Sat Feb  7 02:39:07 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastMouse.c	Fri Oct  8 17:49:25 2010
@@ -131,6 +131,16 @@
 	break;
 
 	case DEVICE_ON:
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if (ioctl(dreamcastPtrPriv.fd, WSMOUSEIO_SETVERSION, version) == -1) {
+   Error (dreamcastMouseProc ioctl WSMOUSEIO_SETVERSION);
+   return !Success;
+   }
+   }
+#endif
+
 	dreamcastPtrPriv.bmask = 0;
 
 	AddEnabledDevice (dreamcastPtrPriv.fd);

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c:1.1	Thu Dec 29 15:43:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/ews4800mips/ews4800mipsMouse.c	Fri Oct  8 17:49:25 2010
@@ -120,6 +120,16 @@
 		break;
 
 	case DEVICE_ON:
+#ifdef WSMOUSEIO_SETVERSION
+	   {
+   int version = WSMOUSE_EVENT_VERSION;
+   if

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast

2010-10-08 Thread Izumi Tsutsui

Module Name:xsrc
Committed By:   tsutsui
Date:   Fri Oct  8 18:53:12 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast: dreamcastKbd.c

Log Message:
Also handle WSKBDIO_SETVERSION. Now Xdreamcast works again.

XXX: not sure if other MD legacy servers need this


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.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/dreamcast/dreamcastKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.3 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c:1.3	Wed Jul  7 18:46:52 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dreamcast/dreamcastKbd.c	Fri Oct  8 18:53:11 2010
@@ -158,6 +158,15 @@
 case DEVICE_ON:
 	pPriv = (dreamcastKbdPrivPtr)pKeyboard-devicePrivate;
 	dreamcastCleanupFd(pPriv-fd);
+#ifdef WSKBDIO_SETVERSION
+	   {
+		int version = WSKBDIO_EVENT_VERSION;
+		if (ioctl(pPriv-fd, WSKBDIO_SETVERSION, version) == -1) {
+		Error (dreamcastKbdProc ioctl WSKBDIO_SETVERSION);
+		return !Success;
+		}
+   }
+#endif
 	AddEnabledDevice(pPriv-fd);
 	pKeyboard-on = TRUE;
 	break;

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet

2010-06-12 Thread Joerg Sonnenberger

Module Name:xsrc
Committed By:   joerg
Date:   Sat Jun 12 10:46:15 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet:
usbtablet.man

Log Message:
Kill empty .TP, try 2


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet/usbtablet.man

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/xfree86/input/usbtablet/usbtablet.man
diff -u xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet/usbtablet.man:1.3 xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet/usbtablet.man:1.4
--- xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet/usbtablet.man:1.3	Thu Jun 10 14:12:38 2010
+++ xsrc/xfree/xc/programs/Xserver/hw/xfree86/input/usbtablet/usbtablet.man	Sat Jun 12 10:46:15 2010
@@ -95,7 +95,6 @@
 .TP 4
 .B Option \fIDebugLevel\fP \fInumber \fP
 sets the level of debugging info reported.
-.TP 4
 .RE
 .SH SEE ALSO
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__).

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint

2010-06-06 Thread Joerg Sonnenberger

Module Name:xsrc
Committed By:   joerg
Date:   Sun Jun  6 20:10:03 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint: glint.man

Log Message:
Kill empty .TP.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man

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/xfree86/drivers/glint/glint.man
diff -u xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man:1.1.1.4 xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man:1.1.1.4	Fri Mar 18 13:11:40 2005
+++ xsrc/xfree/xc/programs/Xserver/hw/xfree86/drivers/glint/glint.man	Sun Jun  6 20:10:03 2010
@@ -102,7 +102,6 @@
 .TP
 .BI Option \*qFireGL3000\*q \*q boolean \*q
 If you have a card of the same name, turn this on.  Default: off.
-.TP
 .SH SEE ALSO
 XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
 .SH AUTHORS

CVS commit: xsrc/xfree/xc/programs/Xserver/os

2010-06-03 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Fri Jun  4 02:24:45 UTC 2010

Modified Files:
xsrc/xfree/xc/programs/Xserver/os: GetTimeInMillis.c

Log Message:
backout the xfree86 4.5 change to GetTimeInMillis() that returns
relative times instead of absolute times.  it causes problems in
openmotif at the very least, and is not what xorg has done.

from Cliff Wright in PR#39209.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.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/os/GetTimeInMillis.c
diff -u xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c:1.5 xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c:1.6
--- xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c:1.5	Fri Mar 18 14:55:16 2005
+++ xsrc/xfree/xc/programs/Xserver/os/GetTimeInMillis.c	Fri Jun  4 02:24:45 2010
@@ -5,19 +5,7 @@
 GetTimeInMillis(void)
 {
 struct timeval  tp;
-register CARD32 val;
-register INT32 diff;
-static CARD32 oldval = 0;
-static CARD32 time = 0;
 
 X_GETTIMEOFDAY(tp);
-val = (tp.tv_sec * 1000) + (tp.tv_usec / 1000);
-if (oldval) {
-	diff = val - oldval;
-	if (diff  0)
-	time += diff;
-}
-oldval = val;
-
-return time;
+return(tp.tv_sec * 1000) + (tp.tv_usec / 1000);
 }

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/netbsd

2009-10-27 Thread Roland Dowdeswell

Module Name:xsrc
Committed By:   elric
Date:   Tue Oct 27 23:17:13 UTC 2009

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb: sfbsimpleblt.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga: tgasimpleblt.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb: sfbsimpleblt.c
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga: tgasimpleblt.c

Log Message:
Assign my copyrights to TNF in exchange for a beer that christos@
bought me a while ago...


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.c
cvs rdiff -u -r1.1 -r1.2 \
xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/tga/tgasimpleblt.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/alpha/sfb/sfbsimpleblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/sfb/sfbsimpleblt.c	Tue Oct 27 23:17:12 2009
@@ -1,11 +1,15 @@
-/* $NetBSD: sfbsimpleblt.c,v 1.1 2004/01/18 04:13:22 rtr Exp $ */
+/* $NetBSD: sfbsimpleblt.c,v 1.2 2009/10/27 23:17:12 elric Exp $ */
 
 /*
  * sfb simple rops
  */
 
 /*-
- * Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell.  All rights reserved.
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Roland C. Dowdeswell.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -15,22 +19,18 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Roland C. Dowdeswell.
- * 4. The name of the authors may not be used to endorse or promote products
- *  derived from this software without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #define PSZ	8

Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.1 xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.2
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c:1.1	Sun Jan 18 04:13:22 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/alpha/tga/tgasimpleblt.c	Tue Oct 27 23:17:12 2009
@@ -1,11 +1,15 @@
-/* $NetBSD: tgasimpleblt.c,v 1.1 2004/01/18 04:13:22 rtr Exp $ */
+/* $NetBSD: tgasimpleblt.c,v 1.2 2009/10/27 23:17:12 elric Exp $ */
 
 /*
  * tga simple rops
  */
 
 /*-
- * Copyright (c) 1995, 1996, 1998 Roland C. Dowdeswell.  All rights reserved.
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All

CVS commit: xsrc/xfree/xc/programs/Xserver/hw/sun

2009-05-11 Thread matthew green

Module Name:xsrc
Committed By:   mrg
Date:   Tue May 12 04:44:18 UTC 2009

Modified Files:
xsrc/xfree/xc/programs/Xserver/hw/sun: sunKbd.c

Log Message:
be explicit when assigning members of Firm_event, that are now not
a pure timeval, but a 32 bit time_t one.

not worth attempting to version this code to handle 64 bit time_t
since we have it already working properly in Xorg tree and the
current code will work for another 29 years.

build-tested by me for several weeks, also posted by r...@.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.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/sun/sunKbd.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c:1.2	Fri Dec 31 12:33:40 2004
+++ xsrc/xfree/xc/programs/Xserver/hw/sun/sunKbd.c	Tue May 12 04:44:18 2009
@@ -833,7 +833,8 @@
 	autoRepeatEvent = *xE;
 	autoRepeatFirst = TRUE;
 	autoRepeatKeyDown++;
-	autoRepeatLastKeyDownTv = fe-time;
+	autoRepeatLastKeyDownTv.tv_sec = fe-time.tv_sec;
+	autoRepeatLastKeyDownTv.tv_usec = fe-time.tv_usec;
 }
 return FALSE;
 }

62 matches

Mail list logo