xserver-xorg-video-sunleo: Changes to 'upstream-experimental'
.cvsignore | 19 -------------------
.gitignore | 20 ++++++++++++++++++++
configure.ac | 2 +-
man/Makefile.am | 1 -
man/sunleo.man | 6 +++---
src/leo.h | 21 +++++++--------------
src/leo_accel.c | 27 ++++++++++++---------------
src/leo_checks.c | 4 +++-
src/leo_driver.c | 8 +++-----
src/leo_frect.c | 8 ++++++--
src/leo_frectsp.c | 4 +++-
src/leo_fspans.c | 16 +++++++++-------
src/leo_fspanssp.c | 16 +++++++++-------
src/leo_glyph.c | 8 ++++++--
14 files changed, 82 insertions(+), 78 deletions(-)
New commits:
commit 5a3a1ddbc32d24f67d4f7bf7742115bc97baa087
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Sep 3 17:56:28 2008 -0400
sunleo 1.2.0
diff --git a/configure.ac b/configure.ac
index 3d72c9d..2bc09fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sunleo],
- 1.1.0,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sunleo)
commit 1802e3bb1478de88592594d67121489b7a8db193
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Tue Aug 26 22:43:04 2008 -0400
Change GC private key back to an integer variable.
Prepares for a devPrivates system that will store an index.
diff --git a/src/leo.h b/src/leo.h
index eec21ba..46955a6 100644
--- a/src/leo.h
+++ b/src/leo.h
@@ -86,13 +86,13 @@ typedef struct {
#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 DevPrivateKey LeoGCPrivateKey;
-#define LeoGetGCPrivate(g) dixLookupPrivate(&(g)->devPrivates, LeoGCPrivateKey)
+#define LeoGetGCPrivate(g) dixLookupPrivate(&(g)->devPrivates, &LeoGCPrivateIndex)
#endif
extern int leoRopTable[];
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 4408b24..9bfbc4a 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.c
@@ -42,11 +42,7 @@
#include "leo.h"
-#if LEO_OLDPRIV
int LeoGCPrivateIndex;
-#else
-DevPrivateKey LeoGCPrivateKey = &LeoGCPrivateKey;
-#endif
int leoRopTable[16] = {
LEO_ATTR_RGBE_ENABLE|LEO_ROP_ZERO, /* GXclear */
@@ -110,7 +106,7 @@ Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo)
if (!AllocateGCPrivate(pScreen, LeoGCPrivateIndex, sizeof(LeoPrivGCRec)))
return FALSE;
#else
- if (!dixRequestPrivate(LeoGCPrivateKey, sizeof(LeoPrivGCRec)))
+ if (!dixRequestPrivate(&LeoGCPrivateIndex, sizeof(LeoPrivGCRec)))
return FALSE;
#endif
commit 832e0cd293f1f1572d70774d4b4254dcc7a3dcd4
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 19 10:26:04 2008 -0400
Uninclude xf86Version.h
diff --git a/src/leo_driver.c b/src/leo_driver.c
index 9213927..664e645 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -21,7 +21,6 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunleo/leo_driver.c,v 1.8 2001/10/01 13:44:10 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,7 +30,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86Version.h"
#include "mipointer.h"
#include "mibstore.h"
#include "micmap.h"
commit 2a9e73bc6cf37aea24fa590596aba47063613bd0
Author: Dennis Gilmore <dennis@ausil.us>
Date: Tue May 27 19:54:15 2008 +0300
Remove usage of ALLOCATE_LOCAL
Replace with xalloc, as {,DE}ALLOCATE_LOCAL were removed in 1.5.
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index ccc9132..23dcaac 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.c
@@ -68,11 +68,11 @@ LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
} else {
int nTmp = n * miFindMaxBand(clip);
- pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
- pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+ pwidthFree = (int *)xalloc(nTmp * sizeof(int));
+ pptFree = (DDXPointRec *)xalloc(nTmp * sizeof(DDXPointRec));
if (!pptFree || !pwidthFree) {
- if (pptFree) DEALLOCATE_LOCAL(pptFree);
- if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+ if (pptFree) xfree(pptFree);
+ if (pwidthFree) xfree(pwidthFree);
return;
}
n = miClipSpans(clip,
@@ -123,8 +123,8 @@ LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
}
if (numRects != 1) {
- DEALLOCATE_LOCAL(pptFree);
- DEALLOCATE_LOCAL(pwidthFree);
+ xfree(pptFree);
+ xfree(pwidthFree);
}
if (pGC->alu != GXcopy)
ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 4124337..779edd9 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.c
@@ -69,11 +69,11 @@ LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
} else {
int nTmp = n * miFindMaxBand(clip);
- pwidthFree = (int *)ALLOCATE_LOCAL(nTmp * sizeof(int));
- pptFree = (DDXPointRec *)ALLOCATE_LOCAL(nTmp * sizeof(DDXPointRec));
+ pwidthFree = (int *)xalloc(nTmp * sizeof(int));
+ pptFree = (DDXPointRec *)xalloc(nTmp * sizeof(DDXPointRec));
if (!pptFree || !pwidthFree) {
- if (pptFree) DEALLOCATE_LOCAL(pptFree);
- if (pwidthFree) DEALLOCATE_LOCAL(pwidthFree);
+ if (pptFree) xfree(pptFree);
+ if (pwidthFree) xfree(pwidthFree);
return;
}
n = miClipSpans(clip,
@@ -161,8 +161,8 @@ LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
}
if (numRects != 1) {
- DEALLOCATE_LOCAL(pptFree);
- DEALLOCATE_LOCAL(pwidthFree);
+ xfree(pptFree);
+ xfree(pwidthFree);
}
if (pGC->alu != GXcopy)
ld0->rop = LEO_ATTR_RGBE_ENABLE|LEO_ROP_NEW;
commit 53022f9dfd9bd01d5fc1d1ce27165f89fc96cc98
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sat Mar 8 23:58:26 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit 84f95546ccbf9cc3ef6b06288dd415eef534c40c
Author: Eamon Walsh <ewalsh@tycho.nsa.gov>
Date: Wed Jan 23 21:21:55 2008 -0500
Support old and new devPrivates API in this driver.
diff --git a/src/leo.h b/src/leo.h
index 94dc103..eec21ba 100644
--- a/src/leo.h
+++ b/src/leo.h
@@ -84,12 +84,16 @@ typedef struct {
OptionInfoPtr Options;
} LeoRec, *LeoPtr;
-extern DevPrivateKey LeoGCPrivateKey;
-
#define GET_LEO_FROM_SCRN(p) ((LeoPtr)((p)->driverPrivate))
-#define LeoGetGCPrivate(g) \
- ((LeoPrivGCPtr) dixLookupPrivate(&(g)->devPrivates, LeoGCPrivateKey))
+#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 DevPrivateKey LeoGCPrivateKey;
+#define LeoGetGCPrivate(g) dixLookupPrivate(&(g)->devPrivates, LeoGCPrivateKey)
+#endif
extern int leoRopTable[];
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 20f58c0..4408b24 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.c
@@ -42,8 +42,11 @@
#include "leo.h"
-DevPrivateKey LeoGCPrivateKey;
-int LeoGeneration;
+#if LEO_OLDPRIV
+int LeoGCPrivateIndex;
+#else
+DevPrivateKey LeoGCPrivateKey = &LeoGCPrivateKey;
+#endif
int leoRopTable[16] = {
LEO_ATTR_RGBE_ENABLE|LEO_ROP_ZERO, /* GXclear */
@@ -98,12 +101,18 @@ Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo)
LeoCommand0 *lc0;
LeoDraw *ld0;
+#if LEO_OLDPRIV
+ static int LeoGeneration;
if (serverGeneration != LeoGeneration) {
- if (!dixRequestPrivate(LeoGCPrivateKey,
- sizeof(LeoPrivGCRec)))
- return FALSE;
+ LeoGCPrivateIndex = AllocateGCPrivateIndex();
LeoGeneration = serverGeneration;
}
+ if (!AllocateGCPrivate(pScreen, LeoGCPrivateIndex, sizeof(LeoPrivGCRec)))
+ return FALSE;
+#else
+ if (!dixRequestPrivate(LeoGCPrivateKey, sizeof(LeoPrivGCRec)))
+ return FALSE;
+#endif
pLeo->lc0 = lc0 = (LeoCommand0 *) ((char *)pLeo->fb + LEO_LC0_VOFF);
pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF);
commit 970867a0ec6c0f28165ae0246b52f34062013107
Author: David S. Miller <davem@davemloft.net>
Date: Fri Dec 28 23:55:49 2007 +0200
Remove screen/window privates to fix build after devPrivates rework
The screen private isn't needed, neither is the window
private, so remove those.
Convert LEO's GC private over to the new devprivate APIs.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/src/leo.h b/src/leo.h
index b3454a0..94dc103 100644
--- a/src/leo.h
+++ b/src/leo.h
@@ -84,23 +84,12 @@ typedef struct {
OptionInfoPtr Options;
} LeoRec, *LeoPtr;
-extern int LeoScreenPrivateIndex;
-extern int LeoGCPrivateIndex;
-extern int LeoWindowPrivateIndex;
+extern DevPrivateKey LeoGCPrivateKey;
#define GET_LEO_FROM_SCRN(p) ((LeoPtr)((p)->driverPrivate))
-#define LeoGetScreenPrivate(s) \
-((LeoPtr) (s)->devPrivates[LeoScreenPrivateIndex].ptr)
-
#define LeoGetGCPrivate(g) \
-((LeoPrivGCPtr) (g)->devPrivates [LeoGCPrivateIndex].ptr)
-
-#define LeoGetWindowPrivate(w) \
-((LeoStipplePtr) (w)->devPrivates[LeoWindowPrivateIndex].ptr)
-
-#define LeoSetWindowPrivate(w,p) \
-((w)->devPrivates[LeoWindowPrivateIndex].ptr = (pointer) p)
+ ((LeoPrivGCPtr) dixLookupPrivate(&(g)->devPrivates, LeoGCPrivateKey))
extern int leoRopTable[];
diff --git a/src/leo_accel.c b/src/leo_accel.c
index 149c6c8..20f58c0 100644
--- a/src/leo_accel.c
+++ b/src/leo_accel.c
@@ -42,9 +42,7 @@
#include "leo.h"
-int LeoScreenPrivateIndex;
-int LeoGCPrivateIndex;
-int LeoWindowPrivateIndex;
+DevPrivateKey LeoGCPrivateKey;
int LeoGeneration;
int leoRopTable[16] = {
@@ -68,7 +66,8 @@ int leoRopTable[16] = {
void LeoVtChange (ScreenPtr pScreen, int enter)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pScreen);
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN (pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
@@ -100,19 +99,12 @@ Bool LeoAccelInit (ScreenPtr pScreen, LeoPtr pLeo)
LeoDraw *ld0;
if (serverGeneration != LeoGeneration) {
- LeoScreenPrivateIndex = AllocateScreenPrivateIndex ();
- if (LeoScreenPrivateIndex == -1) return FALSE;
- LeoGCPrivateIndex = AllocateGCPrivateIndex ();
- LeoWindowPrivateIndex = AllocateWindowPrivateIndex ();
+ if (!dixRequestPrivate(LeoGCPrivateKey,
+ sizeof(LeoPrivGCRec)))
+ return FALSE;
LeoGeneration = serverGeneration;
}
- /* Allocate private structures holding pointer to both videoRAM and control registers.
- We do not have to map these by ourselves, because the XServer did it for us; we
- only copy the pointers to out structures. */
- if (!AllocateGCPrivate(pScreen, LeoGCPrivateIndex, sizeof(LeoPrivGCRec))) return FALSE;
- if (!AllocateWindowPrivate(pScreen, LeoWindowPrivateIndex, 0)) return FALSE;
- pScreen->devPrivates[LeoScreenPrivateIndex].ptr = pLeo;
pLeo->lc0 = lc0 = (LeoCommand0 *) ((char *)pLeo->fb + LEO_LC0_VOFF);
pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF);
diff --git a/src/leo_checks.c b/src/leo_checks.c
index 27e80a8..e2565b2 100644
--- a/src/leo_checks.c
+++ b/src/leo_checks.c
@@ -129,7 +129,9 @@ int
LeoCheckFill (GCPtr pGC, DrawablePtr pDrawable)
{
LeoPrivGCPtr gcPriv = LeoGetGCPrivate (pGC);
- LeoPtr pLeo = LeoGetScreenPrivate(pDrawable->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoStipplePtr stipple;
unsigned int alu;
int xrot, yrot;
diff --git a/src/leo_frect.c b/src/leo_frect.c
index e3a65fb..dc5a17a 100644
--- a/src/leo_frect.c
+++ b/src/leo_frect.c
@@ -39,7 +39,9 @@
void
LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
xRectangle *prect;
@@ -166,7 +168,9 @@ LeoPolyFillRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *pre
void
LeoPolyFillRect1Rect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
xRectangle *prect;
diff --git a/src/leo_frectsp.c b/src/leo_frectsp.c
index c860a26..f0e55c4 100644
--- a/src/leo_frectsp.c
+++ b/src/leo_frectsp.c
@@ -39,7 +39,9 @@
void
LeoPolyFillStippledRect(DrawablePtr pDrawable, GCPtr pGC, int nrectFill, xRectangle *prectInit)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pDrawable->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoPrivGCPtr gcPriv = LeoGetGCPrivate (pGC);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
diff --git a/src/leo_fspans.c b/src/leo_fspans.c
index ad375d9..ccc9132 100644
--- a/src/leo_fspans.c
+++ b/src/leo_fspans.c
@@ -42,7 +42,9 @@ LeoFillSpansSolid (DrawablePtr pDrawable, GCPtr pGC,
int n, DDXPointPtr ppt,
int *pwidth, int fSorted)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
int numRects, *pwidthFree;
diff --git a/src/leo_fspanssp.c b/src/leo_fspanssp.c
index 26d27e4..4124337 100644
--- a/src/leo_fspanssp.c
+++ b/src/leo_fspanssp.c
@@ -43,7 +43,9 @@ LeoFillSpansStippled (DrawablePtr pDrawable, GCPtr pGC,
int *pwidth, int fSorted)
{
LeoPrivGCPtr gcPriv = LeoGetGCPrivate (pGC);
- LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
int numRects, *pwidthFree;
diff --git a/src/leo_glyph.c b/src/leo_glyph.c
index 9399325..21a42d0 100644
--- a/src/leo_glyph.c
+++ b/src/leo_glyph.c
@@ -42,7 +42,9 @@ void
LeoPolyGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
RegionPtr clip;
@@ -167,7 +169,9 @@ void
LeoTEGlyphBlt (DrawablePtr pDrawable, GCPtr pGC, int x, int y,
unsigned int nglyph, CharInfoPtr *ppci, pointer pGlyphBase)
{
- LeoPtr pLeo = LeoGetScreenPrivate (pGC->pScreen);
+ ScreenPtr pScreen = pDrawable->pScreen;
+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ LeoPtr pLeo = GET_LEO_FROM_SCRN(pScrn);
LeoCommand0 *lc0 = pLeo->lc0;
LeoDraw *ld0 = pLeo->ld0;
RegionPtr clip;
commit 5d7e721d55c7cf7aa44017c2616ce88b2efb524e
Author: Brice Goglin <bgoglin@debian.org>
Date: Tue Aug 7 13:53:13 2007 +0200
Define LEO_*_VERSION using PACKAGE_VERSION*
diff --git a/src/leo_driver.c b/src/leo_driver.c
index 47f624a..9213927 100644
--- a/src/leo_driver.c
+++ b/src/leo_driver.c
@@ -66,9 +66,9 @@ void LeoSync(ScrnInfoPtr pScrn);
#define LEO_VERSION 4000
#define LEO_NAME "SUNLEO"
#define LEO_DRIVER_NAME "sunleo"
-#define LEO_MAJOR_VERSION 1
-#define LEO_MINOR_VERSION 1
-#define LEO_PATCHLEVEL 0
+#define LEO_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define LEO_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define LEO_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the driver
commit 52e5fb1df625f38a33eb0732386f246b6d386077
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 11:05:47 2007 -0800
renamed: .cvsignore -> .gitignore
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2df4a8d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
+*~
commit fe5af18d4bc8fc095e3b12d1030b6e5765c7e3a4
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Mar 1 11:05:03 2007 -0800
Replace references to XFree86/XF86Config in man page
diff --git a/man/sunleo.man b/man/sunleo.man
index 2871ec5..44c7961 100644
--- a/man/sunleo.man
+++ b/man/sunleo.man
@@ -22,7 +22,7 @@ sunleo \- Leo video driver
.fi
.SH DESCRIPTION
.B leo
-is an XFree86 driver for Sun Leo (ZX) video cards.
+is an __xservername__ driver for Sun Leo (ZX) video cards.
.PP
Also known as the ZX or T(urbo)ZX, Leo is a 24 bit accelerated 3D
graphics card. Both cards are double-width, but the TZX also requires
@@ -55,11 +55,11 @@ SPARCcenter 2000
.SH CONFIGURATION DETAILS
You must set "DefaultDepth" to "32" in the Screen Section.
.nf
-Please refer to XF86Config(__filemansuffix__) for general configuration
+Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Driver authors include: Jakub Jelinek <jakub@redhat.com>
.br
Reply to: