Hello community,
here is the log from the commit of package xorg-x11-driver-video
checked in at Fri Mar 21 02:29:54 CET 2008.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-03-17 23:56:16.000000000 +0100
+++ xorg-x11-driver-video/xorg-x11-driver-video.changes 2008-03-19 22:35:45.370726000 +0100
@@ -1,0 +2,31 @@
+Wed Mar 19 22:08:48 CET 2008 - sndirsch@suse.de
+
+- xf86-video-apm 1.2.0
+ xf86-video-ark 0.7.0
+ xf86-video-ast 0.85.0
+ xf86-video-chips 1.2.0
+ xf86-video-cirrus 1.2.0
+ xf86-video-fbdev 0.4.0
+ xf86-video-glint 1.2.0
+ xf86-video-i128 1.3.0
+ xf86-video-i740 1.2.0
+ xf86-video-neomagic 1.2.0
+ xf86-video-rendition 4.2.0
+ xf86-video-s3 0.6.0
+ xf86-video-s3virge 1.10.0
+ xf86-video-savage 2.2.0
+ xf86-video-siliconmotion 1.6.0
+ xf86-video-sis 0.10.0
+ xf86-video-sisusb 0.9.0
+ xf86-video-tdfx 1.4.0
+ xf86-video-trident 1.3.0
+ xf86-video-tseng 1.2.0
+ xf86-video-v4l 0.2.0
+ xf86-video-vmware 10.16.0
+ xf86-video-voodoo 1.2.0
+ xf86-video-dummy 0.3.0
+ * adds pciaccess support
+ * obsoletes xf86-video-glint.diff, xf86-video-savage-xvideofix.diff,
+ xf86-video-sisusb.diff
+
+-------------------------------------------------------------------
Old:
----
xf86-video-apm-X11R7.1-1.1.1.tar.bz2
xf86-video-ark-X11R7.1-0.6.0.tar.bz2
xf86-video-ast-X11R7.1-0.81.0.tar.bz2
xf86-video-chips-X11R7.1-1.1.1.tar.bz2
xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2
xf86-video-dummy-X11R7.1-0.2.0.tar.bz2
xf86-video-fbdev-0.3.1.tar.bz2
xf86-video-glint.diff
xf86-video-glint-X11R7.1-1.1.1.tar.bz2
xf86-video-i128-1.2.1.tar.bz2
xf86-video-i740-X11R7.1-1.1.0.tar.bz2
xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2
xf86-video-rendition-4.1.3.tar.bz2
xf86-video-s3-0.5.0.tar.bz2
xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2
xf86-video-savage-2.1.3.tar.bz2
xf86-video-savage-xvideofix.diff
xf86-video-siliconmotion-1.5.1.tar.bz2
xf86-video-sis-0.9.4.tar.bz2
xf86-video-sisusb.diff
xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2
xf86-video-tdfx-1.3.0.tar.bz2
xf86-video-trident-1.2.3.tar.bz2
xf86-video-tseng-1.1.1.tar.bz2
xf86-video-v4l-X11R7.1-0.1.1.tar.bz2
xf86-video-vmware-10.15.2.tar.bz2
xf86-video-voodoo-1.1.1.tar.bz2
New:
----
xf86-video-apm-1.2.0.tar.bz2
xf86-video-ark-0.7.0.tar.bz2
xf86-video-ast-0.85.0.tar.bz2
xf86-video-chips-1.2.0.tar.bz2
xf86-video-cirrus-1.2.0.tar.bz2
xf86-video-dummy-0.3.0.tar.bz2
xf86-video-fbdev-0.4.0.tar.bz2
xf86-video-glint-1.2.0.tar.bz2
xf86-video-i128-1.3.0.tar.bz2
xf86-video-i740-1.2.0.tar.bz2
xf86-video-neomagic-1.2.0.tar.bz2
xf86-video-rendition-4.2.0.tar.bz2
xf86-video-s3-0.6.0.tar.bz2
xf86-video-s3virge-1.10.0.tar.bz2
xf86-video-s3virge.diff
xf86-video-savage-2.2.0.tar.bz2
xf86-video-siliconmotion-1.6.0.tar.bz2
xf86-video-sis-0.10.0.tar.bz2
xf86-video-sisusb-0.9.0.tar.bz2
xf86-video-tdfx-1.4.0.tar.bz2
xf86-video-trident-1.3.0.tar.bz2
xf86-video-tseng-1.2.0.tar.bz2
xf86-video-v4l-0.2.0.tar.bz2
xf86-video-vmware-10.16.0.tar.bz2
xf86-video-voodoo-1.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.xT6803/_old 2008-03-21 02:28:08.000000000 +0100
+++ /var/tmp/diff_new_pack.xT6803/_new 2008-03-21 02:28:08.000000000 +0100
@@ -15,7 +15,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.3
-Release: 93
+Release: 95
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -23,42 +23,42 @@
Obsoletes: xorg-x11-driver-video-nvidia
Requires: xorg-x11-driver-video-unichrome xorg-x11-driver-video-radeonhd
Summary: X.Org video drivers
-Source0: xf86-video-apm-X11R7.1-1.1.1.tar.bz2
-Source1: xf86-video-ark-X11R7.1-0.6.0.tar.bz2
-Source2: xf86-video-ast-X11R7.1-0.81.0.tar.bz2
+Source0: xf86-video-apm-1.2.0.tar.bz2
+Source1: xf86-video-ark-0.7.0.tar.bz2
+Source2: xf86-video-ast-0.85.0.tar.bz2
Source3: xf86-video-ati-6.6.193.tar.bz2
-Source4: xf86-video-chips-X11R7.1-1.1.1.tar.bz2
-Source5: xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2
+Source4: xf86-video-chips-1.2.0.tar.bz2
+Source5: xf86-video-cirrus-1.2.0.tar.bz2
Source6: xf86-video-cyrix-X11R7.1-1.1.0.tar.bz2
-Source7: xf86-video-dummy-X11R7.1-0.2.0.tar.bz2
-Source8: xf86-video-fbdev-0.3.1.tar.bz2
-Source9: xf86-video-glint-X11R7.1-1.1.1.tar.bz2
-Source10: xf86-video-i128-1.2.1.tar.bz2
-Source11: xf86-video-i740-X11R7.1-1.1.0.tar.bz2
+Source7: xf86-video-dummy-0.3.0.tar.bz2
+Source8: xf86-video-fbdev-0.4.0.tar.bz2
+Source9: xf86-video-glint-1.2.0.tar.bz2
+Source10: xf86-video-i128-1.3.0.tar.bz2
+Source11: xf86-video-i740-1.2.0.tar.bz2
Source12: xf86-video-i810-1.7.4.tar.bz2
Source13: xf86-video-imstt-X11R7.1-1.1.0.tar.bz2
Source14: xf86-video-mga-1.4.8.tar.bz2
-Source15: xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2
+Source15: xf86-video-neomagic-1.2.0.tar.bz2
Source16: xf86-video-newport-0.2.1.tar.bz2
Source17: xf86-video-nsc-2.8.3.tar.bz2
Source18: xf86-video-nv-2.1.8.tar.bz2
-Source19: xf86-video-rendition-4.1.3.tar.bz2
-Source20: xf86-video-s3-0.5.0.tar.bz2
-Source21: xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2
-Source22: xf86-video-savage-2.1.3.tar.bz2
-Source23: xf86-video-siliconmotion-1.5.1.tar.bz2
-Source24: xf86-video-sis-0.9.4.tar.bz2
-Source25: xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2
-Source33: xf86-video-tdfx-1.3.0.tar.bz2
+Source19: xf86-video-rendition-4.2.0.tar.bz2
+Source20: xf86-video-s3-0.6.0.tar.bz2
+Source21: xf86-video-s3virge-1.10.0.tar.bz2
+Source22: xf86-video-savage-2.2.0.tar.bz2
+Source23: xf86-video-siliconmotion-1.6.0.tar.bz2
+Source24: xf86-video-sis-0.10.0.tar.bz2
+Source25: xf86-video-sisusb-0.9.0.tar.bz2
+Source33: xf86-video-tdfx-1.4.0.tar.bz2
Source34: xf86-video-tga-X11R7.1-1.1.0.tar.bz2
-Source35: xf86-video-trident-1.2.3.tar.bz2
-Source36: xf86-video-tseng-1.1.1.tar.bz2
-Source37: xf86-video-v4l-X11R7.1-0.1.1.tar.bz2
+Source35: xf86-video-trident-1.3.0.tar.bz2
+Source36: xf86-video-tseng-1.2.0.tar.bz2
+Source37: xf86-video-v4l-0.2.0.tar.bz2
Source38: xf86-video-vesa-1.3.0.tar.bz2
Source39: xf86-video-vga-X11R7.1-4.1.0.tar.bz2
Source40: xf86-video-via-0.2.2.tar.bz2
-Source41: xf86-video-vmware-10.15.2.tar.bz2
-Source42: xf86-video-voodoo-1.1.1.tar.bz2
+Source41: xf86-video-vmware-10.16.0.tar.bz2
+Source42: xf86-video-voodoo-1.2.0.tar.bz2
Source43: xf86-video-impact-0.2.0.tar.bz2
Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.2.1.tar.bz2
@@ -73,7 +73,6 @@
Patch2: radeon_dell.diff
Patch3: ps_nv.diff
Patch10: xf86-video-tdfx.diff
-Patch11: xf86-video-glint.diff
Patch12: xf86-video-mga-hal.diff
Patch14: xf86-video-rendition.diff
Patch16: xf86-video-nsc.diff
@@ -91,9 +90,8 @@
Patch44: xf86-video-ati.radeonold.diff
Patch46: xf86-video-ati-disable_rmx_dell_rn50.diff
Patch47: xf86-video-vmware-10.15.2.diff
-Patch48: xf86-video-sisusb.diff
Patch50: xf86-video-intel-git.diff
-Patch51: xf86-video-savage-xvideofix.diff
+Patch51: xf86-video-s3virge.diff
Patch100: xf86-video-ati-6.6.3-r128-xvideo.patch
Patch101: xf86-video-ati-6.6.3-compile-cfb.patch
Patch102: xf86-video-ati-6.6.3-if0.patch
@@ -172,9 +170,6 @@
pushd xf86-video-tdfx-*
%patch10
popd
-pushd xf86-video-glint-*
-%patch11
-popd
pushd xf86-video-rendition-*
%patch14
popd
@@ -187,11 +182,8 @@
pushd xf86-video-vmware-*
%patch47
popd
-pushd xf86-video-sisusb-*
-%patch48
-popd
-pushd xf86-video-savage-*
-%patch51 -p1
+pushd xf86-video-s3virge-*
+%patch51
popd
%build
@@ -261,6 +253,34 @@
%{_mandir}/man4/*
%changelog
+* Wed Mar 19 2008 sndirsch@suse.de
+- xf86-video-apm 1.2.0
+ xf86-video-ark 0.7.0
+ xf86-video-ast 0.85.0
+ xf86-video-chips 1.2.0
+ xf86-video-cirrus 1.2.0
+ xf86-video-fbdev 0.4.0
+ xf86-video-glint 1.2.0
+ xf86-video-i128 1.3.0
+ xf86-video-i740 1.2.0
+ xf86-video-neomagic 1.2.0
+ xf86-video-rendition 4.2.0
+ xf86-video-s3 0.6.0
+ xf86-video-s3virge 1.10.0
+ xf86-video-savage 2.2.0
+ xf86-video-siliconmotion 1.6.0
+ xf86-video-sis 0.10.0
+ xf86-video-sisusb 0.9.0
+ xf86-video-tdfx 1.4.0
+ xf86-video-trident 1.3.0
+ xf86-video-tseng 1.2.0
+ xf86-video-v4l 0.2.0
+ xf86-video-vmware 10.16.0
+ xf86-video-voodoo 1.2.0
+ xf86-video-dummy 0.3.0
+ * adds pciaccess support
+ * obsoletes xf86-video-glint.diff, xf86-video-savage-xvideofix.diff,
+ xf86-video-sisusb.diff
* Tue Mar 18 2008 sndirsch@suse.de
- xf86-video-savage-xvideofix.diff
* cherry picked 6 upstream commits on top of the driver release
++++++ xf86-video-apm-X11R7.1-1.1.1.tar.bz2 -> xf86-video-apm-1.2.0.tar.bz2 ++++++
++++ 22443 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/config.h.in new/xf86-video-apm-1.2.0/config.h.in
--- old/xf86-video-apm-X11R7.1-1.1.1/config.h.in 2006-05-23 05:29:00.000000000 +0200
+++ new/xf86-video-apm-1.2.0/config.h.in 2008-03-19 16:38:17.000000000 +0100
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
@@ -50,6 +56,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/configure.ac new/xf86-video-apm-1.2.0/configure.ac
--- old/xf86-video-apm-X11R7.1-1.1.1/configure.ac 2006-04-08 03:14:51.000000000 +0200
+++ new/xf86-video-apm-1.2.0/configure.ac 2008-03-19 16:06:51.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-apm],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-apm)
@@ -68,10 +68,23 @@
AC_SUBST([INCLUDES])
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+
DRIVER_NAME=apm
AC_SUBST([DRIVER_NAME])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/man/apm.man new/xf86-video-apm-1.2.0/man/apm.man
--- old/xf86-video-apm-X11R7.1-1.1.1/man/apm.man 2004-04-23 21:25:03.000000000 +0200
+++ new/xf86-video-apm-1.2.0/man/apm.man 2008-03-19 16:03:06.000000000 +0100
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.2 2001/01/27 18:20:46 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.man,v 1.3 2002/05/07 12:53:49 alanh Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH APM __drivermansuffix__ __vendorversion__
@@ -101,6 +101,6 @@
.BI "Option \*qShadowFB\*q \*q" boolean \*q
Enable or disable use of the shadow framebuffer layer. Default: off.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/man/Makefile.am new/xf86-video-apm-1.2.0/man/Makefile.am
--- old/xf86-video-apm-X11R7.1-1.1.1/man/Makefile.am 2005-12-06 23:48:33.000000000 +0100
+++ new/xf86-video-apm-1.2.0/man/Makefile.am 2008-03-19 16:03:06.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:08 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/missing new/xf86-video-apm-1.2.0/missing
--- old/xf86-video-apm-X11R7.1-1.1.1/missing 2006-05-23 05:29:02.000000000 +0200
+++ new/xf86-video-apm-1.2.0/missing 2008-03-19 16:38:18.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_accel.c new/xf86-video-apm-1.2.0/src/apm_accel.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_accel.c 2005-07-11 04:29:44.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_accel.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_accel.c,v 1.20tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_cursor.c new/xf86-video-apm-1.2.0/src/apm_cursor.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_cursor.c 2005-07-11 04:29:44.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_cursor.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_cursor.c,v 1.14 2000/06/30 18:27:02 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -13,7 +12,6 @@
#include "scrnintstr.h"
#include "servermd.h"
#include "windowstr.h"
-#include "mfb.h"
#include "mipointer.h"
#include "apm.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_dga.c new/xf86-video-apm-1.2.0/src/apm_dga.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_dga.c 2006-04-07 20:34:37.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_dga.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_dga.c,v 1.9 2001/01/06 21:29:11 tsi Exp $ */
/*
* file: apm_dga.c
* ported from s3virge, ported from mga
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_driver.c new/xf86-video-apm-1.2.0/src/apm_driver.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_driver.c 2006-04-08 03:14:51.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_driver.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_driver.c,v 1.65 2003/10/30 17:36:57 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -19,9 +18,9 @@
#define APM_VERSION 4000
#define APM_NAME "APM"
#define APM_DRIVER_NAME "apm"
-#define APM_MAJOR_VERSION 1
-#define APM_MINOR_VERSION 1
-#define APM_PATCHLEVEL 1
+#define APM_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define APM_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define APM_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#ifndef PCI_CHIP_AT3D
#define PCI_CHIP_AT3D 0x643D
#endif
@@ -206,8 +205,12 @@
#ifdef XFree86LOADER
static const char *miscfbSymbols[] = {
+#ifdef HAVE_XF1BPP
"xf1bppScreenInit",
+#endif
+#ifdef HAVE_XF4BPP
"xf4bppScreenInit",
+#endif
NULL
};
#endif
@@ -411,9 +414,11 @@
* file info to override any contradictions.
*/
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(APM_NAME, PCI_VENDOR_ALLIANCE,
ApmChipsets, ApmPciChipsets, DevSections, numDevSections,
drv, &usedChips);
@@ -550,12 +555,16 @@
pEnt = pApm->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
if (pEnt->location.type == BUS_PCI) {
pApm->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pApm->PciTag = pciTag(pApm->PciInfo->bus, pApm->PciInfo->device,
pApm->PciInfo->func);
+#endif
}
else {
pApm->PciInfo = NULL;
+#ifndef XSERVER_LIBPCIACCESS
pApm->PciTag = 0;
+#endif
}
if (flags & PROBE_DETECT) {
@@ -653,10 +662,15 @@
/* Default to 8 */
pScrn->rgbBits = 8;
}
+#ifndef XSERVER_LIBPCIACCESS
+ /* you're getting a linear framebuffer with pciaccess */
if (xf86ReturnOptValBool(pApm->Options, OPTION_NOLINEAR, FALSE)) {
pApm->noLinear = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "No linear framebuffer\n");
}
+#else
+ pApm->noLinear = FALSE;
+#endif
from = X_DEFAULT;
pApm->hwCursor = FALSE;
if (xf86GetOptValBool(pApm->Options, OPTION_HW_CURSOR, &pApm->hwCursor))
@@ -778,7 +792,7 @@
} else {
from = X_PROBED;
if (pApm->PciInfo)
- pApm->Chipset = pApm->PciInfo->chipType;
+ pApm->Chipset = PCI_DEV_DEVICE_ID(pApm->PciInfo);
else
pApm->Chipset = pEnt->chipset;
pScrn->chipset = (char *)xf86TokenToString(ApmChipsets, pApm->Chipset);
@@ -794,7 +808,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pApm->ChipRev);
} else if (pApm->PciInfo) {
- pApm->ChipRev = pApm->PciInfo->chipRev;
+ pApm->ChipRev = PCI_DEV_REVISION(pApm->PciInfo);
}
/*
@@ -818,7 +832,7 @@
pApm->LinAddress = pEnt->device->MemBase;
from = X_CONFIG;
} else if (pApm->PciInfo) {
- pApm->LinAddress = pApm->PciInfo->memBase[0] & 0xFF800000;
+ pApm->LinAddress = PCI_REGION_BASE(pApm->PciInfo, 0, REGION_MEM) & 0xFF800000;
from = X_PROBED;
} else {
/*
@@ -883,9 +897,24 @@
/*unsigned long save;*/
volatile unsigned char *LinMap;
+#ifndef XSERVER_LIBPCIACCESS
LinMap = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pApm->PciTag, pApm->LinAddress,
pApm->LinMapSize);
+#else
+ {
+ void** result = (void**)&LinMap;
+ int err = pci_device_map_range(pApm->PciInfo,
+ pApm->LinAddress,
+ pApm->LinMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
+
/*save = pciReadLong(pApm->PciTag, PCI_CMD_STAT_REG);
pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, save | PCI_CMD_MEM_ENABLE);*/
d9 = LinMap[0xFFECD9];
@@ -1131,14 +1160,18 @@
/* Load bpp-specific modules */
switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
case 1:
mod = "xf1bpp";
req = "xf1bppScreenInit";
break;
+#endif
+#ifndef HAVE_XF4BPP
case 4:
mod = "xf4bpp";
req = "xf4bppScreenInit";
break;
+#endif
case 8:
case 16:
case 24:
@@ -1211,10 +1244,27 @@
APMDECL(pScrn);
vgaHWPtr hwp = VGAHWPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
pApm->LinMap = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pApm->PciTag,
(unsigned long)pApm->LinAddress,
pApm->LinMapSize);
+#else
+ {
+ void** result = (void**)&pApm->LinMap;
+ int err = pci_device_map_range(pApm->PciInfo,
+ pApm->LinAddress,
+ pApm->LinMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
+
+
if (pApm->LinMap == NULL)
return FALSE;
@@ -1877,10 +1927,12 @@
/* Map the chip memory and MMIO areas */
if (pApm->noLinear) {
- pApm->saveCmd = pciReadLong(pApm->PciTag, PCI_CMD_STAT_REG);
- pciWriteLong(pApm->PciTag, PCI_CMD_STAT_REG, pApm->saveCmd | (PCI_CMD_IO_ENABLE|PCI_CMD_MEM_ENABLE));
+ PCI_READ_LONG(pApm->PciInfo, &pApm->saveCmd, PCI_CMD_STAT_REG);
+ PCI_WRITE_LONG(pApm->PciInfo, pApm->saveCmd | (PCI_CMD_IO_ENABLE | PCI_CMD_MEM_ENABLE), PCI_CMD_STAT_REG);
+#ifndef XSERVER_LIBPCIACCESS
pApm->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pApm->PciTag, 0xA0000, 0x10000);
+#endif
}
else
if (!ApmMapMem(pScrn))
@@ -1946,18 +1998,22 @@
miSetPixmapDepths();
switch (pScrn->bitsPerPixel) {
+#ifndef HAVE_XF1BPP
case 1:
ret = xf1bppScreenInit(pScreen, FbBase,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
pScrn->displayWidth);
break;
+#endif
+#ifdef HAVE_XF4BPP
case 4:
ret = xf4bppScreenInit(pScreen, FbBase,
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi,
pScrn->displayWidth);
break;
+#endif
case 8:
case 16:
case 24:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_funcs.c new/xf86-video-apm-1.2.0/src/apm_funcs.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_funcs.c 2005-07-11 04:29:44.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_funcs.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_funcs.c,v 1.18tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm.h new/xf86-video-apm-1.2.0/src/apm.h
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm.h 2006-04-07 20:34:37.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm.h 2008-03-19 16:05:14.000000000 +0100
@@ -1,5 +1,5 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm.h,v 1.19tsi Exp $ */
+#include "apm_pcirename.h"
#include
/* All drivers should typically include these */
@@ -30,8 +30,12 @@
#include "micmap.h"
/* Needed for the 1 and 4 bpp framebuffers */
+#ifdef HAVE_XF1BPP
#include "xf1bpp.h"
+#endif
+#ifdef HAVE_XF4BPP
#include "xf4bpp.h"
+#endif
#include "fb.h"
@@ -104,7 +108,9 @@
typedef struct {
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
int scrnIndex;
int Chipset;
int ChipRev;
@@ -121,7 +127,7 @@
unsigned char savedSR10;
CARD8 MiscOut;
CARD8 c9, d9, db, Rush;
- unsigned long saveCmd;
+ unsigned int saveCmd;
pointer FontInfo;
Bool hwCursor;
Bool noLinear;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_i2c.c new/xf86-video-apm-1.2.0/src/apm_i2c.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_i2c.c 2005-07-11 04:29:44.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_i2c.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_i2c.c,v 1.6.4.1 2001/11/28 22:35:13 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_pcirename.h new/xf86-video-apm-1.2.0/src/apm_pcirename.h
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-apm-1.2.0/src/apm_pcirename.h 2008-03-19 16:00:55.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_regs.h new/xf86-video-apm-1.2.0/src/apm_regs.h
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_regs.h 2004-04-23 21:25:03.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_regs.h 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_regs.h,v 1.7 2000/02/29 03:09:18 dawes Exp $ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_rush.c new/xf86-video-apm-1.2.0/src/apm_rush.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_rush.c 2005-07-11 04:29:44.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_rush.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XdotOrg: driver/xf86-video-apm/src/apm_rush.c,v 1.7 2005/07/11 02:29:44 ajax Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_rush.c,v 1.11tsi Exp $ */
/*
* Copyright Loïc Grenié 1999
*/
@@ -426,7 +424,7 @@
rep.sequenceNumber = client->sequence;
pix = (PixmapPtr)SecurityLookupIDByType(client,
stuff->pixmap, RT_PIXMAP,
- SecurityReadAccess);
+ DixReadAccess);
rep.addr = xf86RushLockPixmap(stuff->screen, pix);
WriteToClient(client, SIZEOF(xXF86RushLockPixmapReply), (char*)&rep);
@@ -445,7 +443,7 @@
REQUEST_SIZE_MATCH(xXF86RushUnlockPixmapReq);
pix = (PixmapPtr)SecurityLookupIDByType(client,
stuff->pixmap, RT_PIXMAP,
- SecurityReadAccess);
+ DixReadAccess);
xf86RushUnlockPixmap(stuff->screen, pix);
return client->noClientException;
}
@@ -577,7 +575,7 @@
pPixmap = (PixmapPtr)SecurityLookupIDByType(client,
stuff->pixmap, RT_PIXMAP,
- SecurityReadAccess);
+ DixReadAccess);
if (!pPixmap) {
client->errorValue = stuff->pixmap;
return (BadPixmap);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/apm_video.c new/xf86-video-apm-1.2.0/src/apm_video.c
--- old/xf86-video-apm-X11R7.1-1.1.1/src/apm_video.c 2006-04-08 01:04:59.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/apm_video.c 2008-03-19 16:05:14.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/apm/apm_video.c,v 1.11tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-apm-X11R7.1-1.1.1/src/Makefile.am new/xf86-video-apm-1.2.0/src/Makefile.am
--- old/xf86-video-apm-X11R7.1-1.1.1/src/Makefile.am 2005-08-21 19:10:05.000000000 +0200
+++ new/xf86-video-apm-1.2.0/src/Makefile.am 2008-03-19 16:00:55.000000000 +0100
@@ -35,7 +35,8 @@
apm_driver.c \
apm.h \
apm_i2c.c \
- apm_regs.h
+ apm_regs.h \
+ apm_pcirename.h
if XF86RUSH
apm_drv_la_SOURCES += apm_rush.c
++++++ xf86-video-ark-X11R7.1-0.6.0.tar.bz2 -> xf86-video-ark-0.7.0.tar.bz2 ++++++
++++ 20989 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/config.h.in new/xf86-video-ark-0.7.0/config.h.in
--- old/xf86-video-ark-X11R7.1-0.6.0/config.h.in 2006-05-23 05:29:40.000000000 +0200
+++ new/xf86-video-ark-0.7.0/config.h.in 2008-03-19 18:16:16.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/configure.ac new/xf86-video-ark-0.7.0/configure.ac
--- old/xf86-video-ark-X11R7.1-0.6.0/configure.ac 2006-04-07 20:37:02.000000000 +0200
+++ new/xf86-video-ark-0.7.0/configure.ac 2008-03-19 18:15:55.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ark],
- 0.6.0,
+ 0.7.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ark)
@@ -62,10 +62,23 @@
AC_SUBST([INCLUDES])
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+
DRIVER_NAME=ark
AC_SUBST([DRIVER_NAME])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/missing new/xf86-video-ark-0.7.0/missing
--- old/xf86-video-ark-X11R7.1-0.6.0/missing 2006-05-23 05:29:42.000000000 +0200
+++ new/xf86-video-ark-0.7.0/missing 2008-03-19 18:16:17.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/src/ark_accel.c new/xf86-video-ark-0.7.0/src/ark_accel.c
--- old/xf86-video-ark-X11R7.1-0.6.0/src/ark_accel.c 2006-04-07 20:37:02.000000000 +0200
+++ new/xf86-video-ark-0.7.0/src/ark_accel.c 2008-03-19 18:15:32.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/src/ark_driver.c new/xf86-video-ark-0.7.0/src/ark_driver.c
--- old/xf86-video-ark-X11R7.1-0.6.0/src/ark_driver.c 2006-04-07 20:37:02.000000000 +0200
+++ new/xf86-video-ark-0.7.0/src/ark_driver.c 2008-03-19 18:15:32.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.22 2003/08/23 15:02:53 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi
*
@@ -366,7 +365,11 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
pARK->Chipset);
} else {
+#ifndef XSERVER_LIBPCIACCESS
pARK->Chipset = pARK->PciInfo->chipType;
+#else
+ pARK->Chipset = pARK->PciInfo->device_id;
+#endif
pScrn->chipset = (char *)xf86TokenToString(ARKChipsets,
pARK->Chipset);
}
@@ -375,15 +378,21 @@
pARK->ChipRev = pEnt->device->chipRev;
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pARK->ChipRev);
- } else
+ } else {
+#ifndef XSERVER_LIBPCIACCESS
pARK->ChipRev = pARK->PciInfo->chipRev;
-
+#else
+ pARK->ChipRev = pARK->PciInfo->revision;
+#endif
+ }
xfree(pEnt);
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n", pScrn->chipset);
+#ifndef XSERVER_LIBPCIACCESS
pARK->PciTag = pciTag(pARK->PciInfo->bus, pARK->PciInfo->device,
pARK->PciInfo->func);
+#endif
/* unlock CRTC[0-7] */
outb(hwp->PIOOffset + hwp->IOBase + 4, 0x11);
@@ -1048,12 +1057,32 @@
/* extended to cover MMIO space at 0xB8000 */
hwp->MapSize = 0x20000;
+#ifndef XSERVER_LIBPCIACCESS
pARK->MMIOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO,
pARK->PciTag, 0xb8000, 0x8000);
pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pARK->PciTag, pARK->FBAddress,
pScrn->videoRam * 1024);
+#else
+
+ pARK->MMIOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO,
+ pARK->PciInfo, 0xb8000, 0x8000);
+
+ {
+ void** result = (void**)&pARK->FBBase;
+ int err = pci_device_map_range(pARK->PciInfo,
+ pARK->FBAddress,
+ pScrn->videoRam * 1024,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
+
if (!pARK->FBBase) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Cound not map framebuffer\n");
@@ -1071,8 +1100,12 @@
/* XXX vgaHWMapMem() isn't called explicitly, so is this correct? */
vgaHWUnmapMem(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pARK->FBBase,
pScrn->videoRam * 1024);
+#else
+ pci_device_unmap_range(pARK->PciInfo, pARK->FBBase, pScrn->videoRam * 1024);
+#endif
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/src/ark.h new/xf86-video-ark-0.7.0/src/ark.h
--- old/xf86-video-ark-X11R7.1-0.6.0/src/ark.h 2006-04-07 20:37:02.000000000 +0200
+++ new/xf86-video-ark-0.7.0/src/ark.h 2008-03-19 18:15:32.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */
/*
* ark
*/
@@ -27,8 +26,12 @@
typedef struct _ARKRec {
+#ifndef XSERVER_LIBPCIACCESS
pciVideoPtr PciInfo;
PCITAG PciTag;
+#else
+ struct pci_device *PciInfo;
+#endif
EntityInfoPtr pEnt;
CARD32 IOAddress;
CARD32 FBAddress;
@@ -55,10 +58,10 @@
#define DRIVER_NAME "ark"
-#define DRIVER_VERSION "0.6.0"
-#define VERSION_MAJOR 0
-#define VERSION_MINOR 6
-#define PATCHLEVEL 0
+#define DRIVER_VERSION PACKAGE_VERSION
+#define VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define VERSION_MINOR PACKAGE_VERSION_MINOR
+#define PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define ARK_VERSION ((VERSION_MAJOR << 24) | \
(VERSION_MINOR << 16) | \
PATCHLEVEL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ark-X11R7.1-0.6.0/src/ark_reg.h new/xf86-video-ark-0.7.0/src/ark_reg.h
--- old/xf86-video-ark-X11R7.1-0.6.0/src/ark_reg.h 2004-04-23 21:25:33.000000000 +0200
+++ new/xf86-video-ark-0.7.0/src/ark_reg.h 2008-03-19 18:15:32.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */
#ifndef _ARK_REG_H
#define _ARK_REG_H
++++++ xf86-video-ast-X11R7.1-0.81.0.tar.bz2 -> xf86-video-ast-0.85.0.tar.bz2 ++++++
++++ 22105 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/ChangeLog new/xf86-video-ast-0.85.0/ChangeLog
--- old/xf86-video-ast-X11R7.1-0.81.0/ChangeLog 2006-05-21 01:33:40.000000000 +0200
+++ new/xf86-video-ast-0.85.0/ChangeLog 2008-03-19 15:28:56.000000000 +0100
@@ -1,3 +1,32 @@
+2008-03-18 Y.C. Chen
+ * src/ast_2dtool.c
+ * src/ast_tool.c
+ Compiler Warning Fixed
+
+2008-03-01 Y.C. Chen
+ * src/ast_driver.c:
+ Add _X_EXPORT for symbols public visibility
+
+2007-08-24 Y.C. Chen
+
+ * configure.ac:
+ * src/ast.h:
+ * src/ast_2dtool.c:
+ * src/ast_accel.c:
+ * src/ast_cursor.c:
+ * src/ast_driver.c:
+ * src/ast_mode.c:
+ * src/ast_tool.c:
+ * src/ast_vgatool.c:
+ * src/ast_2dtool.h
+ * src/ast_mode.h:
+ Support AST2100
+
+2006-04-17 Y.C. Chen
+
+ * src/ast_vgatool.c: (GetMaxDCLK):
+ Fixed can't get correct MCLK in some platforms
+
2006-04-07 Adam Jackson
* configure.ac:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/config.h.in new/xf86-video-ast-0.85.0/config.h.in
--- old/xf86-video-ast-X11R7.1-0.81.0/config.h.in 2006-05-23 05:30:18.000000000 +0200
+++ new/xf86-video-ast-0.85.0/config.h.in 2008-03-19 18:23:33.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/configure.ac new/xf86-video-ast-0.85.0/configure.ac
--- old/xf86-video-ast-X11R7.1-0.81.0/configure.ac 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/configure.ac 2008-03-19 18:22:10.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-ast],
- 0.81.0,
+ 0.85.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-ast)
@@ -58,10 +58,22 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/missing new/xf86-video-ast-0.85.0/missing
--- old/xf86-video-ast-X11R7.1-0.81.0/missing 2006-05-23 05:30:21.000000000 +0200
+++ new/xf86-video-ast-0.85.0/missing 2008-03-19 18:20:07.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_2dtool.c new/xf86-video-ast-0.85.0/src/ast_2dtool.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_2dtool.c 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_2dtool.c 2008-03-19 15:28:56.000000000 +0100
@@ -254,7 +254,7 @@
}
/* ULONG ulGetCMDQLength() */
-__inline ULONG ulGetCMDQLength(ASTRecPtr pAST, ULONG ulWritePointer, ULONG ulCMDQMask)
+static __inline ULONG ulGetCMDQLength(ASTRecPtr pAST, ULONG ulWritePointer, ULONG ulCMDQMask)
{
ULONG ulReadPointer, ulReadPointer2;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_2dtool.h new/xf86-video-ast-0.85.0/src/ast_2dtool.h
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_2dtool.h 2006-03-15 00:51:52.000000000 +0100
+++ new/xf86-video-ast-0.85.0/src/ast_2dtool.h 2008-03-19 15:28:56.000000000 +0100
@@ -61,23 +61,28 @@
} PKT_SC, *PPKT_SC;
/* Eng Reg. Limitation */
-#define MAX_SRC_PITCH 0x1FFF
-#define MAX_DST_PITCH 0x1FFF
-#define MAX_DST_HEIGHT 0x7FF
#define MAX_SRC_X 0x7FF
#define MAX_SRC_Y 0x7FF
#define MAX_DST_X 0x7FF
#define MAX_DST_Y 0x7FF
-#define MAX_RECT_WIDTH 0x7FF
-#define MAX_RECT_HEIGHT 0x7FF
-#define MAX_CLIP 0xFFF
-
-#define MAX_LINE_X 0x7FF
-#define MAX_LINE_Y 0x7FF
-#define MAX_LINE_ERR 0x3FFFFF
-#define MAX_LINE_WIDTH 0x7FF
-#define MAX_LINE_K1 0x3FFFFF
-#define MAX_LINE_K2 0x3FFFFF
+
+#define MASK_SRC_PITCH 0x1FFF
+#define MASK_DST_PITCH 0x1FFF
+#define MASK_DST_HEIGHT 0x7FF
+#define MASK_SRC_X 0xFFF
+#define MASK_SRC_Y 0xFFF
+#define MASK_DST_X 0xFFF
+#define MASK_DST_Y 0xFFF
+#define MASK_RECT_WIDTH 0x7FF
+#define MASK_RECT_HEIGHT 0x7FF
+#define MASK_CLIP 0xFFF
+
+#define MASK_LINE_X 0xFFF
+#define MASK_LINE_Y 0xFFF
+#define MASK_LINE_ERR 0x3FFFFF
+#define MASK_LINE_WIDTH 0x7FF
+#define MASK_LINE_K1 0x3FFFFF
+#define MASK_LINE_K2 0x3FFFFF
#define MAX_PATReg_Size 256
@@ -195,10 +200,10 @@
typedef struct {
- ULONG X1;
- ULONG Y1;
- ULONG X2;
- ULONG Y2;
+ LONG X1;
+ LONG Y1;
+ LONG X2;
+ LONG Y2;
} _LINEInfo;
@@ -208,91 +213,91 @@
{ \
do { \
*(ULONG *)(MMIOREG_SRC_BASE) = (ULONG) (base); \
- } while (*(ULONG *)(MMIOREG_SRC_BASE) != (ULONG) (base)); \
+ } while (*(volatile ULONG *)(MMIOREG_SRC_BASE) != (ULONG) (base)); \
}
#define ASTSetupSRCPitch_MMIO(pitch) \
{ \
do { \
*(ULONG *)(MMIOREG_SRC_PITCH) = (ULONG)(pitch << 16); \
- } while (*(ULONG *)(MMIOREG_SRC_PITCH) != (ULONG)(pitch << 16)); \
+ } while (*(volatile ULONG *)(MMIOREG_SRC_PITCH) != (ULONG)(pitch << 16)); \
}
#define ASTSetupDSTBase_MMIO(base) \
{ \
do { \
*(ULONG *)(MMIOREG_DST_BASE) = (ULONG)(base); \
- } while (*(ULONG *)(MMIOREG_DST_BASE) != (ULONG)(base)); \
+ } while (*(volatile ULONG *)(MMIOREG_DST_BASE) != (ULONG)(base)); \
}
#define ASTSetupDSTPitchHeight_MMIO(pitch, height) \
{ \
ULONG dstpitch; \
- dstpitch = (ULONG)((pitch << 16) + ((height) & MAX_DST_HEIGHT)); \
+ dstpitch = (ULONG)((pitch << 16) + ((height) & MASK_DST_HEIGHT)); \
do { \
*(ULONG *)(MMIOREG_DST_PITCH) = dstpitch; \
- } while (*(ULONG *)(MMIOREG_DST_PITCH) != dstpitch); \
+ } while (*(volatile ULONG *)(MMIOREG_DST_PITCH) != dstpitch); \
}
#define ASTSetupDSTXY_MMIO(x, y) \
{ \
ULONG dstxy; \
- dstxy = (ULONG)(((x & MAX_DST_X) << 16) + (y & MAX_DST_Y)); \
+ dstxy = (ULONG)(((x & MASK_DST_X) << 16) + (y & MASK_DST_Y)); \
do { \
*(ULONG *)(MMIOREG_DST_XY) = dstxy; \
- } while (*(ULONG *)(MMIOREG_DST_XY) != dstxy); \
+ } while (*(volatile ULONG *)(MMIOREG_DST_XY) != dstxy); \
}
#define ASTSetupSRCXY_MMIO(x, y) \
{ \
ULONG srcxy; \
- srcxy = (ULONG)(((x & MAX_SRC_X) << 16) + (y & MAX_SRC_Y)); \
+ srcxy = (ULONG)(((x & MASK_SRC_X) << 16) + (y & MASK_SRC_Y)); \
do { \
*(ULONG *)(MMIOREG_SRC_XY) = srcxy; \
- } while (*(ULONG *)(MMIOREG_SRC_XY) != srcxy); \
+ } while (*(volatile ULONG *)(MMIOREG_SRC_XY) != srcxy); \
}
#define ASTSetupRECTXY_MMIO(x, y) \
{ \
ULONG rectxy; \
- rectxy = (ULONG)(((x & MAX_RECT_WIDTH) << 16) + (y & MAX_RECT_WIDTH)); \
+ rectxy = (ULONG)(((x & MASK_RECT_WIDTH) << 16) + (y & MASK_RECT_WIDTH)); \
do { \
*(ULONG *)(MMIOREG_RECT_XY) = rectxy; \
- } while (*(ULONG *)(MMIOREG_RECT_XY) != rectxy); \
+ } while (*(volatile ULONG *)(MMIOREG_RECT_XY) != rectxy); \
}
#define ASTSetupFG_MMIO(color) \
{ \
do { \
*(ULONG *)(MMIOREG_FG) = (ULONG)(color); \
- } while (*(ULONG *)(MMIOREG_FG) != (ULONG)(color)); \
+ } while (*(volatile ULONG *)(MMIOREG_FG) != (ULONG)(color)); \
}
#define ASTSetupBG_MMIO(color) \
{ \
do { \
*(ULONG *)(MMIOREG_BG) = (ULONG)(color); \
- } while (*(ULONG *)(MMIOREG_BG) != (ULONG)(color)); \
+ } while (*(volatile ULONG *)(MMIOREG_BG) != (ULONG)(color)); \
}
#define ASTSetupMONO1_MMIO(pat) \
{ \
do { \
*(ULONG *)(MMIOREG_MONO1) = (ULONG)(pat); \
- } while (*(ULONG *)(MMIOREG_MONO1) != (ULONG)(pat)); \
+ } while (*(volatile ULONG *)(MMIOREG_MONO1) != (ULONG)(pat)); \
}
#define ASTSetupMONO2_MMIO(pat) \
{ \
do { \
*(ULONG *)(MMIOREG_MONO2) = (ULONG)(pat); \
- } while (*(ULONG *)(MMIOREG_MONO2) != (ULONG)(pat)); \
+ } while (*(volatile ULONG *)(MMIOREG_MONO2) != (ULONG)(pat)); \
}
#define ASTSetupCLIP1_MMIO(left, top) \
{ \
ULONG clip1; \
- clip1 = (ULONG)(((left & MAX_CLIP) << 16) + (top & MAX_CLIP)); \
+ clip1 = (ULONG)(((left & MASK_CLIP) << 16) + (top & MASK_CLIP)); \
do { \
*(ULONG *)(MMIOREG_CLIP1) = clip1; \
- } while (*(ULONG *)(MMIOREG_CLIP1) != clip1); \
+ } while (*(volatile ULONG *)(MMIOREG_CLIP1) != clip1); \
}
#define ASTSetupCLIP2_MMIO(right, bottom) \
{ \
ULONG clip2; \
- clip2 = (ULONG)(((right & MAX_CLIP) << 16) + (bottom & MAX_CLIP)); \
+ clip2 = (ULONG)(((right & MASK_CLIP) << 16) + (bottom & MASK_CLIP)); \
do { \
*(ULONG *)(MMIOREG_CLIP2) = clip2; \
- } while (*(ULONG *)(MMIOREG_CLIP2) != clip2); \
+ } while (*(volatile ULONG *)(MMIOREG_CLIP2) != clip2); \
}
#define ASTSetupCMDReg_MMIO(reg) \
{ \
@@ -302,57 +307,57 @@
{ \
do { \
*(ULONG *)(MMIOREG_PAT + patreg*4) = (ULONG)(pat); \
- } while (*(ULONG *)(MMIOREG_PAT + patreg*4) != (ULONG)(pat)); \
+ } while (*(volatile ULONG *)(MMIOREG_PAT + patreg*4) != (ULONG)(pat)); \
}
/* Line CMD */
#define ASTSetupLineXY_MMIO(x, y) \
{ \
ULONG linexy; \
- linexy = (ULONG)(((x & MAX_LINE_X) << 16) + (y & MAX_LINE_Y)); \
+ linexy = (ULONG)(((x & MASK_LINE_X) << 16) + (y & MASK_LINE_Y)); \
do { \
*(ULONG *)(MMIOREG_LINE_XY) = linexy; \
- } while (*(ULONG *)(MMIOREG_LINE_XY) != linexy); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_XY) != linexy); \
}
#define ASTSetupLineXMErrTerm_MMIO(xm, err) \
{ \
ULONG lineerr; \
- lineerr = (ULONG)((xm << 24) + (err & MAX_LINE_ERR)); \
+ lineerr = (ULONG)((xm << 24) + (err & MASK_LINE_ERR)); \
do { \
*(ULONG *)(MMIOREG_LINE_Err) = lineerr; \
- } while (*(ULONG *)(MMIOREG_LINE_Err) != lineerr); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_Err) != lineerr); \
}
#define ASTSetupLineWidth_MMIO(width) \
{ \
ULONG linewidth; \
- linewidth = (ULONG)((width & MAX_LINE_WIDTH) << 16); \
+ linewidth = (ULONG)((width & MASK_LINE_WIDTH) << 16); \
do { \
*(ULONG *)(MMIOREG_LINE_WIDTH) = linewidth; \
- } while (*(ULONG *)(MMIOREG_LINE_WIDTH) != linewidth); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_WIDTH) != linewidth); \
}
#define ASTSetupLineK1Term_MMIO(err) \
{ \
do { \
- *(ULONG *)(MMIOREG_LINE_K1) = (ULONG)(err & MAX_LINE_K1); \
- } while (*(ULONG *)(MMIOREG_LINE_K1) != (ULONG)(err & MAX_LINE_K1)); \
+ *(ULONG *)(MMIOREG_LINE_K1) = (ULONG)(err & MASK_LINE_K1); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_K1) != (ULONG)(err & MASK_LINE_K1)); \
}
#define ASTSetupLineK2Term_MMIO(err) \
{ \
do { \
- *(ULONG *)(MMIOREG_LINE_K2) = (ULONG)(err & MAX_LINE_K2); \
- } while (*(ULONG *)(MMIOREG_LINE_K2) != (ULONG)(err & MAX_LINE_K2)); \
+ *(ULONG *)(MMIOREG_LINE_K2) = (ULONG)(err & MASK_LINE_K2); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_K2) != (ULONG)(err & MASK_LINE_K2)); \
}
#define ASTSetupLineStyle1_MMIO(pat) \
{ \
do { \
*(ULONG *)(MMIOREG_LINE_STYLE1) = (ULONG)(pat); \
- } while (*(ULONG *)(MMIOREG_LINE_STYLE1) != (ULONG)(pat)); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_STYLE1) != (ULONG)(pat)); \
}
#define ASTSetupLineStyle2_MMIO(pat) \
{ \
do { \
*(ULONG *)(MMIOREG_LINE_STYLE2) = (ULONG)(pat); \
- } while (*(ULONG *)(MMIOREG_LINE_STYLE2) != (ULONG)(pat)); \
+ } while (*(volatile ULONG *)(MMIOREG_LINE_STYLE2) != (ULONG)(pat)); \
}
/* CMDQ Mode Macro */
@@ -377,22 +382,22 @@
#define ASTSetupDSTPitchHeight(addr, pitch, height) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_DST_PITCH); \
- addr->PKT_SC_dwData[0] = (ULONG)((pitch << 16) + ((height) & MAX_DST_HEIGHT)); \
+ addr->PKT_SC_dwData[0] = (ULONG)((pitch << 16) + ((height) & MASK_DST_HEIGHT)); \
}
#define ASTSetupDSTXY(addr, x, y) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_DST_XY); \
- addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_DST_X) << 16) + (y & MAX_DST_Y)); \
+ addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_DST_X) << 16) + (y & MASK_DST_Y)); \
}
#define ASTSetupSRCXY(addr, x, y) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_SRC_XY); \
- addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_SRC_X) << 16) + (y & MAX_SRC_Y)); \
+ addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_SRC_X) << 16) + (y & MASK_SRC_Y)); \
}
#define ASTSetupRECTXY(addr, x, y) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_RECT_XY); \
- addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_RECT_WIDTH) << 16) + (y & MAX_RECT_WIDTH)); \
+ addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_RECT_WIDTH) << 16) + (y & MASK_RECT_WIDTH)); \
}
#define ASTSetupFG(addr, color) \
{ \
@@ -417,12 +422,12 @@
#define ASTSetupCLIP1(addr, left, top) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_CLIP1); \
- addr->PKT_SC_dwData[0] = (ULONG)(((left & MAX_CLIP) << 16) + (top & MAX_CLIP)); \
+ addr->PKT_SC_dwData[0] = (ULONG)(((left & MASK_CLIP) << 16) + (top & MASK_CLIP)); \
}
#define ASTSetupCLIP2(addr, right, bottom) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_CLIP2); \
- addr->PKT_SC_dwData[0] = (ULONG)(((right & MAX_CLIP) << 16) + (bottom & MAX_CLIP)); \
+ addr->PKT_SC_dwData[0] = (ULONG)(((right & MASK_CLIP) << 16) + (bottom & MASK_CLIP)); \
}
#define ASTSetupCMDReg(addr, reg) \
{ \
@@ -439,27 +444,27 @@
#define ASTSetupLineXY(addr, x, y) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_XY); \
- addr->PKT_SC_dwData[0] = (ULONG)(((x & MAX_LINE_X) << 16) + (y & MAX_LINE_Y)); \
+ addr->PKT_SC_dwData[0] = (ULONG)(((x & MASK_LINE_X) << 16) + (y & MASK_LINE_Y)); \
}
#define ASTSetupLineXMErrTerm(addr, xm, err) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_Err); \
- addr->PKT_SC_dwData[0] = (ULONG)((xm << 24) + (err & MAX_LINE_ERR)); \
+ addr->PKT_SC_dwData[0] = (ULONG)((xm << 24) + (err & MASK_LINE_ERR)); \
}
#define ASTSetupLineWidth(addr, width) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_WIDTH); \
- addr->PKT_SC_dwData[0] = (ULONG)((width & MAX_LINE_WIDTH) << 16); \
+ addr->PKT_SC_dwData[0] = (ULONG)((width & MASK_LINE_WIDTH) << 16); \
}
#define ASTSetupLineK1Term(addr, err) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_K1); \
- addr->PKT_SC_dwData[0] = (ULONG)(err & MAX_LINE_K1); \
+ addr->PKT_SC_dwData[0] = (ULONG)(err & MASK_LINE_K1); \
}
#define ASTSetupLineK2Term(addr, err) \
{ \
addr->PKT_SC_dwHeader = (ULONG)(PKT_SINGLE_CMD_HEADER + CMDQREG_LINE_K2); \
- addr->PKT_SC_dwData[0] = (ULONG)(err & MAX_LINE_K2); \
+ addr->PKT_SC_dwData[0] = (ULONG)(err & MASK_LINE_K2); \
}
#define ASTSetupLineStyle1(addr, pat) \
{ \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_accel.c new/xf86-video-ast-0.85.0/src/ast_accel.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_accel.c 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_accel.c 2008-03-19 15:28:56.000000000 +0100
@@ -256,7 +256,6 @@
infoPtr->ClippingFlags = HARDWARE_CLIP_SCREEN_TO_SCREEN_COPY |
HARDWARE_CLIP_MONO_8x8_FILL |
HARDWARE_CLIP_COLOR_8x8_FILL |
- HARDWARE_CLIP_SOLID_FILL |
HARDWARE_CLIP_SOLID_LINE |
HARDWARE_CLIP_DASHED_LINE |
HARDWARE_CLIP_SOLID_LINE;
@@ -338,11 +337,13 @@
/*
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ASTSubsequentScreenToScreenCopy\n");
*/
-
+
/* Modify Reg. Value */
cmdreg = pAST->ulCMDReg;
if (pAST->EnableClip)
cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
srcbase = dstbase = 0;
if (y1 >= MAX_SRC_Y)
@@ -479,7 +480,9 @@
/* Modify Reg. Value */
cmdreg = pAST->ulCMDReg;
if (pAST->EnableClip)
- cmdreg |= CMD_ENABLE_CLIP;
+ cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
dstbase = 0;
if (dst_y >= pScrn->virtualY)
@@ -587,7 +590,9 @@
/* Modify Reg. Value */
cmdreg = (pAST->ulCMDReg & (~CMD_MASK)) | CMD_BITBLT;
if (pAST->EnableClip)
- cmdreg |= CMD_ENABLE_CLIP;
+ cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
dstbase = 0;
if(dir == DEGREES_0) { /* horizontal */
@@ -659,6 +664,8 @@
ulCommand &= ~CMD_NOT_DRAW_LAST_PIXEL;
if (pAST->EnableClip)
ulCommand |= CMD_ENABLE_CLIP;
+ else
+ ulCommand &= ~CMD_ENABLE_CLIP;
dstbase = 0;
miny = (y1 > y2) ? y2 : y1;
maxy = (y1 > y2) ? y1 : y2;
@@ -667,7 +674,7 @@
y1 -= miny;
y2 -= miny;
}
-
+
LineInfo.X1 = x1;
LineInfo.Y1 = y1;
LineInfo.X2 = x2;
@@ -703,6 +710,9 @@
/* Update Write Pointer */
mUpdateWritePointer;
+
+ /* Patch KDE pass abnormal point, ycchen@052507 */
+ vWaitEngIdle(pScrn, pAST);
}
else
@@ -814,6 +824,8 @@
ulCommand &= ~CMD_NOT_DRAW_LAST_PIXEL;
if (pAST->EnableClip)
ulCommand |= CMD_ENABLE_CLIP;
+ else
+ ulCommand &= ~CMD_ENABLE_CLIP;
dstbase = 0;
miny = (y1 > y2) ? y2 : y1;
maxy = (y1 > y2) ? y1 : y2;
@@ -822,7 +834,7 @@
y1 -= miny;
y2 -= miny;
}
-
+
LineInfo.X1 = x1;
LineInfo.Y1 = y1;
LineInfo.X2 = x2;
@@ -858,7 +870,10 @@
/* Update Write Pointer */
mUpdateWritePointer;
-
+
+ /* Patch KDE pass abnormal point, ycchen@052507 */
+ vWaitEngIdle(pScrn, pAST);
+
}
else
{
@@ -951,7 +966,9 @@
/* Modify Reg. Value */
cmdreg = pAST->ulCMDReg;
if (pAST->EnableClip)
- cmdreg |= CMD_ENABLE_CLIP;
+ cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
dstbase = 0;
if (dst_y >= pScrn->virtualY)
@@ -1070,7 +1087,9 @@
/* Modify Reg. Value */
cmdreg = pAST->ulCMDReg;
if (pAST->EnableClip)
- cmdreg |= CMD_ENABLE_CLIP;
+ cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
dstbase = 0;
if (dst_y >= pScrn->virtualY)
@@ -1184,7 +1203,9 @@
/* Modify Reg. Value */
cmdreg = pAST->ulCMDReg;
if (pAST->EnableClip)
- cmdreg |= CMD_ENABLE_CLIP;
+ cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
dstbase = 0;
if (dst_y >= pScrn->virtualY)
@@ -1308,7 +1329,9 @@
/* Modify Reg. Value */
cmdreg = pAST->ulCMDReg;
if (pAST->EnableClip)
- cmdreg |= CMD_ENABLE_CLIP;
+ cmdreg |= CMD_ENABLE_CLIP;
+ else
+ cmdreg &= ~CMD_ENABLE_CLIP;
dstbase = 0;
if (dst_y >= pScrn->virtualY)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_cursor.c new/xf86-video-ast-0.85.0/src/ast_cursor.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_cursor.c 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_cursor.c 2008-03-19 15:28:56.000000000 +0100
@@ -62,7 +62,7 @@
Bool ASTCursorInit(ScreenPtr pScreen);
Bool bInitHWC(ScrnInfoPtr pScrn, ASTRecPtr pAST);
static void ASTShowCursor(ScrnInfoPtr pScrn);
-static void ASTHideCursor(ScrnInfoPtr pScrn);
+void ASTHideCursor(ScrnInfoPtr pScrn);
static void ASTSetCursorPosition(ScrnInfoPtr pScrn, int x, int y);
static void ASTSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg);
static void ASTLoadCursorImage(ScrnInfoPtr pScrn, UCHAR *src);
@@ -146,7 +146,7 @@
}
-static void
+void
ASTHideCursor(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
@@ -235,8 +235,8 @@
for (k=7; k>0; k-=2)
{
jTempSrcAnd32 = *((UCHAR *) pjSrcAnd);
- jTempSrcXor32 = *((UCHAR *) pjSrcXor);
- ulTempDstAnd32[0] = ((jTempSrcAnd32 >> k) & 0x01) ? 0x00008000L:0x00L;
+ jTempSrcXor32 = *((UCHAR *) pjSrcXor);
+ ulTempDstAnd32[0] = ((jTempSrcAnd32 >> k) & 0x01) ? 0x00008000L:0x00L;
ulTempDstXor32[0] = ((jTempSrcXor32 >> k) & 0x01) ? 0x00004000L:0x00L;
ulTempDstData32[0] = ((jTempSrcXor32 >> k) & 0x01) ? pAST->HWCInfo.fg:pAST->HWCInfo.bg;
ulTempDstAnd32[1] = ((jTempSrcAnd32 >> (k-1)) & 0x01) ? 0x80000000L:0x00L;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_driver.c new/xf86-video-ast-0.85.0/src/ast_driver.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_driver.c 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_driver.c 2008-03-19 15:28:56.000000000 +0100
@@ -78,6 +78,7 @@
extern Bool ASTAccelInit(ScreenPtr pScreen);
extern Bool ASTCursorInit(ScreenPtr pScreen);
+extern void ASTHideCursor(ScrnInfoPtr pScrn);
/* Mandatory functions */
static void ASTIdentify(int flags);
@@ -108,7 +109,7 @@
* This is intentionally screen-independent. It indicates the binding
* choice made in the first PreInit.
*/
-DriverRec AST = {
+_X_EXPORT DriverRec AST = {
AST_VERSION,
AST_DRIVER_NAME,
ASTIdentify,
@@ -248,12 +249,16 @@
XORG_VERSION_CURRENT,
AST_MAJOR_VERSION, AST_MINOR_VERSION, AST_PATCH_VERSION,
ABI_CLASS_VIDEODRV,
+#ifdef PATCH_ABI_VERSION
+ ABI_VIDEODRV_VERSION_PATCH,
+#else
ABI_VIDEODRV_VERSION,
+#endif
MOD_CLASS_VIDEODRV,
{0, 0, 0, 0}
};
-XF86ModuleData astModuleData = { &astVersRec, astSetup, NULL };
+_X_EXPORT XF86ModuleData astModuleData = { &astVersRec, astSetup, NULL };
static pointer
astSetup(pointer module, pointer opts, int *errmaj, int *errmin)
@@ -334,6 +339,7 @@
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
/*
* This probing is just checking the PCI data the server already
* collected.
@@ -341,6 +347,7 @@
if (xf86GetPciVideoInfo() == NULL) {
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(AST_NAME, PCI_VENDOR_AST,
ASTChipsets, ASTPciChipsets,
@@ -512,8 +519,10 @@
pAST = ASTPTR(pScrn);
pAST->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
pAST->PciInfo = xf86GetPciInfoForEntity(pAST->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pAST->PciTag = pciTag(pAST->PciInfo->bus, pAST->PciInfo->device,
pAST->PciInfo->func);
+#endif
/* Process the options
* pScrn->confScreen, pScrn->display, pScrn->monitor, pScrn->numEntities,
@@ -544,7 +553,7 @@
} else {
from = X_PROBED;
pScrn->chipset = (char *)xf86TokenToString(ASTChipsets,
- pAST->PciInfo->chipType);
+ PCI_DEV_DEVICE_ID(pAST->PciInfo));
}
if (pAST->pEnt->device->chipRev >= 0) {
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
@@ -563,16 +572,16 @@
/* "Patch" the PIOOffset inside vgaHW in order to force
* the vgaHW module to use our relocated i/o ports.
*/
- VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + pAST->PciInfo->ioBase[2] - 0x380;
+ VGAHWPTR(pScrn)->PIOOffset = pAST->PIOOffset = pAST->IODBase + PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) - 0x380;
- pAST->RelocateIO = (IOADDRESS)(pAST->PciInfo->ioBase[2] + pAST->IODBase);
+ pAST->RelocateIO = (IOADDRESS)(PCI_REGION_BASE(pAST->PciInfo, 2, REGION_IO) + pAST->IODBase);
if (pAST->pEnt->device->MemBase != 0) {
pAST->FBPhysAddr = pAST->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- if (pAST->PciInfo->memBase[0] != 0) {
- pAST->FBPhysAddr = pAST->PciInfo->memBase[0] & 0xFFF00000;
+ if (PCI_REGION_BASE(pAST->PciInfo, 0, REGION_MEM) != 0) {
+ pAST->FBPhysAddr = PCI_REGION_BASE(pAST->PciInfo, 0, REGION_MEM) & 0xFFF00000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -588,8 +597,8 @@
pAST->MMIOPhysAddr = pAST->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- if (pAST->PciInfo->memBase[1]) {
- pAST->MMIOPhysAddr = pAST->PciInfo->memBase[1] & 0xFFFF0000;
+ if (PCI_REGION_BASE(pAST->PciInfo, 1, REGION_MEM)) {
+ pAST->MMIOPhysAddr = PCI_REGION_BASE(pAST->PciInfo, 1, REGION_IO) & 0xFFFF0000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
@@ -627,6 +636,12 @@
pScrn->memPhysBase = (ULONG)pAST->FBPhysAddr;
pScrn->fbOffset = 0;
+ /* Get Revision */
+ if (PCI_DEV_REVISION(pAST->PciInfo) >= 0x10)
+ pAST->jChipType = AST2100;
+ else
+ pAST->jChipType = AST2000;
+
/* Do DDC
* should be done after xf86CollectOptions
*/
@@ -641,12 +656,21 @@
clockRanges->interlaceAllowed = FALSE;
clockRanges->doubleScanAllowed = FALSE;
- i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+ /* Add for AST2100, ycchen@061807 */
+ if (pAST->jChipType == AST2100)
+ i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
pScrn->display->modes, clockRanges,
- 0, 320, 1600, 8 * pScrn->bitsPerPixel,
+ 0, 320, 1920, 8 * pScrn->bitsPerPixel,
200, 1200,
pScrn->display->virtualX, pScrn->display->virtualY,
pAST->FbMapSize, LOOKUP_BEST_REFRESH);
+ else
+ i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+ pScrn->display->modes, clockRanges,
+ 0, 320, 1600, 8 * pScrn->bitsPerPixel,
+ 200, 1200,
+ pScrn->display->virtualX, pScrn->display->virtualY,
+ pAST->FbMapSize, LOOKUP_BEST_REFRESH);
if (i == -1) {
ASTFreeRec(pScrn);
@@ -884,7 +908,8 @@
if (pAST->pHWCPtr) {
xf86FreeOffscreenLinear(pAST->pHWCPtr); /* free HWC Cache */
pAST->pHWCPtr = NULL;
- }
+ }
+ ASTHideCursor(pScrn);
#endif
#ifdef Accel_2D
@@ -942,7 +967,8 @@
if (pAST->pHWCPtr) {
xf86FreeOffscreenLinear(pAST->pHWCPtr); /* free HWC Cache */
pAST->pHWCPtr = NULL;
- }
+ }
+ ASTHideCursor(pScrn);
#endif
#ifdef Accel_2D
@@ -971,6 +997,8 @@
ASTValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags)
{
+ ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
+ ASTRecPtr pAST = ASTPTR(pScrn);
Bool Flags = MODE_NOMODE;
if (mode->Flags & V_INTERLACE) {
@@ -988,6 +1016,13 @@
}
return Flags;
}
+
+ /* Add for AST2100, ycchen@061807 */
+ if (pAST->jChipType == AST2100)
+ {
+ if ( (mode->CrtcHDisplay == 1920) && (mode->CrtcVDisplay == 1200) )
+ return MODE_OK;
+ }
switch (mode->CrtcHDisplay)
{
@@ -1064,7 +1099,8 @@
if (pAST->pHWCPtr) {
xf86FreeOffscreenLinear(pAST->pHWCPtr); /* free HWC Cache */
pAST->pHWCPtr = NULL;
- }
+ }
+ ASTHideCursor(pScrn);
#endif
#ifdef Accel_2D
@@ -1103,7 +1139,7 @@
ASTRecPtr pAST;
vgaRegPtr vgaReg;
ASTRegPtr astReg;
- int i;
+ int i, icount=0;
pAST = ASTPTR(pScrn);
vgaReg = &VGAHWPTR(pScrn)->SavedReg;
@@ -1115,9 +1151,13 @@
/* Ext. Save */
vASTOpenKey(pScrn);
- for (i=0; i<0x50; i++)
- GetIndexReg(CRTC_PORT, (UCHAR) (i+0x80), astReg->ExtCRTC[i]);
-
+ /* fixed Console Switch Refresh Rate Incorrect issue, ycchen@051106 */
+ for (i=0x81; i<=0xB6; i++)
+ GetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+ for (i=0xBC; i<=0xC1; i++)
+ GetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+ GetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
+
}
static void
@@ -1126,7 +1166,7 @@
ASTRecPtr pAST;
vgaRegPtr vgaReg;
ASTRegPtr astReg;
- int i;
+ int i, icount=0;
pAST = ASTPTR(pScrn);
vgaReg = &VGAHWPTR(pScrn)->SavedReg;
@@ -1140,9 +1180,13 @@
/* Ext. restore */
vASTOpenKey(pScrn);
- for (i=0; i<0x50; i++)
- SetIndexReg(CRTC_PORT, (UCHAR) (i+0x80), astReg->ExtCRTC[i]);
-
+ /* fixed Console Switch Refresh Rate Incorrect issue, ycchen@051106 */
+ for (i=0x81; i<=0xB6; i++)
+ SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+ for (i=0xBC; i<=0xC1; i++)
+ SetIndexReg(CRTC_PORT, (UCHAR) (i), astReg->ExtCRTC[icount++]);
+ SetIndexReg(CRTC_PORT, (UCHAR) (0xBB), astReg->ExtCRTC[icount]);
+
}
static void
@@ -1193,7 +1237,8 @@
pAST->VideoModeInfo.ScreenWidth = pScrn->virtualX;
pAST->VideoModeInfo.ScreenHeight = pScrn->virtualY;
pAST->VideoModeInfo.bitsPerPixel = pScrn->bitsPerPixel;
- pAST->VideoModeInfo.ScreenPitch = pScrn->virtualX * ((pScrn->bitsPerPixel + 1) / 8) ;
+ /* Fixed screen pitch incorrect in some specific monitor, ycchen@071707 */
+ pAST->VideoModeInfo.ScreenPitch = pScrn->displayWidth * ((pScrn->bitsPerPixel + 1) / 8) ;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast.h new/xf86-video-ast-0.85.0/src/ast.h
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast.h 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast.h 2008-03-19 15:28:56.000000000 +0100
@@ -23,10 +23,13 @@
#include
#include
+#include "ast_pcirename.h"
+
/* Compiler Options */
#define Accel_2D
/* #define MMIO_2D */
#define HWC
+/* #define PATCH_ABI_VERSION */
/* Vendor & Device Info */
#ifndef PCI_VENDOR_AST
@@ -37,12 +40,18 @@
#define PCI_CHIP_AST2000 0x2000
#endif
+typedef enum _CHIP_ID {
+ VGALegacy,
+ AST2000,
+ AST2100
+} CHIP_ID;
+
/* AST REC Info */
#define AST_NAME "AST"
#define AST_DRIVER_NAME "ast"
-#define AST_MAJOR_VERSION 0
-#define AST_MINOR_VERSION 81
-#define AST_PATCH_VERSION 0
+#define AST_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define AST_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define AST_PATCH_VERSION PACKAGE_VERSION_PATCHLEVEL
#define AST_VERSION \
((AST_MAJOR_VERSION << 20) | (AST_MINOR_VERSION << 10) | AST_PATCH_VERSION)
@@ -54,6 +63,9 @@
#define CMD_QUEUE_GUARD_BAND 0x00000020
#define DEFAULT_HWC_NUM 0x00000002
+/* Patch Info */
+#define ABI_VIDEODRV_VERSION_PATCH SET_ABI_VERSION(0, 5)
+
/* Data Type Definition */
typedef INT32 LONG;
typedef CARD8 UCHAR;
@@ -120,8 +132,12 @@
typedef struct _ASTRec {
EntityInfoPtr pEnt;
- pciVideoPtr PciInfo;
- PCITAG PciTag;
+#ifndef XSERVER_LIBPCIACCESS
+ pciVideoPtr PciInfo;
+ PCITAG PciTag;
+#else
+ struct pci_device *PciInfo;
+#endif
OptionInfoPtr Options;
DisplayModePtr ModePtr;
@@ -132,6 +148,8 @@
CloseScreenProcPtr CloseScreen;
ScreenBlockHandlerProcPtr BlockHandler;
+
+ UCHAR jChipType;
Bool noAccel;
Bool noHWC;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_mode.c new/xf86-video-ast-0.85.0/src/ast_mode.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_mode.c 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_mode.c 2008-03-19 15:28:56.000000000 +0100
@@ -130,7 +130,7 @@
};
VBIOS_ENHTABLE_STRUCT Res640x480Table[] = {
- { 800, 640, 8, 96, 525, 480, 2, 2, VCLK28_322, /* 60Hz */
+ { 800, 640, 8, 96, 525, 480, 2, 2, VCLK25_175, /* 60Hz */
(SyncNN | HBorder | VBorder | Charx8Dot), 60, 1, 0x2E },
{ 832, 640, 16, 40, 520, 480, 1, 3, VCLK31_5, /* 72Hz */
(SyncNN | HBorder | VBorder | Charx8Dot), 72, 2, 0x2E },
@@ -167,7 +167,7 @@
{1312, 1024, 16, 96, 800, 768, 1, 3, VCLK78_75, /* 75Hz */
(SyncPP | Charx8Dot), 75, 3, 0x31 },
{1376, 1024, 48, 96, 808, 768, 1, 3, VCLK94_5, /* 85Hz */
- (SyncPP | Charx8Dot), 85, 4, 0x31 },
+ (SyncPP | Charx8Dot), 84, 4, 0x31 },
{1376, 1024, 48, 96, 808, 768, 1, 3, VCLK94_5, /* end */
(SyncPP | Charx8Dot), 0xFF, 4, 0x31 },
};
@@ -187,7 +187,14 @@
{2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* 60Hz */
(SyncPP | Charx8Dot), 60, 1, 0x33 },
{2160, 1600, 64, 192, 1250, 1200, 1, 3, VCLK162, /* end */
- (SyncPP | Charx8Dot), 60, 1, 0x33 },
+ (SyncPP | Charx8Dot), 0xFF, 1, 0x33 },
+};
+
+VBIOS_ENHTABLE_STRUCT Res1920x1200Table[] = {
+ {2592, 1920,136, 200, 1245, 1200, 3, 6, VCLK193_25, /* 60Hz */
+ (SyncPP | Charx8Dot), 60, 1, 0x33 },
+ {2592, 1920,136, 200, 1245, 1200, 3, 6, VCLK193_25, /* end */
+ (SyncPP | Charx8Dot), 0xFF, 1, 0x33 },
};
VBIOS_DCLK_INFO DCLKTable [] = {
@@ -207,6 +214,7 @@
{0x85, 0x24, 0x00}, /* 0D: VCLK135 */
{0x67, 0x22, 0x00}, /* 0E: VCLK157_5 */
{0x6A, 0x22, 0x00}, /* 0F: VCLK162 */
+ {0x61, 0x2C, 0x81}, /* 10: VCLK193_25 */
};
VBIOS_DAC_INFO DAC_TEXT[] = {
@@ -423,8 +431,10 @@
break;
case 1600:
pVGAModeInfo->pEnhTableEntry = (PVBIOS_ENHTABLE_STRUCT) &Res1600x1200Table[ulRefreshRateIndex];
- break;
- default:
+ break;
+ case 1920:
+ pVGAModeInfo->pEnhTableEntry = (PVBIOS_ENHTABLE_STRUCT) &Res1920x1200Table[ulRefreshRateIndex];
+ break; default:
return (FALSE);
}
@@ -633,7 +643,7 @@
SetIndexRegMask(CRTC_PORT,0xC0, 0x00, pDCLKPtr->Param1);
SetIndexRegMask(CRTC_PORT,0xC1, 0x00, pDCLKPtr->Param2);
- SetIndexRegMask(CRTC_PORT,0xBB, 0xCF, ((pDCLKPtr->Param3 & 0x03) << 4));
+ SetIndexRegMask(CRTC_PORT,0xBB, 0x0F, (pDCLKPtr->Param3 & 0x80) | ((pDCLKPtr->Param3 & 0x03) << 4) );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_mode.h new/xf86-video-ast-0.85.0/src/ast_mode.h
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_mode.h 2006-03-15 00:18:18.000000000 +0100
+++ new/xf86-video-ast-0.85.0/src/ast_mode.h 2008-03-19 15:28:56.000000000 +0100
@@ -21,7 +21,7 @@
*/
/* Mode Limitation */
-#define MAX_HResolution 1600
+#define MAX_HResolution 1920
#define MAX_VResolution 1200
/* Std. Table Index Definition */
@@ -48,6 +48,7 @@
#define VCLK135 0x0D
#define VCLK157_5 0x0E
#define VCLK162 0x0F
+#define VCLK193_25 0x10
/* Flags Definition */
#define Charx8Dot 0x00000001
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_pcirename.h new/xf86-video-ast-0.85.0/src/ast_pcirename.h
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-ast-0.85.0/src/ast_pcirename.h 2008-03-19 15:28:56.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef ASTPCIRENAME_H
+#define ASTPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* ASTPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_tool.c new/xf86-video-ast-0.85.0/src/ast_tool.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_tool.c 2006-04-08 00:25:23.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_tool.c 2008-03-19 15:28:56.000000000 +0100
@@ -67,10 +67,24 @@
{
ASTRecPtr pAST = ASTPTR(pScrn);
-
+#ifndef XSERVER_LIBPCIACCESS
pAST->FBVirtualAddr = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pAST->PciTag,
pAST->FBPhysAddr, pAST->FbMapSize);
+#else
+ {
+ void** result = (void**)&pAST->FBVirtualAddr;
+ int err = pci_device_map_range(pAST->PciInfo,
+ pAST->FBPhysAddr,
+ pAST->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (!pAST->FBVirtualAddr)
return FALSE;
@@ -82,9 +96,13 @@
ASTUnmapMem(ScrnInfoPtr pScrn)
{
ASTRecPtr pAST = ASTPTR(pScrn);
-
+
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pAST->FBVirtualAddr,
pAST->FbMapSize);
+#else
+ pci_device_unmap_range(pAST->PciInfo, pAST->FBVirtualAddr, pAST->FbMapSize);
+#endif
pAST->FBVirtualAddr = 0;
@@ -94,8 +112,9 @@
Bool
ASTMapMMIO(ScrnInfoPtr pScrn)
{
- int mmioFlags;
ASTRecPtr pAST = ASTPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
+ int mmioFlags;
#if !defined(__alpha__)
mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT;
@@ -103,9 +122,25 @@
mmioFlags = VIDMEM_MMIO | VIDMEM_READSIDEEFFECT | VIDMEM_SPARSE;
#endif
+
pAST->MMIOVirtualAddr = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
pAST->PciTag,
pAST->MMIOPhysAddr, pAST->MMIOMapSize);
+
+#else
+ {
+ void** result = (void**)&pAST->MMIOVirtualAddr;
+ int err = pci_device_map_range(pAST->PciInfo,
+ pAST->MMIOPhysAddr,
+ pAST->MMIOMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+
+#endif
if (!pAST->MMIOVirtualAddr)
return FALSE;
@@ -117,8 +152,12 @@
{
ASTRecPtr pAST = ASTPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pAST->MMIOVirtualAddr,
pAST->MMIOMapSize);
+#else
+ pci_device_unmap_range(pAST->PciInfo, pAST->MMIOVirtualAddr, pAST->MMIOMapSize);
+#endif
pAST->MMIOVirtualAddr = 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/ast_vgatool.c new/xf86-video-ast-0.85.0/src/ast_vgatool.c
--- old/xf86-video-ast-X11R7.1-0.81.0/src/ast_vgatool.c 2006-05-21 01:33:40.000000000 +0200
+++ new/xf86-video-ast-0.85.0/src/ast_vgatool.c 2008-03-19 15:28:56.000000000 +0100
@@ -128,7 +128,13 @@
*(ULONG *) (pAST->MMIOVirtualAddr + 0xF004) = 0x1e6e0000;
*(ULONG *) (pAST->MMIOVirtualAddr + 0xF000) = 0x00000001;
-
+
+ *(ULONG *) (pAST->MMIOVirtualAddr + 0x10100) = 0x000000A8;
+
+ do {
+ ;
+ } while (*(volatile ULONG *) (pAST->MMIOVirtualAddr + 0x10100) != 0x000000A8);
+
/* Get BusWidth */
ulData = *(ULONG * ) (pAST->MMIOVirtualAddr + 0x10004);
if (ulData & 0x40)
@@ -137,9 +143,7 @@
ulDRAMBusWidth = 32;
/* Get MCLK */
- {
- *(ULONG *) (pAST->MMIOVirtualAddr + 0x10100) = 0x000000A8;
-
+ {
ulData = *(ULONG *) (pAST->MMIOVirtualAddr + 0x10120);
ulData2 = *(ULONG *) (pAST->MMIOVirtualAddr + 0x10170);
if (ulData2 & 0x2000)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-ast-X11R7.1-0.81.0/src/Makefile.am new/xf86-video-ast-0.85.0/src/Makefile.am
--- old/xf86-video-ast-X11R7.1-0.81.0/src/Makefile.am 2006-03-15 01:43:18.000000000 +0100
+++ new/xf86-video-ast-0.85.0/src/Makefile.am 2008-03-19 18:21:44.000000000 +0100
@@ -39,6 +39,7 @@
ast_driver.c \
ast_mode.c \
ast_mode.h \
+ ast_pcirename.h \
ast_tool.c \
ast_vgatool.c \
ast_vgatool.h
++++++ xf86-video-chips-X11R7.1-1.1.1.tar.bz2 -> xf86-video-chips-1.2.0.tar.bz2 ++++++
++++ 23264 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/compile new/xf86-video-chips-1.2.0/compile
--- old/xf86-video-chips-X11R7.1-1.1.1/compile 2006-05-23 05:31:58.000000000 +0200
+++ new/xf86-video-chips-1.2.0/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/config.h.in new/xf86-video-chips-1.2.0/config.h.in
--- old/xf86-video-chips-X11R7.1-1.1.1/config.h.in 2006-05-23 05:31:56.000000000 +0200
+++ new/xf86-video-chips-1.2.0/config.h.in 2008-03-19 18:35:58.000000000 +0100
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
@@ -50,6 +56,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/configure.ac new/xf86-video-chips-1.2.0/configure.ac
--- old/xf86-video-chips-X11R7.1-1.1.1/configure.ac 2006-04-08 03:21:18.000000000 +0200
+++ new/xf86-video-chips-1.2.0/configure.ac 2008-03-19 18:35:37.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-chips],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-chips)
@@ -58,6 +58,20 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Checks for header files.
AC_HEADER_STDC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/man/Makefile.am new/xf86-video-chips-1.2.0/man/Makefile.am
--- old/xf86-video-chips-X11R7.1-1.1.1/man/Makefile.am 2005-12-06 23:48:33.000000000 +0100
+++ new/xf86-video-chips-1.2.0/man/Makefile.am 2008-03-19 15:29:20.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:08 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/missing new/xf86-video-chips-1.2.0/missing
--- old/xf86-video-chips-X11R7.1-1.1.1/missing 2006-05-23 05:31:58.000000000 +0200
+++ new/xf86-video-chips-1.2.0/missing 2008-03-19 18:35:59.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_accel.c new/xf86-video-chips-1.2.0/src/ct_accel.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_accel.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_accel.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_accel.c,v 1.40tsi Exp $ */
/*
* Copyright 1996, 1997, 1998 by David Bateman
* Modified 1997, 1998 by Nozomi Ytow
@@ -1182,7 +1181,7 @@
} else funcNo = 2;
pad = (((pCache->w * bpp) + 31) >> 5) << 2;
- dstPtr = data = (unsigned char*)ALLOCATE_LOCAL(pad * pCache->h);
+ dstPtr = data = (unsigned char*)xalloc(pad * pCache->h);
srcPtr = (unsigned char*)pPix->devPrivate.ptr;
StippleFunc = StippleTab[funcNo];
@@ -1210,7 +1209,7 @@
pScrn, pCache->x, pCache->y, pCache->w, pCache->h, data,
pad, bpp, pScrn->depth);
- DEALLOCATE_LOCAL(data);
+ xfree(data);
return pCache;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_bank.c new/xf86-video-chips-1.2.0/src/ct_bank.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_bank.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_bank.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_bank.c,v 1.6 2002/01/25 21:55:58 tsi Exp $ */
/*
* Copyright 1997
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_BlitMM.h new/xf86-video-chips-1.2.0/src/ct_BlitMM.h
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_BlitMM.h 2004-04-23 21:27:21.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_BlitMM.h 2008-03-19 18:35:01.000000000 +0100
@@ -1,10 +1,8 @@
-/* $XConsortium: ct_BlitMM.h /main/2 1996/10/25 10:28:31 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BlitMM.h,v 1.3 1998/08/20 08:55:56 dawes Exp $ */
/* Definitions for the Chips and Technology BitBLT engine communication. */
/* These are done using Memory Mapped IO, of the registers */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_Blitter.h new/xf86-video-chips-1.2.0/src/ct_Blitter.h
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_Blitter.h 2004-04-23 21:27:21.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_Blitter.h 2008-03-19 18:35:01.000000000 +0100
@@ -1,10 +1,8 @@
-/* $XConsortium: ct_Blitter.h /main/2 1996/10/25 10:28:37 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_Blitter.h,v 1.3 1998/08/29 05:43:06 dawes Exp $ */
/* Definitions for the Chips and Technology BitBLT engine communication. */
/* registers */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_BltHiQV.h new/xf86-video-chips-1.2.0/src/ct_BltHiQV.h
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_BltHiQV.h 2004-07-30 23:36:39.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_BltHiQV.h 2008-03-19 18:35:01.000000000 +0100
@@ -1,10 +1,8 @@
-/* $XConsortium: ct_BltHiQV.h /main/2 1996/10/25 10:28:43 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_BltHiQV.h,v 1.10 2000/12/06 15:35:12 eich Exp $ */
/* Definitions for the Chips and Technology BitBLT engine communication. */
/* These are done using Memory Mapped IO, of the registers */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_cursor.c new/xf86-video-chips-1.2.0/src/ct_cursor.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_cursor.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_cursor.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_cursor.c,v 1.24 2001/10/01 13:44:03 eich Exp $ */
/*
* Copyright 1994 The XFree86 Project
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_ddc.c new/xf86-video-chips-1.2.0/src/ct_ddc.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_ddc.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_ddc.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_ddc.c,v 1.8 2001/05/09 19:57:04 dbateman Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_dga.c new/xf86-video-chips-1.2.0/src/ct_dga.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_dga.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_dga.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_dga.c,v 1.3tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_driver.c new/xf86-video-chips-1.2.0/src/ct_driver.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_driver.c 2006-04-08 03:21:18.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_driver.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.c,v 1.132tsi Exp $ */
/*
* Copyright 1993 by Jon Block
@@ -113,8 +112,12 @@
/* Needed for the 1 and 4 bpp framebuffers */
+#ifdef HAVE_XF1BPP
#include "xf1bpp.h"
+#endif
+#ifdef HAVE_XF4BPP
#include "xf4bpp.h"
+#endif
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
@@ -137,7 +140,12 @@
/* Mandatory functions */
static const OptionInfoRec * CHIPSAvailableOptions(int chipid, int busid);
static void CHIPSIdentify(int flags);
+#ifdef XSERVER_LIBPCIACCESS
+static Bool CHIPSPciProbe(DriverPtr drv, int entity_num,
+ struct pci_device *dev, intptr_t match_data);
+#else
static Bool CHIPSProbe(DriverPtr drv, int flags);
+#endif
static Bool CHIPSPreInit(ScrnInfoPtr pScrn, int flags);
static Bool CHIPSScreenInit(int Index, ScreenPtr pScreen, int argc,
char **argv);
@@ -465,9 +473,28 @@
#define CHIPS_VERSION 4000
#define CHIPS_NAME "CHIPS"
#define CHIPS_DRIVER_NAME "chips"
-#define CHIPS_MAJOR_VERSION 1
-#define CHIPS_MINOR_VERSION 1
-#define CHIPS_PATCHLEVEL 1
+#define CHIPS_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define CHIPS_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define CHIPS_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
+
+
+#ifdef XSERVER_LIBPCIACCESS
+
+#define CHIPS_DEVICE_MATCH(d, i) \
+ { PCI_VENDOR_CHIPSTECH, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
+
+static const struct pci_id_match chips_device_match[] = {
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65545, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65548, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65550, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65554, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_65555, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_68554, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_69000, 0),
+ CHIPS_DEVICE_MATCH(PCI_CHIP_69030, 0),
+ { 0, 0, 0 },
+};
+#endif
/*
* This contains the functions needed by the server after loading the driver
@@ -481,10 +508,20 @@
CHIPS_VERSION,
CHIPS_DRIVER_NAME,
CHIPSIdentify,
+#ifdef XSERVER_LIBPCIACCESS
+ NULL,
+#else
CHIPSProbe,
+#endif
CHIPSAvailableOptions,
NULL,
- 0
+ 0,
+ NULL,
+
+#ifdef XSERVER_LIBPCIACCESS
+ chips_device_match,
+ CHIPSPciProbe,
+#endif
};
static SymTabRec CHIPSChipsets[] = {
@@ -507,6 +544,7 @@
{ -1, NULL }
};
+
/* Conversion PCI ID to chipset name */
static PciChipsets CHIPSPCIchipsets[] = {
{ CHIPS_CT65545, PCI_CHIP_65545, RES_SHARED_VGA },
@@ -685,8 +723,12 @@
#ifdef XFree86LOADER
static const char *miscfbSymbols[] = {
+#ifdef HAVE_XF1BPP
"xf1bppScreenInit",
+#endif
+#ifdef HAVE_XF4BPP
"xf4bppScreenInit",
+#endif
"cfb8_16ScreenInit",
NULL
};
@@ -854,6 +896,68 @@
}
/* Mandatory */
+#ifdef XSERVER_LIBPCIACCESS
+Bool
+CHIPSPciProbe(DriverPtr drv, int entity_num, struct pci_device * dev,
+ intptr_t match_data)
+{
+ ScrnInfoPtr pScrn = NULL;
+ EntityInfoPtr pEnt;
+ CHIPSPtr cPtr;
+
+ /* Allocate a ScrnInfoRec and claim the slot */
+ pScrn = xf86ConfigPciEntity(pScrn, 0, entity_num, CHIPSPCIchipsets, NULL,
+ NULL, NULL, NULL, NULL);
+ if (pScrn != NULL) {
+ /* Fill in what we can of the ScrnInfoRec */
+ pScrn->driverVersion = CHIPS_VERSION;
+ pScrn->driverName = CHIPS_DRIVER_NAME;
+ pScrn->name = CHIPS_NAME;
+ pScrn->Probe = NULL;
+ pScrn->PreInit = CHIPSPreInit;
+ pScrn->ScreenInit = CHIPSScreenInit;
+ pScrn->SwitchMode = CHIPSSwitchMode;
+ pScrn->AdjustFrame = CHIPSAdjustFrame;
+ pScrn->EnterVT = CHIPSEnterVT;
+ pScrn->LeaveVT = CHIPSLeaveVT;
+ pScrn->FreeScreen = CHIPSFreeScreen;
+ pScrn->ValidMode = CHIPSValidMode;
+
+ /*
+ * For cards that can do dual head per entity, mark the entity
+ * as sharable.
+ */
+ pEnt = xf86GetEntityInfo(entity_num);
+ if (pEnt->chipset == CHIPS_CT69030) {
+ CHIPSEntPtr cPtrEnt = NULL;
+ DevUnion *pPriv;
+
+ xf86SetEntitySharable(entity_num);
+ /* Allocate an entity private if necessary */
+ if (CHIPSEntityIndex < 0)
+ CHIPSEntityIndex = xf86AllocateEntityPrivateIndex();
+ pPriv = xf86GetEntityPrivate(pScrn->entityList[0], CHIPSEntityIndex);
+ if (!pPriv->ptr) {
+ pPriv->ptr = xnfcalloc(sizeof(CHIPSEntRec), 1);
+ cPtrEnt = pPriv->ptr;
+ cPtrEnt->lastInstance = -1;
+ } else {
+ cPtrEnt = pPriv->ptr;
+ }
+ /*
+ * Set the entity instance for this instance of the driver. For
+ * dual head per card, instance 0 is the "master" instance, driving
+ * the primary head, and instance 1 is the "slave".
+ */
+ cPtrEnt->lastInstance++;
+ xf86SetEntityInstanceForScreen(pScrn, pScrn->entityList[0],
+ cPtrEnt->lastInstance);
+ }
+ }
+
+ return (pScrn != NULL);
+}
+#else
static Bool
CHIPSProbe(DriverPtr drv, int flags)
{
@@ -974,6 +1078,7 @@
xfree(devSections);
return foundScreen;
}
+#endif
static int
chipsFindIsaDevice(GDevPtr dev)
@@ -1107,9 +1212,11 @@
if (cPtr->pEnt->location.type == BUS_PCI) {
pciPtr = xf86GetPciInfoForEntity(cPtr->pEnt->index);
cPtr->PciInfo = pciPtr;
+#ifndef XSERVER_LIBPCIACCESS
cPtr->PciTag = pciTag(cPtr->PciInfo->bus,
cPtr->PciInfo->device,
cPtr->PciInfo->func);
+#endif
}
}
/* INT10 */
@@ -1290,6 +1397,7 @@
/* Load bpp-specific modules */
switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
case 1:
if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
vbeFree(cPtr->pVbe);
@@ -1299,6 +1407,8 @@
}
xf86LoaderReqSymbols("xf1bppScreenInit", NULL);
break;
+#endif
+#ifdef HAVE_XF4BPP
case 4:
if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
vbeFree(cPtr->pVbe);
@@ -1308,6 +1418,7 @@
}
xf86LoaderReqSymbols("xf4bppScreenInit", NULL);
break;
+#endif
case 16:
if (cPtr->Flags & ChipsOverlay8plus16) {
if (xf86LoadSubModule(pScrn, "xf8_16bpp") == NULL) {
@@ -1536,10 +1647,10 @@
/* Tack on 0x800000 to access the big-endian aperture? */
#if X_BYTE_ORDER == X_BIG_ENDIAN
if (BE_SWAP_APRETURE(pScrn,cPtr))
- cPtr->FbAddress = (cPtr->PciInfo->memBase[0] & 0xff800000) + 0x800000L;
+ cPtr->FbAddress = (PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000) + 0x800000L;
else
#endif
- cPtr->FbAddress = cPtr->PciInfo->memBase[0] & 0xff800000;
+ cPtr->FbAddress = PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000;
from = X_PROBED;
if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone))
@@ -3108,7 +3219,7 @@
mask &= 0xCF;
}
if (cPtr->pEnt->location.type == BUS_PCI) {
- cPtr->FbAddress = cPtr->PciInfo->memBase[0] & 0xff800000;
+ cPtr->FbAddress = PCI_REGION_BASE(cPtr->PciInfo, 0, REGION_MEM) & 0xff800000;
if (xf86RegisterResources(cPtr->pEnt->index,NULL,ResNone))
useLinear = FALSE;
from = X_PROBED;
@@ -4014,18 +4125,22 @@
}
switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
case 1:
ret = xf1bppScreenInit(pScreen, FBStart,
width,height,
pScrn->xDpi, pScrn->yDpi,
displayWidth);
break;
+#endif
+#ifdef HAVE_XF4BPP
case 4:
ret = xf4bppScreenInit(pScreen, FBStart,
width,height,
pScrn->xDpi, pScrn->yDpi,
displayWidth);
break;
+#endif
case 16:
if (cPtr->Flags & ChipsOverlay8plus16) {
ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart +
@@ -7028,6 +7143,7 @@
if (cPtr->Flags & ChipsLinearSupport) {
if (cPtr->UseMMIO) {
if (IS_HiQV(cPtr)) {
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->pEnt->location.type == BUS_PCI)
cPtr->MMIOBase = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO_32BIT,cPtr->PciTag, cPtr->IOAddress,
@@ -7035,7 +7151,20 @@
else
cPtr->MMIOBase = xf86MapVidMem(pScrn->scrnIndex,
VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x20000L);
+#else
+ {
+ void** result = (void**)&cPtr->MMIOBase;
+ int err = pci_device_map_range(cPtr->PciInfo,
+ cPtr->IOAddress,
+ 0x20000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
} else {
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->pEnt->location.type == BUS_PCI)
cPtr->MMIOBase = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO_32BIT, cPtr->PciTag, cPtr->IOAddress,
@@ -7043,6 +7172,18 @@
else
cPtr->MMIOBase = xf86MapVidMem(pScrn->scrnIndex,
VIDMEM_MMIO_32BIT, cPtr->IOAddress, 0x10000L);
+#else
+ {
+ void** result = (void**)&cPtr->MMIOBase;
+ int err = pci_device_map_range(cPtr->PciInfo,
+ cPtr->IOAddress,
+ 0x10000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
}
if (cPtr->MMIOBase == NULL)
@@ -7065,6 +7206,7 @@
}
}
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->pEnt->location.type == BUS_PCI)
cPtr->FbBase = xf86MapPciMem(pScrn->scrnIndex,VIDMEM_FRAMEBUFFER,
cPtr->PciTag, Addr, Map);
@@ -7072,14 +7214,32 @@
else
cPtr->FbBase = xf86MapVidMem(pScrn->scrnIndex,VIDMEM_FRAMEBUFFER,
Addr, Map);
+#else
+ {
+ void** result = (void**)&cPtr->FbBase;
+ int err = pci_device_map_range(cPtr->PciInfo,
+ Addr,
+ Map,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+ if (err)
+ return FALSE;
+ }
+
+#endif
if (cPtr->FbBase == NULL)
return FALSE;
}
if (cPtr->Flags & ChipsFullMMIOSupport) {
+#ifndef XSERVER_LIBPCIACCESS
cPtr->MMIOBaseVGA = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO,cPtr->PciTag,
cPtr->IOAddress, 0x2000L);
+#else
+ cPtr->MMIOBaseVGA = cPtr->MMIOBase;
+#endif
/* 69030 MMIO Fix.
*
* The hardware lets us map the PipeB data registers
@@ -7089,9 +7249,22 @@
* pipe and to toggle between them as necessary. -GHB
*/
if (cPtr->Flags & ChipsDualChannelSupport)
+#ifndef XSERVER_LIBPCIACCESS
cPtr->MMIOBasePipeB = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO,cPtr->PciTag,
cPtr->IOAddress + 0x800000, 0x2000L);
+#else
+ {
+ void** result = (void**)&cPtr->MMIOBasePipeB;
+ int err = pci_device_map_range(cPtr->PciInfo,
+ cPtr->IOAddress + 0x800000,
+ 0x2000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
cPtr->MMIOBasePipeA = cPtr->MMIOBaseVGA;
}
@@ -7115,21 +7288,39 @@
if (cPtr->Flags & ChipsLinearSupport) {
if (IS_HiQV(cPtr)) {
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->MMIOBase)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->MMIOBase,
0x20000);
if (cPtr->MMIOBasePipeB)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->MMIOBasePipeB,
0x20000);
+#else
+ if (cPtr->MMIOBase)
+ pci_device_unmap_range(cPtr->PciInfo, cPtr->MMIOBase, 0x20000);
+
+ if (cPtr->MMIOBasePipeB)
+ pci_device_unmap_range(cPtr->PciInfo, cPtr->MMIOBasePipeB, 0x2000);
+
+#endif
cPtr->MMIOBasePipeB = NULL;
} else {
+#ifndef XSERVER_LIBPCIACCESS
if (cPtr->MMIOBase)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->MMIOBase,
0x10000);
+#else
+ if (cPtr->MMIOBase)
+ pci_device_unmap_range(cPtr->PciInfo, cPtr->MMIOBase, 0x10000);
+#endif
}
cPtr->MMIOBase = NULL;
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)cPtr->FbBase,
cPtr->FbMapSize);
+#else
+ pci_device_unmap_range(cPtr->PciInfo, cPtr->FbBase, cPtr->FbMapSize);
+#endif
}
cPtr->FbBase = NULL;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_driver.h new/xf86-video-chips-1.2.0/src/ct_driver.h
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_driver.h 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_driver.h 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XConsortium: ct_driver.h /main/3 1996/10/27 11:49:29 kaleb $ */
/*
* Modified 1996 by Egbert Eich
* Modified 1996 by David Bateman
@@ -22,12 +21,12 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_driver.h,v 1.33 2001/10/01 13:44:04 eich Exp $ */
#ifndef _CT_DRIVER_H_
#define _CT_DRIVER_H_
+#include "ct_pcirename.h"
#include "xaa.h"
#include "vbe.h"
#include "xaalocal.h" /* XAA internals as we replace some of XAA */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_pcirename.h new/xf86-video-chips-1.2.0/src/ct_pcirename.h
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-chips-1.2.0/src/ct_pcirename.h 2008-03-19 15:29:20.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_regs.c new/xf86-video-chips-1.2.0/src/ct_regs.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_regs.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_regs.c 2008-03-19 18:35:01.000000000 +0100
@@ -19,7 +19,6 @@
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_regs.c,v 1.8tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_shadow.c new/xf86-video-chips-1.2.0/src/ct_shadow.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_shadow.c 2006-04-07 20:41:11.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_shadow.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/ct_video.c new/xf86-video-chips-1.2.0/src/ct_video.c
--- old/xf86-video-chips-X11R7.1-1.1.1/src/ct_video.c 2006-04-08 01:06:47.000000000 +0200
+++ new/xf86-video-chips-1.2.0/src/ct_video.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/ct_video.c,v 1.16tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -638,8 +637,8 @@
if (dblscan)
tmp = cPtr->VideoZoomMax >> 1;
if (drw_h > src_h)
- tmp = tmp * src_h / drw_h;
- cPtr->writeMR(cPtr, 0x33, tmp);
+ tmp = 256 * src_h / drw_h;
+ cPtr->writeMR(cPtr, 0x33, tmp & 0xFC);
}
cPtr->writeMR(cPtr, 0x1F, m1f);
cPtr->writeMR(cPtr, 0x1E, m1e);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/src/Makefile.am new/xf86-video-chips-1.2.0/src/Makefile.am
--- old/xf86-video-chips-X11R7.1-1.1.1/src/Makefile.am 2005-12-08 23:51:31.000000000 +0100
+++ new/xf86-video-chips-1.2.0/src/Makefile.am 2008-03-19 18:38:03.000000000 +0100
@@ -49,6 +49,7 @@
ct_dga.c \
ct_driver.c \
ct_driver.h \
+ ct_pcirename.h \
ct_regs.c \
ct_shadow.c \
ct_video.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/util/AsmMacros.h new/xf86-video-chips-1.2.0/util/AsmMacros.h
--- old/xf86-video-chips-X11R7.1-1.1.1/util/AsmMacros.h 2005-11-08 07:33:28.000000000 +0100
+++ new/xf86-video-chips-1.2.0/util/AsmMacros.h 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XConsortium: AsmMacros.h /main/13 1996/10/25 11:33:12 kaleb $ */
/*
* (c) Copyright 1993,1994 by David Wexelblat
*
@@ -57,7 +56,6 @@
*
*/
-/* $XFree86$ */
#if defined(__GNUC__)
#if defined(linux) && (defined(__alpha__) || defined(__ia64__))
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/util/dRegs.c new/xf86-video-chips-1.2.0/util/dRegs.c
--- old/xf86-video-chips-X11R7.1-1.1.1/util/dRegs.c 2004-04-23 21:27:51.000000000 +0200
+++ new/xf86-video-chips-1.2.0/util/dRegs.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,10 +1,8 @@
-/* $XConsortium: dRegs.c /main/2 1996/10/27 11:49:40 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/dRegs.c,v 1.8 2001/10/01 13:44:04 eich Exp $ */
#ifdef __NetBSD__
# include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/util/modClock.c new/xf86-video-chips-1.2.0/util/modClock.c
--- old/xf86-video-chips-X11R7.1-1.1.1/util/modClock.c 2004-04-23 21:27:51.000000000 +0200
+++ new/xf86-video-chips-1.2.0/util/modClock.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/modClock.c,v 1.5 2001/05/09 19:57:06 dbateman Exp $ */
#ifdef __NetBSD__
# include
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-chips-X11R7.1-1.1.1/util/mRegs.c new/xf86-video-chips-1.2.0/util/mRegs.c
--- old/xf86-video-chips-X11R7.1-1.1.1/util/mRegs.c 2004-04-23 21:27:51.000000000 +0200
+++ new/xf86-video-chips-1.2.0/util/mRegs.c 2008-03-19 18:35:01.000000000 +0100
@@ -1,10 +1,8 @@
-/* $XConsortium: mRegs.c /main/2 1996/10/27 11:49:43 kaleb $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/chips/util/mRegs.c,v 1.5 2000/10/23 12:10:13 alanh Exp $ */
#ifdef __NetBSD__
# include
++++++ xf86-video-cirrus-X11R7.1-1.1.0.tar.bz2 -> xf86-video-cirrus-1.2.0.tar.bz2 ++++++
++++ 22192 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/config.h.in new/xf86-video-cirrus-1.2.0/config.h.in
--- old/xf86-video-cirrus-X11R7.1-1.1.0/config.h.in 2006-05-23 05:32:39.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/config.h.in 2008-03-19 18:44:38.000000000 +0100
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
@@ -50,6 +56,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/configure.ac new/xf86-video-cirrus-1.2.0/configure.ac
--- old/xf86-video-cirrus-X11R7.1-1.1.0/configure.ac 2006-04-07 20:44:20.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/configure.ac 2008-03-19 18:44:11.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-cirrus],
- 1.1.0,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-cirrus)
@@ -58,6 +58,20 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Checks for header files.
AC_HEADER_STDC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/man/cirrus.man new/xf86-video-cirrus-1.2.0/man/cirrus.man
--- old/xf86-video-cirrus-X11R7.1-1.1.0/man/cirrus.man 2004-04-23 21:28:21.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/man/cirrus.man 2008-03-19 15:29:23.000000000 +0100
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.1 2001/01/24 00:06:17 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cirrus.man,v 1.2 2001/01/27 18:20:47 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH CIRRUS __drivermansuffix__ __vendorversion__
@@ -25,6 +25,6 @@
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/man/Makefile.am new/xf86-video-cirrus-1.2.0/man/Makefile.am
--- old/xf86-video-cirrus-X11R7.1-1.1.0/man/Makefile.am 2005-12-06 23:48:33.000000000 +0100
+++ new/xf86-video-cirrus-1.2.0/man/Makefile.am 2008-03-19 15:29:23.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:08 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/missing new/xf86-video-cirrus-1.2.0/missing
--- old/xf86-video-cirrus-X11R7.1-1.1.0/missing 2006-05-23 05:32:41.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/missing 2008-03-19 18:43:25.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/alp_driver.c new/xf86-video-cirrus-1.2.0/src/alp_driver.c
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/alp_driver.c 2006-04-07 20:44:20.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/alp_driver.c 2008-03-19 15:29:23.000000000 +0100
@@ -56,8 +56,13 @@
/* Framebuffer memory manager */
#include "xf86fbman.h"
+#if HAVE_XF4BPP
#include "xf4bpp.h"
+#endif
+#if HAVE_XF1BPP
#include "xf1bpp.h"
+#endif
+
#include "fb.h"
@@ -346,7 +351,8 @@
/* Map the Alp memory and MMIO areas */
pCir->FbMapSize = 1024*1024; /* XX temp */
- pCir->IoMapSize = 0x4000; /* 16K for moment */
+ if (!pCir->IoMapSize)
+ pCir->IoMapSize = 0x4000; /* 16K for moment */
if (!CirMapMem(pCir, pScrn->scrnIndex))
return 0;
@@ -570,9 +576,9 @@
pCir->Chipset = pCir->pEnt->chipset;
/* Find the PCI info for this screen */
pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
- pCir->PciTag = pciTag(pCir->PciInfo->bus,
- pCir->PciInfo->device,
- pCir->PciInfo->func);
+ pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
if (xf86LoadSubModule(pScrn, "int10")) {
xf86LoaderReqSymLists(int10Symbols,NULL);
@@ -583,8 +589,9 @@
* This is a hack: We restore the PCI base regs as some Colorgraphic
* BIOSes tend to mess them up
*/
- pciWriteLong(pCir->PciTag,0x10,pCir->PciInfo->memBase[0]);
- pciWriteLong(pCir->PciTag,0x14,pCir->PciInfo->memBase[1]);
+
+ PCI_WRITE_LONG(pCir->PciInfo, 0x10, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM));
+ PCI_WRITE_LONG(pCir->PciInfo, 0x14, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM));
}
@@ -595,7 +602,7 @@
* The first thing we should figure out is the depth, bpp, etc.
* We support both 24bpp and 32bpp layouts, so indicate that.
*/
- if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb |
+ if (!xf86SetDepthBpp(pScrn, 0, 0, 24, Support24bppFb | Support32bppFb |
SupportConvert32to24 | PreferConvert32to24)) {
return FALSE;
} else {
@@ -684,7 +691,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pCir->ChipRev);
} else {
- pCir->ChipRev = pCir->PciInfo->chipRev;
+ pCir->ChipRev = PCI_DEV_REVISION(pCir->PciInfo);
}
/* Find the frame buffer base address */
@@ -698,10 +705,10 @@
pCir->FbAddress = pCir->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- if (pCir->PciInfo->memBase[0] != 0) {
+ if (PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM) != 0) {
/* 5446B and 5480 use mask of 0xfe000000.
5446A uses 0xff000000. */
- pCir->FbAddress = pCir->PciInfo->memBase[0] & 0xff000000;
+ pCir->FbAddress = PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM) & 0xff000000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -724,8 +731,9 @@
pCir->IOAddress = pCir->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- if (pCir->PciInfo->memBase[1] != 0) {
- pCir->IOAddress = pCir->PciInfo->memBase[1] & 0xfffff000;
+ if (PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM) != 0) {
+ pCir->IOAddress = PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM) & 0xfffff000;
+ pCir->IoMapSize = PCI_REGION_SIZE(pCir->PciInfo, 1);
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1082,6 +1090,7 @@
/* Load bpp-specific modules */
switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
case 1:
if (xf86LoadSubModule(pScrn, "xf1bpp") == NULL) {
AlpFreeRec(pScrn);
@@ -1089,6 +1098,8 @@
}
xf86LoaderReqSymbols("xf1bppScreenInit",NULL);
break;
+#endif
+#ifdef HAVE_XF4BPP
case 4:
if (xf86LoadSubModule(pScrn, "xf4bpp") == NULL) {
AlpFreeRec(pScrn);
@@ -1096,6 +1107,7 @@
}
xf86LoaderReqSymbols("xf4bppScreenInit",NULL);
break;
+#endif
case 8:
case 16:
case 24:
@@ -1575,18 +1587,22 @@
*/
switch (pScrn->bitsPerPixel) {
+#ifdef HAVE_XF1BPP
case 1:
ret = xf1bppScreenInit(pScreen, FbBase,
width, height,
pScrn->xDpi, pScrn->yDpi,
displayWidth);
break;
+#endif
+#ifdef HAVE_XF4BPP
case 4:
ret = xf4bppScreenInit(pScreen, FbBase,
width, height,
pScrn->xDpi, pScrn->yDpi,
displayWidth);
break;
+#endif
case 8:
case 16:
case 24:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/alp.h new/xf86-video-cirrus-1.2.0/src/alp.h
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/alp.h 2004-04-23 21:28:21.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/alp.h 2008-03-19 15:29:23.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.6 2001/02/15 17:39:28 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp.h,v 1.8 2001/10/01 13:44:05 eich Exp $ */
/* (c) Itai Nahshon */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/cir_driver.c new/xf86-video-cirrus-1.2.0/src/cir_driver.c
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/cir_driver.c 2006-04-07 20:57:40.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/cir_driver.c 2008-03-19 15:29:23.000000000 +0100
@@ -53,9 +53,9 @@
#define CIR_VERSION 4000
#define CIR_NAME "CIRRUS"
#define CIR_DRIVER_NAME "cirrus"
-#define CIR_MAJOR_VERSION 1
-#define CIR_MINOR_VERSION 1
-#define CIR_PATCHLEVEL 0
+#define CIR_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define CIR_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define CIR_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the
@@ -252,7 +252,8 @@
&devSections)) <= 0) {
return FALSE;
}
-
+
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
/*
* We won't let anything in the config file override finding no
@@ -260,6 +261,7 @@
*/
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(CIR_NAME, PCI_VENDOR_CIRRUS,
CIRChipsets, CIRPciChipsets, devSections,
@@ -278,10 +280,10 @@
own driver). */
pPci = xf86GetPciInfoForEntity(usedChips[i]);
pScrn = NULL;
- if (pPci && (pPci->chipType == PCI_CHIP_GD5462 ||
- pPci->chipType == PCI_CHIP_GD5464 ||
- pPci->chipType == PCI_CHIP_GD5464BD ||
- pPci->chipType == PCI_CHIP_GD5465)) {
+ if (pPci && (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5462 ||
+ PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464 ||
+ PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5464BD ||
+ PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GD5465)) {
if (!lg_loaded) {
if (!xf86LoadDrvSubModule(drv, "cirrus_laguna"))
@@ -331,12 +333,27 @@
* Map the frame buffer.
*/
if (pCir->FbMapSize) {
+
+#ifndef XSERVER_LIBPCIACCESS
pCir->FbBase = xf86MapPciMem(scrnIndex, VIDMEM_FRAMEBUFFER,
pCir->PciTag, pCir->FbAddress,
pCir->FbMapSize);
if (pCir->FbBase == NULL)
return FALSE;
+
+#else
+ void** result = (void**)&pCir->FbBase;
+ int err = pci_device_map_range(pCir->PciInfo,
+ pCir->FbAddress,
+ pCir->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+#endif
}
#ifdef CIR_DEBUG
@@ -349,17 +366,33 @@
if (pCir->IOAddress == 0) {
pCir->IOBase = NULL; /* Until we are ready to use MMIO */
} else {
+
+#ifndef XSERVER_LIBPCIACCESS
mmioFlags = VIDMEM_MMIO;
/*
* For Alpha, we need to map SPARSE memory, since we need
* byte/short access. Common-level will automatically use
* sparse mapping for MMIO.
*/
+
pCir->IOBase =
xf86MapPciMem(scrnIndex, mmioFlags, pCir->PciTag,
pCir->IOAddress, pCir->IoMapSize);
if (pCir->IOBase == NULL)
return FALSE;
+
+#else
+ void** result = (void**)&pCir->IOBase;
+ int err = pci_device_map_range(pCir->PciInfo,
+ pCir->IOAddress,
+ pCir->IoMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+
+#endif
}
#ifdef CIR_DEBUG
@@ -388,11 +421,19 @@
/*
* Unmap IO registers to virtual address space
*/
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(scrnIndex, (pointer)pCir->IOBase, pCir->IoMapSize);
+#else
+ pci_device_unmap_range(pCir->PciInfo, (pointer)pCir->IOBase, pCir->IoMapSize);
+#endif
pCir->IOBase = NULL;
}
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(scrnIndex, (pointer)pCir->FbBase, pCir->FbMapSize);
+#else
+ pci_device_unmap_range(pCir->PciInfo, (pointer)pCir->FbBase, pCir->FbMapSize);
+#endif
pCir->FbBase = NULL;
return TRUE;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/cir.h new/xf86-video-cirrus-1.2.0/src/cir.h
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/cir.h 2006-04-07 20:44:20.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/cir.h 2008-03-19 15:29:23.000000000 +0100
@@ -11,6 +11,8 @@
#include
#include
+#include "cir_pcirename.h"
+
/* Card-specific driver information */
#define CIRPTR(p) ((CirPtr)((p)->driverPrivate))
struct lgRec;
@@ -34,8 +36,8 @@
Bool HasFBitBlt;
CARD32 IOAddress;
CARD32 FbAddress;
- unsigned char * IOBase;
- unsigned char * FbBase;
+ void * IOBase;
+ void * FbBase;
long FbMapSize;
long IoMapSize;
int MinClock;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/cir_pcirename.h new/xf86-video-cirrus-1.2.0/src/cir_pcirename.h
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/cir_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-cirrus-1.2.0/src/cir_pcirename.h 2008-03-19 15:29:23.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/lg_driver.c new/xf86-video-cirrus-1.2.0/src/lg_driver.c
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/lg_driver.c 2006-04-07 20:44:20.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/lg_driver.c 2008-03-19 15:29:23.000000000 +0100
@@ -457,9 +457,9 @@
/* Find the PCI info for this screen */
pCir->PciInfo = xf86GetPciInfoForEntity(pCir->pEnt->index);
- pCir->PciTag = pciTag(pCir->PciInfo->bus,
- pCir->PciInfo->device,
- pCir->PciInfo->func);
+ pCir->PciTag = pciTag(PCI_DEV_BUS(pCir->PciInfo),
+ PCI_DEV_DEV(pCir->PciInfo),
+ PCI_DEV_FUNC(pCir->PciInfo));
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr;
@@ -560,7 +560,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pCir->ChipRev);
} else {
- pCir->ChipRev = pCir->PciInfo->chipRev;
+ pCir->ChipRev = PCI_DEV_REVISION(pCir->PciInfo);
}
/* Cirrus swapped the FB and IO registers in the 5465 (by design). */
@@ -584,8 +584,8 @@
pCir->FbAddress = pCir->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- if (pCir->PciInfo->memBase[fbPCIReg] != 0) {
- pCir->FbAddress = pCir->PciInfo->memBase[fbPCIReg] & 0xff000000;
+ if (PCI_REGION_BASE(pCir->PciInfo, fbPCIReg, REGION_MEM) != 0) {
+ pCir->FbAddress = PCI_REGION_BASE(pCir->PciInfo, fbPCIReg, REGION_MEM) & 0xff000000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -609,8 +609,8 @@
pCir->IOAddress = pCir->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- if (pCir->PciInfo->memBase[ioPCIReg] != 0) {
- pCir->IOAddress = pCir->PciInfo->memBase[ioPCIReg] & 0xfffff000;
+ if (PCI_REGION_BASE(pCir->PciInfo, ioPCIReg, REGION_MEM) != 0) {
+ pCir->IOAddress = PCI_REGION_BASE(pCir->PciInfo, ioPCIReg, REGION_MEM) & 0xfffff000;
from = X_PROBED;
} else {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/lg.h new/xf86-video-cirrus-1.2.0/src/lg.h
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/lg.h 2004-04-23 21:28:21.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/lg.h 2008-03-19 15:29:23.000000000 +0100
@@ -10,7 +10,7 @@
* Inspired by cir.h
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.11 2000/12/06 15:35:16 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg.h,v 1.12 2001/05/04 19:05:36 dawes Exp $ */
#ifndef LG_H
#define LG_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/lg_xaa.h new/xf86-video-cirrus-1.2.0/src/lg_xaa.h
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/lg_xaa.h 2004-04-23 21:28:21.000000000 +0200
+++ new/xf86-video-cirrus-1.2.0/src/lg_xaa.h 2008-03-19 15:29:23.000000000 +0100
@@ -13,7 +13,7 @@
* This header file draws much from the file cir_blitLG.h in version 3.3.3
* of XFree86.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.1 1998/11/22 10:37:21 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/lg_xaa.h,v 1.3 2000/02/08 13:13:15 eich Exp $ */
/* This header file defines the necessary structures, contstants, and
variables for using the bitBLT engine on a Laguna family graphics
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-cirrus-X11R7.1-1.1.0/src/Makefile.am new/xf86-video-cirrus-1.2.0/src/Makefile.am
--- old/xf86-video-cirrus-X11R7.1-1.1.0/src/Makefile.am 2005-11-28 17:05:38.000000000 +0100
+++ new/xf86-video-cirrus-1.2.0/src/Makefile.am 2008-03-19 15:29:23.000000000 +0100
@@ -33,7 +33,8 @@
cir_driver.c \
cir.h \
CirrusClk.c \
- cir_shadow.c
+ cir_shadow.c \
+ cir_pcirename.h
cirrus_alpine_la_LTLIBRARIES = cirrus_alpine.la
cirrus_alpine_la_LDFLAGS = -module -avoid-version
++++++ xf86-video-dummy-X11R7.1-0.2.0.tar.bz2 -> xf86-video-dummy-0.3.0.tar.bz2 ++++++
++++ 20624 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-dummy-X11R7.1-0.2.0/config.h.in new/xf86-video-dummy-0.3.0/config.h.in
--- old/xf86-video-dummy-X11R7.1-0.2.0/config.h.in 2006-05-23 05:33:58.000000000 +0200
+++ new/xf86-video-dummy-0.3.0/config.h.in 2008-03-19 22:27:16.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-dummy-X11R7.1-0.2.0/configure.ac new/xf86-video-dummy-0.3.0/configure.ac
--- old/xf86-video-dummy-X11R7.1-0.2.0/configure.ac 2006-04-07 20:50:19.000000000 +0200
+++ new/xf86-video-dummy-0.3.0/configure.ac 2008-03-19 22:27:00.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-dummy],
- 0.2.0,
+ 0.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-dummy)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-dummy-X11R7.1-0.2.0/missing new/xf86-video-dummy-0.3.0/missing
--- old/xf86-video-dummy-X11R7.1-0.2.0/missing 2006-05-23 05:34:00.000000000 +0200
+++ new/xf86-video-dummy-0.3.0/missing 2008-03-19 22:27:17.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-dummy-X11R7.1-0.2.0/src/dummy_driver.c new/xf86-video-dummy-0.3.0/src/dummy_driver.c
--- old/xf86-video-dummy-X11R7.1-0.2.0/src/dummy_driver.c 2006-04-07 20:59:48.000000000 +0200
+++ new/xf86-video-dummy-0.3.0/src/dummy_driver.c 2008-03-19 22:26:50.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */
/*
* Copyright 2002, SuSE Linux AG, Author: Egbert Eich
@@ -85,9 +84,9 @@
#define DUMMY_NAME "DUMMY"
#define DUMMY_DRIVER_NAME "dummy"
-#define DUMMY_MAJOR_VERSION 0
-#define DUMMY_MINOR_VERSION 2
-#define DUMMY_PATCHLEVEL 0
+#define DUMMY_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define DUMMY_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define DUMMY_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This is intentionally screen-independent. It indicates the binding
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-dummy-X11R7.1-0.2.0/src/dummy.h new/xf86-video-dummy-0.3.0/src/dummy.h
--- old/xf86-video-dummy-X11R7.1-0.2.0/src/dummy.h 2006-04-07 20:50:19.000000000 +0200
+++ new/xf86-video-dummy-0.3.0/src/dummy.h 2008-03-19 22:26:50.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86$ */
/* All drivers should typically include these */
#include "xf86.h"
++++++ xf86-video-fbdev-0.3.1.tar.bz2 -> xf86-video-fbdev-0.4.0.tar.bz2 ++++++
++++ 7308 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.3.1/config.h.in new/xf86-video-fbdev-0.4.0/config.h.in
--- old/xf86-video-fbdev-0.3.1/config.h.in 2006-12-29 12:45:58.000000000 +0100
+++ new/xf86-video-fbdev-0.4.0/config.h.in 2008-03-19 18:50:53.000000000 +0100
@@ -59,6 +59,9 @@
/* Patch version of this package */
#undef PACKAGE_VERSION_PATCHLEVEL
+/* Use libpciaccess */
+#undef PCIACCESS
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.3.1/configure.ac new/xf86-video-fbdev-0.4.0/configure.ac
--- old/xf86-video-fbdev-0.3.1/configure.ac 2006-12-29 12:31:10.000000000 +0100
+++ new/xf86-video-fbdev-0.4.0/configure.ac 2008-03-19 18:50:36.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-fbdev],
- 0.3.1,
+ 0.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-fbdev)
@@ -46,6 +46,9 @@
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess],
+ [Enable use of libpciaccess (default: disabled)]),
+ [PCIACCESS=$enableval], [PCIACCESS=no])
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
@@ -56,6 +59,13 @@
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
+if test "x$PCIACCESS" = xyes; then
+ AC_DEFINE(PCIACCESS, 1, [Use libpciaccess])
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+
# Checks for libraries.
# Checks for header files.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.3.1/man/fbdev.man new/xf86-video-fbdev-0.4.0/man/fbdev.man
--- old/xf86-video-fbdev-0.3.1/man/fbdev.man 2006-07-30 14:05:54.000000000 +0200
+++ new/xf86-video-fbdev-0.4.0/man/fbdev.man 2008-03-19 15:29:32.000000000 +0100
@@ -60,4 +60,4 @@
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__),
X(__miscmansuffix__), fbdevhw(__drivermansuffix__)
.SH AUTHORS
-Authors include: Gerd Knorr, Michel Dänzer, Geert Uytterhoeven
+Authors include: Gerd Knorr, Michel D\(:anzer, Geert Uytterhoeven
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.3.1/missing new/xf86-video-fbdev-0.4.0/missing
--- old/xf86-video-fbdev-0.3.1/missing 2006-12-27 09:27:06.000000000 +0100
+++ new/xf86-video-fbdev-0.4.0/missing 2008-03-19 18:50:54.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-fbdev-0.3.1/src/fbdev.c new/xf86-video-fbdev-0.4.0/src/fbdev.c
--- old/xf86-video-fbdev-0.3.1/src/fbdev.c 2006-12-29 12:39:35.000000000 +0100
+++ new/xf86-video-fbdev-0.4.0/src/fbdev.c 2008-03-19 15:29:32.000000000 +0100
@@ -34,6 +34,10 @@
#include "xf86xv.h"
+#ifdef XSERVER_LIBPCIACCESS
+#include
+#endif
+
static Bool debug = 0;
#define TRACE_ENTER(str) \
@@ -49,6 +53,10 @@
static const OptionInfoRec * FBDevAvailableOptions(int chipid, int busid);
static void FBDevIdentify(int flags);
static Bool FBDevProbe(DriverPtr drv, int flags);
+#ifdef XSERVER_LIBPCIACCESS
+static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
+ struct pci_device *dev, intptr_t match_data);
+#endif
static Bool FBDevPreInit(ScrnInfoPtr pScrn, int flags);
static Bool FBDevScreenInit(int Index, ScreenPtr pScreen, int argc,
char **argv);
@@ -76,6 +84,17 @@
#define FBDEV_NAME "FBDEV"
#define FBDEV_DRIVER_NAME "fbdev"
+#ifdef XSERVER_LIBPCIACCESS
+static const struct pci_id_match fbdev_device_match[] = {
+ {
+ PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
+ 0x00030000, 0x00ffffff, 0
+ },
+
+ { 0, 0, 0 },
+};
+#endif
+
_X_EXPORT DriverRec FBDEV = {
FBDEV_VERSION,
FBDEV_DRIVER_NAME,
@@ -87,7 +106,12 @@
FBDevAvailableOptions,
NULL,
0,
- FBDevDriverFunc
+ FBDevDriverFunc,
+
+#ifdef XSERVER_LIBPCIACCESS
+ fbdev_device_match,
+ FBDevPciProbe
+#endif
};
/* Supported "chipsets" */
@@ -273,6 +297,55 @@
xf86PrintChipsets(FBDEV_NAME, "driver for framebuffer", FBDevChipsets);
}
+
+#ifdef XSERVER_LIBPCIACCESS
+static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
+ struct pci_device *dev, intptr_t match_data)
+{
+ ScrnInfoPtr pScrn = NULL;
+
+ if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
+ return FALSE;
+
+ xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
+
+ pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL,
+ NULL, NULL, NULL, NULL);
+ if (pScrn) {
+ char *device;
+ GDevPtr devSection = xf86GetDevFromEntity(pScrn->entityList[0],
+ pScrn->entityInstanceList[0]);
+
+ device = xf86FindOptionValue(devSection->options, "fbdev");
+ if (fbdevHWProbe(NULL, device, NULL)) {
+ pScrn->driverVersion = FBDEV_VERSION;
+ pScrn->driverName = FBDEV_DRIVER_NAME;
+ pScrn->name = FBDEV_NAME;
+ pScrn->Probe = FBDevProbe;
+ pScrn->PreInit = FBDevPreInit;
+ pScrn->ScreenInit = FBDevScreenInit;
+ pScrn->SwitchMode = fbdevHWSwitchModeWeak();
+ pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
+ pScrn->EnterVT = fbdevHWEnterVTWeak();
+ pScrn->LeaveVT = fbdevHWLeaveVTWeak();
+ pScrn->ValidMode = fbdevHWValidModeWeak();
+
+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
+ "claimed PCI slot %d@%d:%d:%d\n",
+ dev->bus, dev->domain, dev->dev, dev->func);
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ "using %s\n", device ? device : "default device");
+ }
+ else {
+ pScrn = NULL;
+ }
+ }
+
+ return (pScrn != NULL);
+}
+#endif
+
+
static Bool
FBDevProbe(DriverPtr drv, int flags)
{
@@ -300,21 +373,27 @@
for (i = 0; i < numDevSections; i++) {
Bool isIsa = FALSE;
+#ifndef XSERVER_LIBPCIACCESS
Bool isPci = FALSE;
+#endif
dev = xf86FindOptionValue(devSections[i]->options,"fbdev");
if (devSections[i]->busID) {
+#ifndef XSERVER_LIBPCIACCESS
if (xf86ParsePciBusString(devSections[i]->busID,&bus,&device,
&func)) {
if (!xf86CheckPciSlot(bus,device,func))
continue;
isPci = TRUE;
- } else if (xf86ParseIsaBusString(devSections[i]->busID))
+ } else
+#endif
+ if (xf86ParseIsaBusString(devSections[i]->busID))
isIsa = TRUE;
}
if (fbdevHWProbe(NULL,dev,NULL)) {
pScrn = NULL;
+#ifndef XSERVER_LIBPCIACCESS
if (isPci) {
/* XXX what about when there's no busID set? */
int entity;
@@ -331,7 +410,9 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG,
"claimed PCI slot %d:%d:%d\n",bus,device,func);
- } else if (isIsa) {
+ } else
+#endif
+ if (isIsa) {
int entity;
entity = xf86ClaimIsaSlot(drv, 0,
@@ -523,15 +604,8 @@
fbdevHWUseBuildinMode(pScrn);
pScrn->currentMode = pScrn->modes;
- if (fPtr->shadowFB)
- pScrn->displayWidth = pScrn->virtualX; /* ShadowFB handles this correctly */
- else {
- int fbbpp;
- /* FIXME: this doesn't work for all cases, e.g. when each scanline
- has a padding which is independent from the depth (controlfb) */
- fbdevHWGetDepth(pScrn,&fbbpp);
- pScrn->displayWidth = fbdevHWGetLineLength(pScrn)/(fbbpp >> 3);
- }
+ /* First approximation, may be refined in ScreenInit */
+ pScrn->displayWidth = pScrn->virtualX;
xf86PrintModes(pScrn);
@@ -719,6 +793,17 @@
int tmp = pScrn->virtualX;
pScrn->virtualX = pScrn->displayWidth = pScrn->virtualY;
pScrn->virtualY = tmp;
+ } else if (!fPtr->shadowFB) {
+ /* FIXME: this doesn't work for all cases, e.g. when each scanline
+ has a padding which is independent from the depth (controlfb) */
+ pScrn->displayWidth = fbdevHWGetLineLength(pScrn) /
+ (pScrn->bitsPerPixel / 8);
+
+ if (pScrn->displayWidth != pScrn->virtualX) {
+ xf86DrvMsg(scrnIndex, X_INFO,
+ "Pitch updated to %d after ModeInit\n",
+ pScrn->displayWidth);
+ }
}
if(fPtr->rotate && !fPtr->PointerMoved) {
++++++ xf86-video-glint-X11R7.1-1.1.1.tar.bz2 -> xf86-video-glint-1.2.0.tar.bz2 ++++++
++++ 22398 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/config.h.in new/xf86-video-glint-1.2.0/config.h.in
--- old/xf86-video-glint-X11R7.1-1.1.1/config.h.in 2006-05-23 05:34:36.000000000 +0200
+++ new/xf86-video-glint-1.2.0/config.h.in 2008-03-19 18:57:11.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/configure.ac new/xf86-video-glint-1.2.0/configure.ac
--- old/xf86-video-glint-X11R7.1-1.1.1/configure.ac 2006-04-08 03:23:07.000000000 +0200
+++ new/xf86-video-glint-1.2.0/configure.ac 2008-03-19 18:56:59.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-glint],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-glint)
@@ -64,6 +64,12 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
@@ -96,6 +102,13 @@
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/DRI.txt new/xf86-video-glint-1.2.0/DRI.txt
--- old/xf86-video-glint-X11R7.1-1.1.1/DRI.txt 2004-04-23 21:33:32.000000000 +0200
+++ new/xf86-video-glint-1.2.0/DRI.txt 2008-03-19 15:29:36.000000000 +0100
@@ -9,7 +9,7 @@
of this document provided the copyright notice and this permission
notice are preserved on all copies.
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.1 1999/06/14 07:31:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/DRI.txt,v 1.2 2000/02/23 04:47:06 martin Exp $
GLINT State Transition Strategy
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/man/Makefile.am new/xf86-video-glint-1.2.0/man/Makefile.am
--- old/xf86-video-glint-X11R7.1-1.1.1/man/Makefile.am 2005-12-06 23:48:34.000000000 +0100
+++ new/xf86-video-glint-1.2.0/man/Makefile.am 2008-03-19 15:29:36.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:09 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/missing new/xf86-video-glint-1.2.0/missing
--- old/xf86-video-glint-X11R7.1-1.1.1/missing 2006-05-23 05:34:39.000000000 +0200
+++ new/xf86-video-glint-1.2.0/missing 2008-03-19 18:57:12.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/README.pm3 new/xf86-video-glint-1.2.0/README.pm3
--- old/xf86-video-glint-X11R7.1-1.1.1/README.pm3 2004-04-23 21:33:32.000000000 +0200
+++ new/xf86-video-glint-1.2.0/README.pm3 2008-03-19 15:29:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.12 2001/08/18 11:37:30 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/README.pm3,v 1.13 2002/05/07 23:15:58 alanh Exp $ */
STATUS as of Tue, 8 May 2001 19:01:39 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glint_common.h new/xf86-video-glint-1.2.0/src/glint_common.h
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glint_common.h 2004-04-23 21:33:32.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/glint_common.h 2008-03-19 15:29:36.000000000 +0100
@@ -25,7 +25,7 @@
* Converted to common header format:
* Jens Owen
*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.1 2002/10/30 12:52:15 alanh Exp $
+ * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_common.h,v 1.2 2003/04/03 16:52:18 dawes Exp $
*
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glint_dri.c new/xf86-video-glint-1.2.0/src/glint_dri.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glint_dri.c 2006-04-07 21:07:59.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/glint_dri.c 2008-03-19 15:29:36.000000000 +0100
@@ -489,16 +489,18 @@
if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
pDRIInfo->busIdString = DRICreatePCIBusID(pGlint->PciInfo);
} else {
+#ifndef XSERVER_LIBPCIACCESS
pDRIInfo->busIdString = xalloc(64); /* Freed in DRIDestroyInfoRec */
sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
((pciConfigPtr)pGlint->PciInfo->thisCard)->busnum,
((pciConfigPtr)pGlint->PciInfo->thisCard)->devnum,
((pciConfigPtr)pGlint->PciInfo->thisCard)->funcnum);
+#endif
}
pDRIInfo->ddxDriverMajorVersion = GLINT_MAJOR_VERSION;
pDRIInfo->ddxDriverMinorVersion = GLINT_MINOR_VERSION;
pDRIInfo->ddxDriverPatchVersion = GLINT_PATCHLEVEL;
- pDRIInfo->frameBufferPhysicalAddress = pGlint->FbAddress;
+ pDRIInfo->frameBufferPhysicalAddress = (pointer) pGlint->FbAddress;
pDRIInfo->frameBufferSize = pGlint->FbMapSize;
pDRIInfo->frameBufferStride =
pScrn->displayWidth * (pScrn->bitsPerPixel >> 3);
@@ -775,12 +777,9 @@
if (pGlint->irq <= 0) {
pGlint->irq = drmGetInterruptFromBusID(pGlint->drmSubFD,
- ((pciConfigPtr)pGlint->PciInfo
- ->thisCard)->busnum,
- ((pciConfigPtr)pGlint->PciInfo
- ->thisCard)->devnum,
- ((pciConfigPtr)pGlint->PciInfo
- ->thisCard)->funcnum);
+ PCI_CFG_BUS(pGlint->PciInfo),
+ PCI_CFG_DEV(pGlint->PciInfo),
+ PCI_CFG_FUNC(pGlint->PciInfo));
}
return TRUE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glint_dri.h new/xf86-video-glint-1.2.0/src/glint_dri.h
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glint_dri.h 2004-04-23 21:33:32.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/glint_dri.h 2008-03-19 15:29:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.6 2002/02/22 21:45:16 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_dri.h,v 1.7 2002/10/30 12:52:16 alanh Exp $ */
/**************************************************************************
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glint_driver.c new/xf86-video-glint-1.2.0/src/glint_driver.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glint_driver.c 2006-04-07 21:07:59.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/glint_driver.c 2008-03-19 15:29:36.000000000 +0100
@@ -344,7 +344,7 @@
#ifdef XFree86LOADER
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
static const char *drmSymbols[] = {
"drmAddBufs",
"drmAddMap",
@@ -414,7 +414,7 @@
xaaSymbols, xf8_32bppSymbols,
shadowSymbols, fbdevHWSymbols, GLINTint10Symbols,
vbeSymbols, ramdacSymbols,
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
drmSymbols, driSymbols,
#endif
NULL);
@@ -651,10 +651,12 @@
&devSections)) <= 0) {
return FALSE;
}
-
+
+#ifndef XSERVER_LIBPCIACCESS
checkusedPci = xf86GetPciVideoInfo();
- if (checkusedPci == NULL && devSections /* for xf86DoProbe */) {
+ if (checkusedPci == NULL && devSections /* for xf86DoProbe */)
+ {
/*
* Changed the behaviour to try probing using the FBDev support
* when no PCI cards have been found. This is for systems without
@@ -721,8 +723,9 @@
xfree(devSections);
- } else if (checkusedPci) {
-
+ } else if (checkusedPci)
+#endif
+{
if (flags & PROBE_DETECT) {
/* HACK, Currently when -configuring, we only return VGA
* based chips. Manual configuring is necessary to poke
@@ -745,8 +748,8 @@
if (!(flags & PROBE_DETECT))
for (i = 0; i < numUsed; i++) {
ScrnInfoPtr pScrn = NULL;
- GLINTEntPtr pGlintEnt = NULL;
- DevUnion *pPriv;
+ GLINTEntPtr pGlintEnt = NULL;
+ DevUnion *pPriv;
pPci = xf86GetPciInfoForEntity(usedChips[i]);
/* Allocate a ScrnInfoRec and claim the slot */
@@ -756,14 +759,16 @@
/* Claim specifics, when we KNOW ! the board */
-
+#ifndef XSERVER_LIBPCIACCESS
/* Appian Jeronimo J2000 */
- if ((pPci->subsysVendor == 0x1097) &&
- (pPci->subsysCard == 0x3d32)) {
+ if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) &&
+ (PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) {
int eIndex;
+ int init_func;
+
if (!xf86IsEntityShared(usedChips[i])) {
eIndex = xf86ClaimPciSlot(pPci->bus,
- pPci->device,
+ pPci->device,
1,
drv, -1 /* XXX */,
NULL, FALSE);
@@ -778,15 +783,15 @@
}
} else
/* Only claim other chips when GAMMA is used */
- if ((pPci->chipType == PCI_CHIP_GAMMA) ||
- (pPci->chipType == PCI_CHIP_GAMMA2) ||
- (pPci->chipType == PCI_CHIP_DELTA)) {
+ if ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) {
while (*checkusedPci != NULL) {
int eIndex;
/* make sure we claim all but our source device */
- if ((pPci->bus == (*checkusedPci)->bus &&
- pPci->device == (*checkusedPci)->device) &&
- pPci->func != (*checkusedPci)->func) {
+ if ((pPci->bus == PCI_DEV_BUS(*checkusedPci) &&
+ pPci->device == PCI_DEV_DEV((*checkusedPci)) &&
+ pPci->func != PCI_DEV_FUNC(*checkusedPci))) {
/* Claim other entities on the same card */
eIndex = xf86ClaimPciSlot((*checkusedPci)->bus,
@@ -799,9 +804,9 @@
xf86AddEntityToScreen(pScrn,eIndex);
} else {
ErrorF("BusID %d:%d:%d already claimed\n",
- (*checkusedPci)->bus,
- (*checkusedPci)->device,
- (*checkusedPci)->func);
+ PCI_DEV_BUS(*checkusedPci),
+ PCI_DEV_DEV(*checkusedPci),
+ PCI_DEV_FUNC(*checkusedPci));
xfree(usedChips);
return FALSE;
}
@@ -809,6 +814,7 @@
checkusedPci++;
}
}
+#endif
/* Fill in what we can of the ScrnInfoRec */
pScrn->driverVersion = GLINT_VERSION;
@@ -825,8 +831,8 @@
/* Allow sharing if Appian J2000 detected */
/* (later Diamond FireGL3000 support too) */
- if ((pPci->subsysVendor == 0x1097) &&
- (pPci->subsysCard == 0x3d32)) {
+ if ((PCI_SUB_VENDOR_ID(pPci) == 0x1097) &&
+ (PCI_SUB_DEVICE_ID(pPci) == 0x3d32)) {
xf86SetEntitySharable(usedChips[i]);
/* Allocate an entity private if necessary */
if (GLINTEntityIndex < 0)
@@ -1031,8 +1037,10 @@
if (pGlint->pEnt->location.type == BUS_PCI)
{
pGlint->PciInfo = xf86GetPciInfoForEntity(pGlint->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pGlint->PciTag = pciTag(pGlint->PciInfo->bus, pGlint->PciInfo->device,
pGlint->PciInfo->func);
+#endif
}
pGlint->InFifoSpace = 0; /* Force a Read of FIFO space on first run */
@@ -1046,14 +1054,14 @@
for (i = 1; i < pScrn->numEntities; i++) {
pEnt = xf86GetEntityInfo(pScrn->entityList[i]);
pPci = xf86GetPciInfoForEntity(pEnt->index);
- if ( (pPci->chipType == PCI_CHIP_MX) ||
- (pPci->chipType == PCI_CHIP_PERMEDIA) ||
- (pPci->chipType == PCI_CHIP_TI_PERMEDIA) ||
- (pPci->chipType == PCI_CHIP_500TX) ||
- (pPci->chipType == PCI_CHIP_300SX) ||
- (pPci->chipType == PCI_CHIP_R4) ||
- (pPci->chipType == PCI_CHIP_PERMEDIA3) ) {
- pGlint->MultiChip = pPci->chipType;
+ if ( (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_MX) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_TI_PERMEDIA) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_500TX) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_300SX) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_R4) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_PERMEDIA3) ) {
+ pGlint->MultiChip = PCI_DEV_DEVICE_ID(pPci);
if (pGlint->numMultiDevices >= GLINT_MAX_MULTI_DEVICES) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"%d multiple chips unsupported, aborting. (Max - 2)\n",
@@ -1071,9 +1079,9 @@
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index);
- if ( ((pPci->chipType == PCI_CHIP_GAMMA) ||
- (pPci->chipType == PCI_CHIP_GAMMA2) ||
- (pPci->chipType == PCI_CHIP_DELTA)) &&
+ if ( ((PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_GAMMA2) ||
+ (PCI_DEV_DEVICE_ID(pPci) == PCI_CHIP_DELTA)) &&
(pGlint->numMultiDevices == 0) ) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Gamma/Delta with ZERO connected chips, aborting\n");
@@ -1085,9 +1093,9 @@
EntityInfoPtr pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
pciVideoPtr pPci = xf86GetPciInfoForEntity(pEnt->index);
- if ((pPci->chipType != PCI_CHIP_GAMMA) &&
- (pPci->chipType != PCI_CHIP_GAMMA2) &&
- (pPci->chipType != PCI_CHIP_DELTA)) {
+ if ((PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA) &&
+ (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_GAMMA2) &&
+ (PCI_DEV_DEVICE_ID(pPci) != PCI_CHIP_DELTA)) {
GLINTProbeDDC(pScrn, pGlint->pEnt->index);
return TRUE;
} else
@@ -1314,8 +1322,8 @@
pGlint->Chipset);
} else {
from = X_PROBED;
- pGlint->Chipset = pGlint->PciInfo->vendor << 16 |
- pGlint->PciInfo->chipType;
+ pGlint->Chipset = PCI_DEV_VENDOR_ID(pGlint->PciInfo) << 16 |
+ PCI_DEV_DEVICE_ID(pGlint->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(GLINTChipsets,
pGlint->Chipset);
}
@@ -1324,7 +1332,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pGlint->ChipRev);
} else {
- pGlint->ChipRev = pGlint->PciInfo->chipRev;
+ pGlint->ChipRev = PCI_DEV_REVISION(pGlint->PciInfo);
}
}
@@ -1370,7 +1378,7 @@
pGlint->FbAddress = pGlint->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- pGlint->FbAddress = pGlint->PciInfo->memBase[2] & 0xFF800000;
+ pGlint->FbAddress = PCI_REGION_BASE(pGlint->PciInfo, 2, REGION_MEM) & 0xFF800000;
}
if (pGlint->FbAddress)
@@ -1380,11 +1388,11 @@
/* Trap GAMMA & DELTA specification, with no linear address */
/* Find the first GLINT chip and use that address */
if (pGlint->FbAddress == 0) {
- if (pGlint->MultiPciInfo[0]->memBase[2]) {
- pGlint->FbAddress = pGlint->MultiPciInfo[0]->memBase[2];
+ if (PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM)) {
+ pGlint->FbAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"FrameBuffer used from first rasterizer chip at 0x%lx\n",
- pGlint->MultiPciInfo[0]->memBase[2]);
+ PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM));
} else {
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"No FrameBuffer memory - aborting\n");
@@ -1400,7 +1408,7 @@
pGlint->IOAddress = pGlint->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- pGlint->IOAddress = pGlint->PciInfo->memBase[0] & 0xFFFFC000;
+ pGlint->IOAddress = PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
}
if ((IS_J2000) && (pGlint->Chipset == PCI_VENDOR_3DLABS_CHIP_GAMMA)) {
@@ -1484,12 +1492,9 @@
/* Delta has a bug, we need to fix it here */
{
int basecopro =
- pGlint->MultiPciInfo[0]->memBase[0] & 0xFFFFC000;
- int basedelta = pGlint->PciInfo->memBase[0] & 0xFFFFC000;
- int glintdelta = pGlint->PciTag;
- int glintcopro = pciTag(pGlint->MultiPciInfo[0]->bus,
- pGlint->MultiPciInfo[0]->device,
- pGlint->MultiPciInfo[0]->func);
+ PCI_REGION_BASE(pGlint->MultiPciInfo[0], 0, REGION_MEM) & 0xFFFFC000;
+ int basedelta = PCI_REGION_BASE(pGlint->PciInfo, 0, REGION_MEM) & 0xFFFFC000;
+ int dummy;
int base3copro, offset;
if( (basedelta & 0x20000) ^ (basecopro & 0x20000) ) {
@@ -1499,7 +1504,7 @@
} else {
offset = 0x1c; /* base3 */
}
- base3copro = pciReadLong(glintcopro, offset);
+ PCI_READ_LONG(pGlint->MultiPciInfo[0], &base3copro, offset);
if( (basecopro & 0x20000) ^ (base3copro & 0x20000) ) {
/*
* oops, still different; we know that base3
@@ -1515,25 +1520,27 @@
* read value
* write new value
*/
- (void) pciReadLong(glintdelta, 0x10);
- pciWriteLong(glintdelta, 0x10, 0xffffffff);
- (void) pciReadLong(glintdelta, 0x10);
- pciWriteLong(glintdelta, 0x10, base3copro);
+ PCI_READ_LONG(pGlint->PciInfo, &dummy, 0x10);
+ PCI_WRITE_LONG(pGlint->PciInfo, 0xffffffff, 0x10);
+ PCI_READ_LONG(pGlint->PciInfo, &dummy, 0x10);
+ PCI_WRITE_LONG(pGlint->PciInfo, base3copro, 0x10);
/*
* additionally,sometimes we see the baserom which might
* confuse the chip, so let's make sure that is disabled
*/
- (void) pciReadLong(glintcopro, 0x30);
- pciWriteLong(glintcopro, 0x30, 0xffffffff);
- (void) pciReadLong(glintcopro, 0x30);
- pciWriteLong(glintcopro, 0x30, 0);
+ PCI_READ_LONG(pGlint->MultiPciInfo[0], &dummy, 0x30);
+ PCI_WRITE_LONG(pGlint->MultiPciInfo[0], 0xffffffff, 0x30);
+ PCI_READ_LONG(pGlint->MultiPciInfo[0], &dummy, 0x30);
+ PCI_WRITE_LONG(pGlint->MultiPciInfo[0], 0, 0x30);
/*
* now update our internal structure accordingly
*/
- pGlint->IOAddress =
+ pGlint->IOAddress = base3copro;
+#ifndef XSERVER_LIBPCIACCESS
pGlint->PciInfo->memBase[0] = base3copro;
+#endif
xf86DrvMsg(pScrn->scrnIndex, from,
"Delta Bug - Changing MMIO registers to 0x%lX\n",
(unsigned long)pGlint->IOAddress);
@@ -2458,17 +2465,47 @@
* Map IO registers to virtual address space
* We always map VGA IO registers - even if we don't need them
*/
+#ifndef XSERVER_LIBPCIACCESS
pGlint->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
pGlint->PciTag, pGlint->IOAddress, 0x20000);
+#else
+ {
+ void** result = (void**)&pGlint->IOBase;
+ int err = pci_device_map_range(pGlint->PciInfo,
+ pGlint->IOAddress,
+ 0x20000,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pGlint->IOBase == NULL)
return FALSE;
if (pGlint->FbMapSize != 0) {
+#ifndef XSERVER_LIBPCIACCESS
pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pGlint->PciTag,
pGlint->FbAddress,
pGlint->FbMapSize);
+#else
+ {
+ void** result = (void**)&pGlint->FbBase;
+ int err = pci_device_map_range(pGlint->PciInfo,
+ pGlint->FbAddress,
+ pGlint->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+
+#endif
if (pGlint->FbBase == NULL)
return FALSE;
}
@@ -2503,11 +2540,20 @@
/*
* Unmap IO registers to virtual address space
*/
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->IOBase, 0x20000);
+#else
+ pci_device_unmap_range(pGlint->PciInfo, pGlint->IOBase, 0x20000);
+#endif
pGlint->IOBase = NULL;
- if (pGlint->FbBase != NULL)
+ if (pGlint->FbBase != NULL) {
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase, pGlint->FbMapSize);
+#else
+ pci_device_unmap_range(pGlint->PciInfo, pGlint->FbBase, pGlint->FbMapSize);
+#endif
+ }
pGlint->FbBase = NULL;
TRACE_EXIT("GLINTUnmapMem");
@@ -2924,7 +2970,7 @@
return FALSE;
}
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
/*
* Setup DRI after visuals have been established, but before fbScreenInit
* is called. fbScreenInit will eventually call into the drivers
@@ -3153,7 +3199,7 @@
xf86DPMSInit(pScreen, (DPMSSetProcPtr)GLINTDisplayPowerManagementSet, 0);
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
if (pGlint->directRenderingEnabled) {
/* Now that mi, cfb, drm and others have done their thing,
* complete the DRI setup.
@@ -3462,7 +3508,7 @@
GLINTPtr pGlint = GLINTPTR(pScrn);
TRACE_ENTER("GLINTCloseScreen");
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
if (pGlint->directRenderingEnabled) {
GLINTDRICloseScreen(pScreen);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glint.h new/xf86-video-glint-1.2.0/src/glint.h
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glint.h 2006-04-08 03:23:07.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/glint.h 2008-03-19 15:29:36.000000000 +0100
@@ -30,13 +30,19 @@
#ifndef _GLINT_H_
#define _GLINT_H_
+#include
+#include
+#include
+
+#include "glintpcirename.h"
+
#include "xaa.h"
#include "xf86RamDac.h"
#include "xf86cmap.h"
#include "xf86i2c.h"
#include "xf86DDC.h"
#include "xf86xv.h"
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
#include "xf86drm.h"
#include "sarea.h"
#define _XF86DRI_SERVER_
@@ -44,18 +50,15 @@
#include "GL/glxint.h"
#include "glint_dripriv.h"
#endif
-#include
-#include
-#include
#define GLINT_MAX_MULTI_DEVICES 2
#define GLINT_VERSION 4000
#define GLINT_NAME "GLINT"
#define GLINT_DRIVER_NAME "glint"
-#define GLINT_MAJOR_VERSION 1
-#define GLINT_MINOR_VERSION 1
-#define GLINT_PATCHLEVEL 1
+#define GLINT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define GLINT_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define GLINT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
typedef struct {
CARD32 glintRegs[0x2000];
@@ -77,7 +80,9 @@
int numMultiDevices;
int MultiChip;
Bool MultiAperture;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
EntityInfoPtr pEnt;
GLINTEntPtr entityPrivate;
RamDacHelperRecPtr RamDac;
@@ -169,7 +174,7 @@
void (*VideoTimerCallback)(ScrnInfoPtr, Time);
XF86VideoAdaptorPtr adaptor;
int videoKey;
-#ifdef XF86DRI
+#ifdef XF86DRI_DEVEL
Bool directRenderingEnabled;
Bool PCIMode;
DRIInfoPtr pDRIInfo;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glintpcirename.h new/xf86-video-glint-1.2.0/src/glintpcirename.h
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glintpcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-glint-1.2.0/src/glintpcirename.h 2008-03-19 15:29:36.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef SISPCIRENAME_H
+#define SISPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* SISPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/glint_regs.h new/xf86-video-glint-1.2.0/src/glint_regs.h
--- old/xf86-video-glint-X11R7.1-1.1.1/src/glint_regs.h 2004-04-23 21:33:32.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/glint_regs.h 2008-03-19 15:29:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.36 2003/01/12 03:55:47 tsi Exp $ */
/*
* glint register file
@@ -34,46 +34,46 @@
#define PCI_CHIP_3DLABS_GAMMA2 0x0E
/* The boards we know */
-#define IS_GLORIAXXL ((pGlint->PciInfo->subsysVendor == 0x1048) && \
- (pGlint->PciInfo->subsysCard == 0x0a42))
+#define IS_GLORIAXXL ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a42))
-#define IS_GLORIASYNERGY ((pGlint->PciInfo->subsysVendor == 0x1048) && \
- (pGlint->PciInfo->subsysCard == 0x0a32))
+#define IS_GLORIASYNERGY ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a32))
-#define IS_GMX2000 ((pGlint->PciInfo->subsysVendor == 0x3d3d) && \
- (pGlint->PciInfo->subsysCard == 0x0106))
+#define IS_GMX2000 ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d) && \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0106))
-#define IS_J2000 ((pGlint->PciInfo->subsysVendor == 0x1097) && \
- (pGlint->PciInfo->subsysCard == 0x3d32))
+#define IS_J2000 ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1097) && \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x3d32))
-#define IS_JPRO ((pGlint->PciInfo->subsysVendor == 0x1097) && \
- (pGlint->PciInfo->subsysCard == 0x3db3))
+#define IS_JPRO ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1097) && \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x3db3))
/* COMPAQ OEM VX1 PCI
* subsys == 0x0121 if VGA is enabled
* subsys == 0x000a if VGA has never been enabled
*/
-#define IS_PCI_QVX1 (pGlint->PciInfo->subsysVendor == 0x3d3d && \
- ((pGlint->PciInfo->subsysCard == 0x0121) || \
- (pGlint->PciInfo->subsysCard == 0x000a)))
+#define IS_PCI_QVX1 (PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d && \
+ ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0121) || \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x000a)))
/* COMPAQ OEM VX1 AGP
* subsys == 0x0144 if VGA is enabled
* subsys == 0x000c if VGA has never been enabled
*/
-#define IS_AGP_QVX1 (pGlint->PciInfo->subsysVendor == 0x3d3d && \
- ((pGlint->PciInfo->subsysCard == 0x0144) || \
- (pGlint->PciInfo->subsysCard == 0x000c)))
+#define IS_AGP_QVX1 (PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x3d3d && \
+ ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0144) || \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x000c)))
#define IS_QVX1 (IS_PCI_QVX1 || IS_AGP_QVX1)
-#define IS_ELSA_SYNERGY ((pGlint->PciInfo->subsysVendor == 0x1048) && \
- (pGlint->PciInfo->subsysCard == 0x0a32))
+#define IS_ELSA_SYNERGY ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x1048) && \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0a32))
/* COMPAQ OEM Permedia 2V with VGA disable jumper - 0x13e9 ? */
-#define IS_QPM2V ((pGlint->PciInfo->subsysVendor == 0x13e9) && \
- ((pGlint->PciInfo->subsysCard == 0x0100) || \
- (pGlint->PciInfo->subsysCard == 0x0002)))
+#define IS_QPM2V ((PCI_SUB_VENDOR_ID(pGlint->PciInfo) == 0x13e9) && \
+ ((PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0100) || \
+ (PCI_SUB_DEVICE_ID(pGlint->PciInfo) == 0x0002)))
/**********************************************
* GLINT 500TX Configuration Region Registers *
@@ -1248,7 +1248,8 @@
#define GLINTDACDelay(x) do { \
int delay = x; \
- while(delay--){(void)GLINT_READ_REG(InFIFOSpace);}; \
+ unsigned char tmp; \
+ while(delay--){tmp = GLINT_READ_REG(InFIFOSpace);}; \
} while(0)
#define GLINT_MASK_WRITE_REG(v,m,r) \
@@ -1281,7 +1282,7 @@
} \
}
-#ifndef XF86DRI
+#ifndef XF86DRI_DEVEL
#define LOADROP(rop) \
{ \
if (pGlint->ROP != rop) { \
@@ -1306,7 +1307,7 @@
} \
}
-#ifndef XF86DRI
+#ifndef XF86DRI_DEVEL
#define DO_PLANEMASK(planemask) \
{ \
if (planemask != pGlint->planemask) { \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/Makefile.am new/xf86-video-glint-1.2.0/src/Makefile.am
--- old/xf86-video-glint-X11R7.1-1.1.1/src/Makefile.am 2005-09-27 22:53:19.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/Makefile.am 2008-03-19 18:59:45.000000000 +0100
@@ -33,6 +33,7 @@
glint_dga.c \
glint_driver.c \
glint.h \
+ glintpcirename.h \
glint_regs.h \
glint_shadow.c \
IBMramdac.c \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/pm2_video.c new/xf86-video-glint-1.2.0/src/pm2_video.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/pm2_video.c 2006-04-08 01:07:25.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/pm2_video.c 2008-03-19 15:29:36.000000000 +0100
@@ -41,6 +41,8 @@
#include
#include
#include
+#include
+#include
#undef MIN
#undef ABS
@@ -2767,9 +2769,9 @@
xvipc.pAPriv = pAPriv; /* Server head ID */
xvipc.op = OP_CONNECT;
- xvipc.a = pGlint->PciInfo->bus;
- xvipc.b = pGlint->PciInfo->device;
- xvipc.c = pGlint->PciInfo->func;
+ xvipc.a = PCI_DEV_BUS(pGlint->PciInfo);
+ xvipc.b = PCI_DEV_DEV(pGlint->PciInfo);
+ xvipc.c = PCI_DEV_FUNC(pGlint->PciInfo);
xvipc.d = pScrn->videoRam << 10; /* XF86Config overrides probing */
@@ -3004,8 +3006,10 @@
break;
}
- if (VideoIO)
- switch (pciReadLong(pGlint->PciTag, PCI_SUBSYSTEM_ID_REG)) {
+ if (VideoIO) {
+ unsigned int temp;
+ PCI_READ_LONG(pGlint->PciInfo, &temp, PCI_SUBSYSTEM_ID_REG);
+ switch (temp) {
case PCI_SUBSYSTEM_ID_WINNER_2000_P2A:
case PCI_SUBSYSTEM_ID_WINNER_2000_P2C:
case PCI_SUBSYSTEM_ID_GLORIA_SYNERGY_P2A:
@@ -3016,7 +3020,7 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_PROBED, 1, "No Xv vio support for this board\n");
VideoIO = FALSE;
}
-
+ }
if (pGlint->NoAccel && !VideoIO)
return;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/pm3_accel.c new/xf86-video-glint-1.2.0/src/pm3_accel.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/pm3_accel.c 2006-04-07 21:07:59.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/pm3_accel.c 2008-03-19 15:29:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XdotOrg: driver/xf86-video-glint/src/pm3_accel.c,v 1.6 2006/04/07 19:07:59 ajax Exp $ */
+/* $XdotOrg: driver/xf86-video-glint/src/pm3_accel.c,v 1.5 2005/07/11 02:29:49 ajax Exp $ */
/*
* Copyright 2000-2001 by Sven Luther .
*
@@ -67,7 +67,7 @@
#define PM3_OTHERWRITEMASK \
(pGlint->PM3_UsingSGRAM ? PM3FBSoftwareWriteMask : PM3FBHardwareWriteMask )
-#ifndef XF86DRI
+#ifndef XF86DRI_DEVEL
#define PM3_PLANEMASK(planemask) \
{ \
if (planemask != pGlint->planemask) { \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/pm3_dac.c new/xf86-video-glint-1.2.0/src/pm3_dac.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/pm3_dac.c 2006-04-07 21:07:59.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/pm3_dac.c 2008-03-19 15:29:36.000000000 +0100
@@ -65,10 +65,24 @@
* regardless of memory configuration */
pGlint->FbMapSize = 64*1024*1024;
+#ifndef XSERVER_LIBPCIACCESS
/* Mark as VIDMEM_MMIO to avoid write-combining while detecting memory */
pGlint->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pGlint->PciTag, pGlint->FbAddress, pGlint->FbMapSize);
+#else
+ {
+ void** result = (void**)&pGlint->FbBase;
+ int err = pci_device_map_range(pGlint->PciInfo,
+ pGlint->FbAddress,
+ pGlint->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pGlint->FbBase == NULL)
return 0;
@@ -119,8 +133,12 @@
GLINT_SLOW_WRITE_REG(temp, PM3MemBypassWriteMask);
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pGlint->FbBase,
pGlint->FbMapSize);
+#else
+ pci_device_unmap_range(pGlint->PciInfo, pGlint->FbBase, pGlint->FbMapSize);
+#endif
pGlint->FbBase = NULL;
pGlint->FbMapSize = 0;
@@ -466,10 +484,8 @@
if (pGlint->MultiAperture) {
STOREREG(GMultGLINTAperture, pGlint->realWidth);
- STOREREG(GMultGLINT1,
- pGlint->MultiPciInfo[0]->memBase[2] & 0xFF800000);
- STOREREG(GMultGLINT2,
- pGlint->MultiPciInfo[1]->memBase[2] & 0xFF800000);
+ STOREREG(GMultGLINT1, PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM) & 0xFF800000);
+ STOREREG(GMultGLINT2, PCI_REGION_BASE(pGlint->MultiPciInfo[1], 2, REGION_MEM) & 0xFF800000);
}
STOREREG(PM3MemBypassWriteMask, 0xffffffff);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/pm3_regs.h new/xf86-video-glint-1.2.0/src/pm3_regs.h
--- old/xf86-video-glint-X11R7.1-1.1.1/src/pm3_regs.h 2004-04-23 21:33:33.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/pm3_regs.h 2008-03-19 15:29:36.000000000 +0100
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.9tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/pm3_regs.h,v 1.10 2003/01/12 03:55:47 tsi Exp $ */
/*
* glint register file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/tx_accel.c new/xf86-video-glint-1.2.0/src/tx_accel.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/tx_accel.c 2006-04-07 21:07:59.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/tx_accel.c 2008-03-19 15:29:36.000000000 +0100
@@ -296,7 +296,7 @@
){
GLINTPtr pGlint = GLINTPTR(pScrn);
-#ifndef XF86DRI
+#ifndef XF86DRI_DEVEL
if (w != pGlint->startxsub) {
GLINT_WRITE_REG(w<<16, StartXSub);
pGlint->startxsub = w;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-glint-X11R7.1-1.1.1/src/tx_dac.c new/xf86-video-glint-1.2.0/src/tx_dac.c
--- old/xf86-video-glint-X11R7.1-1.1.1/src/tx_dac.c 2006-04-07 21:07:59.000000000 +0200
+++ new/xf86-video-glint-1.2.0/src/tx_dac.c 2008-03-19 15:29:36.000000000 +0100
@@ -69,10 +69,8 @@
* as incorrect scanline interleaving when software rendering.
*/
STOREREG(GMultGLINTAperture, pGlint->realWidth);
- STOREREG(GMultGLINT1,
- pGlint->MultiPciInfo[0]->memBase[2] & 0xFF800000);
- STOREREG(GMultGLINT2,
- pGlint->MultiPciInfo[1]->memBase[2] & 0xFF800000);
+ STOREREG(GMultGLINT1, PCI_REGION_BASE(pGlint->MultiPciInfo[0], 2, REGION_MEM) & 0xFF800000);
+ STOREREG(GMultGLINT2, PCI_REGION_BASE(pGlint->MultiPciInfo[1], 2, REGION_MEM) & 0xFF800000);
}
if (IS_GMX2000 || IS_GLORIAXXL) {
++++++ xf86-video-i128-1.2.1.tar.bz2 -> xf86-video-i128-1.3.0.tar.bz2 ++++++
++++ 22064 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/config.h.in new/xf86-video-i128-1.3.0/config.h.in
--- old/xf86-video-i128-1.2.1/config.h.in 2006-12-01 23:29:45.000000000 +0100
+++ new/xf86-video-i128-1.3.0/config.h.in 2008-03-19 19:13:44.000000000 +0100
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
@@ -50,6 +56,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/configure.ac new/xf86-video-i128-1.3.0/configure.ac
--- old/xf86-video-i128-1.2.1/configure.ac 2006-12-01 23:28:40.000000000 +0100
+++ new/xf86-video-i128-1.3.0/configure.ac 2008-03-19 19:13:29.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-i128],
- 1.2.1,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-i128)
@@ -58,6 +58,20 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Checks for header files.
AC_HEADER_STDC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/man/i128.man new/xf86-video-i128-1.3.0/man/i128.man
--- old/xf86-video-i128-1.2.1/man/i128.man 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/man/i128.man 2008-03-19 15:29:39.000000000 +0100
@@ -3,7 +3,7 @@
.ds q \N'34'
.TH I128 __drivermansuffix__ __vendorversion__
.SH NAME
-i128 \- Number 9 I128 video driver
+i128 \- Number 9 I128 __xservername__ video driver
.SH SYNOPSIS
.nf
.B "Section \*qDevice\*q"
@@ -14,7 +14,7 @@
.fi
.SH DESCRIPTION
.B i128
-is an XFree86 driver for Number 9 I128 video cards. The driver is
+is an __xservername__ driver for Number 9 I128 video cards. The driver is
accelerated and provides support for all versions of the I128 chip family,
including the SGI flatpanel configuration. Multi-head configurations are
supported.
@@ -34,7 +34,7 @@
.B I128-T2R4
Ticket 2 Ride IV
.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
@@ -65,6 +65,6 @@
This turns on verbose debug information from the driver.
Default: off.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Robin Cutshaw (driver), Galen Brooks (flatpanel support).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/man/Makefile.am new/xf86-video-i128-1.3.0/man/Makefile.am
--- old/xf86-video-i128-1.2.1/man/Makefile.am 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/man/Makefile.am 2008-03-19 15:29:39.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/missing new/xf86-video-i128-1.3.0/missing
--- old/xf86-video-i128-1.2.1/missing 2006-12-01 23:29:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/missing 2008-03-19 19:13:45.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128accel.c new/xf86-video-i128-1.3.0/src/i128accel.c
--- old/xf86-video-i128-1.2.1/src/i128accel.c 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128accel.c 2008-03-19 19:12:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128accel.c,v 1.7 2000/12/06 01:07:34 robin Exp $ */
/*
* Copyright 1997-2000 by Robin Cutshaw
@@ -35,7 +34,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128dga.c new/xf86-video-i128-1.3.0/src/i128dga.c
--- old/xf86-video-i128-1.2.1/src/i128dga.c 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128dga.c 2008-03-19 19:12:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128dga.c,v 1.3tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -6,7 +5,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xaa.h"
@@ -266,7 +264,7 @@
int *flags
){
I128Ptr pI128 = I128PTR(pScrn);
- unsigned long FbAddress = pI128->PciInfo->memBase[0] & 0xFFC00000;
+ unsigned long FbAddress = PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0xFFC00000;
*name = NULL; /* no special device */
*mem = (unsigned char*)FbAddress;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128_driver.c new/xf86-video-i128-1.3.0/src/i128_driver.c
--- old/xf86-video-i128-1.2.1/src/i128_driver.c 2006-12-01 23:28:58.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128_driver.c 2008-03-19 19:12:45.000000000 +0100
@@ -26,7 +26,6 @@
#include "config.h"
#endif
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128_driver.c,v 1.34tsi Exp $ */
/* All drivers should typically include these */
@@ -34,9 +33,6 @@
#include "xf86_OSproc.h"
#include "xf86Resources.h"
-/* All drivers need this */
-#include "xf86_ansic.h"
-
#include "compiler.h"
/* Drivers for PCI hardware need this */
@@ -116,9 +112,9 @@
#define I128_VERSION 4000
#define I128_NAME "I128"
#define I128_DRIVER_NAME "i128"
-#define I128_MAJOR_VERSION 1
-#define I128_MINOR_VERSION 2
-#define I128_PATCHLEVEL 1
+#define I128_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define I128_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define I128_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the
@@ -386,6 +382,7 @@
* All of the cards this driver supports are PCI, so the "probing" just
* amounts to checking the PCI data that the server has already collected.
*/
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
/*
* We won't let anything in the config file override finding no
@@ -393,6 +390,7 @@
*/
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(I128_NAME, PCI_VENDOR_NUMNINE,
I128Chipsets, I128PciChipsets, devSections,
@@ -569,8 +567,10 @@
/* Find the PCI info for this screen */
pI128->PciInfo = xf86GetPciInfoForEntity(pI128->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pI128->PciTag = pciTag(pI128->PciInfo->bus, pI128->PciInfo->device,
pI128->PciInfo->func);
+#endif
pI128->Primary = xf86IsPrimaryPci(pI128->PciInfo);
@@ -717,9 +717,9 @@
* Set the Chipset and ChipRev.
*/
from = X_PROBED;
- pI128->Chipset = pI128->PciInfo->chipType;
+ pI128->Chipset = PCI_DEV_DEVICE_ID(pI128->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(I128Chipsets, pI128->Chipset);
- pI128->ChipRev = pI128->PciInfo->chipRev;
+ pI128->ChipRev = PCI_DEV_REVISION(pI128->PciInfo);
/*
* This shouldn't happen because such problems should be caught in
@@ -737,15 +737,15 @@
}
xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
- if (pI128->PciInfo->subsysVendor == 0x105D)
+ if (PCI_SUB_VENDOR_ID(pI128->PciInfo) == 0x105D)
xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"Number Nine\"\n");
- else if (pI128->PciInfo->subsysVendor == 0x10F0)
+ else if (PCI_SUB_VENDOR_ID(pI128->PciInfo) == 0x10F0)
xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"Peritek\"\n");
else
xf86DrvMsg(pScrn->scrnIndex, from, "Subsystem Vendor: \"%x\"\n",
- pI128->PciInfo->subsysVendor);
+ PCI_SUB_VENDOR_ID(pI128->PciInfo));
- iobase = (pI128->PciInfo->ioBase[5] & 0xFFFFFF00) + hwp->PIOOffset;
+ iobase = (PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00) + hwp->PIOOffset;
pI128->RegRec.iobase = iobase;
pI128->io.rbase_g = inl(iobase) & 0xFFFFFF00;
@@ -789,9 +789,18 @@
else
pI128->MemoryType = I128_MEMORY_WRAM;
} else if (pI128->Chipset == PCI_CHIP_I128_2) {
+#ifndef XSERVER_LIBPCIACCESS
if (((((pciConfigPtr)pI128->PciInfo->thisCard)->pci_command & 0x03)
- == 0x03) && (pI128->PciInfo->subsysCard == 0x08))
+ == 0x03) && (PCI_SUB_DEVICE_ID(pI128->PciInfo) == 0x08))
pI128->MemoryType = I128_MEMORY_DRAM;
+#else
+ {
+ unsigned short temp;
+ pci_device_cfg_read_u16(pI128->PciInfo, &temp, 0x4);
+ if ((temp & 0x03 == 0x03) && (PCI_SUB_DEVICE_ID(pI128->PciInfo) == 0x08))
+ pI128->MemoryType = I128_MEMORY_DRAM;
+ }
+#endif
}
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Memory type %s\n",
@@ -806,10 +815,10 @@
outl(pI128->RegRec.iobase + 0x20, pI128->io.config2);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Linear framebuffer at 0x%lX\n",
- (unsigned long)pI128->PciInfo->memBase[0]);
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM));
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MMIO registers at 0x%lX\n",
- (unsigned long)pI128->PciInfo->ioBase[5]);
+ (unsigned long)PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO));
if (xf86RegisterResources(pI128->pEnt->index, NULL, ResExclusive)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1288,7 +1297,7 @@
switch(pI128->Chipset) {
case PCI_CHIP_I128_T2R4:
/* Use the subsystem ID to determine the memory size */
- switch ((pI128->PciInfo->subsysCard) & 0x0007) {
+ switch ((PCI_SUB_DEVICE_ID(pI128->PciInfo)) & 0x0007) {
case 0x00: /* 4MB card */
SizeFound = 4 * 1024; break;
case 0x01: /* 8MB card */
@@ -1310,7 +1319,7 @@
}
break;
case PCI_CHIP_I128_T2R:
- switch ((pI128->PciInfo->subsysCard) & 0xFFF7) {
+ switch ((PCI_SUB_DEVICE_ID(pI128->PciInfo)) & 0xFFF7) {
case 0x00: /* 4MB card, no daughtercard */
SizeFound = 4 * 1024; break;
case 0x01: /* 4MB card, 4MB daughtercard */
@@ -1360,22 +1369,49 @@
/*
* Map IO registers to virtual address space
*/
-
+#ifndef XSERVER_LIBPCIACCESS
pI128->mem.mw0_ad = (unsigned char *)xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_FRAMEBUFFER,
pI128->PciTag,
pI128->PciInfo->memBase[0] & 0xFFC00000,
pI128->MemorySize*1024);
+#else
+ {
+ void** result = (void**)&pI128->mem.mw0_ad;
+ int err = pci_device_map_range(pI128->PciInfo,
+ PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0xffc00000,
+ pI128->MemorySize * 1024,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
+
if (pI128->mem.mw0_ad == NULL)
return FALSE;
pI128->MemoryPtr = pI128->mem.mw0_ad;
+#ifndef XSERVER_LIBPCIACCESS
pI128->mem.rbase_g = (CARD32 *)xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_MMIO | VIDMEM_MMIO_32BIT,
pI128->PciTag,
pI128->PciInfo->memBase[4] & 0xFFFF0000,
64*1024);
+#else
+ {
+ void** result = (void**)&pI128->mem.rbase_g;
+ int err = pci_device_map_range(pI128->PciInfo,
+ PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM) & 0xffff0000,
+ 64 * 1024,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
if (pI128->mem.rbase_g == NULL)
return FALSE;
@@ -2069,38 +2105,39 @@
" PCI Registers\n");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" MW0_AD 0x%08lx addr 0x%08lx %spre-fetchable\n",
- pI128->PciInfo->memBase[0],
- pI128->PciInfo->memBase[0] & 0xFFC00000,
- pI128->PciInfo->memBase[0] & 0x8 ? "" : "not-");
+ PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM),
+ PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0xFFC00000,
+ PCI_REGION_BASE(pI128->PciInfo, 0, REGION_MEM) & 0x8 ? "" : "not-");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" MW1_AD 0x%08lx addr 0x%08lx %spre-fetchable\n",
- pI128->PciInfo->memBase[1],
- pI128->PciInfo->memBase[1] & 0xFFC00000,
- pI128->PciInfo->memBase[1] & 0x8 ? "" : "not-");
+ PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM),
+ PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM) & 0xFFC00000,
+ PCI_REGION_BASE(pI128->PciInfo, 1, REGION_MEM) & 0x8 ? "" : "not-");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" XYW_AD(A) 0x%08lx addr 0x%08lx\n",
- pI128->PciInfo->memBase[2],
- pI128->PciInfo->memBase[2] & 0xFFC00000);
+ PCI_REGION_BASE(pI128->PciInfo, 2, REGION_MEM),
+ PCI_REGION_BASE(pI128->PciInfo, 2, REGION_MEM) & 0xFFC00000);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" XYW_AD(B) 0x%08lx addr 0x%08lx\n",
- pI128->PciInfo->memBase[3],
- pI128->PciInfo->memBase[3] & 0xFFC00000);
+ PCI_REGION_BASE(pI128->PciInfo, 3, REGION_MEM),
+ PCI_REGION_BASE(pI128->PciInfo, 3, REGION_MEM) & 0xFFC00000);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" RBASE_G 0x%08lx addr 0x%08lx\n",
- pI128->PciInfo->memBase[4],
- pI128->PciInfo->memBase[4] & 0xFFFF0000);
+ PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM),
+ PCI_REGION_BASE(pI128->PciInfo, 4, REGION_MEM) & 0xFFFF0000);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" IO 0x%08lx addr 0x%08lx\n",
- pI128->PciInfo->ioBase[5],
- pI128->PciInfo->ioBase[5] & 0xFFFFFF00);
+ PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO),
+ PCI_REGION_BASE(pI128->PciInfo, 5, REGION_IO) & 0xFFFFFF00);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" SSC 0x%08x addr 0x%08x\n",
- pI128->PciInfo->subsysCard,
- pI128->PciInfo->subsysCard & 0xFFFFFF00);
+ PCI_SUB_DEVICE_ID(pI128->PciInfo),
+ PCI_SUB_DEVICE_ID(pI128->PciInfo) & 0xFFFFFF00);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" SSV 0x%08x addr 0x%08x\n",
- pI128->PciInfo->subsysVendor,
- pI128->PciInfo->subsysVendor & 0xFFFFFF00);
+ PCI_SUB_VENDOR_ID(pI128->PciInfo),
+ PCI_SUB_VENDOR_ID(pI128->PciInfo) & 0xFFFFFF00);
+#ifndef XSERVER_LIBPCIACCESS
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" RBASE_E 0x%08lx addr 0x%08lx %sdecode-enabled\n\n",
pI128->PciInfo->biosBase,
@@ -2111,6 +2148,7 @@
" PCICMDST 0x%08x 0x%08x\n",
((pciConfigPtr)pI128->PciInfo->thisCard)->pci_command,
((pciConfigPtr)pI128->PciInfo->thisCard)->pci_status);
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
" IO Mapped Registers\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128exa.c new/xf86-video-i128-1.3.0/src/i128exa.c
--- old/xf86-video-i128-1.2.1/src/i128exa.c 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128exa.c 2008-03-19 15:29:39.000000000 +0100
@@ -34,7 +34,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128.h new/xf86-video-i128-1.3.0/src/i128.h
--- old/xf86-video-i128-1.2.1/src/i128.h 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128.h 2008-03-19 19:12:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128.h,v 1.5 2001/04/01 14:00:11 tsi Exp $ */
/*
* Number Nine I128 functions
*
@@ -12,6 +11,8 @@
#ifndef I128_H
#define I128_H
+#include "i128pcirename.h"
+
#include "compiler.h"
#include "xaa.h"
#include "exa.h"
@@ -35,7 +36,9 @@
typedef struct {
EntityInfoPtr pEnt;
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
xf86AccessRec Access;
int Chipset;
int ChipRev;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128IBMDAC.c new/xf86-video-i128-1.3.0/src/i128IBMDAC.c
--- old/xf86-video-i128-1.2.1/src/i128IBMDAC.c 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128IBMDAC.c 2008-03-19 19:12:45.000000000 +0100
@@ -21,14 +21,12 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128IBMDAC.c,v 1.3tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "cursorstr.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128init.c new/xf86-video-i128-1.3.0/src/i128init.c
--- old/xf86-video-i128-1.2.1/src/i128init.c 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128init.c 2008-03-19 19:12:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128init.c,v 1.5 2000/11/03 00:50:53 robin Exp $ */
/*
* Copyright 1995-2000 by Robin Cutshaw
* Copyright 1998 by Number Nine Visual Technology, Inc.
@@ -27,11 +26,9 @@
#include "config.h"
#endif
-/* $XConsortium: $ */
#include "xf86.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128pcirename.h new/xf86-video-i128-1.3.0/src/i128pcirename.h
--- old/xf86-video-i128-1.2.1/src/i128pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128pcirename.h 2008-03-19 15:29:39.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/i128reg.h new/xf86-video-i128-1.3.0/src/i128reg.h
--- old/xf86-video-i128-1.2.1/src/i128reg.h 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/i128reg.h 2008-03-19 19:12:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/i128reg.h,v 1.2 2000/10/23 14:11:39 robin Exp $ */
/*
* Copyright 1994 by Robin Cutshaw
*
@@ -21,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: i128reg.h /main/4 1996/05/12 20:56:19 kaleb $ */
#ifndef I128REG_H
#define I128REG_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/IBMRGB.h new/xf86-video-i128-1.3.0/src/IBMRGB.h
--- old/xf86-video-i128-1.2.1/src/IBMRGB.h 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/IBMRGB.h 2008-03-19 19:12:45.000000000 +0100
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/IBMRGB.h,v 1.1 2000/10/04 23:34:58 robin Exp $ */
-/* $XConsortium: $ */
#define IBMRGB_REF_FREQ_1 14.31818
#define IBMRGB_REF_FREQ_2 50.00000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/Makefile.am new/xf86-video-i128-1.3.0/src/Makefile.am
--- old/xf86-video-i128-1.2.1/src/Makefile.am 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/Makefile.am 2008-03-19 19:15:06.000000000 +0100
@@ -36,6 +36,7 @@
i128.h \
i128IBMDAC.c \
i128init.c \
+ i128pcirename.h \
i128reg.h \
IBMRGB.h \
Ti302X.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-i128-1.2.1/src/Ti302X.h new/xf86-video-i128-1.3.0/src/Ti302X.h
--- old/xf86-video-i128-1.2.1/src/Ti302X.h 2006-12-01 23:25:47.000000000 +0100
+++ new/xf86-video-i128-1.3.0/src/Ti302X.h 2008-03-19 19:12:45.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/i128/Ti302X.h,v 1.2 2001/03/03 22:26:11 tsi Exp $ */
/*
* Copyright 1994-2000 by Robin Cutshaw
*
@@ -21,7 +20,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $XConsortium: $ */
#include "compiler.h"
++++++ xf86-video-i128-1.2.1.tar.bz2 -> xf86-video-i740-1.2.0.tar.bz2 ++++++
++++ 33531 lines of diff (skipped)
++++++ xf86-video-neomagic-X11R7.1-1.1.1.tar.bz2 -> xf86-video-neomagic-1.2.0.tar.bz2 ++++++
++++ 21734 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/config.h.in new/xf86-video-neomagic-1.2.0/config.h.in
--- old/xf86-video-neomagic-X11R7.1-1.1.1/config.h.in 2006-05-23 05:38:46.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/config.h.in 2008-03-19 19:39:14.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/configure.ac new/xf86-video-neomagic-1.2.0/configure.ac
--- old/xf86-video-neomagic-X11R7.1-1.1.1/configure.ac 2006-04-08 03:35:16.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/configure.ac 2008-03-19 19:38:49.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-neomagic],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-neomagic)
@@ -47,6 +47,7 @@
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
# Checks for extensions
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
@@ -59,10 +60,22 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/man/Makefile.am new/xf86-video-neomagic-1.2.0/man/Makefile.am
--- old/xf86-video-neomagic-X11R7.1-1.1.1/man/Makefile.am 2005-12-06 23:48:35.000000000 +0100
+++ new/xf86-video-neomagic-1.2.0/man/Makefile.am 2008-03-19 15:30:07.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:09 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/man/neomagic.man new/xf86-video-neomagic-1.2.0/man/neomagic.man
--- old/xf86-video-neomagic-X11R7.1-1.1.1/man/neomagic.man 2004-04-23 21:39:11.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/man/neomagic.man 2008-03-19 15:30:07.000000000 +0100
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.4 2003/02/20 03:22:52 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neomagic.man,v 1.5 2003/05/29 21:48:09 herrb Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH NEOMAGIC __drivermansuffix__ __vendorversion__
@@ -90,7 +90,7 @@
.fi
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Jens Owen, Kevin E. Martin, and also Egbert Eich,
Mark Vojkovich, Alan Hourihane.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/missing new/xf86-video-neomagic-1.2.0/missing
--- old/xf86-video-neomagic-X11R7.1-1.1.1/missing 2006-05-23 05:38:48.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/missing 2008-03-19 19:36:57.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/README new/xf86-video-neomagic-1.2.0/README
--- old/xf86-video-neomagic-X11R7.1-1.1.1/README 2004-04-23 21:39:11.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/README 2008-03-19 15:30:07.000000000 +0100
@@ -147,4 +147,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/README,v 1.1 1999/04/17 07:06:15 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/README,v 1.2 2002/10/30 12:52:20 alanh Exp $
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/Makefile.am new/xf86-video-neomagic-1.2.0/src/Makefile.am
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/Makefile.am 2005-07-26 18:52:43.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/Makefile.am 2008-03-19 15:30:07.000000000 +0100
@@ -43,4 +43,5 @@
neo_reg.h \
neo_shadow.c \
neo_video.c \
- neo_video.h
+ neo_video.h \
+ neo_pcirename.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2070.c new/xf86-video-neomagic-1.2.0/src/neo_2070.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2070.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_2070.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2070.c,v 1.4 2002/04/04 14:05:44 eich Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2090.c new/xf86-video-neomagic-1.2.0/src/neo_2090.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2090.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_2090.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2090.c,v 1.6 2002/04/04 14:05:44 eich Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2097.c new/xf86-video-neomagic-1.2.0/src/neo_2097.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2097.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_2097.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2097.c,v 1.11 2002/10/30 12:52:21 alanh Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2200.c new/xf86-video-neomagic-1.2.0/src/neo_2200.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_2200.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_2200.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_2200.c,v 1.19tsi Exp $ */
/*
* The original Precision Insight driver for
* XFree86 v.3.3 has been sponsored by Red Hat.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_bank.c new/xf86-video-neomagic-1.2.0/src/neo_bank.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_bank.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_bank.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_bank.c,v 1.3 2002/01/25 21:56:05 tsi Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_cursor.c new/xf86-video-neomagic-1.2.0/src/neo_cursor.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_cursor.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_cursor.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_cursor.c,v 1.8 2001/10/28 03:33:42 tsi Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_dga.c new/xf86-video-neomagic-1.2.0/src/neo_dga.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_dga.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_dga.c 2008-03-19 19:36:41.000000000 +0100
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane,
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_dga.c,v 1.4 2001/10/01 13:44:07 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_driver.c new/xf86-video-neomagic-1.2.0/src/neo_driver.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_driver.c 2006-04-08 03:35:16.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_driver.c 2008-03-19 19:36:41.000000000 +0100
@@ -30,7 +30,6 @@
* Copyright 2002 Shigehiro Nomura
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_driver.c,v 1.74 2003/12/31 05:07:30 dawes Exp $ */
/*
* The original Precision Insight driver for
@@ -158,9 +157,9 @@
#define NEO_NAME "NEOMAGIC"
#define NEO_DRIVER_NAME "neomagic"
-#define NEO_MAJOR_VERSION 1
-#define NEO_MINOR_VERSION 1
-#define NEO_PATCHLEVEL 1
+#define NEO_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define NEO_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define NEO_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This is intentionally screen-independent. It indicates the binding
@@ -612,7 +611,10 @@
}
/* PCI BUS */
- if (xf86GetPciVideoInfo() ) {
+#ifndef XSERVER_LIBPCIACCESS
+ if (xf86GetPciVideoInfo() )
+#endif
+ {
numUsed = xf86MatchPciInstances(NEO_NAME, PCI_VENDOR_NEOMAGIC,
NEOChipsets, NEOPCIchipsets,
devSections,numDevSections,
@@ -778,9 +780,11 @@
/* This driver can handle ISA and PCI buses */
if (nPtr->pEnt->location.type == BUS_PCI) {
nPtr->PciInfo = xf86GetPciInfoForEntity(nPtr->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
nPtr->PciTag = pciTag(nPtr->PciInfo->bus,
nPtr->PciInfo->device,
nPtr->PciInfo->func);
+#endif
}
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Chipset is a ");
@@ -1221,7 +1225,7 @@
if (nPtr->pEnt->location.type == BUS_PCI) {
if (!nPtr->NeoLinearAddr) {
- nPtr->NeoLinearAddr = nPtr->PciInfo->memBase[0];
+ nPtr->NeoLinearAddr = PCI_REGION_BASE(nPtr->PciInfo, 0, REGION_MEM);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"FB base address is set at 0x%lX.\n",
nPtr->NeoLinearAddr);
@@ -1241,8 +1245,8 @@
case NM2230:
case NM2360:
case NM2380:
- nPtr->NeoMMIOAddr = nPtr->PciInfo->memBase[1];
- nPtr->NeoMMIOAddr2 = nPtr->PciInfo->memBase[2];
+ nPtr->NeoMMIOAddr = PCI_REGION_BASE(nPtr->PciInfo, 1, REGION_MEM);
+ nPtr->NeoMMIOAddr2 = PCI_REGION_BASE(nPtr->PciInfo, 2, REGION_MEM);
break;
}
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
@@ -2057,6 +2061,8 @@
if (!nPtr->noLinear) {
if (!nPtr->noMMIO) {
if (nPtr->pEnt->location.type == BUS_PCI){
+
+#ifndef XSERVER_LIBPCIACCESS
nPtr->NeoMMIOBase =
xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
nPtr->PciTag, nPtr->NeoMMIOAddr,
@@ -2067,6 +2073,29 @@
nPtr->PciTag, nPtr->NeoMMIOAddr2,
0x100000L);
}
+
+#else
+ void** result = (void**)&nPtr->NeoMMIOBase;
+ int err = pci_device_map_range(nPtr->PciInfo,
+ nPtr->NeoMMIOAddr,
+ 0x200000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+
+ if (nPtr->NeoMMIOAddr2 != 0){
+ result = (void**)&nPtr->NeoMMIOBase2;
+ int err = pci_device_map_range(nPtr->PciInfo,
+ nPtr->NeoMMIOAddr2,
+ 0x100000L,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
} else
nPtr->NeoMMIOBase =
xf86MapVidMem(pScrn->scrnIndex,
@@ -2077,11 +2106,26 @@
}
if (nPtr->pEnt->location.type == BUS_PCI)
+
+#ifndef XSERVER_LIBPCIACCESS
nPtr->NeoFbBase =
xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
nPtr->PciTag,
(unsigned long)nPtr->NeoLinearAddr,
nPtr->NeoFbMapSize);
+#else
+ {
+ void** result = (void**)&nPtr->NeoFbBase;
+ int err = pci_device_map_range(nPtr->PciInfo,
+ nPtr->NeoLinearAddr,
+ nPtr->NeoFbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
else
nPtr->NeoFbBase =
xf86MapVidMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
@@ -2106,16 +2150,30 @@
NEOPtr nPtr = NEOPTR(pScrn);
if (!nPtr->noLinear) {
+#ifndef XSERVER_LIBPCIACCESS
if (nPtr->NeoMMIOBase)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase,
0x200000L);
+#else
+ if (nPtr->NeoMMIOBase)
+ pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase, 0x200000L);
+#endif
nPtr->NeoMMIOBase = NULL;
+#ifndef XSERVER_LIBPCIACCESS
if (nPtr->NeoMMIOBase2)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoMMIOBase2,
0x100000L);
+#else
+ if (nPtr->NeoMMIOBase2)
+ pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoMMIOBase2, 0x100000L);
+#endif
nPtr->NeoMMIOBase2 = NULL;
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)nPtr->NeoFbBase,
nPtr->NeoFbMapSize);
+#else
+ pci_device_unmap_range(nPtr->PciInfo, (pointer)nPtr->NeoFbBase, nPtr->NeoFbMapSize);
+#endif
}
nPtr->NeoFbBase = NULL;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo.h new/xf86-video-neomagic-1.2.0/src/neo.h
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo.h 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo.h 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo.h,v 1.23tsi Exp $ */
/*
* The original Precision Insight driver for
@@ -37,6 +36,9 @@
*/
#include
+
+#include "neo_pcirename.h"
+
/* All drivers should typically include these */
#include "xf86.h"
#include "xf86_OSproc.h"
@@ -201,7 +203,9 @@
{
int NeoChipset;
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
EntityInfoPtr pEnt;
XAAInfoRecPtr AccelInfoRec;
NEOACLRec Accel;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_i2c.c new/xf86-video-neomagic-1.2.0/src/neo_i2c.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_i2c.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_i2c.c 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_i2c.c,v 1.4 2002/09/16 18:05:58 eich Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_macros.h new/xf86-video-neomagic-1.2.0/src/neo_macros.h
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_macros.h 2004-04-23 21:39:11.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_macros.h 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_macros.h,v 1.1 1999/04/17 07:06:27 dawes Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_pcirename.h new/xf86-video-neomagic-1.2.0/src/neo_pcirename.h
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-neomagic-1.2.0/src/neo_pcirename.h 2008-03-19 15:30:07.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_reg.h new/xf86-video-neomagic-1.2.0/src/neo_reg.h
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_reg.h 2004-04-23 21:39:11.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_reg.h 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_reg.h,v 1.1 1999/04/17 07:06:29 dawes Exp $ */
/*
* The original Precision Insight driver for
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_shadow.c new/xf86-video-neomagic-1.2.0/src/neo_shadow.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_shadow.c 2006-04-07 21:24:45.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_shadow.c 2008-03-19 19:36:41.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_shadow.c,v 1.2 2000/11/03 18:46:11 eich Exp $ */
/*
Copyright (c) 1999, 2000 The XFree86 Project Inc.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_video.c new/xf86-video-neomagic-1.2.0/src/neo_video.c
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_video.c 2006-04-08 01:09:50.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_video.c 2008-03-19 19:36:41.000000000 +0100
@@ -26,7 +26,6 @@
/*
* Copyright 2002 SuSE Linux AG, Author: Egbert Eich
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/neo_video.c,v 1.6tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_video.h new/xf86-video-neomagic-1.2.0/src/neo_video.h
--- old/xf86-video-neomagic-X11R7.1-1.1.1/src/neo_video.h 2005-04-20 14:25:28.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/src/neo_video.h 2008-03-19 19:36:41.000000000 +0100
@@ -22,7 +22,6 @@
CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
**********************************************************************/
-/* $XFree86$ */
#ifndef _NEO_VIDEO_H
#define _NEO_VIDEO_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-neomagic-X11R7.1-1.1.1/TODO new/xf86-video-neomagic-1.2.0/TODO
--- old/xf86-video-neomagic-X11R7.1-1.1.1/TODO 2004-04-23 21:39:11.000000000 +0200
+++ new/xf86-video-neomagic-1.2.0/TODO 2008-03-19 15:30:07.000000000 +0100
@@ -17,4 +17,4 @@
-$XFree86$
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/neomagic/TODO,v 1.1 1999/04/17 07:06:16 dawes Exp $
++++++ xf86-video-rendition-4.1.3.tar.bz2 -> xf86-video-rendition-4.2.0.tar.bz2 ++++++
++++ 11330 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/ChangeLog new/xf86-video-rendition-4.2.0/ChangeLog
--- old/xf86-video-rendition-4.1.3/ChangeLog 2006-12-16 00:55:42.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/ChangeLog 2008-03-19 19:47:10.000000000 +0100
@@ -1,3 +1,85 @@
+commit e943057ef844a7a3153b6158f3dd26ae02296e98
+Author: Adam Jackson
+Date: Wed Mar 19 14:45:52 2008 -0400
+
+ Fix includes to silence a warning.
+
+ Patch from opensuse, although it has no attribution there.
+
+commit 34db3fdcff85f151843fcae7d0aa307697291d5e
+Author: Adam Jackson
+Date: Wed Mar 19 14:41:58 2008 -0400
+
+ Death to RCS tags.
+
+commit cfff99db2648d49e9c3af3cb9d965ea5f306b1f7
+Author: Matthieu Herrb
+Date: Sat Mar 8 23:45:25 2008 +0100
+
+ Makefile.am: nuke RCS Id
+
+commit 99011b4380991cd56987f75a6d48ee609d931b2a
+Author: Dave Airlie
+Date: Wed Feb 27 13:29:57 2008 +1000
+
+ pciaccess: do unmap path
+
+commit 7e343a778d302474fef1d177006b54743ce0a394
+Author: Dave Airlie
+Date: Wed Feb 27 12:50:43 2008 +1000
+
+ pciaccess: make auto-detect work
+
+commit 41cba91bc5572a66e8b6f09c9cf4c4c173b29f8f
+Author: Brice Goglin
+Date: Tue Aug 7 12:10:15 2007 +0200
+
+ RENDITION_VERSION* using PACKAGE_VERSION_*
+
+commit 73c1f290c1ed767a8c9340ca1404f89baace762e
+Author: Ian Romanick
+Date: Tue Mar 6 09:22:44 2007 -0800
+
+ Port driver to PCI-rework interfaces.
+
+ Quick and dirty port to the PCI-rework interfaces. Test on a V2100
+ cards. This is the only Rendition hardware to which I have access.
+ V1000 and / or V2200 may be broken, but I doubt it.
+
+ Comments in the source claim that acceleration is buggy, and it is
+ disabled by default. I *did not* do any testing with acceleration.
+
+commit 1a2a9e76aa9b8fbd821c41fd67646a7c35180b48
+Author: Ian Romanick
+Date: Tue Mar 6 09:16:44 2007 -0800
+
+ Move renditionTypes, renditionChipsets, and renditionPCIchipsets earlier in file.
+
+commit 5338846d8d76081c39402324c12cfec382ac2742
+Author: Ian Romanick
+Date: Tue Mar 6 09:14:43 2007 -0800
+
+ Add prototype for renditionGetRec.
+
+commit 6d3e26e8311cf46a8c9ceb81debe5d8e97bf28bf
+Merge: 77647fe... ef00c3e...
+Author: Ian Romanick
+Date: Fri Mar 2 20:48:05 2007 -0800
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-video-rendition
+
+commit 77647fed6e448cc0a46970c79e28062c6f5625bd
+Author: Ian Romanick
+Date: Fri Mar 2 20:47:42 2007 -0800
+
+ Supply NULL driverFunc pointer in DriverRec.
+
+commit ef00c3eb3e558da02080ed30274f1fa8b6d8b8eb
+Author: Alan Coopersmith
+Date: Tue Feb 27 10:38:53 2007 -0800
+
+ Man page updates - replace references to XFree86 & changes for XF86 4.0
+
commit b3872c3317fe560d47a0a621d7a9bd6f81d3573a
Author: Daniel Stone
Date: Sat Dec 16 01:54:57 2006 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/config.h.in new/xf86-video-rendition-4.2.0/config.h.in
--- old/xf86-video-rendition-4.1.3/config.h.in 2006-12-16 00:55:31.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/config.h.in 2008-03-19 19:47:10.000000000 +0100
@@ -38,6 +38,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/configure.ac new/xf86-video-rendition-4.2.0/configure.ac
--- old/xf86-video-rendition-4.1.3/configure.ac 2006-12-16 00:54:51.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/configure.ac 2008-03-19 19:46:00.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-rendition],
- 4.1.3,
+ 4.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-rendition)
@@ -57,6 +57,20 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Checks for header files.
AC_HEADER_STDC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/man/Makefile.am new/xf86-video-rendition-4.2.0/man/Makefile.am
--- old/xf86-video-rendition-4.1.3/man/Makefile.am 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/man/Makefile.am 2008-03-19 15:30:59.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/man/rendition.man new/xf86-video-rendition-4.2.0/man/rendition.man
--- old/xf86-video-rendition-4.1.3/man/rendition.man 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/man/rendition.man 2008-03-19 15:30:59.000000000 +0100
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $
+.\" $__xservername__: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.man,v 1.3 2003/06/18 16:17:39 eich Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH RENDITION __drivermansuffix__ __vendorversion__
@@ -14,7 +14,7 @@
.fi
.SH DESCRIPTION
.B rendition
-is an XFree86 driver for Rendition/Micron based video cards. The driver
+is an __xservername__ driver for Rendition/Micron based video cards. The driver
supports following framebuffer depths: 8, 15 (Verite V1000 only), 16
and 24. Acceleration and multi-head configurations are
not supported yet, but are work in progress.
@@ -32,7 +32,7 @@
.B V2200
Verite V2200 based cards.
.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
@@ -79,8 +79,8 @@
.TP
.BI "Option \*qNoDDC\*q \*q" boolean \*q
Disable probing of DDC-information from your monitor. This information is not
-used yet and is only there for informational purposes. This might change
-before final XFree86 4.0 release. Safe to disable if you experience problems
+used yet and is only there for informational purposes.
+Safe to disable if you experience problems
during startup of X-server.
Default: Probe DDC.
.TP
@@ -107,6 +107,6 @@
.B "Option \*qMTRR\*q"
to let the driver request write-combining of memory access on the video board.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: Marc Langenbach, Dejan Ilic
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/missing new/xf86-video-rendition-4.2.0/missing
--- old/xf86-video-rendition-4.1.3/missing 2006-12-16 00:55:34.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/missing 2008-03-19 19:43:23.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/accel.h new/xf86-video-rendition-4.2.0/src/accel.h
--- old/xf86-video-rendition-4.1.3/src/accel.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/accel.h 2008-03-19 19:41:58.000000000 +0100
@@ -3,7 +3,6 @@
*
* header file for accel.c
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accel.h,v 1.3 1999/11/19 13:54:44 hohndel Exp $ */
#ifndef __ACCEL_H__
#define __ACCEL_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/accelX.c new/xf86-video-rendition-4.2.0/src/accelX.c
--- old/xf86-video-rendition-4.1.3/src/accelX.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/accelX.c 2008-03-19 19:41:58.000000000 +0100
@@ -3,7 +3,6 @@
*
* accelerator functions for X
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/accelX.c,v 1.10 2001/06/15 21:22:54 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/cmd2d.h new/xf86-video-rendition-4.2.0/src/cmd2d.h
--- old/xf86-video-rendition-4.1.3/src/cmd2d.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/cmd2d.h 2008-03-19 19:41:58.000000000 +0100
@@ -4,7 +4,6 @@
/*
* commands the 2d microcode offers
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cmd2d.h,v 1.2 1999/10/14 04:43:14 dawes Exp $ */
#define CMD_SETUP 32
#define CMD_SET_PIX_REG 2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/commonregs.h new/xf86-video-rendition-4.2.0/src/commonregs.h
--- old/xf86-video-rendition-4.1.3/src/commonregs.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/commonregs.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/commonregs.h,v 1.1 1999/11/19 13:54:44 hohndel Exp $ */
#ifndef __COMMONREGS_H__
#define __COMMONREGS_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/cscode.h new/xf86-video-rendition-4.2.0/src/cscode.h
--- old/xf86-video-rendition-4.1.3/src/cscode.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/cscode.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,7 +1,6 @@
/****************************************************************************\
* NOTE: This file generated automatically. Do not edit by hand! *
\****************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/cscode.h,v 1.3 1999/10/13 04:21:19 dawes Exp $ */
#ifndef __CSCODE_H__
#define __CSCODE_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/hwcursor.c new/xf86-video-rendition-4.2.0/src/hwcursor.c
--- old/xf86-video-rendition-4.1.3/src/hwcursor.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/hwcursor.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.c,v 1.6 2000/02/25 21:03:00 dawes Exp $ */
/*
* includes
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/hwcursor.h new/xf86-video-rendition-4.2.0/src/hwcursor.h
--- old/xf86-video-rendition-4.1.3/src/hwcursor.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/hwcursor.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/hwcursor.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
/*
* file hwcursor.h
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/rendition.c new/xf86-video-rendition-4.2.0/src/rendition.c
--- old/xf86-video-rendition-4.1.3/src/rendition.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/rendition.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.c,v 1.58 2003/11/03 05:11:26 tsi Exp $ */
/*
* Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved.
*
@@ -64,6 +63,14 @@
#include "rendition_shadow.h"
#include "vbe.h"
+#ifdef XSERVER_LIBPCIACCESS
+# include
+# define DEVICE_ID(p) (p)->device_id
+#else
+# define DEVICE_ID(p) (p)->chipType
+#endif
+
+
/*
* defines
*/
@@ -72,10 +79,10 @@
#define RENDITION_NAME "RENDITION"
#define RENDITION_DRIVER_NAME "rendition"
-#define RENDITION_VERSION_NAME "4.1.0"
-#define RENDITION_VERSION_MAJOR 4
-#define RENDITION_VERSION_MINOR 1
-#define RENDITION_PATCHLEVEL 0
+#define RENDITION_VERSION_NAME PACKAGE_VERSION
+#define RENDITION_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define RENDITION_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define RENDITION_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define RENDITION_VERSION_CURRENT ((RENDITION_VERSION_MAJOR << 24) | \
(RENDITION_VERSION_MINOR << 16) | RENDITION_PATCHLEVEL)
@@ -101,7 +108,12 @@
static const OptionInfoRec * renditionAvailableOptions(int, int);
static void renditionIdentify(int);
+#ifdef XSERVER_LIBPCIACCESS
+static Bool renditionPciProbe(DriverPtr drv, int entity_num,
+ struct pci_device *dev, intptr_t match_data);
+#else
static Bool renditionProbe(DriverPtr, int);
+#endif
static Bool renditionPreInit(ScrnInfoPtr, int);
static Bool renditionScreenInit(int, ScreenPtr, int, char **);
static Bool renditionSwitchMode(int, DisplayModePtr, int);
@@ -120,6 +132,7 @@
static xf86MonPtr renditionProbeDDC(ScrnInfoPtr pScrn, int index);
static void renditionLoadPalette(ScrnInfoPtr, int, int *, LOCO *, VisualPtr);
+static renditionPtr renditionGetRec(ScrnInfoPtr pScreenInfo);
/*
@@ -137,14 +150,54 @@
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
+enum renditionTypes {
+ CHIP_RENDITION_V1000,
+ CHIP_RENDITION_V2x00
+};
+
+/* supported chipsets */
+static SymTabRec renditionChipsets[] = {
+ {CHIP_RENDITION_V1000, "V1000"},
+ {CHIP_RENDITION_V2x00, "V2x00"},
+ {-1, NULL}
+};
+
+#ifdef XSERVER_LIBPCIACCESS
+#define RENDITION_DEVICE_MATCH(d, i) \
+ { 0x1163, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
+
+static const struct pci_id_match rendition_device_match[] = {
+ RENDITION_DEVICE_MATCH(PCI_CHIP_V1000, CHIP_RENDITION_V1000),
+ RENDITION_DEVICE_MATCH(PCI_CHIP_V2x00, CHIP_RENDITION_V2x00),
+
+ { 0, 0, 0 }
+};
+#else
+static PciChipsets renditionPCIchipsets[] = {
+ { CHIP_RENDITION_V1000, PCI_CHIP_V1000, RES_SHARED_VGA },
+ { CHIP_RENDITION_V2x00, PCI_CHIP_V2x00, RES_SHARED_VGA },
+ { -1, -1, RES_UNDEFINED }
+};
+#endif
+
_X_EXPORT DriverRec RENDITION={
RENDITION_VERSION_CURRENT,
"rendition",
renditionIdentify,
+#ifdef XSERVER_LIBPCIACCESS
+ NULL,
+#else
renditionProbe,
+#endif
renditionAvailableOptions,
NULL,
- 0
+ 0,
+ NULL,
+
+#ifdef XSERVER_LIBPCIACCESS
+ rendition_device_match,
+ renditionPciProbe
+#endif
};
static const char *vgahwSymbols[]={
@@ -239,19 +292,19 @@
renditionSetup(pointer Module, pointer Options, int *ErrorMajor,
int *ErrorMinor)
{
- static Bool Initialised=FALSE;
+ static Bool Initialised = FALSE;
if (!Initialised) {
- Initialised=TRUE;
- xf86AddDriver(&RENDITION, Module, 0);
+ Initialised = TRUE;
+ xf86AddDriver(&RENDITION, Module, 1);
LoaderRefSymLists(vgahwSymbols, ramdacSymbols,
fbSymbols, xaaSymbols, ddcSymbols, int10Symbols,
shadowfbSymbols, vbeSymbols, NULL);
- return (pointer)TRUE;
+ return (pointer) TRUE;
}
if (ErrorMajor)
- *ErrorMajor=LDR_ONCEONLY;
+ *ErrorMajor = LDR_ONCEONLY;
return NULL;
}
@@ -259,24 +312,6 @@
#endif
-enum renditionTypes {
- CHIP_RENDITION_V1000,
- CHIP_RENDITION_V2x00
-};
-
-/* supported chipsets */
-static SymTabRec renditionChipsets[] = {
- {CHIP_RENDITION_V1000, "V1000"},
- {CHIP_RENDITION_V2x00, "V2x00"},
- {-1, NULL}
-};
-
-static PciChipsets renditionPCIchipsets[] = {
- { CHIP_RENDITION_V1000, PCI_CHIP_V1000, RES_SHARED_VGA },
- { CHIP_RENDITION_V2x00, PCI_CHIP_V2x00, RES_SHARED_VGA },
- { -1, -1, RES_UNDEFINED }
-};
-
/*
* functions
*/
@@ -297,6 +332,49 @@
+#ifdef XSERVER_LIBPCIACCESS
+static Bool
+renditionPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev,
+ intptr_t match_data)
+{
+ ScrnInfoPtr pScrn;
+
+
+ /* Allocate a ScrnInfoRec and claim the slot */
+ pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, RES_SHARED_VGA,
+ NULL, NULL, NULL, NULL);
+ if (pScrn != NULL) {
+ renditionPtr pRendition;
+
+
+ pScrn->driverVersion = RENDITION_VERSION_CURRENT;
+ pScrn->driverName = RENDITION_DRIVER_NAME;
+ pScrn->name = RENDITION_NAME;
+ pScrn->Probe = NULL;
+ pScrn->PreInit = renditionPreInit;
+ pScrn->ScreenInit = renditionScreenInit;
+ pScrn->SwitchMode = renditionSwitchMode;
+ pScrn->AdjustFrame = renditionAdjustFrame;
+ pScrn->EnterVT = renditionEnterVT;
+ pScrn->LeaveVT = renditionLeaveVT;
+ pScrn->FreeScreen = renditionFreeScreen;
+ pScrn->ValidMode = renditionValidMode;
+
+ /* allocate driver private structure */
+ pRendition = renditionGetRec(pScrn);
+ if (pRendition == NULL) {
+ return FALSE;
+ }
+
+ pRendition->pEnt = xf86GetEntityInfo(entity_num);
+ pRendition->PciInfo = dev;
+ }
+
+ return (pScrn != NULL);
+}
+
+#else
+
/*
* This function is called once, at the start of the first server generation to
* do a minimal probe for supported hardware.
@@ -354,7 +432,7 @@
}
return foundScreen;
}
-
+#endif
#if 0
static Bool
@@ -491,16 +569,20 @@
if (pScreenInfo->numEntities != 1)
return FALSE;
+#ifndef XSERVER_LIBPCIACCESS
/* allocate driver private structure */
if (!renditionGetRec(pScreenInfo))
return FALSE;
+#endif
pRendition=RENDITIONPTR(pScreenInfo);
+#ifndef XSERVER_LIBPCIACCESS
/* Get the entity, and make sure it is PCI. */
pRendition->pEnt = xf86GetEntityInfo(pScreenInfo->entityList[0]);
if (pRendition->pEnt->location.type != BUS_PCI)
return FALSE;
+#endif
if (flags & PROBE_DETECT) {
ConfiguredMonitor =
@@ -522,10 +604,12 @@
xf86FreeInt10(pInt);
}
+#ifndef XSERVER_LIBPCIACCESS
/* Find the PCI info for this screen */
pRendition->PciInfo = xf86GetPciInfoForEntity(pRendition->pEnt->index);
pRendition->pcitag= pciTag(pRendition->PciInfo->bus,
pRendition->PciInfo->device, pRendition->PciInfo->func);
+#endif
/*
* XXX This could be refined if some VGA memory resources are not
@@ -557,7 +641,7 @@
case 15:
{
- if (PCI_CHIP_V1000 != pRendition->PciInfo->chipType) {
+ if (PCI_CHIP_V1000 == DEVICE_ID(pRendition->PciInfo)) {
xf86DrvMsg( pScreenInfo->scrnIndex, X_ERROR,
"Given depth (%d) is not supported by this chipset.\n",
pScreenInfo->depth);
@@ -631,7 +715,7 @@
/* set various fields according to the given options */
/* to be filled in <ml> */
- if (PCI_CHIP_V1000==pRendition->PciInfo->chipType){
+ if (PCI_CHIP_V1000 == DEVICE_ID(pRendition->PciInfo)) {
pRendition->board.chip=V1000_DEVICE;
}
else {
@@ -654,12 +738,19 @@
pRendition->board.accel=0;
pRendition->board.vgaio_base = pvgaHW->PIOOffset;
- pRendition->board.io_base =
- pRendition->board.vgaio_base + pRendition->PciInfo->ioBase[1];
+ pRendition->board.io_base = pRendition->board.vgaio_base
+#ifdef XSERVER_LIBPCIACCESS
+ + pRendition->PciInfo->regions[1].base_addr;
+#else
+ + pRendition->PciInfo->ioBase[1]
+#endif
+ ;
pRendition->board.mmio_base=0;
pRendition->board.vmmio_base=0;
pRendition->board.mem_size=0;
+#ifndef XSERVER_LIBPCIACCESS
pRendition->board.mem_base=(vu8 *)pRendition->PciInfo->memBase[0];
+#endif
pRendition->board.vmem_base=NULL;
pRendition->board.init=0;
@@ -677,8 +768,14 @@
"Rendition %s @ %lx/%lx\n",
renditionChipsets[pRendition->board.chip==V1000_DEVICE ? 0:1]
.name,
+#ifdef XSERVER_LIBPCIACCESS
+ pRendition->PciInfo->regions[1].base_addr,
+ pRendition->PciInfo->regions[0].base_addr
+#else
pRendition->PciInfo->ioBase[1],
- pRendition->PciInfo->memBase[0]);
+ pRendition->PciInfo->memBase[0]
+#endif
+ );
/* First of all get a "clean" starting state */
verite_resetboard(pScreenInfo);
@@ -1363,13 +1460,18 @@
Bool WriteCombine;
int mapOption;
renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
+#ifdef XSERVER_LIBPCIACCESS
+ int err;
+#endif
#ifdef DEBUG
ErrorF("Mapping ...\n");
+#ifndef XSERVER_LIBPCIACCESS
ErrorF("%d %d %d %x %d\n", pScreenInfo->scrnIndex, VIDMEM_FRAMEBUFFER,
pRendition->pcitag,
pRendition->board.mem_base, pScreenInfo->videoRam * 1024);
#endif
+#endif
if (pRendition->board.chip == V1000_DEVICE){
/* Some V1000 boards are known to have problems with Write-Combining */
@@ -1392,12 +1494,19 @@
mapOption = VIDMEM_MMIO;
}
+#ifdef XSERVER_LIBPCIACCESS
+ err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
+ pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
+
+ return (err == 0);
+#else
pRendition->board.vmem_base=
xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
pRendition->pcitag,
(unsigned long)pRendition->board.mem_base,
pScreenInfo->videoRam * 1024);
return TRUE;
+#endif
#ifdef DEBUG0
ErrorF("Done\n");
@@ -1407,12 +1516,20 @@
static Bool
renditionUnmapMem(ScrnInfoPtr pScreenInfo)
{
+ renditionPtr pRendition = RENDITIONPTR(pScreenInfo);
#ifdef DEBUG
ErrorF("Unmapping ...\n");
#endif
+
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScreenInfo->scrnIndex,
- RENDITIONPTR(pScreenInfo)->board.vmem_base,
+ pRendition->board.vmem_base,
pScreenInfo->videoRam * 1024);
+#else
+ pci_device_unmap_range(pRendition->PciInfo,
+ pRendition->board.vmem_base,
+ pScreenInfo->videoRam * 1024);
+#endif
return TRUE;
#ifdef DEBUG0
ErrorF("Done\n");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/rendition.h new/xf86-video-rendition-4.2.0/src/rendition.h
--- old/xf86-video-rendition-4.1.3/src/rendition.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/rendition.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition.h,v 1.5 2000/02/25 21:03:02 dawes Exp $ */
#ifndef __RENDITION_H__
#define __RENDITION_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/rendition_options.h new/xf86-video-rendition-4.2.0/src/rendition_options.h
--- old/xf86-video-rendition-4.1.3/src/rendition_options.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/rendition_options.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_options.h,v 1.5 2001/05/04 19:05:42 dawes Exp $ */
#ifndef __RENDITION_OPTION_H__
#define __RENDITION_OPTION_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/rendition_shadow.c new/xf86-video-rendition-4.2.0/src/rendition_shadow.c
--- old/xf86-video-rendition-4.1.3/src/rendition_shadow.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/rendition_shadow.c 2008-03-19 19:41:58.000000000 +0100
@@ -4,7 +4,6 @@
* The functions used by ShadowFB
* Based on code written by Mark Vojkovich
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/rendition_shadow.h new/xf86-video-rendition-4.2.0/src/rendition_shadow.h
--- old/xf86-video-rendition-4.1.3/src/rendition_shadow.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/rendition_shadow.h 2008-03-19 19:41:58.000000000 +0100
@@ -3,7 +3,6 @@
*
* headfile for rendition_shadow.c
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/rendition_shadow.h,v 1.1 2000/03/01 00:25:25 dawes Exp $ */
#ifndef __RENDITION_SHADOW_H__
#define __RENDITION_SHADOW_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/v1kregs.h new/xf86-video-rendition-4.2.0/src/v1kregs.h
--- old/xf86-video-rendition-4.1.3/src/v1kregs.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/v1kregs.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1kregs.h,v 1.4 1999/11/19 13:54:45 hohndel Exp $ */
#ifndef __V1KREGS_H__
#define __V1KREGS_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/v1krisc.c new/xf86-video-rendition-4.2.0/src/v1krisc.c
--- old/xf86-video-rendition-4.1.3/src/v1krisc.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/v1krisc.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.c,v 1.6 2000/03/31 20:13:25 dawes Exp $ */
/*
*
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/v1krisc.h new/xf86-video-rendition-4.2.0/src/v1krisc.h
--- old/xf86-video-rendition-4.1.3/src/v1krisc.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/v1krisc.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v1krisc.h,v 1.3 1999/10/13 04:21:21 dawes Exp $ */
/*
* file v1krisc.h
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/v2kregs.h new/xf86-video-rendition-4.2.0/src/v2kregs.h
--- old/xf86-video-rendition-4.1.3/src/v2kregs.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/v2kregs.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/v2kregs.h,v 1.4 1999/11/19 13:54:46 hohndel Exp $ */
#ifndef __V2KREGS_H__
#define __V2KREGS_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vboard.c new/xf86-video-rendition-4.2.0/src/vboard.c
--- old/xf86-video-rendition-4.1.3/src/vboard.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vboard.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.c,v 1.18tsi Exp $ */
/*
* includes
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vboard.h new/xf86-video-rendition-4.2.0/src/vboard.h
--- old/xf86-video-rendition-4.1.3/src/vboard.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vboard.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vboard.h,v 1.6 2000/03/31 20:13:26 dawes Exp $ */
/*
* vboard.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vloaduc.c new/xf86-video-rendition-4.2.0/src/vloaduc.c
--- old/xf86-video-rendition-4.1.3/src/vloaduc.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vloaduc.c 2008-03-19 19:45:17.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.c,v 1.13tsi Exp $ */
/*
* includes
*/
@@ -17,6 +16,7 @@
#include
#include
#include
+#include
#ifdef HAVE_ELF_H
#include
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vloaduc.h new/xf86-video-rendition-4.2.0/src/vloaduc.h
--- old/xf86-video-rendition-4.1.3/src/vloaduc.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vloaduc.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vloaduc.h,v 1.4 2000/03/31 20:13:27 dawes Exp $ */
/*
* file vloaduc.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vmisc.c new/xf86-video-rendition-4.2.0/src/vmisc.c
--- old/xf86-video-rendition-4.1.3/src/vmisc.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vmisc.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,5 +1,4 @@
/* Misc routines used elsewhere in driver */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.c,v 1.3 2000/02/25 21:03:05 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vmisc.h new/xf86-video-rendition-4.2.0/src/vmisc.h
--- old/xf86-video-rendition-4.1.3/src/vmisc.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vmisc.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmisc.h,v 1.3 2000/03/31 20:13:27 dawes Exp $ */
#ifndef __VMISC_H__
#define __VMISC_H__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vmodes.c new/xf86-video-rendition-4.2.0/src/vmodes.c
--- old/xf86-video-rendition-4.1.3/src/vmodes.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vmodes.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.c,v 1.13 2002/12/11 17:23:33 dawes Exp $ */
/*
* file vmodes.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vmodes.h new/xf86-video-rendition-4.2.0/src/vmodes.h
--- old/xf86-video-rendition-4.1.3/src/vmodes.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vmodes.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vmodes.h,v 1.5 2002/04/04 14:05:45 eich Exp $ */
/*
* file vmodes.h
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vos.h new/xf86-video-rendition-4.2.0/src/vos.h
--- old/xf86-video-rendition-4.1.3/src/vos.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vos.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vos.h,v 1.9 2002/01/25 21:56:07 tsi Exp $ */
/*
* file vos.h
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vramdac.c new/xf86-video-rendition-4.2.0/src/vramdac.c
--- old/xf86-video-rendition-4.1.3/src/vramdac.c 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vramdac.c 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.c,v 1.18 2002/12/11 17:23:33 dawes Exp $ */
/*
* includes
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vramdac.h new/xf86-video-rendition-4.2.0/src/vramdac.h
--- old/xf86-video-rendition-4.1.3/src/vramdac.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vramdac.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vramdac.h,v 1.6 2002/04/04 14:05:45 eich Exp $ */
/*
* file vramdac.h
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-rendition-4.1.3/src/vtypes.h new/xf86-video-rendition-4.2.0/src/vtypes.h
--- old/xf86-video-rendition-4.1.3/src/vtypes.h 2006-11-08 18:16:47.000000000 +0100
+++ new/xf86-video-rendition-4.2.0/src/vtypes.h 2008-03-19 19:41:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/rendition/vtypes.h,v 1.8 2001/10/28 03:33:44 tsi Exp $ */
#ifndef _VTYPES_H_
#define _VTYPES_H_
@@ -11,6 +10,9 @@
#include
#include "xf86Pci.h"
+#ifdef XSERVER_LIBPCIACCESS
+#include
+#endif
/*
* defines
@@ -177,8 +179,12 @@
{
struct verite_board_t board; /* information on the board */
struct verite_modeinfo_t mode; /* information on the mode */
+#ifdef XSERVER_LIBPCIACCESS
+ struct pci_device * PciInfo;
+#else
PCITAG pcitag; /* tag for the PCI config space */
pciVideoPtr PciInfo; /* PCI config data */
+#endif
EntityInfoPtr pEnt; /* entity information */
CloseScreenProcPtr CloseScreen; /* wrap CloseScreen */
xf86CursorInfoPtr CursorInfoRec; /* Cursor data */
++++++ xf86-video-s3-0.5.0.tar.bz2 -> xf86-video-s3-0.6.0.tar.bz2 ++++++
++++ 10386 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/ChangeLog new/xf86-video-s3-0.6.0/ChangeLog
--- old/xf86-video-s3-0.5.0/ChangeLog 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/ChangeLog 2008-03-19 15:31:01.000000000 +0100
@@ -1,3 +1,11 @@
+2008-02-23 Evgeny M. Zubok
+
+ * src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly
+ others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64
+ * src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make
+ the 1024x768@16bpp mode work.
+ Thanks to Richard Driscoll for these patches.
+
2006-04-07 Adam Jackson
* configure.ac:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/compile new/xf86-video-s3-0.6.0/compile
--- old/xf86-video-s3-0.5.0/compile 2006-11-26 05:33:11.000000000 +0100
+++ new/xf86-video-s3-0.6.0/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey .
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to .
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/config.h.in new/xf86-video-s3-0.6.0/config.h.in
--- old/xf86-video-s3-0.5.0/config.h.in 2006-11-27 20:19:40.000000000 +0100
+++ new/xf86-video-s3-0.6.0/config.h.in 2008-03-19 19:53:35.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/configure.ac new/xf86-video-s3-0.6.0/configure.ac
--- old/xf86-video-s3-0.5.0/configure.ac 2006-11-27 20:14:01.000000000 +0100
+++ new/xf86-video-s3-0.6.0/configure.ac 2008-03-19 19:53:21.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3],
- 0.5.0,
+ 0.6.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3)
@@ -58,10 +58,22 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/missing new/xf86-video-s3-0.6.0/missing
--- old/xf86-video-s3-0.5.0/missing 2006-11-23 19:33:44.000000000 +0100
+++ new/xf86-video-s3-0.6.0/missing 2008-03-19 19:53:36.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/Makefile.am new/xf86-video-s3-0.6.0/src/Makefile.am
--- old/xf86-video-s3-0.5.0/src/Makefile.am 2006-11-26 05:32:43.000000000 +0100
+++ new/xf86-video-s3-0.6.0/src/Makefile.am 2008-03-19 19:54:46.000000000 +0100
@@ -36,6 +36,7 @@
s3_driver.c \
s3.h \
s3_IBMRGB.c \
+ s3_pcirename.h \
s3_reg.h \
s3_Ti.c \
s3_Trio64DAC.c \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/newmmio.h new/xf86-video-s3-0.6.0/src/newmmio.h
--- old/xf86-video-s3-0.5.0/src/newmmio.h 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/newmmio.h 2008-03-19 19:53:10.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/newmmio.h,v 1.6 2001/07/02 10:46:04 alanh Exp $ */
/*
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_accel.c new/xf86-video-s3-0.6.0/src/s3_accel.c
--- old/xf86-video-s3-0.5.0/src/s3_accel.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_accel.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,8 +24,6 @@
*
*
*/
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2004/04/23 19:43:14 eich Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_accel.c,v 1.2 2001/10/28 03:33:44 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_bios.c new/xf86-video-s3-0.6.0/src/s3_bios.c
--- old/xf86-video-s3-0.5.0/src/s3_bios.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_bios.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,7 +24,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_bios.c,v 1.2 2001/07/11 07:45:35 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -46,8 +45,13 @@
if (!init) {
init = 1;
+#ifndef XSERVER_LIBPCIACCESS
if (xf86ReadDomainMemory(pS3->PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
return NULL;
+#else
+ if (pci_device_read_rom(pS3->PciInfo, bios))
+ return NULL;
+#endif
if ((bios[0] != 0x55) || (bios[1] != 0xaa))
return NULL;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_cursor.c new/xf86-video-s3-0.6.0/src/s3_cursor.c
--- old/xf86-video-s3-0.5.0/src/s3_cursor.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_cursor.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,7 +24,6 @@
*
*
*/
-/* $XFree86: $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_dga.c new/xf86-video-s3-0.6.0/src/s3_dga.c
--- old/xf86-video-s3-0.5.0/src/s3_dga.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_dga.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,7 +24,6 @@
*
*
*/
-/* $XFree86: $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_driver.c new/xf86-video-s3-0.6.0/src/s3_driver.c
--- old/xf86-video-s3-0.5.0/src/s3_driver.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_driver.c 2008-03-19 19:53:10.000000000 +0100
@@ -34,7 +34,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_driver.c,v 1.19tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -499,7 +498,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipID override: 0x%04X\n",
pS3->Chipset);
} else {
- pS3->Chipset = pS3->PciInfo->chipType;
+ pS3->Chipset = PCI_DEV_DEVICE_ID(pS3->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(S3Chipsets,
pS3->Chipset);
}
@@ -508,14 +507,16 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pS3->ChipRev);
} else
- pS3->ChipRev = pS3->PciInfo->chipRev;
+ pS3->ChipRev = PCI_DEV_REVISION(pS3->PciInfo);
xfree(pEnt);
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Chipset: \"%s\"\n", pScrn->chipset);
+#ifndef XSERVER_LIBPCIACCESS
pS3->PciTag = pciTag(pS3->PciInfo->bus, pS3->PciInfo->device,
pS3->PciInfo->func);
+#endif
switch (pS3->Chipset) {
case PCI_CHIP_964_0:
@@ -531,7 +532,7 @@
break;
}
- pS3->FBAddress = pS3->PciInfo->memBase[0];
+ pS3->FBAddress = PCI_REGION_BASE(pS3->PciInfo, 0, REGION_MEM);
pScrn->memPhysBase = pS3->FBAddress;
pScrn->fbOffset = 0;
@@ -1016,9 +1017,25 @@
S3Ptr pS3 = S3PTR(pScrn);
if (pS3->S3NewMMIO) {
+
+
+#ifndef XSERVER_LIBPCIACCESS
pS3->MMIOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pS3->PciTag, pS3->IOAddress,
S3_NEWMMIO_REGSIZE);
+#else
+ {
+ void** result = (void**)&pS3->MMIOBase;
+ int err = pci_device_map_range(pS3->PciInfo,
+ pS3->IOAddress,
+ S3_NEWMMIO_REGSIZE,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (!pS3->MMIOBase) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Could not map MMIO\n");
@@ -1026,9 +1043,25 @@
}
}
+#ifndef XSERVER_LIBPCIACCESS
pS3->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pS3->PciTag, pS3->FBAddress,
pScrn->videoRam * 1024);
+
+#else
+ {
+ void** result = (void**)&pS3->FBBase;
+ int err = pci_device_map_range(pS3->PciInfo,
+ pS3->FBAddress,
+ pS3->videoRam * 1024,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (!pS3->FBBase) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Could not map framebuffer\n");
@@ -1045,11 +1078,21 @@
{
S3Ptr pS3 = S3PTR(pScrn);
- if (pS3->S3NewMMIO)
+ if (pS3->S3NewMMIO) {
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pS3->MMIOBase,
S3_NEWMMIO_REGSIZE);
+#else
+ pci_device_unmap_range(pS3->PciInfo, pS3->MMIOBase, S3_NEWMMIO_REGSIZE);
+#endif
+ }
+
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pS3->FBBase,
pScrn->videoRam * 1024);
+#else
+ pci_device_unmap_range(pS3->PciInfo, pS3->FBBase, pScrn->videoRam * 1024);
+#endif
return;
}
@@ -1847,11 +1890,47 @@
outb(vgaCRReg, tmp);
}
-
-
-static void S3DisplayPowerManagementSet(ScrnInfoPtr pScrn,
- int PowerManagementMode, int flags)
-{
- vgaHWDPMSSet(pScrn, PowerManagementMode, flags);
+static void
+S3DisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode,
+ int flags)
+{
+ S3Ptr pS3 = S3PTR(pScrn);
+ switch (pS3->Chipset) {
+ case PCI_CHIP_TRIO64V2_DXGX:
+ case PCI_CHIP_TRIO:
+ case PCI_CHIP_AURORA64VP:
+ case PCI_CHIP_TRIO64UVP:
+ {
+ int srd;
+
+ outb(0x3c4, 0x08);
+ outb(0x3c5, 0x06); /* unlock extended sequence registers */
+
+ outb(0x3c4, 0x0d);
+ srd = inb(0x3c5) & 0xf; /* clear the sync control bits */
+
+ switch (PowerManagementMode) {
+ case DPMSModeOn:
+ /* Screen: On; HSync: On, VSync: On */
+ break;
+ case DPMSModeStandby:
+ /* Screen: Off; HSync: Off, VSync: On */
+ srd |= 0x10;
+ break;
+ case DPMSModeSuspend:
+ /* Screen: Off; HSync: On, VSync: Off */
+ srd |= 0x40;
+ break;
+ case DPMSModeOff:
+ /* Screen: Off; HSync: Off, VSync: Off */
+ srd |= 0x50;
+ break;
+ }
+ outb(0x3c4, 0x0d);
+ outb(0x3c5, srd);
+ break;
+ }
+ default:
+ vgaHWDPMSSet(pScrn, PowerManagementMode, flags);
+ }
}
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3.h new/xf86-video-s3-0.6.0/src/s3.h
--- old/xf86-video-s3-0.5.0/src/s3.h 2006-11-27 20:19:07.000000000 +0100
+++ new/xf86-video-s3-0.6.0/src/s3.h 2008-03-19 19:53:10.000000000 +0100
@@ -24,12 +24,12 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3.h,v 1.17 2003/07/04 16:24:28 eich Exp $ */
#ifndef _S3_H
#define _S3_H
+#include "s3_pcirename.h"
#include
#include "xf86.h"
@@ -86,7 +86,9 @@
typedef struct _S3Rec {
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
EntityInfoPtr pEnt;
unsigned long IOAddress;
unsigned long FBAddress;
@@ -164,10 +166,10 @@
#define DRIVER_NAME "s3"
-#define DRIVER_VERSION "0.5.0"
-#define VERSION_MAJOR 0
-#define VERSION_MINOR 5
-#define PATCHLEVEL 0
+#define DRIVER_VERSION PACKAGE_VERSION
+#define VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define VERSION_MINOR PACKAGE_VERSION_MINOR
+#define PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define S3_VERSION ((VERSION_MAJOR << 24) | \
(VERSION_MINOR << 16) | PATCHLEVEL)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_IBMRGB.c new/xf86-video-s3-0.6.0/src/s3_IBMRGB.c
--- old/xf86-video-s3-0.5.0/src/s3_IBMRGB.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_IBMRGB.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,7 +24,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_IBMRGB.c,v 1.4 2002/12/11 17:30:48 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_pcirename.h new/xf86-video-s3-0.6.0/src/s3_pcirename.h
--- old/xf86-video-s3-0.5.0/src/s3_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-s3-0.6.0/src/s3_pcirename.h 2008-03-19 15:31:01.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_reg.h new/xf86-video-s3-0.6.0/src/s3_reg.h
--- old/xf86-video-s3-0.5.0/src/s3_reg.h 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_reg.h 2008-03-19 19:53:10.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_reg.h,v 1.1 2001/07/02 10:46:04 alanh Exp $ */
#ifndef _S3_REG_H
#define _S3_REG_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_Ti.c new/xf86-video-s3-0.6.0/src/s3_Ti.c
--- old/xf86-video-s3-0.5.0/src/s3_Ti.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_Ti.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,7 +24,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Ti.c,v 1.4 2001/10/28 03:33:44 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_Trio64DAC.c new/xf86-video-s3-0.6.0/src/s3_Trio64DAC.c
--- old/xf86-video-s3-0.5.0/src/s3_Trio64DAC.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_Trio64DAC.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,7 +24,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_Trio64DAC.c,v 1.7tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -327,7 +326,7 @@
135000, 270000);
else if (pS3->Chipset == PCI_CHIP_TRIO64V2_DXGX)
S3TrioSetClock(pScrn, mode->Clock, 2, 1, 1, 31, 0, 3, 2,
- 170000, 270000);
+ 170000, 340000);
else
S3TrioSetClock(pScrn, mode->Clock, 2, 1, 1, 31, 0, 3, 2,
135000, 270000);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3-0.5.0/src/s3_video.c new/xf86-video-s3-0.6.0/src/s3_video.c
--- old/xf86-video-s3-0.5.0/src/s3_video.c 2006-09-02 20:01:40.000000000 +0200
+++ new/xf86-video-s3-0.6.0/src/s3_video.c 2008-03-19 19:53:10.000000000 +0100
@@ -24,12 +24,13 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3/s3_video.c,v 1.4tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#define S3_NEWMMIO /* previously defined in Imakefile in monolith */
+
#include "xf86.h"
#include "xf86_OSproc.h"
++++++ xf86-video-s3virge-X11R7.1-1.9.1.tar.bz2 -> xf86-video-s3virge-1.10.0.tar.bz2 ++++++
++++ 22239 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/CALLMAP new/xf86-video-s3virge-1.10.0/CALLMAP
--- old/xf86-video-s3virge-X11R7.1-1.9.1/CALLMAP 2004-04-23 21:43:44.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/CALLMAP 2008-03-19 15:31:03.000000000 +0100
@@ -20,4 +20,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/CALLMAP,v 1.1 1998/11/01 12:35:58 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/CALLMAP,v 1.2 1998/11/22 10:37:28 dawes Exp $
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/config.h.in new/xf86-video-s3virge-1.10.0/config.h.in
--- old/xf86-video-s3virge-X11R7.1-1.9.1/config.h.in 2006-05-23 05:42:53.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/config.h.in 2008-03-19 20:02:25.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/configure.ac new/xf86-video-s3virge-1.10.0/configure.ac
--- old/xf86-video-s3virge-X11R7.1-1.9.1/configure.ac 2006-04-08 03:40:56.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/configure.ac 2008-03-19 20:02:10.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-s3virge],
- 1.9.1,
+ 1.10.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-s3virge)
@@ -58,10 +58,23 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/man/Makefile.am new/xf86-video-s3virge-1.10.0/man/Makefile.am
--- old/xf86-video-s3virge-X11R7.1-1.9.1/man/Makefile.am 2005-12-06 23:48:37.000000000 +0100
+++ new/xf86-video-s3virge-1.10.0/man/Makefile.am 2008-03-19 15:31:03.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:10 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/man/s3virge.man new/xf86-video-s3virge-1.10.0/man/s3virge.man
--- old/xf86-video-s3virge-X11R7.1-1.9.1/man/s3virge.man 2004-04-23 21:43:44.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/man/s3virge.man 2008-03-19 15:31:03.000000000 +0100
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man,v 1.3 2001/11/21 22:43:00 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man,v 1.4 2003/02/13 03:21:33 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH s3virge __drivermansuffix__ __vendorversion__
@@ -221,7 +221,7 @@
Enable or disable a cr3a fix added for ViRGE MX. Default: on.
.SH SEE ALSO
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH KNOWN BUGS
The VideoRam generic driver parameter is presently ignored by the
@@ -229,10 +229,11 @@
cards, because they may autodetect as 4M.
.SH SUPPORT
-For assistance with this driver, or __xservername__ in general, check the web
-site at http://www.x.org. If you find a problem with __xservername__ or have a
+For assistance with this driver, or XFree86 in general, check the XFree86 web
+site at http://www.xfree86.org. A FAQ is available on the web site at
+http://www.xfree86.org/FAQ/. If you find a problem with XFree86 or have a
question not answered in the FAQ please use our bug report form available on
-the web site. When reporting problems
+the web site or send mail to XFree86@XFree86.org. When reporting problems
with the driver send as much detail as possible, including chipset type, a
server output log, and operating system specifics.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/missing new/xf86-video-s3virge-1.10.0/missing
--- old/xf86-video-s3virge-X11R7.1-1.9.1/missing 2006-05-23 05:42:55.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/missing 2008-03-19 20:02:26.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/Makefile.am new/xf86-video-s3virge-1.10.0/src/Makefile.am
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/Makefile.am 2005-07-26 20:47:44.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/Makefile.am 2008-03-19 20:03:04.000000000 +0100
@@ -39,6 +39,7 @@
s3v_hwcurs.c \
s3v_i2c.c \
s3v_macros.h \
+ s3v_pcirename.h \
s3v_rop.h \
s3v_shadow.c \
s3v_xv.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/newmmio.h new/xf86-video-s3virge-1.10.0/src/newmmio.h
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/newmmio.h 2003-11-14 17:48:55.000000000 +0100
+++ new/xf86-video-s3virge-1.10.0/src/newmmio.h 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/newmmio.h,v 1.5 1999/03/21 07:35:15 dawes Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/regs3v.h new/xf86-video-s3virge-1.10.0/src/regs3v.h
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/regs3v.h 2003-11-14 17:48:55.000000000 +0100
+++ new/xf86-video-s3virge-1.10.0/src/regs3v.h 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/regs3v.h,v 1.9 2002/01/25 21:56:08 tsi Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_accel.c new/xf86-video-s3virge-1.10.0/src/s3v_accel.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_accel.c 2005-07-11 04:29:59.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_accel.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_accel.c,v 1.25 2003/11/06 18:38:05 tsi Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_dac.c new/xf86-video-s3virge-1.10.0/src/s3v_dac.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_dac.c 2005-07-11 04:29:59.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_dac.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dac.c,v 1.4 2003/02/04 02:20:50 dawes Exp $ */
/*
Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_dga.c new/xf86-video-s3virge-1.10.0/src/s3v_dga.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_dga.c 2006-04-07 22:50:21.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_dga.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_dga.c,v 1.7 2002/01/14 18:02:58 dawes Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
@@ -67,12 +66,7 @@
#include "xaa.h"
#include "xaalocal.h"
#include "s3v.h"
-#if 0
-#include "mga_bios.h"
-#include "mga.h"
-#include "mga_reg.h"
-#include "mga_macros.h"
-#endif
+
#include "dgaproc.h"
@@ -84,10 +78,7 @@
static void S3V_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
static void S3V_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
/* dummy... */
-#if 0
-static void MGA_BlitTransRect(ScrnInfoPtr, int, int, int, int, int, int,
- unsigned long);
-#endif
+
static
DGAFunctionRec S3V_DGAFuncs = {
@@ -326,19 +317,7 @@
}
}
-#if 0
-static void
-MGA_BlitTransRect(
- ScrnInfoPtr pScrn,
- int srcx, int srcy,
- int w, int h,
- int dstx, int dsty,
- unsigned long color
-){
- /* this one should be separate since the XAA function would
- prohibit usage of ~0 as the key */
-}
-#endif
+
static Bool
S3V_OpenFramebuffer(
@@ -352,7 +331,7 @@
S3VPtr ps3v = S3VPTR(pScrn);
*name = NULL; /* no special device */
- *mem = (unsigned char*)ps3v->PciInfo->memBase[0];
+ *mem = (unsigned char*)PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
*size = ps3v->videoRambytes;
*offset = 0;
*flags = DGA_NEED_ROOT;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_driver.c new/xf86-video-s3virge-1.10.0/src/s3v_driver.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_driver.c 2006-04-08 03:40:56.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_driver.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_driver.c,v 1.93 2003/11/06 18:38:05 tsi Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
@@ -29,6 +28,7 @@
#include "config.h"
#endif
+#include
#include "xf86Resources.h"
/* Needed by Resources Access Control (RAC) */
#include "xf86RAC.h"
@@ -121,10 +121,10 @@
#define S3VIRGE_NAME "S3VIRGE"
#define S3VIRGE_DRIVER_NAME "s3virge"
-#define S3VIRGE_VERSION_NAME "1.9.1"
-#define S3VIRGE_VERSION_MAJOR 1
-#define S3VIRGE_VERSION_MINOR 9
-#define S3VIRGE_PATCHLEVEL 1
+#define S3VIRGE_VERSION_NAME PACKAGE_VERSION
+#define S3VIRGE_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define S3VIRGE_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define S3VIRGE_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define S3VIRGE_DRIVER_VERSION ((S3VIRGE_VERSION_MAJOR << 24) | \
(S3VIRGE_VERSION_MINOR << 16) | \
S3VIRGE_PATCHLEVEL)
@@ -418,7 +418,7 @@
#endif /* XFree86LOADER */
-static unsigned char *find_bios_string(PCITAG Tag, int BIOSbase, char *match1, char *match2)
+static unsigned char *find_bios_string(S3VPtr ps3v, int BIOSbase, char *match1, char *match2)
{
#define BIOS_BSIZE 1024
#define BIOS_BASE 0xc0000
@@ -429,8 +429,13 @@
if (!init) {
init = 1;
- if (xf86ReadDomainMemory(Tag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
+#ifndef XSERVER_LIBPCIACCESS
+ if (xf86ReadDomainMemory(ps3v->PciTag, BIOSbase, BIOS_BSIZE, bios) != BIOS_BSIZE)
return NULL;
+#else
+ if (pci_device_read_rom(ps3v->PciInfo, bios))
+ return NULL;
+#endif
if ((bios[0] != 0x55) || (bios[1] != 0xaa))
return NULL;
}
@@ -521,9 +526,12 @@
*/
return FALSE;
}
+
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(S3VIRGE_NAME, PCI_S3_VENDOR_ID,
S3VChipsets, S3VPciChipsets, devSections,
@@ -941,7 +949,7 @@
ps3v->Chipset);
} else {
from = X_PROBED;
- ps3v->Chipset = ps3v->PciInfo->chipType;
+ ps3v->Chipset = PCI_DEV_DEVICE_ID(ps3v->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(S3VChipsets, ps3v->Chipset);
}
@@ -950,7 +958,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
ps3v->ChipRev);
} else {
- ps3v->ChipRev = ps3v->PciInfo->chipRev;
+ ps3v->ChipRev = PCI_DEV_REVISION(ps3v->PciInfo);
}
xfree(pEnt);
@@ -975,8 +983,10 @@
xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
+#ifndef XSERVER_LIBPCIACCESS
ps3v->PciTag = pciTag(ps3v->PciInfo->bus, ps3v->PciInfo->device,
ps3v->PciInfo->func);
+#endif
/* Handle XVideo after we know chipset, so we can give an */
/* intelligent comment about support */
@@ -1197,7 +1207,7 @@
* <= 8bpp: 191500
*/
- if (find_bios_string(ps3v->PciTag, BIOS_BASE, "S3 86C325",
+ if (find_bios_string(ps3v, BIOS_BASE, "S3 86C325",
"MELCO WGP-VG VIDEO BIOS") != NULL) {
if (xf86GetVerbosity())
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "MELCO BIOS found\n");
@@ -2298,15 +2308,30 @@
/* so that we can use registers map */
/* structure - see newmmio.h */
/* around 0x10000 from MemBase */
+#ifndef XSERVER_LIBPCIACCESS
ps3v->MapBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, ps3v->PciTag,
- ps3v->PciInfo->memBase[0] + S3_NEWMMIO_REGBASE,
- S3_NEWMMIO_REGSIZE);
+ PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) + S3_NEWMMIO_REGBASE,
+ S3_NEWMMIO_REGSIZE);
ps3v->MapBaseDense = xf86MapPciMem(pScrn->scrnIndex,
- VIDMEM_MMIO_32BIT,
- ps3v->PciTag,
- ps3v->PciInfo->memBase[0] + S3_NEWMMIO_REGBASE,
- 0x8000);
+ VIDMEM_MMIO_32BIT,
+ ps3v->PciTag,
+ PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) + S3_NEWMMIO_REGBASE,
+ 0x8000);
+#else
+ {
+ void** result = (void**)&ps3v->MapBase;
+ int err = pci_device_map_range(ps3v->PciInfo,
+ PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) + S3_NEWMMIO_REGBASE,
+ S3_NEWMMIO_REGSIZE,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+ ps3v->MapBaseDense = ps3v->MapBase;
+#endif
if( !ps3v->MapBase ) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -2315,10 +2340,26 @@
}
/* Map the framebuffer */
if (ps3v->videoRambytes) { /* not set in PreInit() */
+#ifndef XSERVER_LIBPCIACCESS
ps3v->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
- ps3v->PciTag, ps3v->PciInfo->memBase[0],
+ ps3v->PciTag, PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM),
ps3v->videoRambytes );
+#else
+ {
+ void** result = (void**)&ps3v->FBBase;
+ int err = pci_device_map_range(ps3v->PciInfo,
+ PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM),
+ ps3v->videoRambytes,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
+
if( !ps3v->FBBase ) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Internal error: could not map framebuffer.\n");
@@ -2329,7 +2370,7 @@
ps3v->FBStart = ps3v->FBBase;
}
- pScrn->memPhysBase = ps3v->PciInfo->memBase[0];
+ pScrn->memPhysBase = PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM);
pScrn->fbOffset = 0;
/* Set up offset to hwcursor memory area */
@@ -2376,14 +2417,24 @@
ps3v->PrimaryVidMapped = FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)ps3v->MapBase,
S3_NEWMMIO_REGSIZE);
+#else
+ pci_device_unmap_range(ps3v->PciInfo, ps3v->MapBase,
+ S3_NEWMMIO_REGSIZE);
+#endif
+
+#ifndef XSERVER_LIBPCIACCESS
if (ps3v->FBBase)
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)ps3v->FBBase,
ps3v->videoRambytes);
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)ps3v->MapBaseDense,
0x8000);
-
+#else
+ pci_device_unmap_range(ps3v->PciInfo, ps3v->FBBase,
+ ps3v->videoRambytes);
+#endif
return;
}
@@ -3633,9 +3684,9 @@
* (EE 06/03/99)
*/
outb(vgaCRIndex, 0x59); /*@@@EE*/
- outb(vgaCRReg, ps3v->PciInfo->memBase[0] >> 24);
+ outb(vgaCRReg, PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) >> 24);
outb(vgaCRIndex, 0x5A);
- outb(vgaCRReg, ps3v->PciInfo->memBase[0] >> 16);
+ outb(vgaCRReg, PCI_REGION_BASE(ps3v->PciInfo, 0, REGION_MEM) >> 16);
outb(vgaCRIndex, 0x53);
#endif
/* Save register for restore */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v.h new/xf86-video-s3virge-1.10.0/src/s3v.h
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v.h 2006-04-07 22:50:21.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v.h 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v.h,v 1.31 2003/02/04 02:20:49 dawes Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
@@ -28,6 +27,8 @@
#ifndef _S3V_H
#define _S3V_H
+#include "s3v_pcirename.h"
+
#include
/* All drivers should typically include these */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_hwcurs.c new/xf86-video-s3virge-1.10.0/src/s3v_hwcurs.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_hwcurs.c 2005-07-11 04:29:59.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_hwcurs.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_hwcurs.c,v 1.7 2003/02/04 02:20:50 dawes Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_i2c.c new/xf86-video-s3virge-1.10.0/src/s3v_i2c.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_i2c.c 2006-04-07 22:50:21.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_i2c.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_i2c.c,v 1.4 2000/03/31 20:13:32 dawes Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_macros.h new/xf86-video-s3virge-1.10.0/src/s3v_macros.h
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_macros.h 2003-11-14 17:48:55.000000000 +0100
+++ new/xf86-video-s3virge-1.10.0/src/s3v_macros.h 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_macros.h,v 1.11 2000/11/28 20:59:18 dawes Exp $ */
/*
Copyright (C) 1994-1999 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_pcirename.h new/xf86-video-s3virge-1.10.0/src/s3v_pcirename.h
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-s3virge-1.10.0/src/s3v_pcirename.h 2008-03-19 15:31:03.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_rop.h new/xf86-video-s3virge-1.10.0/src/s3v_rop.h
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_rop.h 2004-04-23 21:43:44.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_rop.h 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_rop.h,v 1.2 1998/11/28 10:43:16 dawes Exp $ */
/*
Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_shadow.c new/xf86-video-s3virge-1.10.0/src/s3v_shadow.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_shadow.c 2006-04-07 22:50:21.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_shadow.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.2 2000/03/06 22:59:30 dawes Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_xv.c new/xf86-video-s3virge-1.10.0/src/s3v_xv.c
--- old/xf86-video-s3virge-X11R7.1-1.9.1/src/s3v_xv.c 2006-04-08 01:12:35.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/src/s3v_xv.c 2008-03-19 20:01:58.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.10tsi Exp $ */
/*
Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved.
@@ -64,11 +63,7 @@
static int S3VSetPortAttributeOverlay(ScrnInfoPtr, Atom, INT32, pointer);
static int S3VGetPortAttributeOverlay(ScrnInfoPtr, Atom ,INT32 *, pointer);
-#if 0
-static XF86VideoAdaptorPtr MGASetupImageVideoTexture(ScreenPtr);
-static int MGASetPortAttributeTexture(ScrnInfoPtr, Atom, INT32, pointer);
-static int MGAGetPortAttributeTexture(ScrnInfoPtr, Atom ,INT32 *, pointer);
-#endif
+
static void S3VStopVideo(ScrnInfoPtr, pointer, Bool);
static void S3VQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short,
unsigned int *, unsigned int *, pointer);
@@ -78,9 +73,6 @@
static int S3VQueryImageAttributes(ScrnInfoPtr, int, unsigned short *,
unsigned short *, int *, int *);
-#if 0
-static void MGABlockHandler(int, pointer, pointer, pointer);
-#endif
static void S3VResetVideoOverlay(ScrnInfoPtr);
@@ -132,28 +124,8 @@
&& ps3v->XVideo
)
{
-#if 0
- if((pMga->Overlay8Plus24 /* || dualhead */ || pMga->TexturedVideo) &&
- (pScrn->bitsPerPixel != 24))
- {
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using texture video\n");
- newAdaptor = MGASetupImageVideoTexture(pScreen);
- pMga->TexturedVideo = TRUE;
- } else {
-#endif
-
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Using overlay video\n");
newAdaptor = S3VSetupImageVideoOverlay(pScreen);
-
-#if 0
- pMga->TexturedVideo = FALSE;
- }*/
-
- if(!pMga->Overlay8Plus24 /* && !dualhead */)
- S3VInitOffscreenImages(pScreen);
- pMga->BlockHandler = pScreen->BlockHandler;
- pScreen->BlockHandler = MGABlockHandler;
-#endif
}
@@ -241,43 +213,9 @@
INT32 value,
pointer data
){
-#if 0
- MGAPtr pMga = MGAPTR(pScrn);
- MGAPortPrivPtr pPriv = pMga->portPrivate;
-
- CHECK_DMA_QUIESCENT(pMga, pScrn);
-
- if(attribute == xvBrightness) {
- if((value < -128) || (value > 127))
- return BadValue;
- pPriv->brightness = value;
- OUTREG(MGAREG_BESLUMACTL, ((pPriv->brightness & 0xff) << 16) |
- (pPriv->contrast & 0xff));
- } else
- if(attribute == xvContrast) {
- if((value < 0) || (value > 255))
- return BadValue;
- pPriv->contrast = value;
- OUTREG(MGAREG_BESLUMACTL, ((pPriv->brightness & 0xff) << 16) |
- (pPriv->contrast & 0xff));
- } else
- if(attribute == xvColorKey) {
- pPriv->colorKey = value;
- outMGAdac(0x55, (pPriv->colorKey & pScrn->mask.red) >>
- pScrn->offset.red);
- outMGAdac(0x56, (pPriv->colorKey & pScrn->mask.green) >>
- pScrn->offset.green);
- outMGAdac(0x57, (pPriv->colorKey & pScrn->mask.blue) >>
- pScrn->offset.blue);
- REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
- } else
-#endif
return BadMatch;
-#if 0
- return Success;
-#endif
}
static int
@@ -287,26 +225,10 @@
INT32 *value,
pointer data
){
-#if 0
- MGAPtr pMga = MGAPTR(pScrn);
- MGAPortPrivPtr pPriv = pMga->portPrivate;
- if(attribute == xvBrightness) {
- *value = pPriv->brightness;
- } else
- if(attribute == xvContrast) {
- *value = pPriv->contrast;
- } else
- if(attribute == xvColorKey) {
- *value = pPriv->colorKey;
- } else
-#endif
return BadMatch;
-#if 0
- return Success;
-#endif
}
@@ -438,15 +360,8 @@
adapt->pFormats = Formats;
adapt->nPorts = 1;
adapt->pAttributes = NULL /*Attributes*/;
-#if 0
- if (pMga->Chipset == PCI_CHIP_MGAG400) {
- adapt->nImages = 4;
- adapt->nAttributes = 3;
- } else {
-#endif
- adapt->nImages = 3;
- adapt->nAttributes = 0;
- /* }*/
+ adapt->nImages = 3;
+ adapt->nAttributes = 0;
adapt->pImages = Images;
adapt->PutVideo = NULL;
adapt->PutStill = NULL;
@@ -475,13 +390,6 @@
S3VPtr ps3v = S3VPTR(pScrn);
S3VPortPrivPtr pPriv = ps3v->portPrivate;
-#if 0
- MGAPtr pMga = MGAPTR(pScrn);
- MGAPortPrivPtr pPriv = pMga->portPrivate;
-
- if(pMga->TexturedVideo) return;
-#endif
-
REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
if(shutdown) {
@@ -602,12 +510,6 @@
if(!ps3v->NeedSTREAMS)
return;
-#if 0
- /* got 64 scanlines to do it in */
- tmp = INREG(MGAREG_VCOUNT) + 64;
- if(tmp > pScrn->currentMode->VDisplay)
- tmp -= pScrn->currentMode->VDisplay;
-#endif
/* Reference at http://www.webartz.com/fourcc/ */
/* Looks like ViRGE only supports YUY2 and Y211?, */
@@ -860,14 +762,6 @@
dst_start = ps3v->FBStart + offset + left + (top * dstPitch);
/*dst_start = pMga->FbStart + offset + left + (top * dstPitch);*/
-#if 0
- if(pMga->TexturedVideo && pMga->AccelInfoRec->NeedToSync &&
- ((long)data != pPriv->lastPort))
- {
- MGAStormSync(pScrn);
- pMga->AccelInfoRec->NeedToSync = FALSE;
- }
-#endif
switch(id) {
case FOURCC_YV12:
@@ -895,17 +789,7 @@
break;
}
-#if 0
- if(pMga->TexturedVideo) {
- pPriv->lastPort = (long)data;
- MGADisplayVideoTexture(pScrn, id, offset,
- REGION_NUM_RECTS(clipBoxes), REGION_RECTS(clipBoxes),
- width, height, dstPitch, src_x, src_y, src_w, src_h,
- drw_x, drw_y, drw_w, drw_h);
- pPriv->videoStatus = FREE_TIMER;
- pPriv->freeTime = currentTime.milliseconds + FREE_DELAY;
- } else {
-#endif
+
/* update cliplist */
if(!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
@@ -918,10 +802,7 @@
x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
pPriv->videoStatus = CLIENT_VIDEO_ON;
-#if 0
- }
- pMga->VideoTimerCallback = MGAVideoTimerCallback;
-#endif
+
return Success;
}
@@ -934,22 +815,11 @@
unsigned short *w, unsigned short *h,
int *pitches, int *offsets
){
-#if 0
- MGAPtr pMga = MGAPTR(pScrn);
-#endif
+
int size, tmp;
-#if 0
- if(pMga->TexturedVideo) {
- if(*w > 2046) *w = 2046;
- if(*h > 2046) *h = 2046;
- } else {
-#endif
if(*w > 1024) *w = 1024;
if(*h > 1024) *h = 1024;
-#if 0
- }
-#endif
*w = (*w + 1) & ~1;
if(offsets) offsets[0] = 0;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-s3virge-X11R7.1-1.9.1/TODO_NOTES new/xf86-video-s3virge-1.10.0/TODO_NOTES
--- old/xf86-video-s3virge-X11R7.1-1.9.1/TODO_NOTES 2004-04-23 21:43:44.000000000 +0200
+++ new/xf86-video-s3virge-1.10.0/TODO_NOTES 2008-03-19 15:31:03.000000000 +0100
@@ -323,4 +323,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.22 2003/02/04 02:20:49 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $
++++++ xf86-video-s3virge.diff ++++++
--- src/s3v_driver.c.orig 2008-03-19 22:58:01.510230250 +0100
+++ src/s3v_driver.c 2008-03-19 23:00:49.216711250 +0100
@@ -1239,12 +1239,12 @@
* Toshiba Tecra 5x0/7x0 seems to use 28.636 MHz
* Compaq Armada 7x00 uses 14.318 MHz
*/
- if (find_bios_string(ps3v->PciTag, BIOS_BASE, "COMPAQ M5 BIOS", NULL) != NULL) {
+ if (find_bios_string((pointer) ps3v->PciTag, BIOS_BASE, "COMPAQ M5 BIOS", NULL) != NULL) {
if (xf86GetVerbosity())
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "COMPAQ M5 BIOS found\n");
/* ps3v->refclk_fact = 1.0; */
}
- else if (find_bios_string(ps3v->PciTag, BIOS_BASE, "TOSHIBA Video BIOS", NULL) != NULL) {
+ else if (find_bios_string((pointer) ps3v->PciTag, BIOS_BASE, "TOSHIBA Video BIOS", NULL) != NULL) {
if (xf86GetVerbosity())
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "TOSHIBA Video BIOS found\n");
/* ps3v->refclk_fact = 2.0; */
++++++ xf86-video-savage-2.1.3.tar.bz2 -> xf86-video-savage-2.2.0.tar.bz2 ++++++
++++ 10527 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/configure.ac new/xf86-video-savage-2.2.0/configure.ac
--- old/xf86-video-savage-2.1.3/configure.ac 2007-08-17 02:43:06.000000000 +0200
+++ new/xf86-video-savage-2.2.0/configure.ac 2008-03-19 20:14:21.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-savage],
- 2.1.3,
+ 2.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-savage)
@@ -95,6 +95,18 @@
AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support])
fi
+save_CFLAGS="$CFLAGS"
+CFLAGS="$XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes], [XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CFLAGS="$save_CFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/man/Makefile.am new/xf86-video-savage-2.2.0/man/Makefile.am
--- old/xf86-video-savage-2.1.3/man/Makefile.am 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/man/Makefile.am 2008-03-19 15:31:06.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/missing new/xf86-video-savage-2.2.0/missing
--- old/xf86-video-savage-2.1.3/missing 2007-07-12 01:52:10.000000000 +0200
+++ new/xf86-video-savage-2.2.0/missing 2008-03-19 20:07:50.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_accel.c new/xf86-video-savage-2.2.0/src/savage_accel.c
--- old/xf86-video-savage-2.1.3/src/savage_accel.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_accel.c 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.23 2003/12/22 17:48:10 tsi Exp $ */
/*
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_bci.h new/xf86-video-savage-2.2.0/src/savage_bci.h
--- old/xf86-video-savage-2.1.3/src/savage_bci.h 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_bci.h 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_bci.h,v 1.3 2002/05/14 20:19:51 alanh Exp $ */
#ifndef _S3BCI_H_
#define _S3BCI_H_
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_dga.c new/xf86-video-savage-2.2.0/src/savage_dga.c
--- old/xf86-video-savage-2.1.3/src/savage_dga.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_dga.c 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_dga.c,v 1.6 2003/01/18 15:22:29 eich Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
@@ -391,7 +390,7 @@
SavagePtr psav = SAVPTR(pScrn);
*name = NULL; /* no special device */
- *mem = (unsigned char*)psav->FrameBufferBase;
+ *mem = (unsigned char*)psav->FbRegion.base;
*size = psav->videoRambytes;
*offset = 0;
*flags = DGA_NEED_ROOT;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_dri.c new/xf86-video-savage-2.2.0/src/savage_dri.c
--- old/xf86-video-savage-2.1.3/src/savage_dri.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_dri.c 2008-03-19 20:12:29.000000000 +0100
@@ -467,8 +467,8 @@
xf86DrvMsg( pScreen->myNum, X_INFO,
"[agp] Mode 0x%08lx [AGP 0x%04x/0x%04x; Card 0x%04x/0x%04x]\n",
mode, vendor, device,
- psav->PciInfo->vendor,
- psav->PciInfo->chipType );
+ VENDOR_ID(psav->PciInfo),
+ DEVICE_ID(psav->PciInfo));
if ( drmAgpEnable( psav->drmFD, mode ) < 0 ) {
xf86DrvMsg( pScreen->myNum, X_ERROR, "[agp] AGP not enabled\n" );
@@ -624,7 +624,7 @@
pSAVAGEDRIServer->registers.size = SAVAGEIOMAPSIZE;
if ( drmAddMap( psav->drmFD,
- (drm_handle_t)psav->MmioBase,
+ (drm_handle_t)psav->MmioRegion.base,
pSAVAGEDRIServer->registers.size,
DRM_REGISTERS,0,
&pSAVAGEDRIServer->registers.handle ) < 0 ) {
@@ -636,7 +636,7 @@
pSAVAGEDRIServer->aperture.size = 5 * 0x01000000;
if ( drmAddMap( psav->drmFD,
- (drm_handle_t)(psav->ApertureBase),
+ (drm_handle_t)(psav->ApertureRegion.base),
pSAVAGEDRIServer->aperture.size,
DRM_FRAME_BUFFER,0,
&pSAVAGEDRIServer->aperture.handle ) < 0 ) {
@@ -882,14 +882,18 @@
sprintf(pDRIInfo->busIdString,
"PCI:%d:%d:%d",
psav->PciInfo->bus,
+#ifdef XSERVER_LIBPCIACCESS
+ psav->PciInfo->dev,
+#else
psav->PciInfo->device,
+#endif
psav->PciInfo->func);
}
pDRIInfo->ddxDriverMajorVersion = SAVAGE_VERSION_MAJOR;
pDRIInfo->ddxDriverMinorVersion = SAVAGE_VERSION_MINOR;
pDRIInfo->ddxDriverPatchVersion = SAVAGE_PATCHLEVEL;
- pDRIInfo->frameBufferPhysicalAddress = (pointer) psav->FrameBufferBase;
+ pDRIInfo->frameBufferPhysicalAddress = (pointer) psav->FbRegion.base;
pDRIInfo->frameBufferSize = psav->videoRambytes;
pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8);
pDRIInfo->ddxDrawableTableEntry = SAVAGE_MAX_DRAWABLES;
@@ -1115,14 +1119,7 @@
pSAVAGEDRI->apertureHandle = pSAVAGEDRIServer->aperture.handle;
pSAVAGEDRI->apertureSize = pSAVAGEDRIServer->aperture.size;
- {
- unsigned int shift = 0;
-
- if(pSAVAGEDRI->width > 1024)
- shift = 1;
-
- pSAVAGEDRI->aperturePitch = psav->ulAperturePitch;
- }
+ pSAVAGEDRI->aperturePitch = psav->ulAperturePitch;
{
unsigned int value = 0;
@@ -1432,11 +1429,11 @@
if (nbox>1) {
/* Keep ordering in each band, reverse order of bands */
- pboxNew1 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
+ pboxNew1 = xalloc(sizeof(BoxRec)*nbox);
if (!pboxNew1) return;
- pptNew1 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
+ pptNew1 = xalloc(sizeof(DDXPointRec)*nbox);
if (!pptNew1) {
- DEALLOCATE_LOCAL(pboxNew1);
+ xfree(pboxNew1);
return;
}
pboxBase = pboxNext = pbox+nbox-1;
@@ -1467,14 +1464,14 @@
if (nbox > 1) {
/*reverse orderof rects in each band */
- pboxNew2 = (BoxPtr)ALLOCATE_LOCAL(sizeof(BoxRec)*nbox);
- pptNew2 = (DDXPointPtr)ALLOCATE_LOCAL(sizeof(DDXPointRec)*nbox);
+ pboxNew2 = xalloc(sizeof(BoxRec)*nbox);
+ pptNew2 = xalloc(sizeof(DDXPointRec)*nbox);
if (!pboxNew2 || !pptNew2) {
- if (pptNew2) DEALLOCATE_LOCAL(pptNew2);
- if (pboxNew2) DEALLOCATE_LOCAL(pboxNew2);
+ if (pptNew2) xfree(pptNew2);
+ if (pboxNew2) xfree(pboxNew2);
if (pboxNew1) {
- DEALLOCATE_LOCAL(pptNew1);
- DEALLOCATE_LOCAL(pboxNew1);
+ xfree(pptNew1);
+ xfree(pboxNew1);
}
return;
}
@@ -1529,12 +1526,12 @@
SAVAGESelectBuffer(pScrn, SAVAGE_FRONT);
if (pboxNew2) {
- DEALLOCATE_LOCAL(pptNew2);
- DEALLOCATE_LOCAL(pboxNew2);
+ xfree(pptNew2);
+ xfree(pboxNew2);
}
if (pboxNew1) {
- DEALLOCATE_LOCAL(pptNew1);
- DEALLOCATE_LOCAL(pboxNew1);
+ xfree(pptNew1);
+ xfree(pboxNew1);
}
BCI_SEND(0xc0020000); /* wait for 2D idle */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_driver.c new/xf86-video-savage-2.2.0/src/savage_driver.c
--- old/xf86-video-savage-2.1.3/src/savage_driver.c 2007-07-12 05:51:42.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_driver.c 2008-03-19 15:31:06.000000000 +0100
@@ -39,6 +39,9 @@
#include "config.h"
#endif
+#include
+#include
+
#include "xf86RAC.h"
#include "shadowfb.h"
@@ -70,7 +73,13 @@
static const OptionInfoRec * SavageAvailableOptions(int chipid, int busid);
static void SavageIdentify(int flags);
+#ifdef XSERVER_LIBPCIACCESS
+static Bool SavagePciProbe(DriverPtr drv, int entity_num,
+ struct pci_device *dev, intptr_t match_data);
+#else
static Bool SavageProbe(DriverPtr drv, int flags);
+static int LookupChipID(PciChipsets* pset, int ChipID);
+#endif
static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags);
static Bool SavageEnterVT(int scrnIndex, int flags);
@@ -111,7 +120,7 @@
static unsigned int SavageDDC1Read(ScrnInfoPtr pScrn);
static void SavageProbeDDC(ScrnInfoPtr pScrn, int index);
static void SavageGetTvMaxSize(SavagePtr psav);
-static Bool SavagePanningCheck(ScrnInfoPtr pScrn);
+static Bool SavagePanningCheck(ScrnInfoPtr pScrn, DisplayModePtr pMode);
#ifdef XF86DRI
static Bool SavageCheckAvailableRamFor3D(ScrnInfoPtr pScrn);
#endif
@@ -130,18 +139,38 @@
int gSavageEntityIndex = -1;
-_X_EXPORT DriverRec SAVAGE =
-{
- SAVAGE_VERSION,
- SAVAGE_DRIVER_NAME,
- SavageIdentify,
- SavageProbe,
- SavageAvailableOptions,
- NULL,
- 0,
- NULL
-};
+#ifdef XSERVER_LIBPCIACCESS
+#define SAVAGE_DEVICE_MATCH(d, i) \
+ { 0x5333, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) }
+
+static const struct pci_id_match savage_device_match[] = {
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE4, S3_SAVAGE4),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE3D, S3_SAVAGE3D),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE3D_MV, S3_SAVAGE3D),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE2000, S3_SAVAGE2000),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE_MX_MV, S3_SAVAGE_MX),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE_MX, S3_SAVAGE_MX),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE_IX_MV, S3_SAVAGE_MX),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SAVAGE_IX, S3_SAVAGE_MX),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_PROSAVAGE_PM, S3_PROSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_PROSAVAGE_KM, S3_PROSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_S3TWISTER_P, S3_TWISTER),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_S3TWISTER_K, S3_TWISTER),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_MX128, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_MX64, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_MX64C, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_IX128SDR, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_IX128DDR, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_IX64SDR, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_IX64DDR, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_IXCSDR, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_SUPSAV_IXCDDR, S3_SUPERSAVAGE),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_PROSAVAGE_DDR, S3_PROSAVAGEDDR),
+ SAVAGE_DEVICE_MATCH(PCI_CHIP_PROSAVAGE_DDRK, S3_PROSAVAGEDDR),
+ { 0, 0, 0 },
+};
+#endif
/* Supported chipsets */
@@ -184,6 +213,7 @@
{ -1, NULL }
};
+#ifndef XSERVER_LIBPCIACCESS
/* This table maps a PCI device ID to a chipset family identifier. */
static PciChipsets SavagePciChipsets[] = {
@@ -212,6 +242,7 @@
{ S3_SUPERSAVAGE, PCI_CHIP_SUPSAV_IXCDDR, RES_SHARED_VGA },
{ -1, -1, RES_UNDEFINED }
};
+#endif
typedef enum {
OPTION_PCI_BURST
@@ -246,6 +277,7 @@
,OPTION_AGP_MODE
,OPTION_AGP_SIZE
,OPTION_DRI
+ ,OPTION_IGNORE_EDID
} SavageOpts;
@@ -272,6 +304,7 @@
{ OPTION_DISABLE_COB, "DisableCOB", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_BCI_FOR_XV, "BCIforXv", OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_DVI, "DVI", OPTV_BOOLEAN, {0}, FALSE },
+ { OPTION_IGNORE_EDID, "IgnoreEDID", OPTV_BOOLEAN, {0}, FALSE },
#ifdef XF86DRI
{ OPTION_BUS_TYPE, "BusType", OPTV_ANYSTR, {0}, FALSE },
{ OPTION_DMA_TYPE, "DmaType", OPTV_ANYSTR, {0}, FALSE },
@@ -283,6 +316,28 @@
{ -1, NULL, OPTV_NONE, {0}, FALSE }
};
+_X_EXPORT DriverRec SAVAGE =
+{
+ SAVAGE_VERSION,
+ SAVAGE_DRIVER_NAME,
+ SavageIdentify,
+#ifdef XSERVER_LIBPCIACCESS
+ NULL,
+#else
+ SavageProbe,
+#endif
+ SavageAvailableOptions,
+ NULL,
+ 0,
+ NULL,
+
+#ifdef XSERVER_LIBPCIACCESS
+ savage_device_match,
+ SavagePciProbe
+#endif
+};
+
+
static const char *vgaHWSymbols[] = {
"vgaHWBlankScreen",
@@ -786,6 +841,82 @@
}
+#ifdef XSERVER_LIBPCIACCESS
+static Bool SavagePciProbe(DriverPtr drv, int entity_num,
+ struct pci_device *dev, intptr_t match_data)
+{
+ ScrnInfoPtr pScrn;
+
+
+ if ((match_data < S3_SAVAGE3D) || (match_data > S3_SAVAGE2000)) {
+ return FALSE;
+ }
+
+ pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL,
+ RES_SHARED_VGA, NULL, NULL, NULL, NULL);
+ if (pScrn != NULL) {
+ EntityInfoPtr pEnt;
+ SavagePtr psav;
+
+
+ pScrn->driverVersion = SAVAGE_VERSION;
+ pScrn->driverName = SAVAGE_DRIVER_NAME;
+ pScrn->name = "SAVAGE";
+ pScrn->Probe = NULL;
+ pScrn->PreInit = SavagePreInit;
+ pScrn->ScreenInit = SavageScreenInit;
+ pScrn->SwitchMode = SavageSwitchMode;
+ pScrn->AdjustFrame = SavageAdjustFrame;
+ pScrn->EnterVT = SavageEnterVT;
+ pScrn->LeaveVT = SavageLeaveVT;
+ pScrn->FreeScreen = NULL;
+ pScrn->ValidMode = SavageValidMode;
+
+ if (!SavageGetRec(pScrn))
+ return FALSE;
+
+ psav = SAVPTR(pScrn);
+
+ psav->PciInfo = dev;
+ psav->Chipset = match_data;
+
+ pEnt = xf86GetEntityInfo(entity_num);
+
+ /* MX, IX, SuperSavage cards support Dual-Head, mark the entity as
+ * sharable.
+ */
+ if (pEnt->chipset == S3_SAVAGE_MX || pEnt->chipset == S3_SUPERSAVAGE) {
+ DevUnion *pPriv;
+ SavageEntPtr pSavageEnt;
+
+ xf86SetEntitySharable(entity_num);
+
+ if (gSavageEntityIndex == -1)
+ gSavageEntityIndex = xf86AllocateEntityPrivateIndex();
+
+ pPriv = xf86GetEntityPrivate(pEnt->index, gSavageEntityIndex);
+ if (!pPriv->ptr) {
+ int j;
+ int instance = xf86GetNumEntityInstances(pEnt->index);
+
+ for (j = 0; j < instance; j++)
+ xf86SetEntityInstanceForScreen(pScrn, pEnt->index, j);
+
+ pPriv->ptr = xnfcalloc(sizeof(SavageEntRec), 1);
+ pSavageEnt = pPriv->ptr;
+ pSavageEnt->HasSecondary = FALSE;
+ } else {
+ pSavageEnt = pPriv->ptr;
+ pSavageEnt->HasSecondary = TRUE;
+ }
+ }
+ }
+
+ return (pScrn != NULL);
+}
+
+#else
+
static Bool SavageProbe(DriverPtr drv, int flags)
{
int i;
@@ -824,6 +955,8 @@
NULL, NULL, NULL, NULL);
if (pScrn != NULL) {
+ SavagePtr psav;
+
pScrn->driverVersion = SAVAGE_VERSION;
pScrn->driverName = SAVAGE_DRIVER_NAME;
pScrn->name = "SAVAGE";
@@ -837,6 +970,23 @@
pScrn->FreeScreen = NULL;
pScrn->ValidMode = SavageValidMode;
foundScreen = TRUE;
+
+ if (!SavageGetRec(pScrn))
+ return FALSE;
+
+ psav = SAVPTR(pScrn);
+
+ psav->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
+ if (pEnt->device->chipset && *pEnt->device->chipset) {
+ psav->Chipset = xf86StringToToken(SavageChipsets,
+ pEnt->device->chipset);
+ } else if (pEnt->device->chipID >= 0) {
+ psav->Chipset = LookupChipID(SavagePciChipsets,
+ pEnt->device->chipID);
+ } else {
+ psav->Chipset = LookupChipID(SavagePciChipsets,
+ psav->PciInfo->chipType);
+ }
}
pEnt = xf86GetEntityInfo(usedChips[i]);
@@ -890,6 +1040,7 @@
return -1;
}
+#endif
static void SavageDoDDC(ScrnInfoPtr pScrn)
{
@@ -924,11 +1075,12 @@
xf86LoaderReqSymLists(i2cSymbols,NULL);
if (SavageI2CInit(pScrn)) {
unsigned char tmp;
+ xf86MonPtr pMon;
InI2CREG(tmp,psav->DDCPort);
OutI2CREG(tmp | 0x13,psav->DDCPort);
- xf86SetDDCproperties(pScrn,xf86PrintEDID(
- xf86DoEDID_DDC2(pScrn->scrnIndex,psav->I2C)));
+ pMon = xf86PrintEDID(xf86DoEDID_DDC2(pScrn->scrnIndex,psav->I2C));
+ if (!psav->IgnoreEDID) xf86SetDDCproperties(pScrn, pMon);
OutI2CREG(tmp,psav->DDCPort);
}
}
@@ -1198,6 +1350,7 @@
memcpy(psav->Options, SavageOptions, sizeof(SavageOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, psav->Options);
+ xf86GetOptValBool(psav->Options, OPTION_IGNORE_EDID, &psav->IgnoreEDID);
xf86GetOptValBool(psav->Options, OPTION_PCI_BURST, &psav->pci_burst);
if (psav->pci_burst) {
@@ -1404,7 +1557,6 @@
psav->pVbe = VBEInit(NULL, pEnt->index);
}
- psav->PciInfo = xf86GetPciInfoForEntity(pEnt->index);
xf86RegisterResources(pEnt->index, NULL, ResNone);
xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
@@ -1413,11 +1565,9 @@
if (pEnt->device->chipset && *pEnt->device->chipset) {
pScrn->chipset = pEnt->device->chipset;
psav->ChipId = pEnt->device->chipID;
- psav->Chipset = xf86StringToToken(SavageChipsets, pScrn->chipset);
from = X_CONFIG;
} else if (pEnt->device->chipID >= 0) {
psav->ChipId = pEnt->device->chipID;
- psav->Chipset = LookupChipID(SavagePciChipsets, psav->ChipId);
pScrn->chipset = (char *)xf86TokenToString(SavageChipsets,
psav->Chipset);
from = X_CONFIG;
@@ -1425,8 +1575,7 @@
pEnt->device->chipID);
} else {
from = X_PROBED;
- psav->ChipId = psav->PciInfo->chipType;
- psav->Chipset = LookupChipID(SavagePciChipsets, psav->ChipId);
+ psav->ChipId = DEVICE_ID(psav->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(SavageChipsets,
psav->Chipset);
}
@@ -1439,7 +1588,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
psav->ChipRev);
} else
- psav->ChipRev = psav->PciInfo->chipRev;
+ psav->ChipRev = CHIP_REVISION(psav->PciInfo);
xf86DrvMsg(pScrn->scrnIndex, from, "Engine: \"%s\"\n", pScrn->chipset);
@@ -1448,13 +1597,22 @@
xfree(pEnt);
+#ifndef XSERVER_LIBPCIACCESS
psav->PciTag = pciTag(psav->PciInfo->bus, psav->PciInfo->device,
psav->PciInfo->func);
+#endif
/* Set AGP Mode from config */
/* We support 1X 2X and 4X */
#ifdef XF86DRI
+#ifdef XSERVER_LIBPCIACCESS
+ /* Try to read the AGP capabilty block from the device. If there is
+ * no AGP info, the device is PCI.
+ */
+
+ psav->IsPCI = (pci_device_get_agp_info(psav->PciInfo) == NULL);
+#else
/* AGP/PCI (FK: copied from radeon_driver.c) */
/* Proper autodetection of an AGP capable device requires examining
* PCI config registers to determine if the device implements extended
@@ -1513,6 +1671,7 @@
cap_ptr = (cap_id >> 8) & SAVAGE_CAP_PTR_MASK;
}
}
+#endif
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "%s card detected\n",
(psav->IsPCI) ? "PCI" : "AGP");
@@ -2906,97 +3065,132 @@
static Bool SavageMapMem(ScrnInfoPtr pScrn)
{
SavagePtr psav = SAVPTR(pScrn);
- int mode;
- unsigned i;
+ int err;
TRACE(("SavageMapMem()\n"));
if( S3_SAVAGE3D_SERIES(psav->Chipset) ) {
- psav->MmioRegion.bar = 0;
- psav->MmioRegion.offset = SAVAGE_NEWMMIO_REGBASE_S3;
-
- psav->FbRegion.bar = 0;
- psav->FbRegion.offset = 0;
-
- psav->last_bar = 0;
+#ifdef XSERVER_LIBPCIACCESS
+ psav->MmioRegion.base = SAVAGE_NEWMMIO_REGBASE_S3
+ + psav->PciInfo->regions[0].base_addr;
+ psav->FbRegion.base = psav->PciInfo->regions[0].base_addr;
+#else
+ psav->MmioRegion.base = SAVAGE_NEWMMIO_REGBASE_S3
+ + psav->PciInfo->memBase[0];
+ psav->FbRegion.base = psav->PciInfo->memBase[0];
+#endif
} else {
- psav->MmioRegion.bar = 0;
- psav->MmioRegion.offset = SAVAGE_NEWMMIO_REGBASE_S4;
-
- psav->FbRegion.bar = 1;
- psav->FbRegion.offset = 0;
-
- psav->last_bar = 1;
+#ifdef XSERVER_LIBPCIACCESS
+ psav->MmioRegion.base = SAVAGE_NEWMMIO_REGBASE_S4
+ + psav->PciInfo->regions[0].base_addr;
+ psav->FbRegion.base = psav->PciInfo->regions[1].base_addr;
+#else
+ psav->MmioRegion.base = SAVAGE_NEWMMIO_REGBASE_S4
+ + psav->PciInfo->memBase[0];
+ psav->FbRegion.base = psav->PciInfo->memBase[1];
+#endif
}
+ psav->MmioRegion.size = SAVAGE_NEWMMIO_REGSIZE;
+ psav->FbRegion.size = psav->videoRambytes;
+
/* On Paramount and Savage 2000, aperture 0 is PCI base 2. On other
* chipsets it's in the same BAR as the framebuffer.
*/
if ((psav->Chipset == S3_SUPERSAVAGE)
- || (psav->Chipset == S3_SAVAGE2000)) {
- psav->ApertureRegion.bar = 2;
- psav->ApertureRegion.offset = 0;
-
- psav->last_bar = 2;
+ || (psav->Chipset == S3_SAVAGE2000)) {
+#ifdef XSERVER_LIBPCIACCESS
+ psav->ApertureRegion.base = psav->PciInfo->regions[2].base_addr;
+#else
+ psav->ApertureRegion.base = psav->PciInfo->memBase[2];
+#endif
} else {
- psav->ApertureRegion.bar = psav->FbRegion.bar;
- psav->ApertureRegion.offset = 0x02000000;
+ psav->ApertureRegion.base = psav->FbRegion.base + 0x02000000;
}
+ psav->ApertureRegion.size = (psav->IsPrimary || psav->IsSecondary)
+ ? (0x01000000 * 2) : (0x01000000 * 5);
- psav->MmioBase = psav->PciInfo->memBase[ psav->MmioRegion.bar ]
- + psav->MmioRegion.offset;
-
- psav->FrameBufferBase = psav->PciInfo->memBase[ psav->FbRegion.bar ]
- + psav->FbRegion.offset;
-
- psav->ApertureBase = psav->PciInfo->memBase[ psav->FbRegion.bar ]
- + psav->ApertureRegion.offset;
+ if (psav->FbRegion.size != 0) {
+#ifdef XSERVER_LIBPCIACCESS
+ err = pci_device_map_range(psav->PciInfo, psav->FbRegion.base,
+ psav->FbRegion.size,
+ (PCI_DEV_MAP_FLAG_WRITABLE
+ | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+ & psav->FbRegion.memory);
+#else
+ psav->FbRegion.memory =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+ psav->PciTag, psav->FbRegion.base,
+ psav->FbRegion.size);
+ err = (psav->FbRegion.memory == NULL) ? errno : 0;
+#endif
+ if (err) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Internal error: cound not map framebuffer range (%d, %s).\n",
+ err, strerror(err));
+ return FALSE;
+ }
- /* FIXME: This seems fine even on Savage3D where the same BAR contains the
- * FIXME: MMIO space and the framebuffer. Write-combining gets fixed up
- * FIXME: later. Someone should investigate this, though. And kick S3
- * FIXME: for doing something so silly.
- */
- mode = VIDMEM_MMIO;
- for (i = 0; i <= psav->last_bar; i++) {
- psav->bar_mappings[i] = xf86MapPciMem(pScrn->scrnIndex, mode,
- psav->PciTag,
- psav->PciInfo->memBase[i],
- (1U << psav->PciInfo->size[i]));
- if (!psav->bar_mappings[i]) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
- "Internal error: cound not map PCI region %u, last BAR = %u\n",
- i, psav->last_bar);
- return FALSE;
- }
-
- mode = VIDMEM_FRAMEBUFFER;
+ psav->FBBase = psav->FbRegion.memory;
+ psav->FBStart = (psav->IsSecondary)
+ ? psav->FBBase + 0x1000000 : psav->FBBase;
}
- psav->MapBase = psav->bar_mappings[ psav->MmioRegion.bar ]
- + psav->MmioRegion.offset;
-
- psav->BciMem = psav->MapBase + 0x10000;
-
- SavageEnableMMIO(pScrn);
+ if (psav->ApertureRegion.memory == NULL) {
+#ifdef XSERVER_LIBPCIACCESS
+ err = pci_device_map_range(psav->PciInfo, psav->ApertureRegion.base,
+ psav->ApertureRegion.size,
+ (PCI_DEV_MAP_FLAG_WRITABLE
+ | PCI_DEV_MAP_FLAG_WRITE_COMBINE),
+ & psav->ApertureRegion.memory);
+#else
+ psav->ApertureRegion.memory =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+ psav->PciTag, psav->ApertureRegion.base,
+ psav->ApertureRegion.size);
+ err = (psav->ApertureRegion.memory == NULL) ? errno : 0;
+#endif
+ if (err) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Internal error: cound not map aperture range (%d, %s).\n",
+ err, strerror(err));
+ return FALSE;
+ }
- psav->FBBase = psav->bar_mappings[ psav->FbRegion.bar ]
- + psav->FbRegion.offset;
+ psav->ApertureMap = (psav->IsSecondary)
+ ? psav->ApertureRegion.memory + 0x1000000
+ : psav->ApertureRegion.memory;
+ }
- psav->FBStart = (psav->IsSecondary)
- ? psav->FBBase + 0x1000000 : psav->FBBase;
+ if (psav->MmioRegion.memory == NULL) {
+#ifdef XSERVER_LIBPCIACCESS
+ err = pci_device_map_range(psav->PciInfo, psav->MmioRegion.base,
+ psav->MmioRegion.size,
+ (PCI_DEV_MAP_FLAG_WRITABLE),
+ & psav->MmioRegion.memory);
+#else
+ psav->MmioRegion.memory =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
+ psav->PciTag, psav->MmioRegion.base,
+ psav->MmioRegion.size);
+ err = (psav->MmioRegion.memory == NULL) ? errno : 0;
+#endif
+ if (err) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Internal error: cound not map MMIO range (%d, %s).\n",
+ err, strerror(err));
+ return FALSE;
+ }
- psav->ApertureMap = psav->bar_mappings[ psav->ApertureRegion.bar ]
- + psav->ApertureRegion.offset;
+ psav->MapBase = psav->MmioRegion.memory;
+ psav->BciMem = psav->MapBase + 0x10000;
- if (psav->IsSecondary) {
- psav->ApertureMap += 0x1000000;
+ SavageEnableMMIO(pScrn);
}
- pScrn->memPhysBase = psav->PciInfo->memBase[0];
-
+ pScrn->memPhysBase = psav->FbRegion.base;
return TRUE;
}
@@ -3004,30 +3198,55 @@
static void SavageUnmapMem(ScrnInfoPtr pScrn, int All)
{
SavagePtr psav = SAVPTR(pScrn);
- unsigned i;
TRACE(("SavageUnmapMem(%x,%x)\n", psav->MapBase, psav->FBBase));
if (psav->PrimaryVidMapped) {
- vgaHWUnmapMem(pScrn);
- psav->PrimaryVidMapped = FALSE;
+ vgaHWUnmapMem(pScrn);
+ psav->PrimaryVidMapped = FALSE;
}
SavageDisableMMIO(pScrn);
- for (i = (All) ? 0 : 1; i <= psav->last_bar; i++) {
- if (psav->bar_mappings[i]) {
- xf86UnMapVidMem(pScrn->scrnIndex, psav->bar_mappings[i],
- (1U << psav->PciInfo->size[i]));
- psav->bar_mappings[i] = NULL;
- }
+ if (All && (psav->MmioRegion.memory != NULL)) {
+#ifdef XSERVER_LIBPCIACCESS
+ pci_device_unmap_range(psav->PciInfo,
+ psav->MmioRegion.memory,
+ psav->MmioRegion.size);
+#else
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)psav->MapBase,
+ SAVAGE_NEWMMIO_REGSIZE);
+#endif
+
+ psav->MmioRegion.memory = NULL;
+ psav->MapBase = 0;
+ psav->BciMem = 0;
}
- if (All) {
- psav->MapBase = 0;
- psav->BciMem = 0;
+ if (psav->FbRegion.memory != NULL) {
+#ifdef XSERVER_LIBPCIACCESS
+ pci_device_unmap_range(psav->PciInfo,
+ psav->FbRegion.memory,
+ psav->FbRegion.size);
+#else
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)psav->FbRegion.base,
+ psav->FbRegion.size);
+#endif
}
-
+
+ if (psav->ApertureRegion.memory != NULL) {
+#ifdef XSERVER_LIBPCIACCESS
+ pci_device_unmap_range(psav->PciInfo,
+ psav->ApertureRegion.memory,
+ psav->ApertureRegion.size);
+#else
+ xf86UnMapVidMem(pScrn->scrnIndex, (pointer)psav->ApertureRegion.base,
+ psav->ApertureRegion.size);
+#endif
+ }
+
+ psav->FbRegion.memory = NULL;
+ psav->ApertureRegion.memory = NULL;
psav->FBBase = 0;
psav->FBStart = 0;
psav->ApertureMap = 0;
@@ -3116,7 +3335,7 @@
if( psav->ShadowStatus ) {
psav->ShadowPhysical =
- psav->FrameBufferBase + psav->CursorKByte*1024 + 4096 - 32;
+ psav->FbRegion.base + psav->CursorKByte*1024 + 4096 - 32;
psav->ShadowVirtual = (CARD32 *)
(psav->FBBase + psav->CursorKByte*1024 + 4096 - 32);
@@ -3413,7 +3632,7 @@
}
#endif
- SavagePanningCheck(pScrn);
+ SavagePanningCheck(pScrn, pScrn->currentMode);
#ifdef XvExtension
if( !psav->FBStart2nd && !psav->NoAccel /*&& !SavagePanningCheck(pScrn)*/ ) {
if (psav->IsSecondary)
@@ -4057,7 +4276,7 @@
pSavEnt = pPriv->ptr;
SavageModeInit(pSavEnt->pSecondaryScrn, pSavEnt->pSecondaryScrn->currentMode);
}
- SavagePanningCheck(pScrn);
+ SavagePanningCheck(pScrn, mode);
return success;
}
@@ -4513,7 +4732,8 @@
xf86PrintEDID(pMon);
- xf86SetDDCproperties(pScrn,pMon);
+ if (!psav->IgnoreEDID)
+ xf86SetDDCproperties(pScrn,pMon);
/* undo initialization */
OutI2CREG(byte,psav->I2CPort);
@@ -4536,12 +4756,9 @@
static Bool
-SavagePanningCheck(ScrnInfoPtr pScrn)
+SavagePanningCheck(ScrnInfoPtr pScrn, DisplayModePtr pMode)
{
SavagePtr psav = SAVPTR(pScrn);
- DisplayModePtr pMode;
-
- pMode = pScrn->currentMode;
psav->iResX = pMode->CrtcHDisplay;
psav->iResY = pMode->CrtcVDisplay;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_driver.h new/xf86-video-savage-2.2.0/src/savage_driver.h
--- old/xf86-video-savage-2.1.3/src/savage_driver.h 2007-08-17 02:33:38.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_driver.h 2008-03-19 15:31:06.000000000 +0100
@@ -33,6 +33,19 @@
#include
#include
+#ifdef XSERVER_LIBPCIACCESS
+#include
+#define VENDOR_ID(p) (p)->vendor_id
+#define DEVICE_ID(p) (p)->device_id
+#define SUBSYS_ID(p) (p)->subdevice_id
+#define CHIP_REVISION(p) (p)->revision
+#else
+#define VENDOR_ID(p) (p)->vendor
+#define DEVICE_ID(p) (p)->chipType
+#define SUBSYS_ID(p) (p)->subsysCard
+#define CHIP_REVISION(p) (p)->chipRev
+#endif
+
#define MODE_24 24
#include "compiler.h"
@@ -267,8 +280,14 @@
} StatInfoRec,*StatInfoPtr;
struct savage_region {
- unsigned bar;
- unsigned long offset;
+#ifdef XSERVER_LIBPCIACCESS
+ pciaddr_t base;
+ pciaddr_t size;
+#else
+ unsigned long base;
+ unsigned long size;
+#endif
+ void * memory;
};
typedef struct _Savage {
@@ -292,18 +311,12 @@
int endfb;
/* These are physical addresses. */
- unsigned long FrameBufferBase;
- unsigned long MmioBase;
- unsigned long ApertureBase;
unsigned long ShadowPhysical;
/* These are linear addresses. */
struct savage_region MmioRegion;
struct savage_region FbRegion;
struct savage_region ApertureRegion;
- unsigned last_bar;
-
- unsigned char* bar_mappings[3];
unsigned char* MapBase;
unsigned char* BciMem;
@@ -322,6 +335,7 @@
/* Here are all the Options */
OptionInfoPtr Options;
+ Bool IgnoreEDID;
Bool ShowCache;
Bool pci_burst;
Bool NoPCIRetry;
@@ -363,8 +377,12 @@
int TVSizeY;
CloseScreenProcPtr CloseScreen;
+#ifdef XSERVER_LIBPCIACCESS
+ struct pci_device * PciInfo;
+#else
pciVideoPtr PciInfo;
PCITAG PciTag;
+#endif
int Chipset;
int ChipId;
int ChipRev;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_hwmc.c new/xf86-video-savage-2.2.0/src/savage_hwmc.c
--- old/xf86-video-savage-2.1.3/src/savage_hwmc.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_hwmc.c 2008-03-19 15:31:06.000000000 +0100
@@ -202,7 +202,7 @@
return FALSE;
}
- offset = pSAVAGE->hwmcOffset + pSAVAGE->FrameBufferBase;
+ offset = pSAVAGE->hwmcOffset + pSAVAGE->FbRegion.base;
if(drmAddMap(pSAVAGE->drmFD, offset, pSAVAGE->hwmcSize,
DRM_FRAME_BUFFER, 0, &pSAVAGEDriPriv->xvmcSurfHandle) < 0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_i2c.c new/xf86-video-savage-2.2.0/src/savage_i2c.c
--- old/xf86-video-savage-2.1.3/src/savage_i2c.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_i2c.c 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_i2c.c,v 1.1 2001/02/13 21:15:19 dawes Exp $ */
/*
Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_regs.h new/xf86-video-savage-2.2.0/src/savage_regs.h
--- old/xf86-video-savage-2.1.3/src/savage_regs.h 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_regs.h 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h,v 1.11 2002/05/14 20:19:52 alanh Exp $ */
#ifndef _SAVAGE_REGS_H
#define _SAVAGE_REGS_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_shadow.c new/xf86-video-savage-2.2.0/src/savage_shadow.c
--- old/xf86-video-savage-2.1.3/src/savage_shadow.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_shadow.c 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */
/*
Copyright (c) 1999,2000 The XFree86 Project Inc.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_vbe.c new/xf86-video-savage-2.2.0/src/savage_vbe.c
--- old/xf86-video-savage-2.1.3/src/savage_vbe.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_vbe.c 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.c,v 1.11 2002/05/14 20:19:52 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_vbe.h new/xf86-video-savage-2.2.0/src/savage_vbe.h
--- old/xf86-video-savage-2.1.3/src/savage_vbe.h 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_vbe.h 2008-03-19 20:06:46.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_vbe.h,v 1.1 2000/12/02 01:16:15 dawes Exp $ */
/*
This file was originally part of the Linux Real-Mode Interface, or LRMI.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-savage-2.1.3/src/savage_video.c new/xf86-video-savage-2.2.0/src/savage_video.c
--- old/xf86-video-savage-2.1.3/src/savage_video.c 2007-07-12 01:51:18.000000000 +0200
+++ new/xf86-video-savage-2.2.0/src/savage_video.c 2008-03-19 15:31:06.000000000 +0100
@@ -1177,7 +1177,7 @@
SavagePtr psav = SAVPTR(pScrn);
/* half of the dest buffer for copying the YVU data to it ??? */
unsigned char *dstCopy = (unsigned char *)(((unsigned long)dst
- + 2 * srcPitch * h
+ + dstPitch * h
+ 0x0f) & ~0x0f);
/* for pixel transfer */
unsigned long offsetY = (unsigned long)dstCopy - (unsigned long)psav->FBBase;
@@ -1189,21 +1189,15 @@
BCI_GET_PTR;
/* copy Y planar */
- for (i=0;i>1);i++) {
- dstCopy[i] = srcV[i];
- }
+ memcpy(dstCopy, srcV, srcPitch2 * (h>>1));
/* copy U planar */
dstCopy = dstCopy + srcPitch2 * (h>>1);
- for (i=0;i>1);i++) {
- dstCopy[i] = srcU[i];
- }
+ memcpy(dstCopy, srcU, srcPitch2 * (h>>1));
/*
* Transfer pixel data from one memory location to another location
@@ -1253,6 +1247,9 @@
int w
){
w <<= 1;
+ if (w == srcPitch && w == dstPitch) {
+ memcpy(dst, src, w * h);
+ } else
while(h--) {
memcpy(dst, src, w);
src += srcPitch;
@@ -1469,11 +1466,12 @@
if( psav->videoFourCC != id )
SavageStreamsOff(pScrn);
- if( !psav->videoFlags & VF_STREAMS_ON )
+ if( !(psav->videoFlags & VF_STREAMS_ON) )
{
SavageSetBlend(pScrn,id);
SavageStreamsOn(pScrn);
SavageResetVideo(pScrn);
+ pPriv->lastKnownPitch = 0;
}
if (S3_MOBILE_TWISTER_SERIES(psav->Chipset)
@@ -1491,31 +1489,42 @@
* Process horizontal scaling
* upscaling and downscaling smaller than 2:1 controled by MM8198
* MM8190 controls downscaling mode larger than 2:1
+ * Together MM8190 and MM8198 can set arbitrary downscale up to 64:1
*/
scalratio = 0;
ssControl = 0;
if (src_w >= (drw_w * 2)) {
if (src_w < (drw_w * 4)) {
- scalratio = HSCALING(2,1);
- } else if (src_w < (drw_w * 8)) {
ssControl |= HDSCALE_4;
- } else if (src_w < (drw_w * 16)) {
+ scalratio = HSCALING(src_w,(drw_w*4));
+ } else if (src_w < (drw_w * 8)) {
ssControl |= HDSCALE_8;
- } else if (src_w < (drw_w * 32)) {
+ scalratio = HSCALING(src_w,(drw_w*8));
+ } else if (src_w < (drw_w * 16)) {
ssControl |= HDSCALE_16;
- } else if (src_w < (drw_w * 64)) {
+ scalratio = HSCALING(src_w,(drw_w*16));
+ } else if (src_w < (drw_w * 32)) {
ssControl |= HDSCALE_32;
- } else
+ scalratio = HSCALING(src_w,(drw_w*32));
+ } else if (src_w < (drw_w * 64)) {
+ ssControl |= HDSCALE_64;
+ scalratio = HSCALING(src_w,(drw_w*64));
+ } else {
+ /* Request beyond maximum downscale! */
ssControl |= HDSCALE_64;
+ scalratio = HSCALING(2,1);
+ }
} else
scalratio = HSCALING(src_w,drw_w);
ssControl |= src_w;
/*ssControl |= (1 << 24);*/
ssControl |= (GetBlendForFourCC(psav->videoFourCC) << 24);
+#if 0
/* Wait for VBLANK. */
VerticalRetraceWait();
+#endif
OUTREG(SSTREAM_CONTROL_REG, ssControl);
if (scalratio)
OUTREG(SSTREAM_STRETCH_REG,scalratio);
@@ -1612,11 +1621,12 @@
if( psav->videoFourCC != id )
SavageStreamsOff(pScrn);
- if( !psav->videoFlags & VF_STREAMS_ON )
+ if( !(psav->videoFlags & VF_STREAMS_ON) )
{
SavageSetBlend(pScrn,id);
SavageStreamsOn(pScrn);
SavageResetVideo(pScrn);
+ pPriv->lastKnownPitch = 0;
}
/* Calculate horizontal and vertical scale factors. */
@@ -1746,11 +1756,12 @@
if( psav->videoFourCC != id )
SavageStreamsOff(pScrn);
- if( !psav->videoFlags & VF_STREAMS_ON )
+ if( !(psav->videoFlags & VF_STREAMS_ON) )
{
SavageSetBlend(pScrn,id);
SavageStreamsOn(pScrn);
SavageResetVideo(pScrn);
+ pPriv->lastKnownPitch = 0;
}
if (src_w > drw_w)
@@ -1912,6 +1923,10 @@
break;
}
+ if (srcPitch2 != 0 && S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv) {
+ new_size = ((new_size + 0xF) & ~0xF) + srcPitch * height + srcPitch2 * height;
+ }
+
/* if(!(pPriv->area = SavageAllocateMemory(pScrn, pPriv->area, new_h)))
return BadAlloc;*/
pPriv->video_offset = SavageAllocateMemory(pScrn, &pPriv->video_memory,
@@ -1937,7 +1952,7 @@
offsetU += tmp;
offsetV += tmp;
nlines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;
- if (S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv) {
+ if (S3_SAVAGE4_SERIES(psav->Chipset) && psav->BCIforXv && (npixels & 0xF) == 0) {
SavageCopyPlanarDataBCI(
pScrn,
buf + (top * srcPitch) + (left >> 1),
++++++ xf86-video-siliconmotion-1.5.1.tar.bz2 -> xf86-video-siliconmotion-1.6.0.tar.bz2 ++++++
++++ 7597 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/configure.ac new/xf86-video-siliconmotion-1.6.0/configure.ac
--- old/xf86-video-siliconmotion-1.5.1/configure.ac 2007-03-13 07:32:06.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/configure.ac 2008-03-19 20:24:22.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-siliconmotion],
- 1.5.1,
+ 1.6.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-siliconmotion)
@@ -58,10 +58,22 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
# Checks for header files.
AC_HEADER_STDC
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/man/Makefile.am new/xf86-video-siliconmotion-1.6.0/man/Makefile.am
--- old/xf86-video-siliconmotion-1.5.1/man/Makefile.am 2007-01-25 01:05:28.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/man/Makefile.am 2008-03-19 15:31:08.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/missing new/xf86-video-siliconmotion-1.6.0/missing
--- old/xf86-video-siliconmotion-1.5.1/missing 2007-03-04 08:44:18.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/missing 2008-03-19 20:24:35.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/Makefile.am new/xf86-video-siliconmotion-1.6.0/src/Makefile.am
--- old/xf86-video-siliconmotion-1.5.1/src/Makefile.am 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/Makefile.am 2008-03-19 20:25:16.000000000 +0100
@@ -39,6 +39,7 @@
smi.h \
smi_hwcurs.c \
smi_i2c.c \
+ smi_pcirename.h \
smi_shadow.c \
smi_video.c \
smi_video.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/regsmi.h new/xf86-video-siliconmotion-1.6.0/src/regsmi.h
--- old/xf86-video-siliconmotion-1.5.1/src/regsmi.h 2007-03-13 06:53:32.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/regsmi.h 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and SIlicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/regsmi.h,v 1.2 2002/01/25 21:56:09 tsi Exp $ */
#ifndef _REGSMI_H
#define _REGSMI_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_accel.c new/xf86-video-siliconmotion-1.6.0/src/smi_accel.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_accel.c 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_accel.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_accel.c,v 1.7tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_dac.c new/xf86-video-siliconmotion-1.6.0/src/smi_dac.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_dac.c 2007-03-13 06:55:52.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_dac.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_dga.c new/xf86-video-siliconmotion-1.6.0/src/smi_dga.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_dga.c 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_dga.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_dga.c,v 1.1 2000/11/28 20:59:19 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_driver.c new/xf86-video-siliconmotion-1.6.0/src/smi_driver.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_driver.c 2007-03-13 07:29:19.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_driver.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from The XFree86 Project or Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_driver.c,v 1.36tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -89,10 +88,10 @@
#define SILICONMOTION_NAME "Silicon Motion"
#define SILICONMOTION_DRIVER_NAME "siliconmotion"
-#define SILICONMOTION_VERSION_NAME "1.4.1"
-#define SILICONMOTION_VERSION_MAJOR 1
-#define SILICONMOTION_VERSION_MINOR 4
-#define SILICONMOTION_PATCHLEVEL 1
+#define SILICONMOTION_VERSION_NAME PACKAGE_VERSION
+#define SILICONMOTION_VERSION_MAJOR PACKAGE_VERSION_MAJOR
+#define SILICONMOTION_VERSION_MINOR PACKAGE_VERSION_MINOR
+#define SILICONMOTION_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define SILICONMOTION_DRIVER_VERSION ((SILICONMOTION_VERSION_MAJOR << 24) | \
(SILICONMOTION_VERSION_MINOR << 16) | \
(SILICONMOTION_PATCHLEVEL))
@@ -447,10 +446,12 @@
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
if (xf86GetPciVideoInfo() == NULL) {
LEAVE_PROC("SMI_Probe");
return FALSE;
}
+#endif
numUsed = xf86MatchPciInstances(SILICONMOTION_NAME, PCI_SMI_VENDOR_ID,
SMIChipsets, SMIPciChipsets, devSections,
@@ -821,7 +822,7 @@
pSmi->Chipset);
} else {
from = X_PROBED;
- pSmi->Chipset = pSmi->PciInfo->chipType;
+ pSmi->Chipset = PCI_DEV_DEVICE_ID(pSmi->PciInfo);
pScrn->chipset = (char *) xf86TokenToString(SMIChipsets, pSmi->Chipset);
}
@@ -830,7 +831,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "ChipRev override: %d\n",
pSmi->ChipRev);
} else {
- pSmi->ChipRev = pSmi->PciInfo->chipRev;
+ pSmi->ChipRev = PCI_DEV_REVISION(pSmi->PciInfo);
}
xfree(pEnt);
@@ -854,8 +855,10 @@
xf86DrvMsg(pScrn->scrnIndex, from, "Chipset: \"%s\"\n", pScrn->chipset);
+#ifndef XSERVER_LIBPCIACCESS
pSmi->PciTag = pciTag(pSmi->PciInfo->bus, pSmi->PciInfo->device,
pSmi->PciInfo->func);
+#endif
pSmi->Dualhead = FALSE;
if (xf86ReturnOptValBool(pSmi->Options, OPTION_DUALHEAD, FALSE) &&
@@ -1785,30 +1788,43 @@
/* Map the Lynx register space */
switch (pSmi->Chipset) {
default:
- memBase = pSmi->PciInfo->memBase[0] + 0x400000;
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x400000;
pSmi->MapSize = 0x10000;
break;
case SMI_COUGAR3DR:
- memBase = pSmi->PciInfo->memBase[1];
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 1, REGION_MEM);
pSmi->MapSize = 0x200000;
break;
case SMI_LYNX3D:
- memBase = pSmi->PciInfo->memBase[0] + 0x680000;
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x680000;
pSmi->MapSize = 0x180000;
break;
case SMI_LYNXEM:
case SMI_LYNXEMplus:
- memBase = pSmi->PciInfo->memBase[0] + 0x400000;
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM) + 0x400000;
pSmi->MapSize = 0x400000;
break;
case SMI_LYNX3DM:
- memBase = pSmi->PciInfo->memBase[0];
+ memBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM);
pSmi->MapSize = 0x200000;
break;
}
+#ifndef XSERVER_LIBPCIACCESS
pSmi->MapBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pSmi->PciTag,
memBase, pSmi->MapSize);
-
+#else
+ {
+ void** result = (void**)&pSmi->MapBase;
+ int err = pci_device_map_range(pSmi->PciInfo,
+ memBase,
+ pSmi->MapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pSmi->MapBase == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: could not map "
"MMIO registers.\n");
@@ -1872,7 +1888,7 @@
"DataPort=%p - %p\n", pSmi->DataPortBase,
pSmi->DataPortBase + pSmi->DataPortSize - 1);
- pScrn->memPhysBase = pSmi->PciInfo->memBase[0];
+ pScrn->memPhysBase = PCI_REGION_BASE(pSmi->PciInfo, 0, REGION_MEM);
SMI_EnableMmio(pScrn);
@@ -1887,11 +1903,26 @@
pScrn->fbOffset = pSmi->FBOffset + pSmi->fbMapOffset;
+#ifndef XSERVER_LIBPCIACCESS
pSmi->FBBase = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_FRAMEBUFFER,
pSmi->PciTag,
pScrn->memPhysBase + pSmi->fbMapOffset,
pSmi->videoRAMBytes);
+#else
+ {
+ void** result = (void**)&pSmi->FBBase;
+ int err = pci_device_map_range(pSmi->PciInfo,
+ pScrn->memPhysBase + pSmi->fbMapOffset,
+ pSmi->videoRAMBytes,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pSmi->FBBase == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Internal error: could not "
@@ -2563,7 +2594,7 @@
if (pSmi->MCLK > 0) {
SMI_CommonCalcClock(pScrn->scrnIndex, pSmi->MCLK,
- 1, 1, 63, 0, 2,
+ 1, 1, 63, 0, 0,
pScrn->clockRanges->minClock,
pScrn->clockRanges->maxClock,
&new->SR6A, &new->SR6B);
@@ -2588,7 +2619,7 @@
vclk = mode->Clock;
if (SMI_LYNX_SERIES(pSmi->Chipset)) {
SMI_CommonCalcClock(pScrn->scrnIndex, vclk,
- 1, 1, 63, 0, 2,
+ 1, 1, 63, 0, 3,
pScrn->clockRanges->minClock,
pScrn->clockRanges->maxClock,
&new->SR6C, &new->SR6D);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_exa.c new/xf86-video-siliconmotion-1.6.0/src/smi_exa.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_exa.c 2007-03-13 05:17:31.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_exa.c 2008-03-19 15:31:08.000000000 +0100
@@ -77,8 +77,8 @@
/* Memory Manager */
pSmi->EXADriverPtr->memoryBase = pSmi->FBBase + pSmi->FBOffset;
- pSmi->EXADriverPtr->memorySize = pSmi->FBReserved - 1024;
- pSmi->EXADriverPtr->offScreenBase = pSmi->width * pSmi->height * pSmi->Bpp + 1024;
+ pSmi->EXADriverPtr->memorySize = pSmi->FBReserved;
+ pSmi->EXADriverPtr->offScreenBase = pSmi->width * pSmi->height * pSmi->Bpp;
/* Flags */
pSmi->EXADriverPtr->flags = EXA_TWO_BITBLT_DIRECTIONS;
@@ -96,6 +96,14 @@
pSmi->EXADriverPtr->maxX = 4096;
pSmi->EXADriverPtr->maxY = 4096;
+ if (pScrn->bitsPerPixel == 24) {
+ pSmi->EXADriverPtr->maxX = 4096 / 3;
+
+ if (pSmi->Chipset == SMI_LYNX) {
+ pSmi->EXADriverPtr->maxY = 4096 / 3;
+ }
+ }
+
pSmi->EXADriverPtr->pixmapPitchAlign = 16;
pSmi->EXADriverPtr->pixmapOffsetAlign = 8;
@@ -112,8 +120,8 @@
pSmi->EXADriverPtr->Solid = SMI_Solid;
pSmi->EXADriverPtr->DoneSolid = SMI_DoneSolid;
- /* DFS & UTS */
#if 0
+ /* DFS & UTS */
pSmi->EXADriverPtr->UploadToScreen = SMI_UploadToScreen;
pSmi->EXADriverPtr->DownloadFromScreen = SMI_DownloadFromScreen;
#endif
@@ -460,30 +468,37 @@
{
ScrnInfoPtr pScrn = xf86Screens[pDst->drawable.pScreen->myNum];
SMIPtr pSmi = SMIPTR(pScrn);
- int i, j, dwords, Bpp, queue, dst_pitch;
- CARD32 *srcp, *dataport;
+ int dst_pitch, source_pitch, align, aligned_pitch;
unsigned long dst_offset;
ENTER_PROC("SMI_UploadToScreen");
DEBUG((VERBLEV, "x=%d y=%d w=%d h=%d src=%d src_pitch=%d\n",
x, y, w, h, src, src_pitch));
+ if (pDst->drawable.bitsPerPixel == 24) {
+ align = 16;
+ } else {
+ align = 128 / pDst->drawable.bitsPerPixel;
+ }
+
+ aligned_pitch = (src_pitch + align - 1) & ~(align - 1);
+
/* calculate pitch in pixel unit */
dst_pitch = exaGetPixmapPitch(pDst) / (pDst->drawable.bitsPerPixel >> 3);
+ source_pitch = src_pitch / (pDst->drawable.bitsPerPixel >> 3);
/* calculate offset in 8 byte (64 bit) unit */
dst_offset = exaGetPixmapOffset(pDst) >> 3;
- Bpp = pDst->drawable.bitsPerPixel / 8;
- dwords = (((w * Bpp) + 3) >> 2) * h;
-
pSmi->AccelCmd = 0xCC /* GXcopy */
| SMI_HOSTBLT_WRITE
| SMI_QUICK_START;
+ /* set clipping */
+ SMI_SetClippingRectangle(pScrn, x, y, x+w, y+h);
- WaitQueue(1);
- /* Destination Window Width */
- WRITE_DPR(pSmi, 0x3C, (dst_pitch << 16));
+ WaitQueue(7);
+ /* Destination and Source Window Widths */
+ WRITE_DPR(pSmi, 0x3C, (dst_pitch << 16) | (source_pitch & 0xFFFF));
if (pDst->drawable.bitsPerPixel == 24) {
x *= 3;
@@ -494,43 +509,27 @@
}
}
- WaitQueue(9);
- /* Destination Row Pitch */
- WRITE_DPR(pSmi, 0x10, (dst_pitch << 16));
+ /* Source and Destination Row Pitch */
+ WRITE_DPR(pSmi, 0x10, (dst_pitch << 16) | (source_pitch & 0xFFFF));
/* Drawing engine data format */
WRITE_DPR(pSmi, 0x1C, SMI_DEDataFormat(pDst));
- /* Destination Base Address (offset) */
+ /* Source and Destination Base Address (offset) */
+ WRITE_DPR(pSmi, 0x40, 0);
WRITE_DPR(pSmi, 0x44, dst_offset);
- /* set l/r clipping */
- WRITE_DPR(pSmi, 0x2C, (0xFFFF0000 | x | 0x2000));
- WRITE_DPR(pSmi, 0x30, (0xFFFF0000 | (x + w)));
-
WRITE_DPR(pSmi, 0x0C, pSmi->AccelCmd);
WRITE_DPR(pSmi, 0x00, 0);
WRITE_DPR(pSmi, 0x04, (x << 16) | (y * 0xFFFF));
WRITE_DPR(pSmi, 0x08, (w << 16) | (h & 0xFFFF));
-
- srcp = (CARD32 *)src;
- dataport = (CARD32 *)pSmi->DataPortBase;
- queue = pSmi->DataPortSize;
- while (dwords) {
- if (queue < 4) {
- /* XXX: check if the hw is ok with this */
- dataport = (CARD32 *)pSmi->DataPortBase;
- queue = pSmi->DataPortSize;
- }
- memcpy(dataport, srcp, 4);
- queue -= 4;
- dwords--;
- srcp++;
- dataport++;
+ while (h--) {
+ WaitQueue(aligned_pitch);
+ memcpy(pSmi->DataPortBase, src, aligned_pitch);
+ src += src_pitch;
}
- WaitQueue(1);
/* disable clipping */
- WRITE_DPR(pSmi, 0x2C, 0);
+ SMI_DisableClipping(pScrn);
exaWaitSync(pDst->drawable.pScreen);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi.h new/xf86-video-siliconmotion-1.6.0/src/smi.h
--- old/xf86-video-siliconmotion-1.5.1/src/smi.h 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi.h 2008-03-19 20:24:11.000000000 +0100
@@ -26,11 +26,12 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi.h,v 1.12tsi Exp $ */
#ifndef _SMI_H
#define _SMI_H
+#include "smi_pcirename.h"
+
#include
#include
@@ -187,7 +188,9 @@
Bool useEXA; /* enable exa acceleration */
pciVideoPtr PciInfo; /* PCI info vars */
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
int Chipset; /* Chip info, set using PCI
above */
int ChipRev;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_hwcurs.c new/xf86-video-siliconmotion-1.6.0/src/smi_hwcurs.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_hwcurs.c 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_hwcurs.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_hwcurs.c,v 1.1 2000/11/28 20:59:20 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_i2c.c new/xf86-video-siliconmotion-1.6.0/src/smi_i2c.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_i2c.c 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_i2c.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86$ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_pcirename.h new/xf86-video-siliconmotion-1.6.0/src/smi_pcirename.h
--- old/xf86-video-siliconmotion-1.5.1/src/smi_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_pcirename.h 2008-03-19 15:31:08.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef S3PCIRENAME_H
+#define S3PCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_shadow.c new/xf86-video-siliconmotion-1.6.0/src/smi_shadow.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_shadow.c 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_shadow.c 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and Silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_shadow.c,v 1.1 2000/11/28 20:59:20 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_video.c new/xf86-video-siliconmotion-1.6.0/src/smi_video.c
--- old/xf86-video-siliconmotion-1.5.1/src/smi_video.c 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_video.c 2008-03-19 20:24:11.000000000 +0100
@@ -41,8 +41,6 @@
Date: 2.11.2001
*/
-/* $XdotOrg: driver/xf86-video-siliconmotion/src/smi_video.c,v 1.5 2005/07/11 02:29:59 ajax Exp $ */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.c,v 1.13 2003/11/10 18:22:26 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-siliconmotion-1.5.1/src/smi_video.h new/xf86-video-siliconmotion-1.6.0/src/smi_video.h
--- old/xf86-video-siliconmotion-1.5.1/src/smi_video.h 2007-03-13 05:17:29.000000000 +0100
+++ new/xf86-video-siliconmotion-1.6.0/src/smi_video.h 2008-03-19 20:24:11.000000000 +0100
@@ -26,7 +26,6 @@
sale, use or other dealings in this Software without prior written
authorization from the XFree86 Project and silicon Motion.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/siliconmotion/smi_video.h,v 1.4 2002/09/16 18:06:01 eich Exp $ */
#ifndef _SMI_VIDEO_H
#define _SMI_VIDEO_H
++++++ xf86-video-sis-0.9.4.tar.bz2 -> xf86-video-sis-0.10.0.tar.bz2 ++++++
++++ 2596 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/configure.ac new/xf86-video-sis-0.10.0/configure.ac
--- old/xf86-video-sis-0.9.4/configure.ac 2007-11-16 12:37:59.000000000 +0100
+++ new/xf86-video-sis-0.10.0/configure.ac 2008-03-19 20:28:25.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sis],
- 0.9.4,
+ 0.10.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sis)
@@ -101,6 +101,19 @@
# technically this should be a configure flag. meh.
AC_DEFINE(XF86EXA, 1, [Build support for Exa])
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_SUBST([DRI_CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/man/Makefile.am new/xf86-video-sis-0.10.0/man/Makefile.am
--- old/xf86-video-sis-0.9.4/man/Makefile.am 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/man/Makefile.am 2008-03-19 15:31:14.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/300vtbl.h new/xf86-video-sis-0.10.0/src/300vtbl.h
--- old/xf86-video-sis-0.9.4/src/300vtbl.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/300vtbl.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Register settings for SiS 300 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/310vtbl.h new/xf86-video-sis-0.10.0/src/310vtbl.h
--- old/xf86-video-sis-0.9.4/src/310vtbl.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/310vtbl.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Register settings for SiS 315/330/340 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/init301.c new/xf86-video-sis-0.10.0/src/init301.c
--- old/xf86-video-sis-0.9.4/src/init301.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/init301.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Mode initializing code (CRT2 section)
* for SiS 300/305/540/630/730,
@@ -932,7 +930,7 @@
#ifdef SIS_LINUX_KERNEL
acpibase = sisfb_read_lpc_pci_dword(SiS_Pr, 0x74);
#else
- acpibase = pciReadLong(0x00000800, 0x74);
+ acpibase = sis_pci_read_device_u32(1, 0x74);
#endif
acpibase &= 0xFFFF;
if(!acpibase) return;
@@ -5220,8 +5218,8 @@
pci50 = sisfb_read_nbridge_pci_dword(SiS_Pr, 0x50);
pciA0 = sisfb_read_nbridge_pci_dword(SiS_Pr, 0xa0);
#else
- pci50 = pciReadLong(0x00000000, 0x50);
- pciA0 = pciReadLong(0x00000000, 0xA0);
+ pci50 = sis_pci_read_host_bridge_u32(0x50);
+ pciA0 = sis_pci_read_host_bridge_u32(0xA0);
#endif
if(SiS_Pr->ChipType == SIS_730) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/init301.h new/xf86-video-sis-0.10.0/src/init301.h
--- old/xf86-video-sis-0.9.4/src/init301.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/init301.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Data and prototypes for init301.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/init.c new/xf86-video-sis-0.10.0/src/init.c
--- old/xf86-video-sis-0.9.4/src/init.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/init.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Mode initializing code (CRT1 section) for
* for SiS 300/305/540/630/730,
@@ -2505,7 +2503,7 @@
#ifdef SIS_LINUX_KERNEL
templ = sisfb_read_nbridge_pci_dword(SiS_Pr, 0x50);
#else
- templ = pciReadLong(0x00000000, 0x50);
+ templ = sis_pci_read_host_bridge_u32(0x50);
#endif
if(SiS_Pr->ChipType == SIS_730) {
@@ -2530,8 +2528,8 @@
sisfb_write_nbridge_pci_dword(SiS_Pr, 0x50, templ);
templ = sisfb_read_nbridge_pci_dword(SiS_Pr, 0xA0);
#else
- pciWriteLong(0x00000000, 0x50, templ);
- templ = pciReadLong(0x00000000, 0xA0);
+ sis_pci_write_host_bridge_u32(0x50, templ);
+ templ = sis_pci_read_host_bridge_u32(0xA0);
#endif
/* GUI grant timer (PCI config 0xA3) */
@@ -2551,7 +2549,7 @@
#ifdef SIS_LINUX_KERNEL
sisfb_write_nbridge_pci_dword(SiS_Pr, 0xA0, templ);
#else
- pciWriteLong(0x00000000, 0xA0, templ);
+ sis_pci_write_host_bridge_u32(0xA0, templ);
#endif
}
#endif /* SIS300 */
@@ -3169,7 +3167,7 @@
#ifdef SIS_LINUX_KERNEL
somebase = sisfb_read_mio_pci_word(SiS_Pr, 0x74);
#else
- somebase = pciReadWord(0x00001000, 0x74);
+ somebase = sis_pci_read_device_u32(2, 0x74);
#endif
somebase &= 0xffff;
@@ -3190,8 +3188,8 @@
sisfb_write_nbridge_pci_byte(SiS_Pr, 0x7e, temp1);
sisfb_write_nbridge_pci_byte(SiS_Pr, 0x8d, temp2);
#else
- pciWriteByte(0x00000000, 0x7e, temp1);
- pciWriteByte(0x00000000, 0x8d, temp2);
+ sis_pci_write_host_bridge_u8(0x7e, temp1);
+ sis_pci_write_host_bridge_u8(0x8d, temp2);
#endif
SiS_SetRegByte((somebase + 0x85), temp3);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/initdef.h new/xf86-video-sis-0.10.0/src/initdef.h
--- old/xf86-video-sis-0.9.4/src/initdef.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/initdef.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Global definitions for init.c and init301.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/initextx.c new/xf86-video-sis-0.10.0/src/initextx.c
--- old/xf86-video-sis-0.9.4/src/initextx.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/initextx.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* X.org/XFree86 specific extensions to init.c/init301.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/initextx.h new/xf86-video-sis-0.10.0/src/initextx.h
--- old/xf86-video-sis-0.9.4/src/initextx.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/initextx.h 2008-03-19 20:28:08.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* X.org/XFree86 specific supplements to init.c/init301.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/init.h new/xf86-video-sis-0.10.0/src/init.h
--- old/xf86-video-sis-0.9.4/src/init.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/init.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Data and prototypes for init.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/Makefile.am new/xf86-video-sis-0.10.0/src/Makefile.am
--- old/xf86-video-sis-0.9.4/src/Makefile.am 2007-02-03 20:15:51.000000000 +0100
+++ new/xf86-video-sis-0.10.0/src/Makefile.am 2008-03-19 20:29:25.000000000 +0100
@@ -46,6 +46,7 @@
sis310_accel.c \
sis310_accel.h \
sis6326_video.c \
+ sispcirename.h \
sis_accel.c \
sis_accel.h \
sis_common.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/oem300.h new/xf86-video-sis-0.10.0/src/oem300.h
--- old/xf86-video-sis-0.9.4/src/oem300.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/oem300.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* OEM Data for 300 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/oem310.h new/xf86-video-sis-0.10.0/src/oem310.h
--- old/xf86-video-sis-0.9.4/src/oem310.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/oem310.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* OEM Data for 315/330/340 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/osdef.h new/xf86-video-sis-0.10.0/src/osdef.h
--- old/xf86-video-sis-0.9.4/src/osdef.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/osdef.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* OS depending defines
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis300_accel.c new/xf86-video-sis-0.10.0/src/sis300_accel.c
--- old/xf86-video-sis-0.9.4/src/sis300_accel.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis300_accel.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis300_accel.c,v 1.23 2006-03-09 06:06:25 anholt Exp $ */
/*
* 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis300_accel.h new/xf86-video-sis-0.10.0/src/sis300_accel.h
--- old/xf86-video-sis-0.9.4/src/sis300_accel.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis300_accel.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* 2D Acceleration for SiS 530, 620, 300, 540, 630, 730.
* Definitions for the SIS engine communication
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis310_accel.c new/xf86-video-sis-0.10.0/src/sis310_accel.c
--- old/xf86-video-sis-0.9.4/src/sis310_accel.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis310_accel.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis310_accel.c,v 1.31 2006-03-09 06:06:25 anholt Exp $ */
/*
* 2D Acceleration for SiS 315, 330 and 340 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis310_accel.h new/xf86-video-sis-0.10.0/src/sis310_accel.h
--- old/xf86-video-sis-0.9.4/src/sis310_accel.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis310_accel.h 2008-03-19 20:28:08.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* 2D Acceleration for SiS 315 and Xabre series
* Definitions for the SIS engine communication.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis6326_video.c new/xf86-video-sis-0.10.0/src/sis6326_video.c
--- old/xf86-video-sis-0.9.4/src/sis6326_video.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis6326_video.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis6326_video.c,v 1.19 2005/10/16 18:12:32 twini Exp $ */
/*
* Xv driver for SiS 5597/5598, 6326 and 530/620.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_accel.c new/xf86-video-sis-0.10.0/src/sis_accel.c
--- old/xf86-video-sis-0.9.4/src/sis_accel.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_accel.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis_accel.c,v 1.23 2006-03-09 06:06:25 anholt Exp $ */
/*
* 2D acceleration for SiS5597/5598 and 6326
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_accel.h new/xf86-video-sis-0.10.0/src/sis_accel.h
--- old/xf86-video-sis-0.9.4/src/sis_accel.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_accel.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* 2D acceleration for 5597/5598 and 6326
* Definitions for the SIS engine communication
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_common.h new/xf86-video-sis-0.10.0/src/sis_common.h
--- old/xf86-video-sis-0.9.4/src/sis_common.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_common.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Common header definitions for SiS 2D/3D/DRM suite
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_cursor.c new/xf86-video-sis-0.10.0/src/sis_cursor.c
--- old/xf86-video-sis-0.9.4/src/sis_cursor.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_cursor.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS hardware cursor handling
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_cursor.h new/xf86-video-sis-0.10.0/src/sis_cursor.h
--- old/xf86-video-sis-0.9.4/src/sis_cursor.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_cursor.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS hardware cursor handling
* Definitions
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_dac.c new/xf86-video-sis-0.10.0/src/sis_dac.c
--- old/xf86-video-sis-0.9.4/src/sis_dac.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_dac.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
*
@@ -545,8 +543,8 @@
/* Save FQBQ and GUI timer settings */
if(pSiS->Chipset == PCI_CHIP_SIS630) {
- sisReg->sisRegsPCI50 = pciReadLong(0x00000000, 0x50);
- sisReg->sisRegsPCIA0 = pciReadLong(0x00000000, 0xA0);
+ sisReg->sisRegsPCI50 = sis_pci_read_host_bridge_u32(0x50);
+ sisReg->sisRegsPCIA0 = sis_pci_read_host_bridge_u32(0xA0);
#ifdef TWDEBUG
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"PCI Config 50 = %lx\n", sisReg->sisRegsPCI50);
@@ -687,9 +685,9 @@
/* Restore FQBQ and GUI timer settings */
if(pSiS->Chipset == PCI_CHIP_SIS630) {
- temp1 = pciReadLong(0x00000000, 0x50);
- temp2 = pciReadLong(0x00000000, 0xA0);
- if(pciReadLong(0x00000000, 0x00) == 0x06301039) {
+ temp1 = sis_pci_read_host_bridge_u32(0x50);
+ temp2 = sis_pci_read_host_bridge_u32(0xA0);
+ if(sis_pci_read_host_bridge_u32(0x00) == 0x06301039) {
temp1 &= 0xf0ffffff;
temp1 |= (sisReg->sisRegsPCI50 & ~0xf0ffffff);
temp2 &= 0xf0ffffff;
@@ -700,8 +698,8 @@
temp2 &= 0x00ffffff;
temp2 |= (sisReg->sisRegsPCIA0 & ~0x00ffffff);
}
- pciWriteLong(0x00000000, 0x50, temp1);
- pciWriteLong(0x00000000, 0xA0, temp2);
+ sis_pci_write_host_bridge_u32(0x50, temp1);
+ sis_pci_write_host_bridge_u32(0xA0, temp2);
}
/* Restore panel link/video bridge registers */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_dac.h new/xf86-video-sis-0.10.0/src/sis_dac.h
--- old/xf86-video-sis-0.9.4/src/sis_dac.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_dac.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
* Definitions and prototypes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_dga.c new/xf86-video-sis-0.10.0/src/sis_dga.c
--- old/xf86-video-sis-0.9.4/src/sis_dga.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_dga.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS DGA handling
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_dri.c new/xf86-video-sis-0.10.0/src/sis_dri.c
--- old/xf86-video-sis-0.9.4/src/sis_dri.c 2007-07-24 20:23:17.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_dri.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis_dri.c,v 1.26 2005/10/21 18:40:19 ajax Exp $ */
/*
* DRI wrapper for 300 and 315 series
*
@@ -59,8 +57,10 @@
#ifdef XORG_VERSION_CURRENT
#define SISHAVECREATEBUSID
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0)
+#ifndef XSERVER_LIBPCIACCESS
extern char *DRICreatePCIBusID(pciVideoPtr PciInfo);
#endif
+#endif
#else
# if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,4,99,9,0)
# undef SISHAVECREATEBUSID
@@ -861,7 +861,7 @@
break;
#endif
case SIS_300_VGA:
- *(pSiS->IOBase + 0x8B50) = 0xff;
+ *((unsigned char *)pSiS->IOBase + 0x8B50) = 0xff;
*(CARD32 *)(pSiS->IOBase + 0x8B60) = 0xffffffff;
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_dri.h new/xf86-video-sis-0.10.0/src/sis_dri.h
--- old/xf86-video-sis-0.9.4/src/sis_dri.h 2007-11-16 12:37:29.000000000 +0100
+++ new/xf86-video-sis-0.10.0/src/sis_dri.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS DRI wrapper
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_driver.c new/xf86-video-sis-0.10.0/src/sis_driver.c
--- old/xf86-video-sis-0.9.4/src/sis_driver.c 2007-07-24 21:52:29.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_driver.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis_driver.c,v 1.72 2006/03/09 06:06:25 anholt Exp $ */
/*
* SiS driver main code
*
@@ -555,7 +553,7 @@
if(!pSiS->sisfbfound) return;
if(!pSiS->sisfb_havelock) return;
- if((fd = open(pSiS->sisfbdevname, 'r')) != -1) {
+ if((fd = open(pSiS->sisfbdevname, O_RDONLY)) != -1) {
parm = lock ? 1 : 0;
ioctl(fd, SISFB_SET_LOCK, &parm);
close(fd);
@@ -614,6 +612,7 @@
* All of the cards this driver supports are PCI, so the "probing" just
* amounts to checking the PCI data that the server has already collected.
*/
+#ifndef XSERVER_LIBPCIACCESS
if(xf86GetPciVideoInfo() == NULL) {
/*
* We won't let anything in the config file override finding no
@@ -621,6 +620,7 @@
*/
return FALSE;
}
+#endif
numUsedSiS = xf86MatchPciInstances(SIS_NAME, PCI_VENDOR_SIS,
SISChipsets, SISPciChipsets, devSections,
@@ -2983,7 +2983,7 @@
/* If card is secondary or if a0000-address decoding
* is disabled, set Phys to beginning of our video RAM.
*/
- pSiS->VGAMapPhys = pSiS->PciInfo->memBase[0];
+ pSiS->VGAMapPhys = PCI_REGION_BASE(pSiS->PciInfo, 0, REGION_MEM);
}
if(!SiSVGAMapMem(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
@@ -3032,7 +3032,7 @@
sprintf(name, "/dev/fb/%1d", (i - 8));
}
- if((fd = open(name, 'r')) != -1) {
+ if((fd = open(name, O_RDONLY)) != -1) {
Bool gotit = FALSE;
@@ -3380,10 +3380,13 @@
/* Find the PCI info for this screen */
pSiS->PciInfo = xf86GetPciInfoForEntity(pSiS->pEnt->index);
- pSiS->PciBus = ((pciConfigPtr)pSiS->PciInfo->thisCard)->busnum; /*SIS_PCI_BUS(pSiS->PciInfo);*/
- pSiS->PciDevice = ((pciConfigPtr)pSiS->PciInfo->thisCard)->devnum; /*SIS_PCI_DEVICE(pSiS->PciInfo);*/
- pSiS->PciFunc = ((pciConfigPtr)pSiS->PciInfo->thisCard)->funcnum; /*SIS_PCI_FUNC(pSiS->PciInfo);*/
- pSiS->PciTag = ((pciConfigPtr)pSiS->PciInfo->thisCard)->tag; /*SIS_PCI_TAG(pSiS->PciInfo);*/
+ pSiS->PciBus = PCI_CFG_BUS(pSiS->PciInfo); /*SIS_PCI_BUS(pSiS->PciInfo);*/
+ pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo); /*SIS_PCI_DEVICE(pSiS->PciInfo);*/
+ pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo); /*SIS_PCI_FUNC(pSiS->PciInfo);*/
+
+ pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo),
+ PCI_DEV_DEV(pSiS->PciInfo),
+ PCI_DEV_FUNC(pSiS->PciInfo));
#ifdef SIS_NEED_MAP_IOP
/********************************************/
@@ -3433,7 +3436,7 @@
{
SymTabRec *myChipsets = SISChipsets;
- if(pSiS->PciInfo->vendor == PCI_VENDOR_XGI) {
+ if(PCI_DEV_VENDOR_ID(pSiS->PciInfo) == PCI_VENDOR_XGI) {
myChipsets = XGIChipsets;
}
@@ -3451,7 +3454,7 @@
pSiS->Chipset);
} else {
- pSiS->Chipset = pSiS->PciInfo->chipType;
+ pSiS->Chipset = PCI_DEV_DEVICE_ID(pSiS->PciInfo);
pScrn->chipset = (char *)xf86TokenToString(myChipsets, pSiS->Chipset);
}
@@ -3464,7 +3467,7 @@
pSiS->ChipRev);
} else {
- pSiS->ChipRev = pSiS->PciInfo->chipRev;
+ pSiS->ChipRev = PCI_DEV_REVISION(pSiS->PciInfo);
}
@@ -3648,7 +3651,7 @@
* by the BIOS. So we can pretty much rely on that these
* are enabled.
*/
- pSiS->RelIO = (SISIOADDRESS)(pSiS->PciInfo->ioBase[2] + pSiS->IODBase);
+ pSiS->RelIO = (SISIOADDRESS)(PCI_REGION_BASE(pSiS->PciInfo, 2, REGION_IO) + pSiS->IODBase);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Relocated I/O registers at 0x%lX\n",
(ULong)pSiS->RelIO);
@@ -3769,7 +3772,7 @@
break;
case PCI_CHIP_SIS630: /* 630 + 730 */
pSiS->ChipType = SIS_630;
- if(pciReadLong(0x00000000, 0x00) == 0x07301039) {
+ if(sis_pci_read_host_bridge_u32(0x00) == 0x07301039) {
pSiS->ChipType = SIS_730;
}
pSiS->SiS_SD_Flags |= SiS_SD_IS300SERIES;
@@ -3808,7 +3811,7 @@
break;
case PCI_CHIP_SIS650: /* 650 + 740 */
pSiS->ChipType = SIS_650;
- if(pciReadLong(0x00000000, 0x00) == 0x07401039) {
+ if(sis_pci_read_host_bridge_u32(0x00) == 0x07401039) {
pSiS->ChipType = SIS_740;
}
pSiS->ChipFlags |= (SiSCF_Integrated | SiSCF_Real256ECore | SiSCF_MMIOPalette);
@@ -3826,7 +3829,7 @@
break;
case PCI_CHIP_SIS660: /* 660, 661, 741, 760, 761, 670(?) */
{
- ULong hpciid = pciReadLong(0x00000000, 0x00);
+ ULong hpciid = sis_pci_read_host_bridge_u32(0x00);
switch(hpciid) {
case 0x06601039:
pSiS->ChipType = SIS_660;
@@ -4067,7 +4070,7 @@
case PCI_CHIP_SIS6326:
pSiS->oldChipset = OC_SIS6326; break;
case PCI_CHIP_SIS530:
- if(pciReadLong(0x00000000, 0x00) == 0x06201039) {
+ if(sis_pci_read_host_bridge_u32(0x00) == 0x06201039) {
pSiS->oldChipset = OC_SIS620;
} else {
if((pSiS->ChipRev & 0x0f) < 0x0a)
@@ -4214,7 +4217,6 @@
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Could not allocate memory for video BIOS image\n");
} else {
- ULong segstart;
UShort mypciid = pSiS->Chipset;
UShort mypcivendor = (pSiS->ChipFlags & SiSCF_IsXGI) ? PCI_VENDOR_XGI : PCI_VENDOR_SIS;
Bool found = FALSE, readpci = FALSE;
@@ -4237,7 +4239,15 @@
biossize = 0x8000;
break;
}
-
+#if XSERVER_LIBPCIACCESS
+ if(readpci) {
+ pSiS->PciInfo->rom_size = biossize;
+ pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS);
+ if(SISCheckBIOS(pSiS, mypciid, mypcivendor, biossize)) {
+ found = TRUE;
+ }
+ }
+#else
if(readpci) {
xf86ReadPciBIOS(0, pSiS->PciTag, 0, pSiS->BIOS, biossize);
if(SISCheckBIOS(pSiS, mypciid, mypcivendor, biossize)) {
@@ -4246,6 +4256,7 @@
}
if(!found) {
+ ULong segstart;
for(segstart = BIOS_BASE; segstart < 0x000f0000; segstart += 0x00001000) {
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
@@ -4260,7 +4271,7 @@
break;
}
}
-
+#endif
if(found) {
UShort romptr = pSiS->BIOS[0x16] | (pSiS->BIOS[0x17] << 8);
pSiS->SiS_Pr->VirtualRomBase = pSiS->BIOS;
@@ -4522,7 +4533,7 @@
pSiS->FbAddress = pSiS->pEnt->device->MemBase;
from = X_CONFIG;
} else {
- pSiS->FbAddress = pSiS->PciInfo->memBase[0] & 0xFFFFFFF0;
+ pSiS->FbAddress = PCI_REGION_BASE(pSiS->PciInfo, 0, REGION_MEM) & 0xFFFFFFF0;
from = X_PROBED;
}
@@ -4546,7 +4557,7 @@
pSiS->IOAddress = pSiS->pEnt->device->IOBase;
from = X_CONFIG;
} else {
- pSiS->IOAddress = pSiS->PciInfo->memBase[1] & 0xFFFFFFF0;
+ pSiS->IOAddress = PCI_REGION_BASE(pSiS->PciInfo, 1, REGION_MEM) & 0xFFFFFFF0;
from = X_PROBED;
}
xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n",
@@ -5064,15 +5075,15 @@
if(pSiS->Chipset == PCI_CHIP_SIS630) {
int i = 0;
do {
- if(mychswtable[i].subsysVendor == pSiS->PciInfo->subsysVendor &&
- mychswtable[i].subsysCard == pSiS->PciInfo->subsysCard) {
+ if(mychswtable[i].subsysVendor == PCI_SUB_VENDOR_ID(pSiS->PciInfo) &&
+ mychswtable[i].subsysCard == PCI_SUB_DEVICE_ID(pSiS->PciInfo)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"PCI subsystem ID found in list for Chrontel/GPIO setup:\n");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"\tVendor/Card: %s %s (ID %04x)\n",
mychswtable[i].vendorName,
mychswtable[i].cardName,
- pSiS->PciInfo->subsysCard);
+ PCI_SUB_DEVICE_ID(pSiS->PciInfo));
pSiS->SiS_Pr->SiS_ChSW = TRUE;
break;
}
@@ -5105,8 +5116,8 @@
((!SiS_customttable[i].bioschksum) ||
(pSiS->SiS_Pr->UseROM &&
(SiS_customttable[i].bioschksum == chksum))) &&
- (SiS_customttable[i].pcisubsysvendor == pSiS->PciInfo->subsysVendor) &&
- (SiS_customttable[i].pcisubsyscard == pSiS->PciInfo->subsysCard) ) {
+ (SiS_customttable[i].pcisubsysvendor == PCI_SUB_VENDOR_ID(pSiS->PciInfo)) &&
+ (SiS_customttable[i].pcisubsyscard == PCI_SUB_DEVICE_ID(pSiS->PciInfo)) ) {
footprint = TRUE;
for(j=0; j<5; j++) {
if(SiS_customttable[i].biosFootprintAddr[j]) {
@@ -5834,14 +5845,14 @@
if(pSiS->SiS_Pr->PDC == -1) {
int i=0;
do {
- if(mypdctable[i].subsysVendor == pSiS->PciInfo->subsysVendor &&
- mypdctable[i].subsysCard == pSiS->PciInfo->subsysCard) {
+ if(mypdctable[i].subsysVendor == PCI_SUB_VENDOR_ID(pSiS->PciInfo) &&
+ mypdctable[i].subsysCard == PCI_SUB_DEVICE_ID(pSiS->PciInfo)) {
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"PCI card/vendor identified for non-default PanelDelayCompensation\n");
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Vendor: %s, card: %s (ID %04x), PanelDelayCompensation: 0x%02x\n",
mypdctable[i].vendorName, mypdctable[i].cardName,
- pSiS->PciInfo->subsysCard, mypdctable[i].pdc);
+ PCI_SUB_DEVICE_ID(pSiS->PciInfo), mypdctable[i].pdc);
if(pSiS->PDC == -1) {
pSiS->PDC = mypdctable[i].pdc;
} else {
@@ -7144,15 +7155,48 @@
pSiSEnt->MapCountIOPBase++;
if(!(pSiSEnt->IOPBase)) {
/* Only map if not mapped previously */
+#ifndef XSERVER_LIBPCIACCESS
pSiSEnt->IOPBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pSiS->PciTag, pSiS->IOPAddress, 128);
+#else
+ {
+ void **result = (void **)&pSiSEnt->IOPBase;
+ int err = pci_device_map_range(pSiS->PciInfo,
+ pSiS->IOPAddress,
+ 128,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO aperture. %s (%d)\n",
+ strerror (err), err);
+ }
+ }
+#endif
}
pSiS->IOPBase = pSiSEnt->IOPBase;
} else
#endif
- pSiS->IOPBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
- pSiS->PciTag, pSiS->IOPAddress, 128);
-
+#ifndef XSERVER_LIBPCIACCESS
+ pSiS->IOPBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
+ pSiS->PciTag, pSiS->IOPAddress, 128);
+#else
+ {
+ void **result = (void **)&pSiS->IOPBase;
+ int err = pci_device_map_range(pSiS->PciInfo,
+ pSiS->IOPAddress,
+ 128,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO aperture. %s (%d)\n",
+ strerror (err), err);
+ }
+ }
+#endif
if(pSiS->IOPBase == NULL) {
SISErrorLog(pScrn, "Could not map I/O port area\n");
return FALSE;
@@ -7222,14 +7266,46 @@
pSiSEnt->MapCountIOBase++;
if(!(pSiSEnt->IOBase)) {
/* Only map if not mapped previously */
+#ifndef XSERVER_LIBPCIACCESS
pSiSEnt->IOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
+#else
+ void **result = (void **)&pSiSEnt->IOBase;
+ int err = pci_device_map_range(pSiS->PciInfo,
+ pSiS->IOAddress,
+ (pSiS->mmioSize * 1024),
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO aperture. %s (%d)\n",
+ strerror (err), err);
+ }
+#endif
}
pSiS->IOBase = pSiSEnt->IOBase;
} else
#endif
+#ifndef XSERVER_LIBPCIACCESS
pSiS->IOBase = xf86MapPciMem(pScrn->scrnIndex, mmioFlags,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
+#else
+ {
+ void **result = (void **)&pSiS->IOBase;
+ int err = pci_device_map_range(pSiS->PciInfo,
+ pSiS->IOAddress,
+ (pSiS->mmioSize * 1024),
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO aperture. %s (%d)\n",
+ strerror (err), err);
+ }
+ }
+#endif
if(pSiS->IOBase == NULL) {
SISErrorLog(pScrn, "Could not map MMIO area\n");
@@ -7246,14 +7322,42 @@
pSiSEnt->MapCountIOBaseDense++;
if(!(pSiSEnt->IOBaseDense)) {
/* Only map if not mapped previously */
+#ifndef XSERVER_LIBPCIACCESS
pSiSEnt->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
+#else
+ void **result = (void **)&pSiSEnt->IOBaseDense;
+ int err = pci_device_map_range(pSiS->PciInfo,
+ pSiS->IOAddress,
+ (pSiS->mmioSize * 1024),
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO dense aperture. %s (%d)\n",
+ strerror (err), err);
+#endif
}
pSiS->IOBaseDense = pSiSEnt->IOBaseDense;
} else
#endif
- pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
+#ifndef XSERVER_LIBPCIACCESS
+ pSiS->IOBaseDense = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pSiS->PciTag, pSiS->IOAddress, (pSiS->mmioSize * 1024));
+#else
+ void **result = (void **)&pSiS->IOBaseDense;
+ int err = pci_device_map_range(pSiS->PciInfo,
+ pSiS->IOAddress,
+ (pSiS->mmioSize * 1024),
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO dense aperture. %s (%d)\n",
+ strerror (err), err);
+#endif
if(pSiS->IOBaseDense == NULL) {
SISErrorLog(pScrn, "Could not map MMIO dense area\n");
@@ -7266,21 +7370,55 @@
pSiSEnt->MapCountFbBase++;
if(!(pSiSEnt->FbBase)) {
/* Only map if not mapped previously */
+#ifndef XSERVER_LIBPCIACCESS
pSiSEnt->FbBase = pSiSEnt->RealFbBase =
xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pSiS->PciTag, (ULong)pSiS->realFbAddress,
pSiS->FbMapSize);
+#else
+ int err = pci_device_map_range(pSiS->PciInfo,
+ (ULong)pSiS->realFbAddress,
+ pSiS->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ (void *)&pSiSEnt->FbBase);
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map FB aperture. %s (%d)\n",
+ strerror (err), err);
+ return FALSE;
+ }
+ pSiSEnt->RealFbBase = pSiSEnt->FbBase;
+#endif
}
pSiS->FbBase = pSiS->RealFbBase = pSiSEnt->FbBase;
/* Adapt FbBase (for DHM and SiS76x UMA skipping; dhmOffset is 0 otherwise) */
pSiS->FbBase += pSiS->dhmOffset;
} else {
#endif
- pSiS->FbBase = pSiS->RealFbBase =
- xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
+
+#ifndef XSERVER_LIBPCIACCESS
+ pSiS->FbBase = pSiS->RealFbBase =
+ xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pSiS->PciTag, (ULong)pSiS->realFbAddress,
pSiS->FbMapSize);
+#else
+ int err = pci_device_map_range(pSiS->PciInfo,
+ (ULong)pSiS->realFbAddress,
+ pSiS->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ (void *)&pSiS->FbBase);
+ if (err) {
+ xf86DrvMsg (pScrn->scrnIndex, X_ERROR,
+ "Unable to map FB aperture. %s (%d)\n",
+ strerror (err), err);
+ return FALSE;
+ }
+ pSiS->RealFbBase = pSiS->FbBase;
+#endif
pSiS->FbBase += pSiS->dhmOffset;
+
#ifdef SISDUALHEAD
}
#endif
@@ -7847,7 +7985,7 @@
if(!pSiS->sisfb_tvposvalid) return;
if(!(pSiS->sisfbdevname[0])) return;
- if((fd = open(pSiS->sisfbdevname, 'r')) != -1) {
+ if((fd = open(pSiS->sisfbdevname, O_RDONLY)) != -1) {
parm = (CARD32)((pSiS->sisfb_tvxpos << 16) | (pSiS->sisfb_tvypos & 0xffff));
ioctl(fd, SISFB_SET_TVPOSOFFSET, &parm);
close(fd);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_driver.h new/xf86-video-sis-0.10.0/src/sis_driver.h
--- old/xf86-video-sis-0.9.4/src/sis_driver.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_driver.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Global data and definitions
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis.h new/xf86-video-sis-0.10.0/src/sis.h
--- old/xf86-video-sis-0.9.4/src/sis.h 2007-11-16 12:37:29.000000000 +0100
+++ new/xf86-video-sis-0.10.0/src/sis.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis.h,v 1.67 2006/04/07 21:05:21 ajax Exp $ */
/*
* Main global data and definitions
*
@@ -39,6 +37,11 @@
#include
#include
#include
+#include
+#include
+#include
+
+#include
#define SISDRIVERVERSIONYEAR 5
#define SISDRIVERVERSIONMONTH 9
@@ -850,15 +853,15 @@
ULong masterFbSize;
ULong slaveFbAddress;
ULong slaveFbSize;
- UChar *FbBase; /* VRAM linear address */
+ void *FbBase; /* VRAM linear address */
UChar *RealFbBase; /* Real VRAM linear address (for DHM, SiS76x UMA skipping) */
- UChar *IOBase; /* MMIO linear address */
+ void *IOBase; /* MMIO linear address */
UShort MapCountIOBase; /* map/unmap queue counter */
UShort MapCountFbBase; /* map/unmap queue counter */
Bool forceUnmapIOBase; /* ignore counter and unmap */
Bool forceUnmapFbBase; /* ignore counter and unmap */
#ifdef __alpha__
- UChar *IOBaseDense; /* MMIO for Alpha platform */
+ void *IOBaseDense; /* MMIO for Alpha platform */
UShort MapCountIOBaseDense;
Bool forceUnmapIOBaseDense; /* ignore counter and unmap */
#endif
@@ -921,7 +924,7 @@
unsigned int CPUFlags;
#ifdef SIS_NEED_MAP_IOP
CARD32 IOPAddress; /* I/O port physical address */
- UChar *IOPBase; /* I/O port linear address */
+ void *IOPBase; /* I/O port linear address */
UShort MapCountIOPBase; /* map/unmap queue counter */
Bool forceUnmapIOPBase; /* ignore counter and unmap */
#endif
@@ -962,13 +965,13 @@
int DSTN; /* For 550 FSTN/DSTN; set by option, no detection */
ULong FbAddress; /* VRAM physical address (in DHM: for each Fb!) */
ULong realFbAddress; /* For DHM/PCI mem mapping: store global FBAddress */
- UChar *FbBase; /* VRAM virtual linear address */
- UChar *RealFbBase; /* Real VRAM virtual linear address (for DHM and SiS76x UMA skipping) */
+ void *FbBase; /* VRAM virtual linear address */
+ void *RealFbBase; /* Real VRAM virtual linear address (for DHM and SiS76x UMA skipping) */
CARD32 IOAddress; /* MMIO physical address */
- UChar *IOBase; /* MMIO linear address */
+ void *IOBase; /* MMIO linear address */
IOADDRESS IODBase; /* Base of PIO memory area */
#ifdef __alpha__
- UChar *IOBaseDense; /* MMIO for Alpha platform */
+ void *IOBaseDense; /* MMIO for Alpha platform */
#endif
SISIOADDRESS RelIO; /* Relocated IO Ports baseaddress */
UChar *BIOS;
@@ -1376,7 +1379,7 @@
Bool SCLogQuiet;
#ifdef SIS_NEED_MAP_IOP
CARD32 IOPAddress; /* I/O port physical address */
- UChar *IOPBase; /* I/O port linear address */
+ void *IOPBase; /* I/O port linear address */
#endif
#ifdef SISMERGED
Bool MergedFB, MergedFBAuto;
@@ -1570,6 +1573,12 @@
extern int SiS_GetSISCRT1SaturationGain(ScrnInfoPtr pScrn);
extern void SiS_SetSISCRT1SaturationGain(ScrnInfoPtr pScrn, int val);
+extern unsigned int sis_pci_read_device_u32(int device, int offset);
+extern unsigned char sis_pci_read_device_u8(int device, int offset);
+extern unsigned int sis_pci_read_host_bridge_u32(int offset);
+extern unsigned char sis_pci_read_host_bridge_u8(int offset);
+extern void sis_pci_write_host_bridge_u8(int offset, unsigned char value);
+extern void sis_pci_write_host_bridge_u32(int offset, unsigned int value);
#endif /* _SIS_H_ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_opt.c new/xf86-video-sis-0.10.0/src/sis_opt.c
--- old/xf86-video-sis-0.9.4/src/sis_opt.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_opt.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS driver option evaluation
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sispcirename.h new/xf86-video-sis-0.10.0/src/sispcirename.h
--- old/xf86-video-sis-0.9.4/src/sispcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-sis-0.10.0/src/sispcirename.h 2008-03-19 15:31:14.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef SISPCIRENAME_H
+#define SISPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* SISPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_regs.h new/xf86-video-sis-0.10.0/src/sis_regs.h
--- old/xf86-video-sis-0.9.4/src/sis_regs.h 2007-07-24 20:25:30.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_regs.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Register access macros and register definitions
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_setup.c new/xf86-video-sis-0.10.0/src/sis_setup.c
--- old/xf86-video-sis-0.9.4/src/sis_setup.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_setup.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Basic hardware and memory detection
*
@@ -99,6 +97,140 @@
{134, 0, 0x4a, 0xa3 }
};
+#ifdef XSERVER_LIBPCIACCESS
+struct pci_device *
+sis_get_device (int device)
+{
+ struct pci_slot_match bridge_match = {
+ 0, 0, device, PCI_MATCH_ANY, 0
+ };
+ struct pci_device_iterator *slot_iterator;
+ struct pci_device *bridge;
+
+ slot_iterator = pci_slot_match_iterator_create (&bridge_match);
+ bridge = pci_device_next (slot_iterator);
+ pci_iterator_destroy (slot_iterator);
+ return bridge;
+}
+
+unsigned int
+sis_pci_read_device_u32(int device, int offset)
+{
+ struct pci_device *host_bridge = sis_get_device(device);
+ unsigned int result;
+
+ pci_device_cfg_read_u32(host_bridge, &result, offset);
+ return result;
+}
+
+unsigned char
+sis_pci_read_device_u8(int device, int offset)
+{
+ struct pci_device *host_bridge = sis_get_device(device);
+ unsigned char result;
+
+ pci_device_cfg_read_u8(host_bridge, &result, offset);
+ return result;
+}
+
+void
+sis_pci_write_host_bridge_u32(int offset, unsigned int value)
+{
+ struct pci_device *host_bridge = sis_get_device(0);
+ pci_device_cfg_write_u32(host_bridge, value, offset);
+}
+
+void
+sis_pci_write_host_bridge_u8(int offset, unsigned char value)
+{
+ struct pci_device *host_bridge = sis_get_device(0);
+ pci_device_cfg_write_u8(host_bridge, value, offset);
+}
+
+#else
+unsigned int
+sis_pci_read_device_u32(int device, int offset)
+{
+ PCITAG tag = pciTag(0, device, 0);
+ return pciReadLong(tag, offset);
+}
+
+unsigned char
+sis_pci_read_device_u8(int device, int offset)
+{
+ PCITAG tag = pciTag(0, device, 0);
+ return pciReadByte(tag, offset);
+}
+
+void
+sis_pci_write_host_bridge_u32(int offset, unsigned int value)
+{
+ pciWriteLong(0x00000000, offset, value);
+}
+
+void
+sis_pci_write_host_bridge_u8(int offset, unsigned char value)
+{
+ pciWriteByte(0x00000000, offset, value);
+}
+
+
+#endif
+
+unsigned int
+sis_pci_read_host_bridge_u32(int offset)
+{
+ return sis_pci_read_device_u32(0, offset);
+}
+
+unsigned char
+sis_pci_read_host_bridge_u8(int offset)
+{
+ return sis_pci_read_device_u8(0, offset);
+}
+
+static int sisESSPresent(ScrnInfoPtr pScrn)
+{
+ int flags = 0;
+#ifndef XSERVER_LIBPCIACCESS
+ int i;
+ pciConfigPtr pdptr, *systemPCIdevices = NULL;
+
+ if((systemPCIdevices = xf86GetPciConfigInfo())) {
+ i = 0;
+ while((pdptr = systemPCIdevices[i])) {
+ if((pdptr->pci_vendor == 0x1274) &&
+ ((pdptr->pci_device == 0x5000) ||
+ ((pdptr->pci_device & 0xFFF0) == 0x1370))) {
+ flags |= ESS137xPRESENT;
+ break;
+ }
+ i++;
+ }
+ }
+ return flags;
+#else
+ struct pci_id_match id_match = { 0x1274, PCI_MATCH_ANY,
+ PCI_MATCH_ANY, PCI_MATCH_ANY,
+ PCI_MATCH_ANY, PCI_MATCH_ANY,
+ 0 };
+ struct pci_device_iterator *id_iterator;
+ struct pci_device *ess137x;
+
+ id_iterator = pci_id_match_iterator_create(&id_match);
+
+ ess137x = pci_device_next(id_iterator);
+ while (ess137x) {
+ if ((ess137x->device_id == 0x5000) ||
+ ((ess137x->device_id & 0xfff0) == 0x1370)) {
+ flags |= ESS137xPRESENT;
+ }
+ ess137x = pci_device_next(id_iterator);
+ }
+ return flags;
+#endif
+}
+
/* For old chipsets, 5597, 6326, 530/620 */
static void
sisOldSetup(ScrnInfoPtr pScrn)
@@ -113,7 +245,7 @@
#if 0
UChar newsr13, newsr28, newsr29;
#endif
- pciConfigPtr pdptr, *systemPCIdevices = NULL;
+
if(pSiS->oldChipset <= OC_SIS6225) {
inSISIDXREG(SISSR, 0x0F, temp);
@@ -206,22 +338,11 @@
pSiS->Flags &= ~(ESS137xPRESENT);
if(pSiS->Chipset == PCI_CHIP_SIS530) {
if(pSiS->oldChipset == OC_SIS530A) {
- if((systemPCIdevices = xf86GetPciConfigInfo())) {
- i = 0;
- while((pdptr = systemPCIdevices[i])) {
- if((pdptr->pci_vendor == 0x1274) &&
- ((pdptr->pci_device == 0x5000) ||
- ((pdptr->pci_device & 0xFFF0) == 0x1370))) {
- pSiS->Flags |= ESS137xPRESENT;
- break;
- }
- i++;
- }
- }
- if(pSiS->Flags & ESS137xPRESENT) {
- xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
- "SiS530/620: Found ESS device\n");
- }
+ pSiS->Flags |= sisESSPresent(pScrn);
+ }
+ if(pSiS->Flags & ESS137xPRESENT) {
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
+ "SiS530/620: Found ESS device\n");
}
}
@@ -289,20 +410,20 @@
case PCI_CHIP_SIS540:
case PCI_CHIP_SIS630:
pSiS->IsAGPCard = TRUE;
- pciconfig = pciReadByte(0x00000000, 0x63);
+ pciconfig = sis_pci_read_host_bridge_u8(0x63);
if(pciconfig & 0x80) {
pScrn->videoRam = (1 << (((pciconfig & 0x70) >> 4) + 21)) / 1024;
pSiS->BusWidth = 64;
- pciconfig = pciReadByte(0x00000000, 0x64);
+ pciconfig = sis_pci_read_host_bridge_u8(0x64);
if((pciconfig & 0x30) == 0x30) {
pSiS->BusWidth = 128;
pScrn->videoRam <<= 1;
}
- ramtype = pciReadByte(0x00000000,0x65);
+ ramtype = sis_pci_read_host_bridge_u8(0x65);
ramtype &= 0x03;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Shared Memory Area is on DIMM%d\n", ramtype);
- ramtype = pciReadByte(0x00000000,(0x60 + ramtype));
+ ramtype = sis_pci_read_host_bridge_u8(0x60 + ramtype);
if(ramtype & 0x80) ramtype = 9;
else ramtype = 4;
pSiS->UMAsize = pScrn->videoRam;
@@ -568,7 +689,7 @@
/* UMA - shared fb */
pScrn->videoRam = 0;
- pciconfig = pciReadByte(0x00000000, 0x4c);
+ pciconfig = sis_pci_read_host_bridge_u8(0x4c);
if(pciconfig & 0xe0) {
pScrn->videoRam = (1 << (((pciconfig & 0xe0) >> 5) - 2)) * 32768;
pSiS->ChipFlags |= SiSCF_760UMA;
@@ -580,7 +701,8 @@
}
/* LFB - local framebuffer: PCI reg hold total RAM (but configurable in BIOS) */
- pciconfig = pciReadByte(0x00000800, 0xcd);
+ /* TODO */
+ pciconfig = sis_pci_read_device_u8(1, 0xcd);
pciconfig = (pciconfig >> 1) & 0x03;
i = 0;
if(pciconfig == 0x01) i = 32768;
@@ -631,7 +753,7 @@
dimmnum = 3;
}
- pciconfig = pciReadByte(0x00000000, 0x64);
+ pciconfig = sis_pci_read_host_bridge_u8(0x64);
if(pciconfig & 0x80) {
pScrn->videoRam = (1 << (((pciconfig & 0x70) >> 4) - 1)) * 32768;
pSiS->UMAsize = pScrn->videoRam;
@@ -643,7 +765,7 @@
pSiS->BusWidth = 64;
for(i = 0; i <= (dimmnum - 1); i++) {
if(pciconfig & (1 << i)) {
- temp = pciReadByte(0x00000000, 0x60 + i);
+ temp = sis_pci_read_host_bridge_u8(0x60 + i);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DIMM%d is %s SDRAM\n",
i, (temp & 0x40) ? "DDR" : "SDR");
@@ -652,7 +774,7 @@
"DIMM%d is not installed\n", i);
}
}
- pciconfig = pciReadByte(0x00000000, 0x7c);
+ pciconfig = sis_pci_read_host_bridge_u8(0x7c);
ramtype = (pciconfig & 0x02) ? 8 : 4;
alldone = TRUE;
}
@@ -662,14 +784,14 @@
} else if(pSiS->Chipset == PCI_CHIP_SIS650) {
- pciconfig = pciReadByte(0x00000000, 0x64);
+ pciconfig = sis_pci_read_host_bridge_u8(0x64);
if(pciconfig & 0x80) {
pScrn->videoRam = (1 << (((pciconfig & 0x70) >> 4) + 22)) / 1024;
pSiS->UMAsize = pScrn->videoRam;
pSiS->BusWidth = 64;
for(i=0; i<=3; i++) {
if(pciconfig & (1 << i)) {
- temp = pciReadByte(0x00000000, 0x60 + i);
+ temp = sis_pci_read_host_bridge_u8(0x60 + i);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"DIMM%d is %s SDRAM\n",
i, (temp & 0x40) ? "DDR" : "SDR");
@@ -678,20 +800,19 @@
"DIMM%d is not installed\n", i);
}
}
- pciconfig = pciReadByte(0x00000000, 0x7c);
+ pciconfig = sis_pci_read_host_bridge_u8(0x7c);
if(pciconfig & 0x02) ramtype = 8;
else ramtype = 4;
alldone = TRUE;
}
} else {
-
- pciconfig = pciReadByte(0x00000000, 0x63);
+ pciconfig = sis_pci_read_host_bridge_u8(0x63);
if(pciconfig & 0x80) {
pScrn->videoRam = (1 << (((pciconfig & 0x70) >> 4) + 21)) / 1024;
pSiS->UMAsize = pScrn->videoRam;
pSiS->BusWidth = 64;
- ramtype = pciReadByte(0x00000000,0x65);
+ ramtype = sis_pci_read_host_bridge_u8(0x65);
ramtype &= 0x01;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED,
"Shared Memory Area is on DIMM%d\n", ramtype);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_shadow.c new/xf86-video-sis-0.10.0/src/sis_shadow.c
--- old/xf86-video-sis-0.9.4/src/sis_shadow.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_shadow.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Copyright (C) 1999-2004 by The XFree86 Project, Inc.
* based on code written by Mark Vojkovich
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_utility.c new/xf86-video-sis-0.10.0/src/sis_utility.c
--- old/xf86-video-sis-0.9.4/src/sis_utility.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_utility.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* SiS driver utility interface & routines
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_vb.c new/xf86-video-sis-0.10.0/src/sis_vb.c
--- old/xf86-video-sis-0.9.4/src/sis_vb.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_vb.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Video bridge detection and configuration for 300, 315 and 330 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_vga.c new/xf86-video-sis-0.10.0/src/sis_vga.c
--- old/xf86-video-sis-0.9.4/src/sis_vga.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_vga.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Mode setup and basic video bridge detection
*
@@ -1717,8 +1715,13 @@
if(pSiS->VGAMapPhys == 0) pSiS->VGAMapPhys = 0xA0000;
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
+#if XSERVER_LIBPCIACCESS
+ pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
+ pSiS->PciInfo, pSiS->VGAMapPhys, pSiS->VGAMapSize);
+#else
pSiS->VGAMemBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
pSiS->PciTag, pSiS->VGAMapPhys, pSiS->VGAMapSize);
+#endif
#else
pSiS->VGAMemBase = xf86MapVidMem(pScrn->scrnIndex, VIDMEM_MMIO_32BIT,
pSiS->VGAMapPhys, pSiS->VGAMapSize);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_video.c new/xf86-video-sis-0.10.0/src/sis_video.c
--- old/xf86-video-sis-0.9.4/src/sis_video.c 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_video.c 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis_video.c,v 1.32 2005/09/23 16:34:04 twini Exp $ */
/*
* Xv driver for SiS 300, 315 and 330 series.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_video.h new/xf86-video-sis-0.10.0/src/sis_video.h
--- old/xf86-video-sis-0.9.4/src/sis_video.h 2007-11-16 12:37:30.000000000 +0100
+++ new/xf86-video-sis-0.10.0/src/sis_video.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sis/src/sis_video.h,v 1.4 2005/07/04 10:57:08 twini Exp $ */
/*
* Xv driver for SiS 300, 315 and 330 series.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/sis_videostr.h new/xf86-video-sis-0.10.0/src/sis_videostr.h
--- old/xf86-video-sis-0.9.4/src/sis_videostr.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/sis_videostr.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* Xv driver for SiS 300, 315 and 330 series
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/vgatypes.h new/xf86-video-sis-0.10.0/src/vgatypes.h
--- old/xf86-video-sis-0.9.4/src/vgatypes.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/vgatypes.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* General type definitions for universal mode switching modules
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sis-0.9.4/src/vstruct.h new/xf86-video-sis-0.10.0/src/vstruct.h
--- old/xf86-video-sis-0.9.4/src/vstruct.h 2007-05-02 15:17:10.000000000 +0200
+++ new/xf86-video-sis-0.10.0/src/vstruct.h 2008-03-19 20:28:09.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg$ */
/*
* General structure definitions for universal mode switching modules
*
++++++ xf86-video-sisusb-X11R7.1-0.8.1.tar.bz2 -> xf86-video-sisusb-0.9.0.tar.bz2 ++++++
++++ 21344 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/config.h.in new/xf86-video-sisusb-0.9.0/config.h.in
--- old/xf86-video-sisusb-X11R7.1-0.8.1/config.h.in 2006-05-23 05:45:54.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/config.h.in 2008-03-19 20:35:21.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/configure.ac new/xf86-video-sisusb-0.9.0/configure.ac
--- old/xf86-video-sisusb-X11R7.1-0.8.1/configure.ac 2006-04-08 03:48:35.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/configure.ac 2008-03-19 20:35:03.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-sisusb],
- 0.8.1,
+ 0.9.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-sisusb)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/man/Makefile.am new/xf86-video-sisusb-0.9.0/man/Makefile.am
--- old/xf86-video-sisusb-X11R7.1-0.8.1/man/Makefile.am 2005-12-06 23:48:38.000000000 +0100
+++ new/xf86-video-sisusb-0.9.0/man/Makefile.am 2008-03-19 15:31:16.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:11 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/man/sisusb.man new/xf86-video-sisusb-0.9.0/man/sisusb.man
--- old/xf86-video-sisusb-X11R7.1-0.8.1/man/sisusb.man 2005-01-25 17:11:05.000000000 +0100
+++ new/xf86-video-sisusb-0.9.0/man/sisusb.man 2008-03-19 15:31:16.000000000 +0100
@@ -1,5 +1,5 @@
.\" $XFree86$
-.\" $XdotOrg: driver/xf86-video-sisusb/man/sisusb.man,v 1.2 2005/01/25 16:11:05 twini Exp $
+.\" $XdotOrg$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
#ifdef __xservername__
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/missing new/xf86-video-sisusb-0.9.0/missing
--- old/xf86-video-sisusb-X11R7.1-0.8.1/missing 2006-05-23 05:45:56.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/missing 2008-03-19 20:35:22.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_accel.c new/xf86-video-sisusb-0.9.0/src/sisusb_accel.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_accel.c 2005-07-11 04:30:00.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_accel.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_accel.c,v 1.6 2005/07/11 02:30:00 ajax Exp $ */
/*
* 2D Acceleration for SiS 315/USB - not functional!
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_accel.h new/xf86-video-sisusb-0.9.0/src/sisusb_accel.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_accel.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_accel.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_accel.h,v 1.4 2005/07/09 02:50:34 twini Exp $ */
/*
* 2D Acceleration for SiS 315/USB
* Definitions for the SIS engine communication.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_cursor.c new/xf86-video-sisusb-0.9.0/src/sisusb_cursor.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_cursor.c 2005-09-28 20:59:22.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_cursor.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_cursor.c,v 1.7 2005/09/28 18:59:22 twini Exp $ */
/*
* SiS 315/USB hardware cursor handling
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_cursor.h new/xf86-video-sisusb-0.9.0/src/sisusb_cursor.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_cursor.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_cursor.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_cursor.h,v 1.3 2005/07/09 02:50:34 twini Exp $ */
/*
* SiSUSB hardware cursor handling definitions
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_dac.c new/xf86-video-sisusb-0.9.0/src/sisusb_dac.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_dac.c 2005-08-16 00:57:51.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_dac.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_dac.c,v 1.6 2005/08/15 22:57:51 twini Exp $ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_dac.h new/xf86-video-sisusb-0.9.0/src/sisusb_dac.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_dac.h 2005-07-09 05:02:56.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_dac.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_dac.h,v 1.4 2005/07/09 03:02:56 twini Exp $ */
/*
* DAC helper functions (Save/Restore, MemClk, etc)
* Definitions and prototypes
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_driver.c new/xf86-video-sisusb-0.9.0/src/sisusb_driver.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_driver.c 2005-09-28 20:48:30.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_driver.c 2008-03-19 20:34:28.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_driver.c,v 1.16 2005/09/28 18:48:30 twini Exp $ */
/*
* SiSUSB driver main code
*
@@ -509,7 +507,7 @@
if(!pSiSUSB->sisfbfound) return;
if(!pSiSUSB->sisfb_havelock) return;
- if((fd = open(pSiSUSB->sisfbdevname, 'r')) != -1) {
+ if((fd = open(pSiSUSB->sisfbdevname, O_RDONLY)) != -1) {
parm = lock ? 1 : 0;
ioctl(fd, SISUSBFB_SET_LOCK, &parm);
close(fd);
@@ -932,7 +930,7 @@
sprintf(name, "/dev/fb/%1d", i-8);
}
- if((fd = open(name, 'r')) != -1) {
+ if((fd = open(name, O_RDONLY)) != -1) {
Bool gotit = FALSE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_driver.h new/xf86-video-sisusb-0.9.0/src/sisusb_driver.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_driver.h 2005-07-09 05:02:56.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_driver.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_driver.h,v 1.8 2005/07/09 03:02:56 twini Exp $ */
/*
* Global data and definitions
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb.h new/xf86-video-sisusb-0.9.0/src/sisusb.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb.h 2006-04-08 03:48:35.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb.h,v 1.17 2006/04/08 01:48:35 ajax Exp $ */
/*
* Main global data and definitions
*
@@ -70,9 +68,9 @@
#define SISUSB_NAME "SISUSB"
#define SISUSB_DRIVER_NAME "sisusb"
-#define SISUSB_MAJOR_VERSION 0
-#define SISUSB_MINOR_VERSION 8
-#define SISUSB_PATCHLEVEL 1
+#define SISUSB_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define SISUSB_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define SISUSB_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
#define SISUSB_CURRENT_VERSION ((SISUSB_MAJOR_VERSION << 16) | \
(SISUSB_MINOR_VERSION << 8) | \
SISUSB_PATCHLEVEL)
@@ -150,7 +148,7 @@
#undef SISGAMMARAMP
#ifdef XORG_VERSION_CURRENT
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0)
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) || XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(4,0,0,0,0)
#define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */
#endif
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_init.c new/xf86-video-sisusb-0.9.0/src/sisusb_init.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_init.c 2005-07-11 04:30:00.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_init.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_init.c,v 1.8 2005/07/11 02:30:00 ajax Exp $ */
/*
* Mode initializing code (CRT1 section) for SiS315/USB
* (Universal module for Linux kernel framebuffer and X.org/XFree86 4.x)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_init.h new/xf86-video-sisusb-0.9.0/src/sisusb_init.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_init.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_init.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_init.h,v 1.6 2005/07/09 02:50:34 twini Exp $ */
/*
* Data and prototypes for init.c
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_opt.c new/xf86-video-sisusb-0.9.0/src/sisusb_opt.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_opt.c 2005-10-27 20:27:19.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_opt.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_opt.c,v 1.7 2005/10/27 18:27:19 twini Exp $ */
/*
* SiSUSB driver option evaluation
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_osdef.h new/xf86-video-sisusb-0.9.0/src/sisusb_osdef.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_osdef.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_osdef.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_osdef.h,v 1.5 2005/07/09 02:50:34 twini Exp $ */
/*
* OS depending defines
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_regs.h new/xf86-video-sisusb-0.9.0/src/sisusb_regs.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_regs.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_regs.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_regs.h,v 1.5 2005/07/09 02:50:34 twini Exp $ */
/*
* Register access macros and register definitions
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_setup.c new/xf86-video-sisusb-0.9.0/src/sisusb_setup.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_setup.c 2005-07-11 04:30:00.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_setup.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_setup.c,v 1.4 2005/07/11 02:30:00 ajax Exp $ */
/*
* Basic hardware and memory detection
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_shadow.c new/xf86-video-sisusb-0.9.0/src/sisusb_shadow.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_shadow.c 2005-07-11 04:30:00.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_shadow.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_shadow.c,v 1.5 2005/07/11 02:30:00 ajax Exp $ */
/*
* SiS USB driver shadow framebuffer handling
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_struct.h new/xf86-video-sisusb-0.9.0/src/sisusb_struct.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_struct.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_struct.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_struct.h,v 1.4 2005/07/09 02:50:34 twini Exp $ */
/*
* General structure definitions for universal mode switching modules
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_types.h new/xf86-video-sisusb-0.9.0/src/sisusb_types.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_types.h 2005-08-16 00:57:51.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_types.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_types.h,v 1.7 2005/08/15 22:57:51 twini Exp $ */
/*
* General type definitions for universal mode switching modules
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_utility.c new/xf86-video-sisusb-0.9.0/src/sisusb_utility.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_utility.c 2005-09-16 15:52:16.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_utility.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_utility.c,v 1.8 2005/09/16 13:52:16 twini Exp $ */
/*
* SiSUSB driver utility interface & routines
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_vga.c new/xf86-video-sisusb-0.9.0/src/sisusb_vga.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_vga.c 2005-07-11 04:30:00.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_vga.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_vga.c,v 1.5 2005/07/11 02:30:00 ajax Exp $ */
/*
* Mode setup and basic video bridge detection
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_video.c new/xf86-video-sisusb-0.9.0/src/sisusb_video.c
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_video.c 2006-04-08 01:15:17.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_video.c 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_video.c,v 1.9 2006/04/07 23:15:17 aplattner Exp $ */
/*
* Xv driver for SiS 315 USB
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_video.h new/xf86-video-sisusb-0.9.0/src/sisusb_video.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_video.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_video.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_video.h,v 1.3 2005/07/09 02:50:34 twini Exp $ */
/*
* Xv driver for SiS 315 USB
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_videostr.h new/xf86-video-sisusb-0.9.0/src/sisusb_videostr.h
--- old/xf86-video-sisusb-X11R7.1-0.8.1/src/sisusb_videostr.h 2005-07-09 04:50:34.000000000 +0200
+++ new/xf86-video-sisusb-0.9.0/src/sisusb_videostr.h 2008-03-19 20:33:49.000000000 +0100
@@ -1,5 +1,3 @@
-/* $XFree86$ */
-/* $XdotOrg: driver/xf86-video-sisusb/src/sisusb_videostr.h,v 1.3 2005/07/09 02:50:34 twini Exp $ */
/*
* Xv driver for SiS 315 USB
*
++++++ xf86-video-tdfx-1.3.0.tar.bz2 -> xf86-video-tdfx-1.4.0.tar.bz2 ++++++
++++ 12166 lines of diff (skipped)
++++++ xf86-video-trident-1.2.3.tar.bz2 -> xf86-video-trident-1.3.0.tar.bz2 ++++++
++++ 11315 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/config.h.in new/xf86-video-trident-1.3.0/config.h.in
--- old/xf86-video-trident-1.2.3/config.h.in 2006-11-03 17:34:03.000000000 +0100
+++ new/xf86-video-trident-1.3.0/config.h.in 2008-03-19 20:40:54.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/configure.ac new/xf86-video-trident-1.3.0/configure.ac
--- old/xf86-video-trident-1.2.3/configure.ac 2006-11-03 17:31:58.000000000 +0100
+++ new/xf86-video-trident-1.3.0/configure.ac 2008-03-19 20:40:40.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-trident],
- 1.2.3,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-trident)
@@ -58,6 +58,19 @@
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
# Checks for libraries.
# Checks for header files.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/man/Makefile.am new/xf86-video-trident-1.3.0/man/Makefile.am
--- old/xf86-video-trident-1.2.3/man/Makefile.am 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/man/Makefile.am 2008-03-19 15:31:20.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/missing new/xf86-video-trident-1.3.0/missing
--- old/xf86-video-trident-1.2.3/missing 2006-11-03 17:34:06.000000000 +0100
+++ new/xf86-video-trident-1.3.0/missing 2008-03-19 20:40:55.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/blade_accel.c new/xf86-video-trident-1.3.0/src/blade_accel.c
--- old/xf86-video-trident-1.2.3/src/blade_accel.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/blade_accel.c 2008-03-19 20:40:10.000000000 +0100
@@ -23,7 +23,6 @@
*
* Trident Blade3D accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/blade_accel.c,v 1.21 2003/10/30 13:38:01 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/image_accel.c new/xf86-video-trident-1.3.0/src/image_accel.c
--- old/xf86-video-trident-1.2.3/src/image_accel.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/image_accel.c 2008-03-19 20:40:10.000000000 +0100
@@ -23,7 +23,6 @@
*
* Trident 3DImage' accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/image_accel.c,v 1.26 2003/10/30 13:38:01 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/Makefile.am new/xf86-video-trident-1.3.0/src/Makefile.am
--- old/xf86-video-trident-1.2.3/src/Makefile.am 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/Makefile.am 2008-03-19 20:41:41.000000000 +0100
@@ -39,8 +39,8 @@
trident_driver.c \
trident.h \
tridenthelper.c \
+ tridentpcirename.h \
trident_i2c.c \
- tridentramdac.c \
trident_regs.h \
trident_shadow.c \
trident_tv.c \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_accel.c new/xf86-video-trident-1.3.0/src/trident_accel.c
--- old/xf86-video-trident-1.2.3/src/trident_accel.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_accel.c 2008-03-19 20:40:10.000000000 +0100
@@ -23,7 +23,6 @@
*
* Trident accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_accel.c,v 1.28 2003/10/30 13:38:01 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_bank.c new/xf86-video-trident-1.3.0/src/trident_bank.c
--- old/xf86-video-trident-1.2.3/src/trident_bank.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_bank.c 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_bank.c,v 1.4 2000/12/07 16:48:04 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_dac.c new/xf86-video-trident-1.3.0/src/trident_dac.c
--- old/xf86-video-trident-1.2.3/src/trident_dac.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_dac.c 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dac.c,v 1.79 2003/11/03 05:11:42 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_dga.c new/xf86-video-trident-1.3.0/src/trident_dga.c
--- old/xf86-video-trident-1.2.3/src/trident_dga.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_dga.c 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane,
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_dga.c,v 1.4 2002/10/08 22:14:11 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_driver.c new/xf86-video-trident-1.3.0/src/trident_driver.c
--- old/xf86-video-trident-1.2.3/src/trident_driver.c 2006-11-03 17:32:04.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_driver.c 2008-03-19 20:40:10.000000000 +0100
@@ -28,7 +28,6 @@
* Massimiliano Ghilardi, max@Linuz.sns.it, some fixes to the
* clockchip programming code.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_driver.c,v 1.190 2004/01/21 22:31:54 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -115,9 +114,9 @@
#define TRIDENT_VERSION 4000
#define TRIDENT_NAME "TRIDENT"
#define TRIDENT_DRIVER_NAME "trident"
-#define TRIDENT_MAJOR_VERSION 1
-#define TRIDENT_MINOR_VERSION 2
-#define TRIDENT_PATCHLEVEL 3
+#define TRIDENT_MAJOR_VERSION PACKAGE_VERSION_MAJOR
+#define TRIDENT_MINOR_VERSION PACKAGE_VERSION_MINOR
+#define TRIDENT_PATCHLEVEL PACKAGE_VERSION_PATCHLEVEL
/*
* This contains the functions needed by the server after loading the driver
@@ -937,7 +936,12 @@
* All of the cards this driver supports are PCI, so the "probing" just
* amounts to checking the PCI data that the server has already collected.
*/
- if (xf86GetPciVideoInfo()) {
+#ifndef XSERVER_LIBPCIACCESS
+ if (xf86GetPciVideoInfo()== NULL) {
+ return FALSE;
+ }
+#endif
+ {
numUsed = xf86MatchPciInstances(TRIDENT_NAME, PCI_VENDOR_TRIDENT,
TRIDENTChipsets, TRIDENTPciChipsets, devSections,
numDevSections, drv, &usedChips);
@@ -1092,9 +1096,9 @@
/* This driver can handle ISA and PCI buses */
if (pTrident->pEnt->location.type == BUS_PCI) {
pTrident->PciInfo = xf86GetPciInfoForEntity(pTrident->pEnt->index);
- pTrident->PciTag = pciTag(pTrident->PciInfo->bus,
- pTrident->PciInfo->device,
- pTrident->PciInfo->func);
+#ifndef XSERVER_LIBPCIACCESS
+ pTrident->PciTag = PCI_DEV_TAG(pTrident->PciInfo);
+#endif
pTrident->Linear = TRUE;
} else {
pTrident->Linear = FALSE;
@@ -1491,7 +1495,7 @@
from = X_CONFIG;
} else {
if (IsPciCard)
- pTrident->FbAddress = pTrident->PciInfo->memBase[0]& 0xFFFFFFF0;
+ pTrident->FbAddress = PCI_REGION_BASE(pTrident->PciInfo, 0, REGION_MEM) & 0xFFFFFFF0;
else
pTrident->FbAddress = 0xA0000;
}
@@ -1510,7 +1514,7 @@
from = X_CONFIG;
} else {
if (IsPciCard)
- pTrident->IOAddress = pTrident->PciInfo->memBase[1]& 0xFFFFC000;
+ pTrident->IOAddress = PCI_REGION_BASE(pTrident->PciInfo, 1, REGION_MEM) & 0xFFFFC000;
else
/* FIXME - Multihead UNAWARE */
pTrident->IOAddress = 0xBF000;
@@ -1996,7 +2000,7 @@
pTrident->NewClockCode = TRUE;
pTrident->frequency = NTSC;
OUTB(0x3C4, 0x5D);
- if (pTrident->PciInfo->subsysVendor != 0x1023) {
+ if (PCI_SUB_VENDOR_ID(pTrident->PciInfo) != 0x1023) {
chipset = "CyberBladeXP";
pTrident->IsCyber = TRUE;
} else
@@ -2321,7 +2325,7 @@
clockRanges->maxClock = pTrident->MaxClock;
clockRanges->clockIndex = -1; /* programmable */
clockRanges->interlaceAllowed = TRUE;
- clockRanges->doubleScanAllowed = FALSE; /* XXX check this */
+ clockRanges->doubleScanAllowed = TRUE;
/*
* xf86ValidateModes will check that the mode HTotal and VTotal values
@@ -2542,12 +2546,32 @@
if (Is3Dchip) mapsize = 0x20000;
if (IsPciCard && UseMMIO)
+#ifndef XSERVER_LIBPCIACCESS
pTrident->IOBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pTrident->PciTag, pTrident->IOAddress, mapsize);
+#else
+ {
+ void **result = (void **)&pTrident->IOBase;
+ int err = pci_device_map_range(pTrident->PciInfo,
+ pTrident->IOAddress,
+ mapsize,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Unable to map IO aperture. %s (%d)\n",
+ strerror(err), err);
+ }
+ }
+#endif
else {
+#ifndef XSERVER_LIBPCIACCESS
pTrident->IOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO,
pTrident->PciTag, pTrident->IOAddress, 0x1000);
pTrident->IOBase += 0xF00;
+#else
+ return FALSE;
+#endif
}
if (pTrident->IOBase == NULL)
@@ -2555,11 +2579,28 @@
if (pTrident->Linear) {
if (pTrident->FbMapSize != 0) {
+#ifndef XSERVER_LIBPCIACCESS
pTrident->FbBase = xf86MapPciMem(pScrn->scrnIndex,
VIDMEM_FRAMEBUFFER,
pTrident->PciTag,
(unsigned long)pTrident->FbAddress,
pTrident->FbMapSize);
+#else
+ {
+ void **result = (void **)&pTrident->FbBase;
+ int err = pci_device_map_range(pTrident->PciInfo,
+ pTrident->FbAddress,
+ pTrident->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+ if (err) {
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+ "Unable to map VRAM aperture. %s (%d)\n",
+ strerror(err), err);
+ }
+ }
+#endif
if (pTrident->FbBase == NULL)
return FALSE;
}
@@ -2585,19 +2626,27 @@
/*
* Unmap IO registers to virtual address space
*/
- if (IsPciCard && UseMMIO)
+#ifdef XSERVER_LIBPCIACCESS
+ pci_device_unmap_range(pTrident->PciInfo, (pointer)pTrident->IOBase, mapsize);
+#else
+ if (IsPciCard && UseMMIO) {
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pTrident->IOBase, mapsize);
- else {
+ } else {
pTrident->IOBase -= 0xF00;
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pTrident->IOBase, 0x1000);
}
+#endif
pTrident->IOBase = NULL;
if (pTrident->Linear) {
if (pTrident->FbMapSize != 0) {
+#ifdef XSERVER_LIBPCIACCESS
+ pci_device_unmap_range(pTrident->PciInfo, (pointer)pTrident->FbBase, pTrident->FbMapSize);
+#else
xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pTrident->FbBase,
pTrident->FbMapSize);
- pTrident->FbBase = NULL;
+#endif
+ pTrident->FbBase = NULL;
}
}
@@ -2646,7 +2695,7 @@
TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
TRIDENTRegPtr tridentReg;
- WAITFORVSYNC;
+ if (!xf86IsPc98()) WAITFORVSYNC;
TridentFindClock(pScrn,mode->Clock);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident.h new/xf86-video-trident-1.3.0/src/trident.h
--- old/xf86-video-trident-1.2.3/src/trident.h 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident.h 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Authors: Alan Hourihane,
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident.h,v 1.59 2003/09/05 22:07:28 alanh Exp $ */
/*#define VBE_INFO*/
#ifndef _TRIDENT_H_
@@ -31,6 +30,8 @@
#include
#include
+#include "tridentpcirename.h"
+
#include "exa.h"
#include "xf86Cursor.h"
#include "xaa.h"
@@ -245,10 +246,6 @@
void TridentOutIndReg(ScrnInfoPtr pScrn,
CARD32 reg, unsigned char mask, unsigned char data);
unsigned char TridentInIndReg(ScrnInfoPtr pScrn, CARD32 reg);
-void TridentWriteAddress(ScrnInfoPtr pScrn, CARD32 index);
-void TridentReadAddress(ScrnInfoPtr pScrn, CARD32 index);
-void TridentWriteData(ScrnInfoPtr pScrn, unsigned char data);
-unsigned char TridentReadData(ScrnInfoPtr pScrn);
void TridentLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indicies, LOCO *colors, VisualPtr pVisual);
void TridentSetOverscan(ScrnInfoPtr pScrn, int overscan);
int TGUISetRead(ScreenPtr pScreen, int bank);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/tridenthelper.c new/xf86-video-trident-1.3.0/src/tridenthelper.c
--- old/xf86-video-trident-1.2.3/src/tridenthelper.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/tridenthelper.c 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridenthelper.c,v 1.20 2001/10/28 03:33:52 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_i2c.c new/xf86-video-trident-1.3.0/src/trident_i2c.c
--- old/xf86-video-trident-1.2.3/src/trident_i2c.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_i2c.c 2008-03-19 20:40:10.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_i2c.c,v 1.2 1999/01/23 09:55:59 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/tridentpcirename.h new/xf86-video-trident-1.3.0/src/tridentpcirename.h
--- old/xf86-video-trident-1.2.3/src/tridentpcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/tridentpcirename.h 2008-03-19 15:31:20.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef TRIDENTPCIRENAME_H
+#define TRIDENTPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* TRIDENTPCIRENAME_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/tridentramdac.c new/xf86-video-trident-1.3.0/src/tridentramdac.c
--- old/xf86-video-trident-1.2.3/src/tridentramdac.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/tridentramdac.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,70 +0,0 @@
-/*
- * Copyright 1992-2003 by Alan Hourihane, North Wales, UK.
- *
- * 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, and that the name of Alan Hourihane not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Alan Hourihane makes no representations
- * about the suitability of this software for any purpose. It is provided
- * "as is" without express or implied warranty.
- *
- * ALAN HOURIHANE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Alan Hourihane,
- *
- * TridentOutIndReg() and TridentInIndReg() are used to access
- * the indirect Trident RAMDAC registers only.
- */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tridentramdac.c,v 1.4 2000/12/07 16:48:06 alanh Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "xf86.h"
-#include "xf86_OSproc.h"
-
-#include "xf86PciInfo.h"
-#include "xf86Pci.h"
-
-#include "trident_regs.h"
-#include "trident.h"
-
-void
-TridentWriteAddress(ScrnInfoPtr pScrn, CARD32 index)
-{
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
- MMIO_OUTB(0x3C6, 0xFF);
- MMIO_OUTB(0x3C8, index);
-}
-
-void
-TridentWriteData(ScrnInfoPtr pScrn, unsigned char data)
-{
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
- MMIO_OUTB(0x3C9, data);
-}
-
-void
-TridentReadAddress(ScrnInfoPtr pScrn, CARD32 index)
-{
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
- MMIO_OUTB(0x3C6, 0xFF);
- MMIO_OUTB(0x3C7, index);
-}
-
-unsigned char
-TridentReadData(ScrnInfoPtr pScrn)
-{
- TRIDENTPtr pTrident = TRIDENTPTR(pScrn);
- return(MMIO_INB(0x3C9));
-}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_regs.h new/xf86-video-trident-1.3.0/src/trident_regs.h
--- old/xf86-video-trident-1.2.3/src/trident_regs.h 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_regs.h 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_regs.h,v 1.27 2003/09/05 22:07:29 alanh Exp $ */
#define DEBUG 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_shadow.c new/xf86-video-trident-1.3.0/src/trident_shadow.c
--- old/xf86-video-trident-1.2.3/src/trident_shadow.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_shadow.c 2008-03-19 20:40:10.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_shadow.c,v 1.2 2000/11/16 19:45:01 eich Exp $ */
/*
Copyright (c) 1999, 2000 The XFree86 Project Inc.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_tv.c new/xf86-video-trident-1.3.0/src/trident_tv.c
--- old/xf86-video-trident-1.2.3/src/trident_tv.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_tv.c 2008-03-19 20:40:10.000000000 +0100
@@ -2,7 +2,6 @@
* VIA TV additions
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_tv.c,v 1.1 2003/04/15 22:13:43 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/trident_video.c new/xf86-video-trident-1.3.0/src/trident_video.c
--- old/xf86-video-trident-1.2.3/src/trident_video.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/trident_video.c 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/trident_video.c,v 1.45 2003/11/10 18:22:34 tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -113,7 +112,7 @@
if (pTrident->Chipset == CYBER9397DVD ||
pTrident->Chipset == CYBER9525DVD ||
- pTrident->Chipset >= BLADE3D)
+ (pTrident->Chipset >= BLADE3D && pTrident->Chipset < CYBERBLADEXP4))
pTrident->videoFlags |= VID_DOUBLE_LINEBUFFER_FOR_WIDE_SRC;
newAdaptor = TRIDENTSetupImageVideo(pScreen);
@@ -261,6 +260,9 @@
OUTW(0x3C4, 0x007A);
OUTW(0x3C4, 0x007D);
}
+ if (pTrident->Chipset == CYBERBLADEXP4) {
+ OUTW(0x3CE, 0x0462);
+ }
switch (pScrn->depth) {
case 8:
VIDEOOUT(pPriv->colorKey, pTrident->keyOffset);
@@ -887,6 +889,13 @@
offset += top * dstPitch;
+ /* Fix video position when using doublescan */
+ if(pScrn->currentMode->Flags & V_DBLSCAN) {
+ dstBox.y1 <<= 1;
+ dstBox.y2 <<= 1;
+ drw_h <<= 1;
+ }
+
tridentFixFrame(pScrn,&pPriv->fixFrame);
TRIDENTDisplayVideo(pScrn, id, offset, width, height, dstPitch,
x1, y1, x2, y2, &dstBox, src_w, src_h, drw_w, drw_h);
@@ -1303,12 +1312,16 @@
case CYBERBLADEE4:
pTrident->hsync -= 8;
break;
+ case CYBERBLADEXP4:
+ pTrident->hsync -= 24;
+ pTrident->hsync_rskew = -1;
+ break;
case CYBER9397:
pTrident->hsync -= 1;
pTrident->vsync -= 0;
pTrident->vsync_bskew = 0;
break;
- case CYBER9397DVD:
+ case CYBER9397DVD:
pTrident->hsync_rskew = -1;
pTrident->vsync_bskew = -1;
break;
@@ -1330,6 +1343,8 @@
* full vblank has passed.
* - Alan.
*/
- WAITFORVSYNC;
- WAITFORVSYNC;
+ if (!xf86IsPc98()) {
+ WAITFORVSYNC;
+ WAITFORVSYNC;
+ }
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/tvga_dac.c new/xf86-video-trident-1.3.0/src/tvga_dac.c
--- old/xf86-video-trident-1.2.3/src/tvga_dac.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/tvga_dac.c 2008-03-19 20:40:10.000000000 +0100
@@ -21,7 +21,6 @@
*
* Author: Alan Hourihane, alanh@fairlite.demon.co.uk
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/tvga_dac.c,v 1.7tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/xp4_accel.c new/xf86-video-trident-1.3.0/src/xp4_accel.c
--- old/xf86-video-trident-1.2.3/src/xp4_accel.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/xp4_accel.c 2008-03-19 20:40:10.000000000 +0100
@@ -23,7 +23,6 @@
*
* CyberBladeXP4 accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/xp_accel.c,v 1.8tsi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-trident-1.2.3/src/xp_accel.c new/xf86-video-trident-1.3.0/src/xp_accel.c
--- old/xf86-video-trident-1.2.3/src/xp_accel.c 2006-11-03 17:31:54.000000000 +0100
+++ new/xf86-video-trident-1.3.0/src/xp_accel.c 2008-03-19 20:40:10.000000000 +0100
@@ -23,7 +23,6 @@
*
* BladeXP accelerated options.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/trident/xp_accel.c,v 1.6 2003/10/30 13:38:02 alanh Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
++++++ xf86-video-tseng-1.1.1.tar.bz2 -> xf86-video-tseng-1.2.0.tar.bz2 ++++++
++++ 21565 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/config.h.in new/xf86-video-tseng-1.2.0/config.h.in
--- old/xf86-video-tseng-1.1.1/config.h.in 2006-10-14 00:46:56.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/config.h.in 2008-03-19 21:03:52.000000000 +0100
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
@@ -50,6 +56,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/configure.ac new/xf86-video-tseng-1.2.0/configure.ac
--- old/xf86-video-tseng-1.1.1/configure.ac 2006-10-14 00:46:36.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/configure.ac 2008-03-19 21:03:05.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-tseng],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-tseng)
@@ -62,6 +62,20 @@
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
# Checks for header files.
AC_HEADER_STDC
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/man/Makefile.am new/xf86-video-tseng-1.2.0/man/Makefile.am
--- old/xf86-video-tseng-1.1.1/man/Makefile.am 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/man/Makefile.am 2008-03-19 15:31:22.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/man/tseng.man new/xf86-video-tseng-1.2.0/man/tseng.man
--- old/xf86-video-tseng-1.1.1/man/tseng.man 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/man/tseng.man 2008-03-19 15:31:22.000000000 +0100
@@ -14,17 +14,17 @@
.fi
.SH DESCRIPTION
.B tseng
-is an XFree86 driver for Tseng Labs video cards.
+is an __xservername__ driver for Tseng Labs video cards.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B tseng
driver supports...
.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.
.SH "SEE ALSO"
-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/missing new/xf86-video-tseng-1.2.0/missing
--- old/xf86-video-tseng-1.1.1/missing 2006-10-14 00:15:15.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/missing 2008-03-19 20:48:11.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/Makefile.am new/xf86-video-tseng-1.2.0/src/Makefile.am
--- old/xf86-video-tseng-1.1.1/src/Makefile.am 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/src/Makefile.am 2008-03-19 20:49:02.000000000 +0100
@@ -35,4 +35,5 @@
tseng_dga.c \
tseng_driver.c \
tseng.h \
- tseng_mode.c
+ tseng_mode.c \
+ tseng_pcirename.h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/tseng_accel.c new/xf86-video-tseng-1.2.0/src/tseng_accel.c
--- old/xf86-video-tseng-1.1.1/src/tseng_accel.c 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/src/tseng_accel.c 2008-03-19 20:45:11.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_accel.c,v 1.29 1999/06/12 07:18:57 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/tseng_cursor.c new/xf86-video-tseng-1.2.0/src/tseng_cursor.c
--- old/xf86-video-tseng-1.1.1/src/tseng_cursor.c 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/src/tseng_cursor.c 2008-03-19 20:45:11.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_cursor.c,v 1.16 2000/09/19 12:46:19 eich Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/tseng_dga.c new/xf86-video-tseng-1.2.0/src/tseng_dga.c
--- old/xf86-video-tseng-1.1.1/src/tseng_dga.c 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/src/tseng_dga.c 2008-03-19 20:45:11.000000000 +0100
@@ -1,4 +1,3 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_dga.c,v 1.1 2000/12/06 15:35:24 eich Exp $ */
/*
* Copyright 2000 by Rainer Keller, .
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/tseng_driver.c new/xf86-video-tseng-1.2.0/src/tseng_driver.c
--- old/xf86-video-tseng-1.1.1/src/tseng_driver.c 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/src/tseng_driver.c 2008-03-19 20:45:11.000000000 +0100
@@ -1,5 +1,4 @@
/*
- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng_driver.c,v 1.97tsi Exp $
*
* Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany.
*
@@ -26,7 +25,6 @@
*
* Large parts rewritten for XFree86 4.0 by Koen Gadeyne.
*/
-/* $XConsortium: et4_driver.c /main/27 1996/10/28 04:48:15 kaleb $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -417,9 +415,11 @@
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
/* PCI only driver now. */
if (!xf86GetPciVideoInfo())
return FALSE;
+#endif
/* XXX maybe this can go some time soon */
/*
@@ -476,7 +476,7 @@
/* Set up ChipType, ChipRev and pScrn->chipset.
* This last one is usually not done manually, but
* it's for informative use only anyway. */
- switch (pTseng->PciInfo->chipType) {
+ switch (PCI_DEV_DEVICE_ID(pTseng->PciInfo)) {
case PCI_CHIP_ET4000_W32P_A:
pTseng->ChipType = ET4000;
pTseng->ChipRev = REV_A;
@@ -500,7 +500,7 @@
case PCI_CHIP_ET6000:
pTseng->ChipType = ET6000;
- if (pTseng->PciInfo->chipRev < 0x70) {
+ if (PCI_DEV_REVISION(pTseng->PciInfo) < 0x70) {
pScrn->chipset = "ET6000";
pTseng->ChipRev = REV_ET6000;
} else {
@@ -510,24 +510,26 @@
break;
default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unknown Tseng PCI ID: %X\n",
- pTseng->PciInfo->chipType);
+ PCI_DEV_DEVICE_ID(pTseng->PciInfo));
return FALSE;
}
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Chipset: \"%s\"\n", pScrn->chipset);
+#ifndef XSERVER_LIBPCIACCESS
pTseng->PciTag = pciTag(pTseng->PciInfo->bus, pTseng->PciInfo->device,
pTseng->PciInfo->func);
+#endif
/* only the ET6000 implements a PCI IO address */
if (pTseng->ChipType == ET6000) {
- if (!pTseng->PciInfo->ioBase[1]) {
+ if (!PCI_REGION_BASE(pTseng->PciInfo, 1, REGION_IO)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"No valid PCI I/O address in PCI config space\n");
return FALSE;
}
- pTseng->ET6000IOAddress = pTseng->PciInfo->ioBase[1];
+ pTseng->ET6000IOAddress = PCI_REGION_BASE(pTseng->PciInfo, 1, REGION_IO);
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "ET6000 PCI I/O registers at 0x%lX\n",
(unsigned long)pTseng->ET6000IOAddress);
@@ -942,12 +944,12 @@
PDEBUG(" TsengGetFbAddress\n");
/* base0 is the framebuffer and base1 is the PCI IO space. */
- if (!pTseng->PciInfo->memBase[0]) {
+ if (PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"No valid Framebuffer address in PCI config space;\n");
return FALSE;
} else
- pTseng->FbAddress = pTseng->PciInfo->memBase[0];
+ pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM);
if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) {
@@ -1680,10 +1682,25 @@
return FALSE;
}
+#ifndef XSERVER_LIBPCIACCESS
pTseng->FbBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER,
pTseng->PciTag,
(unsigned long)pTseng->FbAddress,
pTseng->FbMapSize);
+#else
+ {
+ void** result = (void**)&pTseng->FbBase;
+ int err = pci_device_map_range(pTseng->PciInfo,
+ pTseng->FbAddress,
+ pTseng->FbMapSize,
+ PCI_DEV_MAP_FLAG_WRITABLE |
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+
+ if (err)
+ return FALSE;
+ }
+#endif
if (pTseng->FbBase == NULL) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Could not mmap linear video memory.\n");
@@ -1692,10 +1709,14 @@
/* need some sanity here */
if (pTseng->UseAccel) {
+#ifndef XSERVER_LIBPCIACCESS
pTseng->MMioBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO,
pTseng->PciTag,
(unsigned long)pTseng->FbAddress,
pTseng->FbMapSize);
+#else
+ pTseng->MMioBase = pTseng->FbBase;
+#endif
if (!pTseng->MMioBase) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Could not mmap mmio memory.\n");
@@ -1717,7 +1738,11 @@
PDEBUG(" TsengUnmapMem\n");
+#ifndef XSERVER_LIBPCIACCESS
xf86UnMapVidMem(pScrn->scrnIndex, (pointer) pTseng->FbBase, pTseng->FbMapSize);
+#else
+ pci_device_unmap_range(pTseng->PciInfo, pTseng->FbBase, pTseng->FbMapSize);
+#endif
vgaHWUnmapMem(pScrn);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/tseng.h new/xf86-video-tseng-1.2.0/src/tseng.h
--- old/xf86-video-tseng-1.1.1/src/tseng.h 2006-10-12 00:28:31.000000000 +0200
+++ new/xf86-video-tseng-1.2.0/src/tseng.h 2008-03-19 21:01:54.000000000 +0100
@@ -1,9 +1,9 @@
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tseng/tseng.h,v 1.37tsi Exp $ */
-
#ifndef _TSENG_H
#define _TSENG_H
+#include "config.h"
+
+#include "tseng_pcirename.h"
#include
/* All drivers should typically include these */
@@ -35,8 +35,12 @@
#include "micmap.h"
/* Needed for the 1 and 4 bpp framebuffers */
+#ifdef HAVE_XF1BPP
#include "xf1bpp.h"
+#endif
+#ifdef HAVE_XF4BPP
#include "xf4bpp.h"
+#endif
#include "fb.h"
/* Drivers using the XAA interface ... */
@@ -106,7 +110,9 @@
unsigned char *BresenhamTable;
/* normal stuff starts here */
pciVideoPtr PciInfo;
+#ifndef XSERVER_LIBPCIACCESS
PCITAG PciTag;
+#endif
Bool UsePCIRetry; /* Do we use PCI-retry or busy-waiting */
Bool UseAccel; /* Do we use the XAA acceleration architecture */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-tseng-1.1.1/src/tseng_pcirename.h new/xf86-video-tseng-1.2.0/src/tseng_pcirename.h
--- old/xf86-video-tseng-1.1.1/src/tseng_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-tseng-1.2.0/src/tseng_pcirename.h 2008-03-19 15:31:22.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef CIRPCIRENAME_H
+#define CIRPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* CIRPCIRENAME_H */
++++++ xf86-video-v4l-X11R7.1-0.1.1.tar.bz2 -> xf86-video-v4l-0.2.0.tar.bz2 ++++++
++++ 20811 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/config.h.in new/xf86-video-v4l-0.2.0/config.h.in
--- old/xf86-video-v4l-X11R7.1-0.1.1/config.h.in 2006-05-23 05:53:53.000000000 +0200
+++ new/xf86-video-v4l-0.2.0/config.h.in 2008-03-19 21:42:56.000000000 +0100
@@ -50,6 +50,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/configure.ac new/xf86-video-v4l-0.2.0/configure.ac
--- old/xf86-video-v4l-X11R7.1-0.1.1/configure.ac 2006-04-08 03:52:08.000000000 +0200
+++ new/xf86-video-v4l-0.2.0/configure.ac 2008-03-19 21:42:34.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-v4l],
- 0.1.1,
+ 0.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-v4l)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/man/Makefile.am new/xf86-video-v4l-0.2.0/man/Makefile.am
--- old/xf86-video-v4l-X11R7.1-0.1.1/man/Makefile.am 2005-12-06 23:48:40.000000000 +0100
+++ new/xf86-video-v4l-0.2.0/man/Makefile.am 2008-03-19 15:31:23.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id: Makefile.am,v 1.5 2005/11/28 22:04:14 alanc Exp $
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/man/v4l.man new/xf86-video-v4l-0.2.0/man/v4l.man
--- old/xf86-video-v4l-X11R7.1-0.1.1/man/v4l.man 2005-12-19 10:07:50.000000000 +0100
+++ new/xf86-video-v4l-0.2.0/man/v4l.man 2008-03-19 15:31:23.000000000 +0100
@@ -18,7 +18,7 @@
list within the module section of your __xconfigfile__ file if you want
to use it. There are no config options.
.P
-Note that the the extmod module is also required for the Xvideo
+Note that the extmod module is also required for the Xvideo
support (and lots of other extensions too).
.SH SUPPORTED HARDWARE
The
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/missing new/xf86-video-v4l-0.2.0/missing
--- old/xf86-video-v4l-X11R7.1-0.1.1/missing 2006-05-23 05:53:55.000000000 +0200
+++ new/xf86-video-v4l-0.2.0/missing 2008-03-19 21:42:57.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/README new/xf86-video-v4l-0.2.0/README
--- old/xf86-video-v4l-X11R7.1-0.1.1/README 2004-04-23 21:52:24.000000000 +0200
+++ new/xf86-video-v4l-0.2.0/README 2008-03-19 15:31:23.000000000 +0100
@@ -34,4 +34,4 @@
-$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.1 1999/03/28 15:32:50 dawes Exp $
+$XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/README,v 1.2 2001/05/07 21:59:07 tsi Exp $
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/src/v4l.c new/xf86-video-v4l-0.2.0/src/v4l.c
--- old/xf86-video-v4l-X11R7.1-0.1.1/src/v4l.c 2006-04-08 03:52:08.000000000 +0200
+++ new/xf86-video-v4l-0.2.0/src/v4l.c 2008-03-19 21:41:45.000000000 +0100
@@ -2,7 +2,6 @@
* video4linux Xv Driver
* based on Michael Schimek's permedia 2 driver.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/v4l.c,v 1.33 2003/12/05 03:55:32 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -593,7 +592,8 @@
if (-1 == ioctl(V4L_FD,VIDIOCSAUDIO,&pPPriv->audio))
perror("ioctl VIDIOCSAUDIO");
} else if (attribute == xvFreq) {
- if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&value))
+ unsigned long freq = value;
+ if (-1 == ioctl(V4L_FD,VIDIOCSFREQ,&freq))
perror("ioctl VIDIOCSFREQ");
} else if (0 != pPPriv->yuv_format &&
pPPriv->myfmt->setAttribute) {
@@ -645,7 +645,9 @@
ret = BadValue;
}
} else if (attribute == xvFreq) {
- ioctl(V4L_FD,VIDIOCGFREQ,value);
+ unsigned long freq;
+ ioctl(V4L_FD,VIDIOCGFREQ,&freq);
+ *value = freq;
} else if (0 != pPPriv->yuv_format &&
pPPriv->myfmt->getAttribute) {
/* not mine -> pass to yuv scaler driver */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-v4l-X11R7.1-0.1.1/src/videodev.h new/xf86-video-v4l-0.2.0/src/videodev.h
--- old/xf86-video-v4l-X11R7.1-0.1.1/src/videodev.h 2005-04-20 14:25:32.000000000 +0200
+++ new/xf86-video-v4l-0.2.0/src/videodev.h 2008-03-19 21:14:52.000000000 +0100
@@ -7,7 +7,6 @@
* Used here with the explicit permission of the original author, Alan Cox.
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/v4l/videodev.h,v 1.7tsi Exp $ */
#include
++++++ xf86-video-vmware-10.15.2.tar.bz2 -> xf86-video-vmware-10.16.0.tar.bz2 ++++++
++++ 6396 lines of diff (skipped)
++++++ xf86-video-voodoo-1.1.1.tar.bz2 -> xf86-video-voodoo-1.2.0.tar.bz2 ++++++
++++ 21426 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/config.h.in new/xf86-video-voodoo-1.2.0/config.h.in
--- old/xf86-video-voodoo-1.1.1/config.h.in 2006-10-14 00:51:08.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/config.h.in 2008-03-19 22:08:04.000000000 +0100
@@ -32,6 +32,12 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Have 1bpp support */
+#undef HAVE_XF1BPP
+
+/* Have 4bpp support */
+#undef HAVE_XF4BPP
+
/* Name of package */
#undef PACKAGE
@@ -50,6 +56,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/configure.ac new/xf86-video-voodoo-1.2.0/configure.ac
--- old/xf86-video-voodoo-1.1.1/configure.ac 2006-10-14 00:50:50.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/configure.ac 2008-03-19 22:07:36.000000000 +0100
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-voodoo],
- 1.1.1,
+ 1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-voodoo)
@@ -59,6 +59,21 @@
# Checks for libraries.
# Checks for header files.
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
+AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ [XSERVER_LIBPCIACCESS=yes],[XSERVER_LIBPCIACCESS=no],
+ [#include "xorg-server.h"])
+AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
+AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
+CPPFLAGS="$SAVE_CPPFLAGS"
+
+if test "x$XSERVER_LIBPCIACCESS" = xyes; then
+ PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+ XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
+fi
+AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
+
AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/man/Makefile.am new/xf86-video-voodoo-1.2.0/man/Makefile.am
--- old/xf86-video-voodoo-1.1.1/man/Makefile.am 2006-10-12 00:28:56.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/man/Makefile.am 2008-03-19 15:31:33.000000000 +0100
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/man/voodoo.man new/xf86-video-voodoo-1.2.0/man/voodoo.man
--- old/xf86-video-voodoo-1.1.1/man/voodoo.man 2006-10-12 00:28:56.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/man/voodoo.man 2008-03-19 15:31:33.000000000 +0100
@@ -14,7 +14,7 @@
.fi
.SH DESCRIPTION
.B voodoo
-is an XFree86 driver for Voodoo 1 and Voodoo 2 series video adapters.
+is an __xservername__ driver for Voodoo 1 and Voodoo 2 series video adapters.
On the Voodoo 1 the driver uses a shadow buffer in system memory as
the video adapter has only 3D acceleration. Selected portions of the shadow
framebuffer are copied out to the Voodoo board at the right time. Because
@@ -67,6 +67,6 @@
sstfb frame buffer driver as there is insufficient information to restore
the chip to its previous state.
.SH "SEE ALSO"
-XFree86(1), __xconfigfile__(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__)
+__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
.SH AUTHORS
Authors: Alan Cox, Ghozlane Toumi, Henrik Harmsen.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/missing new/xf86-video-voodoo-1.2.0/missing
--- old/xf86-video-voodoo-1.1.1/missing 2006-10-14 00:17:20.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/missing 2008-03-19 22:04:56.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/src/Makefile.am new/xf86-video-voodoo-1.2.0/src/Makefile.am
--- old/xf86-video-voodoo-1.1.1/src/Makefile.am 2006-10-12 00:28:56.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/src/Makefile.am 2008-03-19 22:05:40.000000000 +0100
@@ -32,4 +32,5 @@
voodoo_dga.c \
voodoo_driver.c \
voodoo.h \
+ voodoo_pcirename.h \
voodoo_hardware.c
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/src/voodoo_driver.c new/xf86-video-voodoo-1.2.0/src/voodoo_driver.c
--- old/xf86-video-voodoo-1.1.1/src/voodoo_driver.c 2006-10-12 00:28:56.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/src/voodoo_driver.c 2008-03-19 22:07:12.000000000 +0100
@@ -39,7 +39,6 @@
* ANY KIND OR FORM.
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/voodoo/voodoo_driver.c,v 1.27 2001/08/07 07:04:46 keithp Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -265,7 +264,10 @@
}
/* PCI BUS */
- if (xf86GetPciVideoInfo() ) {
+#ifndef XSERVER_LIBPCIACCESS
+ if (xf86GetPciVideoInfo() )
+#endif
+ {
numUsed = xf86MatchPciInstances(VOODOO_NAME, PCI_VENDOR_3DFX,
VoodooChipsets, VoodooPCIChipsets,
devSections,numDevSections,
@@ -400,8 +402,9 @@
pVoo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
pVoo->PciInfo = xf86GetPciInfoForEntity(pVoo->pEnt->index);
+#ifndef XSERVER_LIBPCIACCESS
pVoo->PciTag = pciTag(pVoo->PciInfo->bus, pVoo->PciInfo->device, pVoo->PciInfo->func);
-
+#endif
/* Collect all of the relevant option flags (fill in pScrn->options) */
xf86CollectOptions(pScrn, NULL);
@@ -446,13 +449,38 @@
}
/* MMIO at 0 , FB at 4Mb, Texture at 8Mb */
+ pVoo->PhysBase = PCI_REGION_BASE(pVoo->PciInfo, 0, REGION_MEM) + 0x400000;
+
+#ifndef XSERVER_LIBPCIACCESS
pVoo->MMIO = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pVoo->PciTag,
- pVoo->PciInfo->memBase[0], 0x400000);
+ pVoo->PciInfo->memBase[0], 0x400000);
pVoo->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_MMIO, pVoo->PciTag,
- pVoo->PciInfo->memBase[0] + 0x400000, 0x400000);
-
- pVoo->PhysBase = pVoo->PciInfo->memBase[0] + 0x400000;
+ pVoo->PciInfo->memBase[0] + 0x400000, 0x400000);
+#else
+ {
+ void** result = (void**)&pVoo->MMIO;
+ int err = pci_device_map_range(pVoo->PciInfo,
+ PCI_REGION_BASE(pVoo->PciInfo, 0, REGION_MEM),
+ 0x400000,
+ PCI_DEV_MAP_FLAG_WRITABLE,
+ result);
+ if (err)
+ return FALSE;
+ }
+
+ {
+ void** result = (void**)&pVoo->FBBase;
+ int err = pci_device_map_range(pVoo->PciInfo,
+ PCI_REGION_BASE(pVoo->PciInfo, 0, REGION_MEM) + 0x400000,
+ 0x400000,
+ PCI_DEV_MAP_FLAG_WRITABLE|
+ PCI_DEV_MAP_FLAG_WRITE_COMBINE,
+ result);
+ if (err)
+ return FALSE;
+ }
+#endif
VoodooHardwareInit(pVoo);
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/src/voodoo.h new/xf86-video-voodoo-1.2.0/src/voodoo.h
--- old/xf86-video-voodoo-1.1.1/src/voodoo.h 2006-10-12 00:28:56.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/src/voodoo.h 2008-03-19 15:31:33.000000000 +0100
@@ -1,3 +1,4 @@
+#include "voodoo_pcirename.h"
#include
typedef struct {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/src/voodoo_hardware.c new/xf86-video-voodoo-1.2.0/src/voodoo_hardware.c
--- old/xf86-video-voodoo-1.1.1/src/voodoo_hardware.c 2006-10-12 00:28:56.000000000 +0200
+++ new/xf86-video-voodoo-1.2.0/src/voodoo_hardware.c 2008-03-19 15:31:33.000000000 +0100
@@ -145,12 +145,13 @@
static void pci_enable(VoodooPtr pVoo, int wr, int dac, int fifo)
{
- CARD32 x = pciReadLong(pVoo->PciTag, 0x40);
+ CARD32 x;
+ PCI_READ_LONG(pVoo->PciInfo, &x, 0x40);
x &= ~7;
x |= wr;
x |= fifo<<1;
x |= dac<<2;
- pciWriteLong(pVoo->PciTag, 0x40, x);
+ PCI_WRITE_LONG(pVoo->PciInfo, x, 0x40);
}
/*
@@ -160,9 +161,9 @@
static void vclock_enable(VoodooPtr pVoo, int enable)
{
if(enable)
- pciWriteLong(pVoo->PciTag, 0xC0, 0);
+ PCI_WRITE_LONG(pVoo->PciInfo, 0, 0xc0);
else
- pciWriteLong(pVoo->PciTag, 0xE0, 0);
+ PCI_WRITE_LONG(pVoo->PciInfo, 0, 0xe0);
}
/*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-voodoo-1.1.1/src/voodoo_pcirename.h new/xf86-video-voodoo-1.2.0/src/voodoo_pcirename.h
--- old/xf86-video-voodoo-1.1.1/src/voodoo_pcirename.h 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-voodoo-1.2.0/src/voodoo_pcirename.h 2008-03-19 15:31:33.000000000 +0100
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2007 George Sapountzis
+ *
+ * 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
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ */
+
+/**
+ * Macros for porting drivers from legacy xfree86 PCI code to the pciaccess
+ * library. The main purpose being to facilitate source code compatibility.
+ */
+
+#ifndef TRIDENTPCIRENAME_H
+#define TRIDENTPCIRENAME_H
+
+enum region_type {
+ REGION_MEM,
+ REGION_IO
+};
+
+#ifndef XSERVER_LIBPCIACCESS
+
+/* pciVideoPtr */
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->chipType)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->chipRev)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subsysVendor)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subsysCard)
+
+#define PCI_DEV_TAG(_pcidev) pciTag((_pcidev)->bus, \
+ (_pcidev)->device, \
+ (_pcidev)->func)
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->device)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pciConfigPtr */
+#define PCI_CFG_TAG(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->tag)
+#define PCI_CFG_BUS(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->busnum)
+#define PCI_CFG_DEV(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->devnum)
+#define PCI_CFG_FUNC(_pcidev) (((pciConfigPtr)(_pcidev)->thisCard)->funcnum)
+
+/* region addr: xfree86 uses different fields for memory regions and I/O ports */
+#define PCI_REGION_BASE(_pcidev, _b, _type) \
+ (((_type) == REGION_MEM) ? (_pcidev)->memBase[(_b)] \
+ : (_pcidev)->ioBase[(_b)])
+
+/* region size: xfree86 uses the log2 of the region size,
+ * but with zero meaning no region, not size of one XXX */
+#define PCI_REGION_SIZE(_pcidev, _b) \
+ (((_pcidev)->size[(_b)] > 0) ? (1 << (_pcidev)->size[(_b)]) : 0)
+
+/* read/write PCI configuration space */
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadByte(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ *(_value_ptr) = pciReadLong(PCI_CFG_TAG(_pcidev), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pciWriteLong(PCI_CFG_TAG(_pcidev), (_offset), (_value))
+
+#else /* XSERVER_LIBPCIACCESS */
+
+typedef struct pci_device *pciVideoPtr;
+
+#define PCI_DEV_VENDOR_ID(_pcidev) ((_pcidev)->vendor_id)
+#define PCI_DEV_DEVICE_ID(_pcidev) ((_pcidev)->device_id)
+#define PCI_DEV_REVISION(_pcidev) ((_pcidev)->revision)
+
+#define PCI_SUB_VENDOR_ID(_pcidev) ((_pcidev)->subvendor_id)
+#define PCI_SUB_DEVICE_ID(_pcidev) ((_pcidev)->subdevice_id)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_DEV_TAG(_pcidev) (_pcidev)
+
+/* PCI_DEV macros, typically used in printf's, add domain ? XXX */
+#define PCI_DEV_BUS(_pcidev) ((_pcidev)->bus)
+#define PCI_DEV_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_DEV_FUNC(_pcidev) ((_pcidev)->func)
+
+/* pci-rework functions take a 'pci_device' parameter instead of a tag */
+#define PCI_CFG_TAG(_pcidev) (_pcidev)
+
+/* PCI_CFG macros, typically used in DRI init, contain the domain */
+#define PCI_CFG_BUS(_pcidev) (((_pcidev)->domain << 8) | \
+ (_pcidev)->bus)
+#define PCI_CFG_DEV(_pcidev) ((_pcidev)->dev)
+#define PCI_CFG_FUNC(_pcidev) ((_pcidev)->func)
+
+#define PCI_REGION_BASE(_pcidev, _b, _type) ((_pcidev)->regions[(_b)].base_addr)
+#define PCI_REGION_SIZE(_pcidev, _b) ((_pcidev)->regions[(_b)].size)
+
+#define PCI_READ_BYTE(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u8((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_READ_LONG(_pcidev, _value_ptr, _offset) \
+ pci_device_cfg_read_u32((_pcidev), (_value_ptr), (_offset))
+
+#define PCI_WRITE_LONG(_pcidev, _value, _offset) \
+ pci_device_cfg_write_u32((_pcidev), (_value), (_offset))
+
+#endif /* XSERVER_LIBPCIACCESS */
+
+#endif /* TRIDENTPCIRENAME_H */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org