CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2013-06-04 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Tue Jun  4 22:56:31 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_driver.c

Log Message:
reduce a diff to upstream.
fix LeoFreeScreen() to use the right screen arg.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.3 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.4
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.3	Tue Jun  4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c	Tue Jun  4 22:56:31 2013
@@ -1,3 +1,4 @@
+
 /*
  * Leo (ZX) framebuffer driver.
  *
@@ -658,7 +659,7 @@ LeoCloseScreen(CLOSE_SCREEN_ARGS_DECL)
 static void
 LeoFreeScreen(FREE_SCREEN_ARGS_DECL)
 {
-SCRN_INFO_PTR(pScrn);
+SCRN_INFO_PTR(arg);
 LeoFreeRec(pScrn);
 }

CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2011-05-24 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Tue May 24 19:31:19 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_accel.c

Log Message:
use new dix API; the old one is gone.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.3 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.4
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.3	Fri Nov 26 07:05:17 2010
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c	Tue May 24 15:31:18 2011
@@ -110,7 +110,8 @@
 	if (!AllocateGCPrivate(pScreen, LeoGCPrivateIndex, sizeof(LeoPrivGCRec)))
 		return FALSE;
 #else
-	if (!dixRequestPrivate(LeoGCPrivateIndex, sizeof(LeoPrivGCRec)))
+	if (!dixRegisterPrivateKey(LeoGCPrivateIndex, PRIVATE_GC,
+	sizeof(LeoPrivGCRec))
 		return FALSE;
 #endif

CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2011-05-24 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Wed May 25 03:13:49 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_accel.c

Log Message:
missing paren


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.4 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.5
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.4	Tue May 24 15:31:18 2011
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c	Tue May 24 23:13:49 2011
@@ -111,7 +111,7 @@
 		return FALSE;
 #else
 	if (!dixRegisterPrivateKey(LeoGCPrivateIndex, PRIVATE_GC,
-	sizeof(LeoPrivGCRec))
+	sizeof(LeoPrivGCRec)))
 		return FALSE;
 #endif

CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2011-05-24 Thread Christos Zoulas 
Module Name:xsrc
Committed By:   christos
Date:   Wed May 25 03:19:26 UTC 2011

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_fspans.c
leo_fspanssp.c

Log Message:
don't try to use functions that don't exist, abort() instead.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c:1.1.1.1 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c:1.2
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c:1.1.1.1	Fri Sep  4 16:12:48 2009
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspans.c	Tue May 24 23:19:26 2011
@@ -66,6 +66,8 @@
 		cy1 = clip-extents.y1;
 		cy2 = clip-extents.y2;
 	} else {
+#if 0
+		/* These functions are gone from xserver */
 		int nTmp = n * miFindMaxBand(clip);
 
 		pwidthFree = (int *)xalloc(nTmp * sizeof(int));
@@ -80,6 +82,9 @@
 pptFree, pwidthFree, fSorted);
 		pwidth = pwidthFree;
 		ppt = pptFree;
+#else
+		abort();
+#endif
 	}
 	
 	if (pGC-alu != GXcopy)
Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c:1.1.1.1 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c:1.2
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c:1.1.1.1	Fri Sep  4 16:12:48 2009
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_fspanssp.c	Tue May 24 23:19:26 2011
@@ -67,6 +67,8 @@
 		cy1 = clip-extents.y1;
 		cy2 = clip-extents.y2;
 	} else {
+#if 0
+		/* These functions are gone from the x server */
 		int nTmp = n * miFindMaxBand(clip);
 
 		pwidthFree = (int *)xalloc(nTmp * sizeof(int));
@@ -81,6 +83,9 @@
 pptFree, pwidthFree, fSorted);
 		pwidth = pwidthFree;
 		ppt = pptFree;
+#else
+		abort();
+#endif
 	}
 	
 	if (pGC-alu != GXcopy)

CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2010-11-26 Thread Takeshi Nakayama 
Module Name:xsrc
Committed By:   nakayama
Date:   Fri Nov 26 12:05:17 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_accel.c

Log Message:
Follow leo.h rev 1.2 change.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.2 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.3
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.2	Thu Sep 10 21:20:19 2009
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c	Fri Nov 26 12:05:17 2010
@@ -42,7 +42,11 @@
 
 #include	leo.h
 
+#if LEO_OLDPRIV
 int LeoGCPrivateIndex;
+#else
+DevPrivateKeyRec LeoGCPrivateIndex;
+#endif
 
 int	leoRopTable[16] = {
 	LEO_ATTR_RGBE_ENABLE|LEO_ROP_ZERO,		/* GXclear */

CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2010-11-24 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Wed Nov 24 23:29:22 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h

Log Message:
make this compile on sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h:1.1.1.1 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h:1.2
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h:1.1.1.1	Fri Sep  4 20:12:48 2009
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h	Wed Nov 24 23:29:22 2010
@@ -86,12 +86,13 @@
 
 #define GET_LEO_FROM_SCRN(p)((LeoPtr)((p)-driverPrivate))
 
-extern int LeoGCPrivateIndex;
 
 #define LEO_OLDPRIV (GET_ABI_MAJOR(ABI_VIDEODRV_VERSION)  4)
 #if LEO_OLDPRIV
+extern int LeoGCPrivateIndex;
 #define LeoGetGCPrivate(g) (g)-devPrivates[LeoGCPrivateIndex].ptr
 #else
+extern DevPrivateKeyRec LeoGCPrivateIndex;
 #define LeoGetGCPrivate(g) dixLookupPrivate((g)-devPrivates, LeoGCPrivateIndex)
 #endif

CVS commit: xsrc/external/mit/xf86-video-sunleo/dist/src

2009-09-10 Thread Michael Lorenz 
Module Name:xsrc
Committed By:   macallan
Date:   Thu Sep 10 21:20:19 UTC 2009

Modified Files:
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_accel.c leo_driver.c

Log Message:
first steps to make this driver actually work:
- accept 24bit colour, not just 32 ( this changed ages ago - didn't anyone
  test this driver on actual hardware? )
- fix colour weights
- use the right WID so we actually see what we draw
TODO:
- figure out why output is greyscale from the red channel only
- add actual acceleration


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.1.1.1 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.2
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.1.1.1	Fri Sep  4 20:12:48 2009
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c	Thu Sep 10 21:20:19 2009
@@ -118,10 +118,10 @@
 	/* We will now clear the screen: we'll draw a rectangle covering all the
 	 * viewscreen, using a 'blackness' ROP.
 	 */
-	ld0-wid = 1;
+	ld0-wid = 0x10;
 	ld0-widclip = 0;
 	ld0-wmask = 0x;
-	ld0-planemask = 0xff;
+	ld0-planemask = 0x00ff;
 	ld0-rop = LEO_ATTR_WE_ENABLE|LEO_ATTR_RGBE_ENABLE|LEO_ATTR_FORCE_WID;
 	ld0-fg = 0;
 	ld0-vclipmin = 0;
@@ -138,7 +138,7 @@
 	while (lc0-csr  LEO_CSR_BLT_BUSY);
 	
 	lc0-addrspace = LEO_ADDRSPC_OBGR;
-	ld0-rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
+	ld0-rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW|LEO_ATTR_FORCE_WID;
 
 	/* Success */
 	return TRUE;
Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.1.1.1 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.2
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c:1.1.1.1	Fri Sep  4 20:12:48 2009
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_driver.c	Thu Sep 10 21:20:19 2009
@@ -1,4 +1,3 @@
-
 /*
  * Leo (ZX) framebuffer driver.
  *
@@ -339,6 +338,7 @@
 	/* Check that the returned depth is one we support */
 	switch (pScrn-depth) {
 	case 32:
+	case 24:
 	/* OK */
 	break;
 	default:
@@ -362,7 +362,7 @@
  * xf86SetWeight references it.
  */
 if (pScrn-depth  8) {
-	rgb weight = {10, 11, 11};
+	rgb weight = {0, 0, 0};
 	rgb mask = {0xff, 0xff00, 0xff};
 
 	if (!xf86SetWeight(pScrn, weight, mask)) {