xserver-xorg-video-dummy: Changes to 'debian-experimental'
.cvsignore | 19 +++++++++++++++++++
ChangeLog | 3 +++
autogen.sh | 12 ++++++++++++
src/.cvsignore | 6 ++++++
src/dummy_driver.c | 2 +-
5 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 22e38bed8cd2d1e54c47d0763436012eeccb2d32
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 18:59:48 2006 +0000
VERSION -> DUMMY_VERSION
diff --git a/ChangeLog b/ChangeLog
index 3d6ca24..89f15c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
* src/dummy_driver.c:
Unlibcwrap. Bump server version requirement. Bump to 0.2.0.
+ * src/dummy_driver.c:
+ VERSION -> DUMMY_VERSION
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 2846aa6..6e8b3e2 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -281,7 +281,7 @@ DUMMYProbe(DriverPtr drv, int flags)
/* Allocate a ScrnInfoRec and claim the slot */
if ((pScrn = xf86AllocateScreen(drv,0 ))) {
xf86AddEntityToScreen(pScrn,entityIndex);
- pScrn->driverVersion = VERSION;
+ pScrn->driverVersion = DUMMY_VERSION;
pScrn->driverName = DUMMY_DRIVER_NAME;
pScrn->name = DUMMY_NAME;
pScrn->Probe = DUMMYProbe;
commit 7432eaf48b70437bd55e5cc98833cce224d9e131
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Apr 7 18:50:19 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index 5fd68a6..3d6ca24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-06 Adam Jackson <ajax@freedesktop.org>
+
+ * configure.ac:
+ * src/dummy.h:
+ * src/dummy_cursor.c:
+ * src/dummy_dga.c:
+ * src/dummy_driver.c:
+ Unlibcwrap. Bump server version requirement. Bump to 0.2.0.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8fd2885..f019cd1 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-dummy],
- 0.1.0.5,
+ 0.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
@@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
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)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/dummy.h b/src/dummy.h
index e9dabe0..17d872d 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -3,12 +3,12 @@
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Cursor.h"
#include "xf86xv.h"
#include <X11/extensions/Xv.h>
+#include <string.h>
/* Supported chipsets */
typedef enum {
diff --git a/src/dummy_cursor.c b/src/dummy_cursor.c
index 58fa18a..aa6021f 100644
--- a/src/dummy_cursor.c
+++ b/src/dummy_cursor.c
@@ -5,7 +5,6 @@ #endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Cursor.h"
#include "cursorstr.h"
diff --git a/src/dummy_dga.c b/src/dummy_dga.c
index 98131ed..2c74600 100644
--- a/src/dummy_dga.c
+++ b/src/dummy_dga.c
@@ -4,7 +4,6 @@ #endif
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "dgaproc.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 0c5fd71..2846aa6 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -11,7 +11,6 @@ #endif
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
/* This is used for module versioning */
#include "xf86Version.h"
@@ -82,12 +81,12 @@ static Bool dummyDriverFunc(ScrnInfoPtr
/* static void DUMMYDisplayPowerManagementSet(ScrnInfoPtr pScrn, */
/* int PowerManagementMode, int flags); */
-#define VERSION 4000
+#define DUMMY_VERSION 4000
#define DUMMY_NAME "DUMMY"
#define DUMMY_DRIVER_NAME "dummy"
#define DUMMY_MAJOR_VERSION 0
-#define DUMMY_MINOR_VERSION 1
+#define DUMMY_MINOR_VERSION 2
#define DUMMY_PATCHLEVEL 0
/*
@@ -106,7 +105,7 @@ static int pix24bpp = 0;
*/
_X_EXPORT DriverRec DUMMY = {
- VERSION,
+ DUMMY_VERSION,
DUMMY_DRIVER_NAME,
DUMMYIdentify,
DUMMYProbe,
commit 474af880791908da7e006c4d500bc7318107bbd1
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 28f1c53..5fd68a6 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 ca154ac..8fd2885 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-dummy],
- 0.1.0.4,
+ 0.1.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 9b9ea496e698e4d078c67b8f5674fd6479e3b2bb
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Dec 19 16:25:53 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 d2cff58c1e7ff03109bd17c5f8247b9b166b71f2
Author: Kevin E Martin <kem@kem.org>
Date: Thu Dec 15 00:24:17 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index 033be09..28f1c53 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-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 89e6527..ca154ac 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-dummy],
- 0.1.0.3,
+ 0.1.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 39f1e4449acb3e5da96aaaaa86e2544e9be968b1
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 564c90f..89e6527 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-dummy],
- 0.1.0.2,
+ 0.1.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 1b47f2e8f47501122a3b613b95ea5de99f76a8c2
Author: Kevin E Martin <kem@kem.org>
Date: Fri Dec 2 02:16:08 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 1729edb..564c90f 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)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
commit c2c245b18409db7013dee0b0b4b7176daae7e290
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 5877e0d..1729edb 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 e6887d858e8b837c29c7833ab4b55034b736c6d8
Author: Eric Anholt <anholt@freebsd.org>
Date: Mon Nov 21 10:49:12 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/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 ec562722d0ae21f82a0dcc1a4a3e45ed52592aed
Author: Kevin E Martin <kem@kem.org>
Date: Tue Nov 15 05:42:03 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 5b0998e..5877e0d 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(XV, videoproto)
+XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto fontsproto $REQUIRED_MODULES)
commit 1073cc5a2bd62b6972fcda4d4d9ccbe43f2506d4
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 cd52060..5b0998e 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-dummy],
- 0.1.0.1,
+ 0.1.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 5ced29a35f7571899f281af094fbd1f242f95e7d
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 7e9b27f..cd52060 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,15 @@ AC_ARG_WITH(xorg-module-dir, [ --with-x
[ moduledir="$libdir/xorg/modules" ])
AC_SUBST(moduledir)
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+XORG_DRIVER_CHECK_EXT(XV, videoproto)
+
# 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)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
commit ffa97f23462ff045834b4abae33cf645ed6c3517
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 2008a95..7e9b27f 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-dummy],
- 0.1.0,
+ 0.1.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
commit 4bb6048d8d0d87f3d91a93fef737882434702bb0
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 deafd3d..2008a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,10 @@ # Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+DRIVER_NAME=dummy
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
commit f586bde47b9ed6561b5350c03b088acfe2e227f6
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 d43c40d00ab34ae85e4684cc3860f641b0bea65c
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Aug 10 14:07:24 2005 +0000
Don\'t lose existing CFLAGS in all the input drivers and some of the video
drivers
diff --git a/configure.ac b/configure.ac
index 69d53a0..deafd3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ # Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, xorg-server xproto)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])
commit ef552d7e1765386c652748a97df67f4ba00beef0
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 3411b7f..69d53a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
0.1.0,
- [ajax@freedesktop.org],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -59,6 +59,8 @@ # Checks for libraries.
# Checks for header files.
AC_HEADER_STDC
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit c5f63f703d838cfae54269c595e14a06ea04f243
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 21:52:24 2005 +0000
Add Makefile.am here. Also, for the record, CVS needs a bullet through its
head
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..8cf4f1f
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,35 @@
+# 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.
+dummy_drv_la_LTLIBRARIES = dummy_drv.la
+dummy_drv_la_LDFLAGS = -module -avoid-version
+dummy_drv_ladir = @moduledir@/drivers
+
+dummy_drv_la_SOURCES = \
+ dummy_cursor.c \
+ dummy_dga.c \
+ dummy_driver.c \
+ dummy.h
commit 30a2cce4b61e2b0e550479ee87f25c895cbca513
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
Date: Wed Jul 13 21:45:21 2005 +0000
Build system for dummy video driver
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..16f4412
--- /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
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..3411b7f
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,65 @@
+# 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-dummy],
+ 0.1.0,
+ [ajax@freedesktop.org],
+ xf86-video-dummy)
+
+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, [ --with-xorg-module-dir=DIR ],
+ [ moduledir="$withval" ],
+ [ moduledir="$libdir/xorg/modules" ])
+AC_SUBST(moduledir)
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, xorg-server xproto)
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+CFLAGS="$XORG_CFLAGS "' -I$(top_srcdir)/src'
+INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include'
+AC_SUBST([CFLAGS])
+AC_SUBST([INCLUDES])
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+])
commit ec9e85771609d6ec8a94b777fc784db4d1026f20
Author: Adam Jackson <ajax@nwnk.net>
Date: Mon Jul 11 02:29:47 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/dummy_cursor.c b/src/dummy_cursor.c
index a83b326..58fa18a 100644
--- a/src/dummy_cursor.c
+++ b/src/dummy_cursor.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
diff --git a/src/dummy_dga.c b/src/dummy_dga.c
index 5e35eda..98131ed 100644
--- a/src/dummy_dga.c
+++ b/src/dummy_dga.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index acec578..0c5fd71 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -4,6 +4,10 @@
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
commit 7b856f1c89ceae998c2133fcd9bba2c1493744e0
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/dummy_driver.c b/src/dummy_driver.c
index 1795d98..acec578 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -101,7 +101,7 @@ static int pix24bpp = 0;
* an upper-case version of the driver name.
*/
-DriverRec DUMMY = {
+_X_EXPORT DriverRec DUMMY = {
VERSION,
DUMMY_DRIVER_NAME,
DUMMYIdentify,
@@ -172,7 +172,7 @@ static XF86ModuleVersionInfo dummyVersRe
* This is the module init data.
* Its name has to be the driver name followed by ModuleData
*/
-XF86ModuleData dummyModuleData = { &dummyVersRec, dummySetup, NULL };
+_X_EXPORT XF86ModuleData dummyModuleData = { &dummyVersRec, dummySetup, NULL };
static pointer
dummySetup(pointer module, pointer opts, int *errmaj, int *errmin)
commit a467602c6c419bd7288d80ad50a6fa62aeff3ec8
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/dummy.h b/src/dummy.h
index 77a759d..e9dabe0 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -8,7 +8,7 @@ #include "xf86_ansic.h"
#include "xf86Cursor.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
/* Supported chipsets */
typedef enum {
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 2e82ba1..1795d98 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -22,7 +22,7 @@ #include "mibstore.h"
#include "micmap.h"
/* identifying atom needed by magnifiers */
-#include "Xatom.h"
+#include <X11/Xatom.h>
#include "property.h"
#include "xf86cmap.h"
@@ -34,7 +34,7 @@ #include "fb.h"
#include "picturestr.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
/*
* Driver data structures.
@@ -42,13 +42,13 @@ #include "Xv.h"
#include "dummy.h"
/* These need to be checked */
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "servermd.h"
#ifdef XFreeXDGA
#define _XF86DGA_SERVER_
-#include "extensions/xf86dgastr.h"
+#include <X11/extensions/xf86dgastr.h>
#endif
/* Mandatory functions */
commit 53407449153e20f7529ed9b403cee5aab25880d0
Author: Adam Jackson <ajax@nwnk.net>
Date: Fri Feb 25 16:38:34 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/dummy_driver.c b/src/dummy_driver.c
index 0760f1b..2e82ba1 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -46,8 +46,10 @@ #include "X.h"
#include "Xproto.h"
#include "scrnintstr.h"
#include "servermd.h"
+#ifdef XFreeXDGA
#define _XF86DGA_SERVER_
#include "extensions/xf86dgastr.h"
+#endif
/* Mandatory functions */
static const OptionInfoRec * DUMMYAvailableOptions(int chipid, int busid);
commit 73816949f2a28a0b8fe39108a8e493f9e47f7718
Author: Egbert Eich <eich@suse.de>
Date: Fri Jan 28 16:12:59 2005 +0000
Modifying X.Org Xserver DDX to allow to run X with ordinary user
permissions when no access to HW registers is required. For API changes
which mostly involve the modifications to make the RRFunc (introduced
with 6.8) more flexible please check Bugzilla #2407. NOTE: This patch
applies changes to OS specific files for other OSes which I cannot
test.
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index e36ecda..0760f1b 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -69,6 +69,9 @@ static Bool DUMMYSaveScreen(ScreenPtr pS
static Bool dummyModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode);
static void dummySave(ScrnInfoPtr pScrn);
static void dummyRestore(ScrnInfoPtr pScrn, Bool restoreText);
+static Bool dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op,
+ pointer ptr);
+
/* static void DUMMYDisplayPowerManagementSet(ScrnInfoPtr pScrn, */
/* int PowerManagementMode, int flags); */
@@ -103,7 +106,8 @@ DriverRec DUMMY = {
DUMMYProbe,
DUMMYAvailableOptions,
NULL,
- 0
+ 0,
+ dummyDriverFunc
};
static SymTabRec DUMMYChipsets[] = {
@@ -175,7 +179,7 @@ dummySetup(pointer module, pointer opts,
if (!setupDone) {
setupDone = TRUE;
- xf86AddDriver(&DUMMY, module, 0);
+ xf86AddDriver(&DUMMY, module, HaveDriverFuncs);
/*
* Modules that this driver always requires can be loaded here
@@ -817,3 +821,19 @@ DUMMYCreateWindow(WindowPtr pWin)
}
return TRUE;
}
+
+
+static Bool
+dummyDriverFunc(ScrnInfoPtr pScrn, xorgDriverFuncOp op, pointer ptr)
+{
+ CARD32 *flag;
+
+ switch (op) {
+ case GET_REQUIRED_HW_INTERFACES:
+ flag = (CARD32*)ptr;
+ (*flag) = 0;
+ return TRUE;
+ default:
+ return FALSE;
+ }
+}
commit 720c9b05f47c3529aa2561ab4c88319322893780
Author: Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk>
Date: Sat Dec 4 00:43:05 2004 +0000
Encoding of numerous files changed to UTF-8
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index a623693..e36ecda 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -413,7 +413,7 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flag
clockRanges = (ClockRangePtr)xnfcalloc(sizeof(ClockRange), 1);
clockRanges->next = NULL;
clockRanges->ClockMulFactor = 1;
- clockRanges->minClock = 11000; /* guessed §§§ */
+ clockRanges->minClock = 11000; /* guessed §§§ */
clockRanges->maxClock = 300000;
clockRanges->clockIndex = -1; /* programmable */
clockRanges->interlaceAllowed = TRUE;
commit b227226476ae94d094376c561d77e85589592fe6
Author: Stuart Kreitman <stuart.kreitman@sun.com>
Date: Fri Oct 15 21:09:00 2004 +0000
Bugzilla #1644: Attach an atom "VFB" to root window of dummy driver.
Committing in Head.
Modified Files: dummy.h dummy_driver.c
diff --git a/src/dummy.h b/src/dummy.h
index edffc4e..77a759d 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
+/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"
@@ -65,6 +65,8 @@ typedef struct dummyRec
int interlace;
dummy_colors colors[256];
pointer* FBBase;
+ Bool (*CreateWindow)() ; /* wrapped CreateWindow */
+ Bool prop;
} DUMMYRec, *DUMMYPtr;
/* The privates of the DUMMY driver */
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 4ad5670..a623693 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.4 2003/08/23 15:02:57 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@@ -21,6 +21,10 @@ #include "mibstore.h"
/* All drivers using the mi colormap manipulation need this */
#include "micmap.h"
+/* identifying atom needed by magnifiers */
+#include "Xatom.h"
+#include "property.h"
+
#include "xf86cmap.h"
#include "xf86fbman.h"
@@ -55,8 +59,9 @@ static Bool DUMMYScreenInit(int Inde
static Bool DUMMYEnterVT(int scrnIndex, int flags);
static void DUMMYLeaveVT(int scrnIndex, int flags);
static Bool DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool DUMMYCreateWindow(WindowPtr pWin);
static void DUMMYFreeScreen(int scrnIndex, int flags);
-static int DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
+static ModeStatus DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags);
static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
@@ -149,7 +154,7 @@ static XF86ModuleVersionInfo dummyVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
DUMMY_MAJOR_VERSION, DUMMY_MINOR_VERSION, DUMMY_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -309,10 +314,6 @@ DUMMYPreInit(ScrnInfoPtr pScrn, int flag
if (!DUMMYGetRec(pScrn)) {
return FALSE;
}
-# define RETURN \
- { DUMMYFreeRec(pScrn);\
- return FALSE;\
- }
dPtr = DUMMYPTR(pScrn);
@@ -471,6 +472,10 @@ # define RETURN \
RETURN;
xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
+
+ /* We have no contiguous physical fb in physical memory */
+ pScrn->memPhysBase = 0;
+ pScrn->fbOffset = 0;
return TRUE;
}
@@ -532,6 +537,8 @@ DUMMYLoadPalette(
}
+static ScrnInfoPtr DUMMYScrn; /* static-globalize it */
+
/* Mandatory */
static Bool
DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
@@ -540,7 +547,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
DUMMYPtr dPtr;
int ret;
VisualPtr visual;
- int height, width;
/*
* we need to get the ScrnInfoRec for this screen, so let's allocate
@@ -548,6 +554,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
*/
pScrn = xf86Screens[pScreen->myNum];
dPtr = DUMMYPTR(pScrn);
+ DUMMYScrn = pScrn;
if (!(dPtr->FBBase = xalloc(pScrn->videoRam * 1024)))
@@ -580,9 +587,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
* Call the framebuffer layer's ScreenInit function, and fill in other
* pScreen fields.
*/
- width = pScrn->virtualX;
- height = pScrn->virtualY;
-
ret = fbScreenInit(pScreen, dPtr->FBBase,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
@@ -668,6 +672,10 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
dPtr->CloseScreen = pScreen->CloseScreen;
pScreen->CloseScreen = DUMMYCloseScreen;
+ /* Wrap the current CreateWindow function */
+ dPtr->CreateWindow = pScreen->CreateWindow;
+ pScreen->CreateWindow = DUMMYCreateWindow;
+
/* Report any unused options (only for the first generation) */
if (serverGeneration == 1) {
xf86ShowUnusedOptions(pScrn->scrnIndex, pScrn->options);
@@ -753,7 +761,7 @@ DUMMYSaveScreen(ScreenPtr pScreen, int m
}
/* Optional */
-static int
+static ModeStatus
DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return(MODE_OK);
@@ -777,3 +785,35 @@ dummyModeInit(ScrnInfoPtr pScrn, Display
return(TRUE);
}
+
+Atom VFB_PROP = 0;
+#define VFB_PROP_NAME "VFB_IDENT"
+
+
+
+static Bool
+DUMMYCreateWindow(WindowPtr pWin)
+{
+ DUMMYPtr dPtr = DUMMYPTR(DUMMYScrn);
+ WindowPtr pWinRoot;
+ int ret;
+
+ ret = dPtr->CreateWindow(pWin);
+ if(ret != TRUE)
+ return(ret);
+
+ if(dPtr->prop == FALSE) {
+ pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum];
+ if (! ValidAtom(VFB_PROP))
+ VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1);
+
+ ret = ChangeWindowProperty(pWinRoot, VFB_PROP, XA_STRING,
+ 8, PropModeReplace, (int)4, (pointer)"TRUE", FALSE);
+ if( ret != Success)
+ ErrorF("Could not set VFB root window property");
+ dPtr->prop = TRUE;
+
+ return TRUE;
+ }
+ return TRUE;
+}
commit a571d5efb53cfe793d61d1b48c2bddc8d337d381
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/src/dummy.h b/src/dummy.h
index 2727925..edffc4e 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index bca78f8..4ad5670 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.4 2003/08/23 15:02:57 dawes Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@@ -56,7 +56,7 @@ static Bool DUMMYEnterVT(int scrnInd
static void DUMMYLeaveVT(int scrnIndex, int flags);
static Bool DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen);
static void DUMMYFreeScreen(int scrnIndex, int flags);
-static ModeStatus DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
+static int DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags);
static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
@@ -149,7 +149,7 @@ static XF86ModuleVersionInfo dummyVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
DUMMY_MAJOR_VERSION, DUMMY_MINOR_VERSION, DUMMY_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -471,10 +471,6 @@ # define RETURN \
RETURN;
xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
-
- /* We have no contiguous physical fb in physical memory */
- pScrn->memPhysBase = 0;
- pScrn->fbOffset = 0;
return TRUE;
}
@@ -544,6 +540,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
DUMMYPtr dPtr;
int ret;
VisualPtr visual;
+ int height, width;
/*
* we need to get the ScrnInfoRec for this screen, so let's allocate
@@ -583,6 +580,9 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
* Call the framebuffer layer's ScreenInit function, and fill in other
* pScreen fields.
*/
+ width = pScrn->virtualX;
+ height = pScrn->virtualY;
+
ret = fbScreenInit(pScreen, dPtr->FBBase,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
@@ -753,7 +753,7 @@ DUMMYSaveScreen(ScreenPtr pScreen, int m
}
/* Optional */
-static ModeStatus
+static int
DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return(MODE_OK);
commit 289ef4abc51e6ba8e902db4093cb5380721cbfe7
Author: Egbert Eich <eich@suse.de>
Date: Wed May 26 16:24:08 2004 +0000
Fixing setting of physical framebuffer base for several drivers. C&T
driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
driver: improved support for lowres double scan modes.
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 2c2380a..bca78f8 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -471,6 +471,10 @@ # define RETURN \
RETURN;
xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
+
+ /* We have no contiguous physical fb in physical memory */
+ pScrn->memPhysBase = 0;
+ pScrn->fbOffset = 0;
return TRUE;
}
commit 5d8038b2977b7c0ab0ea17e263b3720cef83db59
Author: Egbert Eich <eich@suse.de>
Date: Fri Apr 23 19:30:15 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/src/dummy.h b/src/dummy.h
index edffc4e..2727925 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
+/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 224b9e2..2c2380a 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@@ -149,7 +149,7 @@ static XF86ModuleVersionInfo dummyVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
DUMMY_MAJOR_VERSION, DUMMY_MINOR_VERSION, DUMMY_PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
commit f8e1ff3e00a773139aa1ab0ae72c83dc7792c175
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/src/dummy.h b/src/dummy.h
index 2727925..edffc4e 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index c972ceb..224b9e2 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
commit d268ada4b7e5c48cf48825a632af7f0faeaff6d0
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/src/dummy.h b/src/dummy.h
index edffc4e..2727925 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
+/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 224b9e2..c972ceb 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
commit 2ba39037fa8840a654432f032cc97b6830946cf9
Author: Egbert Eich <eich@suse.de>
Date: Thu Feb 26 13:35:52 2004 +0000
readding XFree86's cvs IDs
diff --git a/src/dummy.h b/src/dummy.h
index 2727925..edffc4e 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 912e5dd..224b9e2 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
commit f352d52a2a89e4c55689a90db83a9f7e03e562c1
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/src/dummy.h b/src/dummy.h
index edffc4e..2727925 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
+/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 224b9e2..912e5dd 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
+/* $XFree86$ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
commit 77748634e71f2c42d03d708515e65351f0b755cb
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/dummy.h b/src/dummy.h
index 3f9243d..edffc4e 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
@@ -6,11 +7,8 @@ #include "xf86_ansic.h"
#include "xf86Cursor.h"
-#ifdef XvExtension
-# include "xf86xv.h"
-# include "Xv.h"
-#endif /* XvExtension */
-
+#include "xf86xv.h"
+#include "Xv.h"
/* Supported chipsets */
typedef enum {
@@ -59,14 +57,12 @@ typedef struct dummyRec
int cursorFG, cursorBG;
Bool screenSaver;
-#ifdef XvExtension
Bool video;
XF86VideoAdaptorPtr overlayAdaptor;
int overlay;
int overlay_offset;
int videoKey;
int interlace;
-#endif /* XvExtension */
dummy_colors colors[256];
pointer* FBBase;
} DUMMYRec, *DUMMYPtr;
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index d95edb0..224b9e2 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@@ -7,7 +8,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86_ansic.h"
-#include "xf86Bus.h"
/* This is used for module versioning */
#include "xf86Version.h"
@@ -29,10 +29,8 @@ #include "fb.h"
#include "picturestr.h"
-#ifdef XvExtension
#include "xf86xv.h"
#include "Xv.h"
-#endif
/*
* Driver data structures.
@@ -58,7 +56,7 @@ static Bool DUMMYEnterVT(int scrnInd
static void DUMMYLeaveVT(int scrnIndex, int flags);
static Bool DUMMYCloseScreen(int scrnIndex, ScreenPtr pScreen);
static void DUMMYFreeScreen(int scrnIndex, int flags);
-static int DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
+static ModeStatus DUMMYValidMode(int scrnIndex, DisplayModePtr mode,
Bool verbose, int flags);
static Bool DUMMYSaveScreen(ScreenPtr pScreen, int mode);
@@ -325,7 +323,7 @@ # define RETURN \
pScrn->monitor = pScrn->confScreen->monitor;
- if (!xf86SetDepthBpp(pScrn, 8, 8, 8, Support24bppFb | Support32bppFb))
+ if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb))
return FALSE;
else {
/* Check that the returned depth is one we support */
@@ -542,7 +540,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
DUMMYPtr dPtr;
int ret;
VisualPtr visual;
- int height, width;
/*
* we need to get the ScrnInfoRec for this screen, so let's allocate
@@ -582,9 +579,6 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr
* Call the framebuffer layer's ScreenInit function, and fill in other
* pScreen fields.
*/
- width = pScrn->virtualX;
- height = pScrn->virtualY;
-
ret = fbScreenInit(pScreen, dPtr->FBBase,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
@@ -755,7 +749,7 @@ DUMMYSaveScreen(ScreenPtr pScreen, int m
}
/* Optional */
-static int
+static ModeStatus
DUMMYValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
return(MODE_OK);
Reply to: