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/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/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/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/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/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/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))