xserver-xorg-video-cyrix: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
ChangeLog | 3 +++
autogen.sh | 12 ++++++++++++
debian/changelog | 3 ++-
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
man/cyrix.man | 10 +++++-----
src/.cvsignore | 6 ++++++
src/cyrix_driver.c | 2 +-
9 files changed, 51 insertions(+), 8 deletions(-)
New commits:
commit aed96cea1ed747e254ebb36c7b2cadfaca925f21
Author: David Nusinow <dnusinow@debian.org>
Date: Sun Feb 11 21:46:37 2007 -0500
Note merge from upstream in changelog
diff --git a/debian/changelog b/debian/changelog
index 8bcc5e1..9f32b6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-cyrix (1:1.1.0-6) UNRELEASED; urgency=low
* Bump xserver ABI metadata to 1.1 for use with server 1.2
+ * Minor changes from upstream
- -- David Nusinow <dnusinow@debian.org> Sat, 10 Feb 2007 21:23:37 -0500
+ -- David Nusinow <dnusinow@debian.org> Sun, 11 Feb 2007 21:46:27 -0500
xserver-xorg-video-cyrix (1:1.1.0-5) UNRELEASED; urgency=low
commit 933fac699a3ba9257c87fb209b6dd21c29d15a4a
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 18:58:45 2006 +0000
VERSION -> CYRIX_VERSION
diff --git a/ChangeLog b/ChangeLog
index 69a3ced..344113a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
* src/cyrix_shadow.c:
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ * src/cyrix_driver.c:
+ VERSION -> CYRIX_VERSION
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index d98108c..e44a5d1 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -410,7 +410,7 @@ #endif
if ((pScrn = xf86ConfigPciEntity(pScrn, 0, usedChips[i],
CYRIXPCIchipsets,NULL, NULL,
NULL, NULL, NULL))) {
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = CYRIX_VERSION;
pScrn->driverName = CYRIX_DRIVER_NAME;
pScrn->name = CYRIX_NAME;
pScrn->Probe = CYRIXProbe;
commit a878ca340afd5c94519ced8db60bac873e69d313
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 18:47:44 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index bcb1d76..69a3ced 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/cyrix.h:
+ * src/cyrix_accel.c:
+ * src/cyrix_bank.c:
+ * src/cyrix_driver.c:
+ * src/cyrix_helper.c:
+ * src/cyrix_shadow.c:
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index fd37994..c163f0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
@@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xex
XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/cyrix.h b/src/cyrix.h
index c75c222..162b009 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
@@ -45,6 +45,7 @@ #define _CYRIX_H_
#include "xaa.h"
#include "xf86Cursor.h"
#include "vgaHW.h"
+#include <string.h>
/* this code is partly based on the MediaGX sources from the GGI project
based on CYRIX example code (gxvideo.c) and included with CYRIX and
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index cda6246..b76b924 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -34,11 +34,9 @@ #endif
#include "vgaHW.h"
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xaalocal.h"
#include "cyrix.h"
#include "miline.h"
-#include "xf86_libc.h"
#include "compiler.h"
/* size of color expand source area (embedded in frame buffer) */
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index 38c1eca..580c23e 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -37,7 +37,6 @@ #define PSZ 8
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
/* Everything using inb/outb, etc needs "compiler.h" */
#include "compiler.h"
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 9dfa4e4..d98108c 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -61,7 +61,6 @@ #include "mibank.h"
#include "micmap.h"
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Version.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
@@ -120,11 +119,11 @@ void CYRIXSetRead(int bank);
void CYRIXSetWrite(int bank);
void CYRIXSetReadWrite(int bank);
-#define VERSION 4000
+#define CYRIX_VERSION 4000
#define CYRIX_NAME "CYRIX"
#define CYRIX_DRIVER_NAME "cyrix"
#define CYRIX_MAJOR_VERSION 1
-#define CYRIX_MINOR_VERSION 0
+#define CYRIX_MINOR_VERSION 1
#define CYRIX_PATCHLEVEL 0
#define VGA_REGION 2
@@ -141,7 +140,7 @@ enum GenericTypes {
*/
_X_EXPORT DriverRec CYRIX = {
- VERSION,
+ CYRIX_VERSION,
CYRIX_DRIVER_NAME,
CYRIXIdentify,
CYRIXProbe,
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index bbb8641..d62af0e 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -47,7 +47,6 @@ #endif
#include "cyrix.h"
#include "vgaHW.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "xf86.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 4c06858..a914429 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -12,7 +12,6 @@ #endif
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "cyrix.h"
commit 88e18c25be3fe2c4d10b1a46e311a9882eda690a
Author: Kevin E Martin <kem@kem.org>
Date: Wed Dec 21 02:29:59 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 30c8af9..bcb1d76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version for X11R7 release.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 74d696c..fd37994 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
commit 2af4143f802821cd9dd949fd6c7f72b68b78acd0
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:52 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+This is a stub file. This package has not yet had its complete licensing
+information compiled. Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit ce65256a7fe3f11aee520b9201713f73ef1e84da
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:16 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index 366bbd7..30c8af9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for final X11R7 release candidate.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index f907eae..74d696c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
commit f60b42c8b25aa9689cc9877b41df38e9ff8bcf2f
Author: Kevin E Martin <kem@kem.org>
Date: Tue Dec 6 22:48:34 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index 033be09..366bbd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * man/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @DRIVER_NAME@.man
+driverman_PRE = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
+driverman_DATA = $(driverman_PRE:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 04e4e6d732d92ea302fdc9bef2cb0b8fde29aa01
Author: Kevin E Martin <kem@kem.org>
Date: Sat Dec 3 05:49:33 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index a28b9de..033be09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC3 release.
+
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index bcf2fdc..f907eae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
commit 0e23a439bfbe4ae475f6dd9bffdaec72c0e410f2
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:07 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 3380125..a28b9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Remove extraneous AC_MSG_RESULT.
+
2005-11-29 Adam Jackson <ajax@freedesktop.org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 86ac469..bcf2fdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dga
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit a8f3112f3a4df72cfc44d3a882e901c24feae5de
Author: Adam Jackson <ajax@nwnk.net>
Date: Tue Nov 29 23:29:58 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index d100f5d..3380125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index a299dcb..86ac469 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit 3c3b656e7df9e8d07750f38cefa68d5d5a039fbd
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Nov 28 22:04:08 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @DRIVER_NAME@.man
commit e3872d1097829989e211d3f06351f4c659143c48
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:11 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+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/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit 2a1e64d4baae3257dbe3596fc17b95a06fd64532
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 15 05:42:02 2005 +0000
Add check for DGA extension to fix issues when building with separate build
roots.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..d100f5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-15 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Add check for DGA extension to fix issues when building with
+ separate build roots.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 20496b0..a299dcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,6 +50,7 @@ # Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
commit 8bd295a5c8dc1e9702e5ea761ba99ef524cd128f
Author: Kevin E Martin <kem@kem.org>
Date: Wed Nov 9 21:15:14 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index ddc163a..20496b0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
commit 55355e159a484a1354342d5a90f6055d0281f7c0
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 1 15:08:52 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index ee59758..ddc163a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,15 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 8e4d568f78e0de0564dfb01f271135df68eb3588
Author: Kevin E Martin <kem@kem.org>
Date: Wed Oct 19 02:48:02 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index e65007b..ee59758 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
commit b3bb8e941d4d5ff628084b015c1487ea481d7b2c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue Oct 18 00:01:53 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @DRIVER_NAME@.man
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:man=@DRIVER_MAN_SUFFIX@)
EXTRA_DIST = @DRIVER_NAME@.man
commit 15ba4155bf08412d9abf743e0a9df582e3924cb1
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Oct 17 22:57:32 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @DRIVER_NAME@.man
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @DRIVER_NAME@.man
CLEANFILES = $(driverman_DATA)
commit 609b544ae0dd194f3575d0c0f198c4d179546d6c
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Mon Oct 17 00:09:02 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 11f5e74..e65007b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=cyrix
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
XORG_CHECK_LINUXDOC
diff --git a/man/Makefile.am b/man/Makefile.am
index b7e45ba..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,22 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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.
-
-dist_man_MANS = \
- cyrix.4
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER 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.
+#
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @DRIVER_NAME@.man
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit e28b8c643be711cef82b319027e20636e82d9320
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Tue Oct 4 20:01:03 2005 +0000
Check in generated README files
diff --git a/README b/README
new file mode 100644
index 0000000..f25e759
--- /dev/null
+++ b/README
@@ -0,0 +1,59 @@
+
+MediaGX Fun
+-----------
+
+This tries to document the "gotcha's" associated with the Cyrix
+hardware and also the SoftVGA (SMM BIOS emulation of video) implementation.
+
+o Palette Handling
+
+ In theory 8bit modes can use the VGA colour control. In practice
+ this doesn't work at least on some 5530 based systems with LCD
+ displays.
+
+ Some 5510 based systems need special handling for external LCD
+ RAMDAC. We don't currently do this.
+
+o Mode Switches
+
+ If you load unsuitable data into the Soft VGA mode switching
+ registers or forgot to set the ModeSwitch disable before you
+ load the registers up mode switches may fail. In a few cases
+ you get bogus illegal instructions reported
+
+o BIOS Versions
+
+ The VSA1/VSA2 firmware that does all the magic on the Cyrix
+ processors is an SMM mode software block in the BIOS. This means
+ the Cyrix is one system where different BIOSes have different bugs
+ instead of just having to fight the hardware
+
+ The BIOS is just plain unusable in a few systems. Code exists to
+ do some mode switches the hard way without VSA getting involved.
+
+o Compression Buffer
+
+ To cut down on the memory usage the display scan checks dirty
+ bits on each scan line (per frame in some situations) and if the
+ line is dirty it scans it from the original buffer and writes back
+ a compressed line if it can do so. If it does this it clears the
+ dirty bit. We have to handle dirty bits ourselves and getting it
+ wrong produces interesting visuals.
+
+o Memory Layout
+
+ When you use VSA to do mode set up it makes certain assumptions
+ about memory layout. Typically it lays out the frame buffer
+ with the compression buffer at the end. When there is enough
+ space between the lines (the chip only handles 1024/2048 bytes
+ stride) it will hide them in the gaps
+
+
+
+To Do
+-----
+- Add bare-metal setup option for the BIOS afflicted
+- Add 5510 external ics5432 RAMDAC support
+- Restore hardware cursor support
+- DDC/EDID and friends
+- RandR would be nice for the tablet pc systems
commit 44f7093372bcba8ff747962f0c7a210cfc871168
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Oct 3 21:22:07 2005 +0000
- For all drivers that have a <driver>.sgml file, add code in their build
system to build the README file at make dist time
- in util/macros/xorg-macros.m4, add a new XORG_CHECK_LINUXDOC macro that
will check if the required tools and files exist, and if so set a
conditional.
- util/modular/symlink.sh
- Link all the <driver>.sgml to xf86-video-<driver>/README.sgml
- Add all the README.<driver> to the list of excluded files
- xc/programs/Xserver/hw/xfree86/doc/sgml/SiS.sgml: Various changes to make
it spew less warnings when the text file is built.
diff --git a/Makefile.am b/Makefile.am
index 7052905..2b6c46a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,10 @@ # CONNECTION WITH THE SOFTWARE OR THE U
AUTOMAKE_OPTIONS = foreign
SUBDIRS = src man
+
+if BUILD_LINUXDOC
+README: README.sgml
+ $(MAKE_TEXT) README.sgml && mv README.txt README
+endif
+
+EXTRA_DIST = README.sgml
diff --git a/configure.ac b/configure.ac
index 0836130..11f5e74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,8 @@ AC_SUBST([moduledir])
XORG_RELEASE_VERSION
+XORG_CHECK_LINUXDOC
+
AC_OUTPUT([
Makefile
src/Makefile
commit 3dd131a3d19ad7d495a41d5de73f009f42efdadf
Author: Daniel Stone <daniel@fooishbar.org>
Date: Thu Aug 18 09:03:46 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
diff --git a/autogen.sh b/autogen.sh
index e81f989..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,4 +10,3 @@ autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"
-
commit f7bd02fe63c3f758a918b9faebefec19b60ae58f
Author: Kevin E Martin <kem@kem.org>
Date: Fri Jul 29 21:22:43 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
diff --git a/configure.ac b/configure.ac
index d8678b3..0836130 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-cyrix],
- 0.1.0,
- [ajax@freedesktop.org],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cyrix)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -57,6 +57,8 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit 879b3e0ec1c8c5c8a9a0ffa87edc98151511dae9
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Jul 25 23:48:54 2005 +0000
Build system for cyrix driver
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7052905
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..d8678b3
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,64 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-video-cyrix],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-cyrix)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory [[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([moduledir])
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+ man/Makefile
+])
commit 5acf191b17618b8d02c8df47e825c8b8b62e8c04
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Mon Jul 25 23:48:41 2005 +0000
Build system for cyrix driver
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..b7e45ba
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+
+dist_man_MANS = \
+ cyrix.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..24bcbff
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,37 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# 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.
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = @XORG_CFLAGS@
+cyrix_drv_la_LTLIBRARIES = cyrix_drv.la
+cyrix_drv_la_LDFLAGS = -module -avoid-version
+cyrix_drv_ladir = @moduledir@/drivers
+
+cyrix_drv_la_SOURCES = \
+ cyrix_accel.c \
+ cyrix_bank.c \
+ cyrix_driver.c \
+ cyrix.h \
+ cyrix_helper.c \
+ cyrix_shadow.c
commit 018083ae6549d6973856f9191517af7794ecbf6a
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:29:46 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 652c1d8..cda6246 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,11 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index e06d6dd..38c1eca 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,11 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 21901d3..9dfa4e4 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -52,6 +52,10 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "fb.h"
#include "mibank.h"
#include "micmap.h"
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 22c46a2..bbb8641 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -41,10 +41,15 @@
*/
/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "cyrix.h"
#include "vgaHW.h"
#include "xf86_ansic.h"
#include "compiler.h"
+#include "xf86.h"
#define CYRIXmarkLinesDirty { \
int k = 0; \
@@ -58,7 +63,7 @@ static void CYRIXresetVGA(ScrnInfoPtr pS
void Cyrix1bppColorMap(ScrnInfoPtr pScrn)
{ /* use dedicated color map routines on new chipsets in 8bpp */
- ErrorF("%s: Cyrix 1BPP is only a stub for now.\n", X_PROBED);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Cyrix 1BPP is only a stub for now.\n");
return;
}
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 479ad36..4c06858 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,10 +1,14 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
Written by Mark Vojkovich <markv@valinux.com>
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Resources.h"
commit a27599b6440422affac684edc1a968aa447c787f
Author: Adam Jackson <ajax@nwnk.net>
Date: Sat Jun 25 21:16:54 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index ae1137f..21901d3 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -136,7 +136,7 @@ enum GenericTypes {
* an upper-case version of the driver name.
*/
-DriverRec CYRIX = {
+_X_EXPORT DriverRec CYRIX = {
VERSION,
CYRIX_DRIVER_NAME,
CYRIXIdentify,
@@ -243,7 +243,7 @@ static XF86ModuleVersionInfo cyrixVersRe
{0,0,0,0}
};
-XF86ModuleData cyrixModuleData = { &cyrixVersRec, cyrixSetup, NULL };
+_X_EXPORT XF86ModuleData cyrixModuleData = { &cyrixVersRec, cyrixSetup, NULL };
pointer
cyrixSetup(pointer module, pointer opts, int *errmaj, int *errmin)
commit c63d55be53ac04503371ab72d1ffb8bd32e9369b
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Apr 20 12:25:23 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 5328aac..ae1137f 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -75,12 +75,12 @@ #include "cyrix.h"
#ifdef XFreeXDGA
#define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
#endif
#include "opaque.h"
#define DPMS_SERVER
-#include "extensions/dpms.h"
+#include <X11/extensions/dpms.h>
static const OptionInfoRec * CYRIXAvailableOptions(int chip, int busid);
static void CYRIXIdentify(int flags);
commit 656a2a50ac5e7683f4e4285d57679d95042984c8
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Feb 25 16:38:33 2005 +0000
Bug #2605: Make the cyrix, dummy, glint, neomagic, tga, and trident drivers
build when BuildXF86DGA NO.
(also fix some datestamps in the changelog)
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index e2a98e4..5328aac 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.27 2003/08/23 16:09:17 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
#include "fb.h"
#include "mibank.h"
@@ -73,8 +73,10 @@ #include "vbe.h"
#include "cyrix.h"
+#ifdef XFreeXDGA
#define _XF86DGA_SERVER_
#include "extensions/xf86dgastr.h"
+#endif
#include "opaque.h"
#define DPMS_SERVER
@@ -99,8 +101,8 @@ static void CYRIXAdjustFrame(int scrnInd
/* Optional functions */
static void CYRIXFreeScreen(int scrnIndex, int flags);
static int CYRIXFindIsaDevice(GDevPtr dev);
-static int CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus CYRIXValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
/* Internally used functions */
static void CYRIXSave(ScrnInfoPtr pScrn);
@@ -233,7 +235,7 @@ static XF86ModuleVersionInfo cyrixVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CYRIX_MAJOR_VERSION, CYRIX_MINOR_VERSION, CYRIX_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
@@ -549,8 +551,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
int videoram;
int i;
ClockRangePtr clockRanges;
- CARD32 physbase, padsize;
- int CYRIXisOldChipRevision;
+ unsigned int physbase, padsize;
int device_step, device_revision;
int vgaIOBase;
unsigned char gcr;
@@ -618,8 +619,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
/* end GGI MediaGX driver based code */
if (padsize == 0) return (FALSE);
- xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase);
- xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize);
+ xf86ErrorF("%s: GX_BASE: 0x%x\n", CYRIX_NAME, physbase);
+ xf86ErrorF("%s: Scratchpad size: %d kbytes\n", CYRIX_NAME, padsize);
/* Probe for the MediaGX processor version details. Older versions
* use different op-codes for setting the organization of the
@@ -635,8 +636,6 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
xf86ErrorF("%s: MediaGX processor ID %d revision %d\n",
CYRIX_NAME, device_step, device_revision);
- CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40);
-
/* Some MediaGX systems have different blit buffer offsets than
* is indicated by the scratchpad size. Make sure that we have
* the right offsets by writing them into the corresponding CPU
@@ -840,7 +839,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
pCyrix->IOAccelAddress = 0x40008100; /* Hard coded for 1st try */
}
- xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%x\n",pCyrix->IOAccelAddress);
+ xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%lx\n",(unsigned long)pCyrix->IOAccelAddress);
/* HW bpp matches reported bpp */
pCyrix->HwBpp = pScrn->bitsPerPixel;
@@ -1011,7 +1010,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, Display
{
int ret = -1;
vgaHWPtr hwp;
- vgaRegPtr vgaReg;
+/* vgaRegPtr vgaReg; */
CYRIXPrvPtr pCyrix;
CYRIXRegPtr cyrixReg;
@@ -1032,7 +1031,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, Display
return FALSE;
/* Program the registers */
- vgaReg = &hwp->ModeReg;
+/* vgaReg = &hwp->ModeReg; */
cyrixReg = &pCyrix->ModeReg;
CyrixRestore(pScrn, cyrixReg);
@@ -1049,13 +1048,13 @@ CYRIXRestore(ScrnInfoPtr pScrn)
{
vgaHWPtr hwp;
vgaRegPtr vgaReg;
- CYRIXPrvPtr pCyrix;
- CYRIXRegPtr cyrixReg;
+ /*CYRIXPrvPtr pCyrix;*/
+ /*CYRIXRegPtr cyrixReg*/;
hwp = VGAHWPTR(pScrn);
- pCyrix = CYRIXPTR(pScrn);
+ /*pCyrix = CYRIXPTR(pScrn);*/
vgaReg = &hwp->SavedReg;
- cyrixReg = &pCyrix->SavedReg;
+ /*cyrixReg = &pCyrix->SavedReg*/;
vgaHWProtect(pScrn, TRUE);
@@ -1501,7 +1500,7 @@ CYRIXFreeScreen(int scrnIndex, int flags
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return(MODE_OK);
commit 20f8eb22197b3f7b175d52d34083dc6a725cabbc
Author: Eric Anholt <anholt@freebsd.org>
Date: Wed Jun 16 09:23:03 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/man/cyrix.man b/man/cyrix.man
index a4d0720..f8fb670 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CYRIX __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ cyrix \- Cyrix video driver
.fi
.SH DESCRIPTION
.B cyrix
-is an __xservername__ driver for the Cyrix MediaGX (now Natsemi Geode) series of
+is an XFree86 driver for the Cyrix MediaGX (now Natsemi Geode) series of
processors when using the built in video.
.SH SUPPORTED HARDWARE
The
@@ -28,7 +28,7 @@ The MediaGX run length compresses its sh
performance on a MediaGX machine pick backgrounds that compress well
horizonally.
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.PP
@@ -64,12 +64,12 @@ considerable time.
.PP
The 5530A video overlay facility is not currently supported.
.PP
-__xservername__ uses the MediaGX 'SoftVGA' interface. On a small number of boards
+XFree86 uses the MediaGX 'SoftVGA' interface. On a small number of boards
this is buggy and may result in strange illegal instruction traps.
.PP
Hardware cursors are not currently supported.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Richard Hecker, Annius Groenink, Dirk Hohndel, The GGI
Project, Alan Cox.
diff --git a/src/cyrix.h b/src/cyrix.h
index a54ea0e..c75c222 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 4b6ef8e..652c1d8 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index 28cb0ba..e06d6dd 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index ad2a12e..e2a98e4 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.27 2003/08/23 16:09:17 dawes Exp $ */
#include "fb.h"
#include "mibank.h"
@@ -99,8 +99,8 @@ static void CYRIXAdjustFrame(int scrnInd
/* Optional functions */
static void CYRIXFreeScreen(int scrnIndex, int flags);
static int CYRIXFindIsaDevice(GDevPtr dev);
-static ModeStatus CYRIXValidMode(int scrnIndex, DisplayModePtr mode,
- Bool verbose, int flags);
+static int CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
+ int flags);
/* Internally used functions */
static void CYRIXSave(ScrnInfoPtr pScrn);
@@ -233,7 +233,7 @@ static XF86ModuleVersionInfo cyrixVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
CYRIX_MAJOR_VERSION, CYRIX_MINOR_VERSION, CYRIX_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
@@ -549,7 +549,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
int videoram;
int i;
ClockRangePtr clockRanges;
- unsigned int physbase, padsize;
+ CARD32 physbase, padsize;
+ int CYRIXisOldChipRevision;
int device_step, device_revision;
int vgaIOBase;
unsigned char gcr;
@@ -617,8 +618,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
/* end GGI MediaGX driver based code */
if (padsize == 0) return (FALSE);
- xf86ErrorF("%s: GX_BASE: 0x%x\n", CYRIX_NAME, physbase);
- xf86ErrorF("%s: Scratchpad size: %d kbytes\n", CYRIX_NAME, padsize);
+ xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase);
+ xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize);
/* Probe for the MediaGX processor version details. Older versions
* use different op-codes for setting the organization of the
@@ -634,6 +635,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
xf86ErrorF("%s: MediaGX processor ID %d revision %d\n",
CYRIX_NAME, device_step, device_revision);
+ CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40);
+
/* Some MediaGX systems have different blit buffer offsets than
* is indicated by the scratchpad size. Make sure that we have
* the right offsets by writing them into the corresponding CPU
@@ -837,7 +840,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
pCyrix->IOAccelAddress = 0x40008100; /* Hard coded for 1st try */
}
- xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%lx\n",(unsigned long)pCyrix->IOAccelAddress);
+ xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%x\n",pCyrix->IOAccelAddress);
/* HW bpp matches reported bpp */
pCyrix->HwBpp = pScrn->bitsPerPixel;
@@ -1008,7 +1011,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, Display
{
int ret = -1;
vgaHWPtr hwp;
-/* vgaRegPtr vgaReg; */
+ vgaRegPtr vgaReg;
CYRIXPrvPtr pCyrix;
CYRIXRegPtr cyrixReg;
@@ -1029,7 +1032,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, Display
return FALSE;
/* Program the registers */
-/* vgaReg = &hwp->ModeReg; */
+ vgaReg = &hwp->ModeReg;
cyrixReg = &pCyrix->ModeReg;
CyrixRestore(pScrn, cyrixReg);
@@ -1046,13 +1049,13 @@ CYRIXRestore(ScrnInfoPtr pScrn)
{
vgaHWPtr hwp;
vgaRegPtr vgaReg;
- /*CYRIXPrvPtr pCyrix;*/
- /*CYRIXRegPtr cyrixReg*/;
+ CYRIXPrvPtr pCyrix;
+ CYRIXRegPtr cyrixReg;
hwp = VGAHWPTR(pScrn);
- /*pCyrix = CYRIXPTR(pScrn);*/
+ pCyrix = CYRIXPTR(pScrn);
vgaReg = &hwp->SavedReg;
- /*cyrixReg = &pCyrix->SavedReg*/;
+ cyrixReg = &pCyrix->SavedReg;
vgaHWProtect(pScrn, TRUE);
@@ -1498,7 +1501,7 @@ CYRIXFreeScreen(int scrnIndex, int flags
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static ModeStatus
+static int
CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return(MODE_OK);
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 593507d..22c46a2 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -45,7 +45,6 @@ #include "cyrix.h"
#include "vgaHW.h"
#include "xf86_ansic.h"
#include "compiler.h"
-#include "xf86.h"
#define CYRIXmarkLinesDirty { \
int k = 0; \
@@ -59,7 +58,7 @@ static void CYRIXresetVGA(ScrnInfoPtr pS
void Cyrix1bppColorMap(ScrnInfoPtr pScrn)
{ /* use dedicated color map routines on new chipsets in 8bpp */
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Cyrix 1BPP is only a stub for now.\n");
+ ErrorF("%s: Cyrix 1BPP is only a stub for now.\n", X_PROBED);
return;
}
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 87f7709..479ad36 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
commit 1f747cbfea77ed1c1435b02d8496e97ec0bf8a8f
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:28:52 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/README.sgml b/README.sgml
index a0861c9..4e937ca 100644
--- a/README.sgml
+++ b/README.sgml
@@ -1,4 +1,4 @@
-<!DOCTYPE linuxdoc PUBLIC "-//XFree86//DTD linuxdoc//EN" [
+<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN" [
<!ENTITY % defs SYSTEM "defs.ent"> %defs;
]>
@@ -7,7 +7,6 @@
<author>The XFree86 Project Inc.
<date>7 March 2000
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
</ident>
<toc>
@@ -28,7 +27,7 @@ CPUs with integrated graphics:
<item>Rather sparse (color depth hardcoded to 8)
</itemize>
-<sect>XF86Config Option <p>
+<sect>xorg.conf Option <p>
<descrip>
<tag>Option "sw_cursor"</tag>
disable the hardware cursor. (Code not verified yet!)
@@ -47,7 +46,7 @@ but NEWBIES should use the 3.3.3.1 relea
just after probing for the ``scratchpad size''. If this is the case,
email to <email>hecker@cat.dfrc.nasa.gov</email> with the output of
<verb>
-XFree86 -probeonly -verbose
+Xorg -probeonly -verbose
</verb>
and this will be fixed.
</itemize>
diff --git a/man/cyrix.man b/man/cyrix.man
index f8fb670..a4d0720 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CYRIX __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@ cyrix \- Cyrix video driver
.fi
.SH DESCRIPTION
.B cyrix
-is an XFree86 driver for the Cyrix MediaGX (now Natsemi Geode) series of
+is an __xservername__ driver for the Cyrix MediaGX (now Natsemi Geode) series of
processors when using the built in video.
.SH SUPPORTED HARDWARE
The
@@ -28,7 +28,7 @@ The MediaGX run length compresses its sh
performance on a MediaGX machine pick backgrounds that compress well
horizonally.
.SH CONFIGURATION DETAILS
-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.
.PP
@@ -64,12 +64,12 @@ considerable time.
.PP
The 5530A video overlay facility is not currently supported.
.PP
-XFree86 uses the MediaGX 'SoftVGA' interface. On a small number of boards
+__xservername__ uses the MediaGX 'SoftVGA' interface. On a small number of boards
this is buggy and may result in strange illegal instruction traps.
.PP
Hardware cursors are not currently supported.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Richard Hecker, Annius Groenink, Dirk Hohndel, The GGI
Project, Alan Cox.
diff --git a/src/cyrix.h b/src/cyrix.h
index c75c222..a54ea0e 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 652c1d8..4b6ef8e 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index e06d6dd..28cb0ba 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index d8092a2..ad2a12e 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
#include "fb.h"
#include "mibank.h"
@@ -233,7 +233,7 @@ static XF86ModuleVersionInfo cyrixVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
CYRIX_MAJOR_VERSION, CYRIX_MINOR_VERSION, CYRIX_PATCHLEVEL,
ABI_CLASS_VIDEODRV, /* This is a video driver */
ABI_VIDEODRV_VERSION,
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 771f62c..593507d 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,7 +39,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
#include "cyrix.h"
#include "vgaHW.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 479ad36..87f7709 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
commit b1ccd48dcb63ebea8353df62bc057f8e99d87cb2
Author: Egbert Eich <eich@suse.de>
Date: Sun Mar 14 08:33:20 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/README.sgml b/README.sgml
index f43a984..a0861c9 100644
--- a/README.sgml
+++ b/README.sgml
@@ -7,7 +7,7 @@
<author>The XFree86 Project Inc.
<date>7 March 2000
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.2 1999/08/23 06:18:33 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
</ident>
<toc>
diff --git a/man/cyrix.man b/man/cyrix.man
index 9343107..f8fb670 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CYRIX __drivermansuffix__ __vendorversion__
diff --git a/src/cyrix.h b/src/cyrix.h
index a54ea0e..c75c222 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 4b6ef8e..652c1d8 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index 28cb0ba..e06d6dd 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 270e046..d8092a2 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
#include "fb.h"
#include "mibank.h"
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 593507d..771f62c 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,7 +39,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
#include "cyrix.h"
#include "vgaHW.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 87f7709..479ad36 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
commit 150715ebc11a37eedcea81f85b986eee4b6167e8
Author: Egbert Eich <eich@suse.de>
Date: Wed Mar 3 12:12:18 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/README.sgml b/README.sgml
index a0861c9..f43a984 100644
--- a/README.sgml
+++ b/README.sgml
@@ -7,7 +7,7 @@
<author>The XFree86 Project Inc.
<date>7 March 2000
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.2 1999/08/23 06:18:33 dawes Exp $
</ident>
<toc>
diff --git a/man/cyrix.man b/man/cyrix.man
index f8fb670..9343107 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.1 2001/01/24 00:06:17 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CYRIX __drivermansuffix__ __vendorversion__
diff --git a/src/cyrix.h b/src/cyrix.h
index c75c222..a54ea0e 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.2 2000/04/19 16:57:43 eich Exp $ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 652c1d8..4b6ef8e 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.3 2000/04/19 16:57:43 eich Exp $ */
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index e06d6dd..28cb0ba 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.1 2000/02/13 00:56:10 dawes Exp $ */
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index d8092a2..270e046 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.30tsi Exp $ */
#include "fb.h"
#include "mibank.h"
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 771f62c..593507d 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,7 +39,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
#include "cyrix.h"
#include "vgaHW.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 479ad36..87f7709 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_shadow.c,v 1.1 1999/08/14 10:49:48 dawes Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
commit 74b8f35e42a342abbe8a283d4f0abd57ee9f266c
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:52 2004 +0000
readding XFree86's cvs IDs
diff --git a/README.sgml b/README.sgml
index 5b13e6e..a0861c9 100644
--- a/README.sgml
+++ b/README.sgml
@@ -7,7 +7,7 @@
<author>The XFree86 Project Inc.
<date>7 March 2000
<ident>
-$XFree86$
+$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
</ident>
<toc>
diff --git a/man/cyrix.man b/man/cyrix.man
index e567418..f8fb670 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CYRIX __drivermansuffix__ __vendorversion__
diff --git a/src/cyrix.h b/src/cyrix.h
index 2285050..c75c222 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 487a251..652c1d8 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index 57bfc52..e06d6dd 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 776e734..d8092a2 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
#include "fb.h"
#include "mibank.h"
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index dd90cdf..771f62c 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,7 +39,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
#include "cyrix.h"
#include "vgaHW.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 0ec1a86..479ad36 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
commit 46d8110792f256330ca4e590224e2e005b5e7ee4
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 09:23:18 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/README.sgml b/README.sgml
index a0861c9..5b13e6e 100644
--- a/README.sgml
+++ b/README.sgml
@@ -7,7 +7,7 @@
<author>The XFree86 Project Inc.
<date>7 March 2000
<ident>
-$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/cyrix.sgml,v 1.3 2000/03/08 05:38:43 dawes Exp $
+$XFree86$
</ident>
<toc>
diff --git a/man/cyrix.man b/man/cyrix.man
index f8fb670..e567418 100644
--- a/man/cyrix.man
+++ b/man/cyrix.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.man,v 1.3 2002/11/06 11:38:59 alanh Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CYRIX __drivermansuffix__ __vendorversion__
diff --git a/src/cyrix.h b/src/cyrix.h
index c75c222..2285050 100644
--- a/src/cyrix.h
+++ b/src/cyrix.h
@@ -37,7 +37,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix.h,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86$ */
#ifndef _CYRIX_H_
#define _CYRIX_H_
diff --git a/src/cyrix_accel.c b/src/cyrix_accel.c
index 652c1d8..487a251 100644
--- a/src/cyrix_accel.c
+++ b/src/cyrix_accel.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_accel.c,v 1.5 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86$ */
#include "vgaHW.h"
#include "xf86.h"
diff --git a/src/cyrix_bank.c b/src/cyrix_bank.c
index e06d6dd..57bfc52 100644
--- a/src/cyrix_bank.c
+++ b/src/cyrix_bank.c
@@ -26,7 +26,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_bank.c,v 1.3 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86$ */
#define PSZ 8
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index d8092a2..776e734 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
+/* $XFree86$ */
#include "fb.h"
#include "mibank.h"
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 771f62c..dd90cdf 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,7 +39,7 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
+/* $XFree86$ */
#include "cyrix.h"
#include "vgaHW.h"
diff --git a/src/cyrix_shadow.c b/src/cyrix_shadow.c
index 479ad36..0ec1a86 100644
--- a/src/cyrix_shadow.c
+++ b/src/cyrix_shadow.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_shadow.c,v 1.1 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86$ */
/*
Copyright (c) 1999, The XFree86 Project Inc.
commit e7feb426384e6242357887790d65a496f664fab0
Author: Kaleb Keithley <kaleb@freedesktop.org>
Date: Tue Nov 25 19:28:36 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/cyrix_driver.c b/src/cyrix_driver.c
index 9908478..d8092a2 100644
--- a/src/cyrix_driver.c
+++ b/src/cyrix_driver.c
@@ -50,7 +50,7 @@
* (note that most of the data books have been released by
* NatSemi and are downloadable for free as pdf files)
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.26 2003/01/07 00:05:13 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_driver.c,v 1.31 2003/11/06 18:38:02 tsi Exp $ */
#include "fb.h"
#include "mibank.h"
@@ -99,8 +99,8 @@ static void CYRIXAdjustFrame(int scrnInd
/* Optional functions */
static void CYRIXFreeScreen(int scrnIndex, int flags);
static int CYRIXFindIsaDevice(GDevPtr dev);
-static int CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose,
- int flags);
+static ModeStatus CYRIXValidMode(int scrnIndex, DisplayModePtr mode,
+ Bool verbose, int flags);
/* Internally used functions */
static void CYRIXSave(ScrnInfoPtr pScrn);
@@ -207,12 +207,14 @@ static const char *shadowSymbols[] = {
NULL
};
+#ifdef XFree86LOADER
static const char *vbeSymbols[] = {
"VBEInit",
"vbeDoEDID",
"vbeFree",
NULL
};
+#endif
/* access to the MediaGX video hardware registers */
@@ -547,8 +549,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
int videoram;
int i;
ClockRangePtr clockRanges;
- CARD32 physbase, padsize;
- int CYRIXisOldChipRevision;
+ unsigned int physbase, padsize;
int device_step, device_revision;
int vgaIOBase;
unsigned char gcr;
@@ -616,8 +617,8 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
/* end GGI MediaGX driver based code */
if (padsize == 0) return (FALSE);
- xf86ErrorF("%s: GX_BASE: 0x%x\n",CYRIX_NAME, physbase);
- xf86ErrorF("%s: Scratchpad size: %d kbytes\n",CYRIX_NAME, padsize);
+ xf86ErrorF("%s: GX_BASE: 0x%x\n", CYRIX_NAME, physbase);
+ xf86ErrorF("%s: Scratchpad size: %d kbytes\n", CYRIX_NAME, padsize);
/* Probe for the MediaGX processor version details. Older versions
* use different op-codes for setting the organization of the
@@ -633,8 +634,6 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
xf86ErrorF("%s: MediaGX processor ID %d revision %d\n",
CYRIX_NAME, device_step, device_revision);
- CYRIXisOldChipRevision = (device_step == 0 && device_revision < 40);
-
/* Some MediaGX systems have different blit buffer offsets than
* is indicated by the scratchpad size. Make sure that we have
* the right offsets by writing them into the corresponding CPU
@@ -838,7 +837,7 @@ CYRIXPreInit(ScrnInfoPtr pScrn, int flag
pCyrix->IOAccelAddress = 0x40008100; /* Hard coded for 1st try */
}
- xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%x\n",pCyrix->IOAccelAddress);
+ xf86DrvMsg(pScrn->scrnIndex, from,"IO registers at 0x%lx\n",(unsigned long)pCyrix->IOAccelAddress);
/* HW bpp matches reported bpp */
pCyrix->HwBpp = pScrn->bitsPerPixel;
@@ -1009,7 +1008,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, Display
{
int ret = -1;
vgaHWPtr hwp;
- vgaRegPtr vgaReg;
+/* vgaRegPtr vgaReg; */
CYRIXPrvPtr pCyrix;
CYRIXRegPtr cyrixReg;
@@ -1030,7 +1029,7 @@ CYRIXModeInit(ScrnInfoPtr pScrn, Display
return FALSE;
/* Program the registers */
- vgaReg = &hwp->ModeReg;
+/* vgaReg = &hwp->ModeReg; */
cyrixReg = &pCyrix->ModeReg;
CyrixRestore(pScrn, cyrixReg);
@@ -1047,13 +1046,13 @@ CYRIXRestore(ScrnInfoPtr pScrn)
{
vgaHWPtr hwp;
vgaRegPtr vgaReg;
- CYRIXPrvPtr pCyrix;
- CYRIXRegPtr cyrixReg;
+ /*CYRIXPrvPtr pCyrix;*/
+ /*CYRIXRegPtr cyrixReg*/;
hwp = VGAHWPTR(pScrn);
- pCyrix = CYRIXPTR(pScrn);
+ /*pCyrix = CYRIXPTR(pScrn);*/
vgaReg = &hwp->SavedReg;
- cyrixReg = &pCyrix->SavedReg;
+ /*cyrixReg = &pCyrix->SavedReg*/;
vgaHWProtect(pScrn, TRUE);
@@ -1499,7 +1498,7 @@ CYRIXFreeScreen(int scrnIndex, int flags
/* Checks if a mode is suitable for the selected chipset. */
/* Optional */
-static int
+static ModeStatus
CYRIXValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return(MODE_OK);
diff --git a/src/cyrix_helper.c b/src/cyrix_helper.c
index 22c46a2..771f62c 100644
--- a/src/cyrix_helper.c
+++ b/src/cyrix_helper.c
@@ -39,12 +39,13 @@
* Dirk H. Hohndel (hohndel@suse.de),
* Portions: the GGI project & confidential CYRIX databooks.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.4 2002/11/06 11:38:59 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cyrix/cyrix_helper.c,v 1.5 2003/09/24 02:43:21 dawes Exp $ */
#include "cyrix.h"
#include "vgaHW.h"
#include "xf86_ansic.h"
#include "compiler.h"
+#include "xf86.h"
#define CYRIXmarkLinesDirty { \
int k = 0; \
@@ -58,7 +59,7 @@ static void CYRIXresetVGA(ScrnInfoPtr pS
void Cyrix1bppColorMap(ScrnInfoPtr pScrn)
{ /* use dedicated color map routines on new chipsets in 8bpp */
- ErrorF("%s: Cyrix 1BPP is only a stub for now.\n", X_PROBED);
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Cyrix 1BPP is only a stub for now.\n");
return;
}
Reply to: