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, int);
Index: xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.c
diff -u xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.c:1.2 xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.c:1.3
--- xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/sfb/sfbsimpleblt.c:1.2 Tue Oct 27 23:17:13 2009
+++ xsrc/xfree/xc/programs/Xserver/hw/netbsd/dec/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:13 elric Exp $ */
+/* $NetBSD: sfbsimpleblt.c,v 1.3 2011/05/24 23:10:03 jakllsch Exp $ */
/*
* sfb simple rops
@@ -53,6 +53,7 @@
#include "dec.h"
#include "sfb.h"
+#include "sfbmap.h"
void
decSfbDoBitbltSimple(
