xserver-xorg-video-s3virge: Changes to 'debian-unstable'
.gitignore | 70 ++++++++++-
COPYING | 64 +++++++++-
ChangeLog | 289 ++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 17 +-
README | 200 ++++++++++++++-------------------
README.sgml | 61 ----------
TODO | 326 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
TODO_NOTES | 326 -------------------------------------------------------
configure.ac | 49 +++-----
debian/changelog | 8 +
debian/copyright | 37 ++++++
man/.cvsignore | 2
man/Makefile.am | 59 +++------
src/.cvsignore | 6 -
src/s3v.h | 3
src/s3v_accel.c | 2
src/s3v_dga.c | 7 -
src/s3v_driver.c | 57 +++++----
src/s3v_hwcurs.c | 1
src/s3v_i2c.c | 1
src/s3v_pciids.h | 18 +++
src/s3v_shadow.c | 1
src/s3v_xv.c | 13 +-
23 files changed, 988 insertions(+), 629 deletions(-)
New commits:
commit a6d5f33bd9223aadedf3527d6c10b17cc2df7377
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon May 7 03:11:21 2012 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index bc12893..43cd2a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xserver-xorg-video-s3virge (1:1.10.4-5) UNRELEASED; urgency=low
+xserver-xorg-video-s3virge (1:1.10.4-5) unstable; urgency=low
* Merge upstream master branch up to 1a17d10a41 to fix the FTBFS
against X server 1.12.
* Update debian/copyright from upstream COPYING.
- -- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 03:07:41 +0200
+ -- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 03:11:18 +0200
xserver-xorg-video-s3virge (1:1.10.4-4) unstable; urgency=low
commit 70e1adb2a89b26bd1bcda40706dcd985d20aecee
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon May 7 03:09:25 2012 +0200
Update debian/copyright from upstream COPYING.
diff --git a/debian/changelog b/debian/changelog
index 32d7811..bc12893 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-video-s3virge (1:1.10.4-5) UNRELEASED; urgency=low
* Merge upstream master branch up to 1a17d10a41 to fix the FTBFS
against X server 1.12.
+ * Update debian/copyright from upstream COPYING.
-- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 03:07:41 +0200
diff --git a/debian/copyright b/debian/copyright
index 23c2aea..3898f30 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,3 +23,40 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Except as contained in this notice, the name of the XFree86 Project shall not
be used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the XFree86 Project.
+
+Written by Jake Richter Copyright (c) 1989, 1990 Panacea Inc., Londonderry,
+NH - All Rights Reserved
+
+This code may be freely incorporated in any program without royalty, as long
+as the copyright notice stays intact.
+
+Additions by Kevin E. Martin (martin@cs.unc.edu)
+
+KEVIN E. MARTIN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+EVENT SHALL KEVIN E. MARTIN 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.
+
+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.
commit b15bc43e10c2bb2ff6d78ea1d69553cdefe01be1
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon May 7 03:08:26 2012 +0200
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 1b95335..6899a3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,292 @@
+commit 1a17d10a4130e7ccff1d9ae07c44200d0520445c
+Author: Tormod Volden <debian.tormod@gmail.com>
+Date: Sun Jan 8 11:34:35 2012 +0100
+
+ Do not use deprecated xf86PciInfo.h
+
+ Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+
+commit 5f0d2a32a81895ba0bf565de096cbdc8bca46c9e
+Author: Tormod Volden <debian.tormod@gmail.com>
+Date: Mon Dec 26 18:04:11 2011 +0100
+
+ Replace deprecated x(c/re)alloc/xfree with m/c/realloc/free
+
+ sed -i 's/xalloc/malloc/g; s/xcalloc/calloc/g; s/xrealloc/realloc/g;
+ s/xfree(/free(/g'
+
+ Also added a missing unistd.h include for usleep().
+
+ Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+ Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit c6282487c4fc0f1180845292b425a241920af332
+Author: Tormod Volden <debian.tormod@gmail.com>
+Date: Thu Dec 29 18:06:25 2011 +0000
+
+ Add missing VERBLEV argument to xf86DrvMsgVerb()
+
+ Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
+commit 6085552878aaeeb4aede096b88aeb153ef73cd5d
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:20:00 2011 -0500
+
+ Fix for new vgahw ABI
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 6a26a16af1495cb13969ae7596bdf2bce16eec28
+Author: Adam Jackson <ajax@redhat.com>
+Date: Mon Dec 19 17:19:07 2011 -0500
+
+ Fall back to shadowfb if XAA is unavailable
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 729e379f277ae94d4b1ae2d6bab46dceec9b30b1
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Nov 17 15:53:28 2011 -0500
+
+ Check ABI major not encoded ABI
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit 92b4671ca75022a56ad9e85b347f81c12157c98f
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed Nov 16 14:58:29 2011 -0500
+
+ Adapt to missing PIOOffset in videoabi 12
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit a568407e74082cd2304b95e0abee083a03ad62b8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:49:04 2010 -0400
+
+ config: add comments for main statements
+
+commit be262ccedd5910043be246efecc8a7a8157fce21
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 16:07:00 2010 -0400
+
+ config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit e34f4157ba908b88f4f5054bfc77bbf42af1da10
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:37:41 2010 -0400
+
+ config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ae2a791deceebaaf7a9ae47dc000f020491db2db
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 14:05:23 2010 -0400
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1f0ca885cf47ecda982bffbdf25c43fe26aaac12
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Jul 21 09:27:42 2010 -0400
+
+ config: complete AC_INIT m4 quoting
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 1ddfe984facffac47101ff6d9c2d337ee911ab1e
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 21:44:58 2010 -0400
+
+ config: remove unrequired AC_SUBST([XORG_CFLAGS])
+
+ This macro is called by PKG_CHECK_MODULES
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 920f72d71a2d01e101ec06d28c4ec11d647f38b6
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 20:24:42 2010 -0400
+
+ config: remove unrequired AC_HEADER_STDC
+
+ Autoconf says:
+ "This macro is obsolescent, as current systems have conforming
+ header files. New programs need not use this macro".
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit d409944a7265872abd3520c4486ec172d80b43c2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 19:41:31 2010 -0400
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 900ba15ae2ef047d4e8f515ce166a11e44ce4de4
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 18:45:19 2010 -0400
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a72398e11a357055042332bb411f96f97c4155c2
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Jul 20 16:15:29 2010 -0400
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+commit f0ae83f0ae2a719f3da189b33c3a99c1d4249866
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Jun 14 07:46:40 2010 -0400
+
+ README: keep the text version of README, discard the sgml version
+
+ The linuxdoc doc tool is deprecated.
+ README files are exclusively text files.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 65630d633d695bee9ba7da57b7e3e9e66b87b1f3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Jun 14 07:45:32 2010 -0400
+
+ README: fix linuxdoc content
+
+ defs.ent are located under X11 directory
+ ident tag is not a Linuxdoc tag
+ replace docbook email tag with linuxdoc email tag
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c26da404906258951341c4c4ace793f2dfdc47f8
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Jun 13 10:26:32 2010 -0400
+
+ COPYING: update file with Copyright notices from source code.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 11fc32f5f06d20c1f651c3ccbbf2ecf22d9b5742
+Author: Tiago Vignatti <tiago.vignatti@nokia.com>
+Date: Thu May 6 20:07:06 2010 +0300
+
+ Remove superfluous commentary
+
+ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+
+commit 67dd666460522d116860b4e7a79795e2743cd20b
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Mar 27 10:27:14 2010 -0400
+
+ config: rename TODO_NOTES and remove from EXTRA_DIST
+
+ Automake always distribute the TODO file.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 3a3b1a1f0759531efb95ad94f2ec7e1d518b8547
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date: Fri Jan 15 15:53:29 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
+
+commit 58df014ecde6215a0f05aa6c92e891eb855b5632
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Dec 15 22:01:02 2009 -0500
+
+ configure.ac: remove unused sdkdir=$(pkg-config...) statement
+
+ The sdkdir variable isn't use, so remove the statement.
+
+ Acked-by: Dan Nicholson <dbn.lists@gmail.com>
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit de421f6cc713fd8323931dff84d1ff1660200860
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Nov 23 09:25:05 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit 083079fe65ba2cbdce48cba1ac74174cd4931969
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:41:41 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Automake 'foreign' option is specified in configure.ac.
+ Remove from Makefile.am
+
+commit abdd39c07ab0992588013f3fd3cfa1eba90b8af3
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Oct 28 14:09:09 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit cf60e891405c32d0874177ca43b32be74cc96eee
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Oct 26 12:54:22 2009 -0400
+
+ Several driver modules do not have a ChangeLog target in Makefile.am #23814
+
+ The git generated ChangeLog replaces the hand written one.
+ Update configure.ac to xorg-macros level 1.3.
+ Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
+ Update Makefile.am to add ChangeLog target if missing
+ Remove ChangeLog from EXTRA_DIST or *CLEAN variables
+ This is a pre-req for the INSTALL_CMD
+
+commit b2261b30b334fab87c661d1285b15b0e75d7ba28
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Oct 22 12:34:18 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
+commit 1dba39e8f379f2c9852a9a71f08066edf83a541f
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 7 11:12:13 2009 -0400
+
+ xf86-video-s3virge: Remove unused .cvsignore file #23776
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
commit 8abfc25662caf07911fd6e31d40b7db8b7c0cac1
Author: Dave Airlie <airlied@redhat.com>
Date: Thu Jul 30 12:04:28 2009 +1000
diff --git a/debian/changelog b/debian/changelog
index 786e04f..32d7811 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-s3virge (1:1.10.4-5) UNRELEASED; urgency=low
+
+ * Merge upstream master branch up to 1a17d10a41 to fix the FTBFS
+ against X server 1.12.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 07 May 2012 03:07:41 +0200
+
xserver-xorg-video-s3virge (1:1.10.4-4) unstable; urgency=low
* Switch to dh:
commit 1a17d10a4130e7ccff1d9ae07c44200d0520445c
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Sun Jan 8 11:34:35 2012 +0100
Do not use deprecated xf86PciInfo.h
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
diff --git a/src/s3v.h b/src/s3v.h
index 42b1f83..f4976ca 100644
--- a/src/s3v.h
+++ b/src/s3v.h
@@ -40,9 +40,6 @@ in this Software without prior written authorization from the XFree86 Project.
/* Everything using inb/outb, etc needs "compiler.h" */
#include "compiler.h"
-/* Drivers for PCI hardware need this */
-#include "xf86PciInfo.h"
-
/* Drivers that need to access the PCI config space directly need this */
#include "xf86Pci.h"
diff --git a/src/s3v_accel.c b/src/s3v_accel.c
index 2e6d798..7837e4a 100644
--- a/src/s3v_accel.c
+++ b/src/s3v_accel.c
@@ -30,6 +30,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include <unistd.h>
#include "s3v.h"
+#include "s3v_pciids.h"
#include "miline.h"
/* fb includes are in s3v.h */
diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 57d05ef..ecf8571 100644
--- a/src/s3v_dga.c
+++ b/src/s3v_dga.c
@@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "xf86.h"
#include "xf86_OSproc.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "xaa.h"
#include "xaalocal.h"
#include "s3v.h"
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 5f64be1..7064b1e 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -57,8 +57,9 @@ in this Software without prior written authorization from the XFree86 Project.
*/
- /* Most xf86 commons are already in s3v.h */
-#include "s3v.h"
+/* Most xf86 commons are already in s3v.h */
+#include "s3v.h"
+#include "s3v_pciids.h"
#include "globals.h"
diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c
index 53c539f..58e8fd9 100644
--- a/src/s3v_hwcurs.c
+++ b/src/s3v_hwcurs.c
@@ -39,6 +39,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include "s3v.h"
+#include "s3v_pciids.h"
/* protos */
diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c
index cbac21f..6bbfd1e 100644
--- a/src/s3v_i2c.c
+++ b/src/s3v_i2c.c
@@ -58,7 +58,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "compiler.h"
#include "xf86Pci.h"
-#include "xf86PciInfo.h"
#include "vgaHW.h"
diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h
new file mode 100644
index 0000000..5d11333
--- /dev/null
+++ b/src/s3v_pciids.h
@@ -0,0 +1,18 @@
+#ifndef S3V_PCIIDS_H
+#define S3V_PCIIDS_H
+
+#define PCI_VENDOR_S3 0x5333
+#define PCI_CHIP_VIRGE 0x5631
+#define PCI_CHIP_TRIO 0x8811
+#define PCI_CHIP_TRIO64UVP 0x8814
+#define PCI_CHIP_VIRGE_VX 0x883D
+#define PCI_CHIP_TRIO64V2_DXGX 0x8901
+#define PCI_CHIP_Trio3D 0x8904
+#define PCI_CHIP_VIRGE_DXGX 0x8A01
+#define PCI_CHIP_VIRGE_GX2 0x8A10
+#define PCI_CHIP_Trio3D_2X 0x8A13
+#define PCI_CHIP_VIRGE_MX 0x8C01
+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02
+#define PCI_CHIP_VIRGE_MXP 0x8C03
+
+#endif /* S3V_PCIIDS_H */
diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c
index e2e1269..82b763f 100644
--- a/src/s3v_shadow.c
+++ b/src/s3v_shadow.c
@@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project.
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "shadowfb.h"
#include "servermd.h"
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index cc836d4..2466789 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -40,8 +40,9 @@ in this Software without prior written authorization from the XFree86 Project.
#include "config.h"
#endif
- /* Most xf86 commons are already in s3v.h */
-#include "s3v.h"
+/* Most xf86 commons are already in s3v.h */
+#include "s3v.h"
+#include "s3v_pciids.h"
#if 0
#define OFF_DELAY 250 /* milliseconds */
commit 5f0d2a32a81895ba0bf565de096cbdc8bca46c9e
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Mon Dec 26 18:04:11 2011 +0100
Replace deprecated x(c/re)alloc/xfree with m/c/realloc/free
sed -i 's/xalloc/malloc/g; s/xcalloc/calloc/g; s/xrealloc/realloc/g;
s/xfree(/free(/g'
Also added a missing unistd.h include for usleep().
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Alex Deucher <alexdeucher@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/s3v_accel.c b/src/s3v_accel.c
index 528ab8a..2e6d798 100644
--- a/src/s3v_accel.c
+++ b/src/s3v_accel.c
@@ -28,6 +28,7 @@ in this Software without prior written authorization from the XFree86 Project.
#include "config.h"
#endif
+#include <unistd.h>
#include "s3v.h"
#include "miline.h"
diff --git a/src/s3v_dga.c b/src/s3v_dga.c
index 7ad42db..57d05ef 100644
--- a/src/s3v_dga.c
+++ b/src/s3v_dga.c
@@ -116,15 +116,15 @@ S3VDGAInit(ScreenPtr pScreen)
to be rewritten to accommodate depth changes in DGA mode */
if(0 /*pScrn->displayWidth != pMode->HDisplay*/) {
- newmodes = xrealloc(modes, (num + 2) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 2) * sizeof(DGAModeRec));
oneMore = TRUE;
} else {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
oneMore = FALSE;
}
if(!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 0440014..5f64be1 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -383,7 +383,7 @@ S3VFreeRec(ScrnInfoPtr pScrn)
PVERB5(" S3VFreeRec\n");
if (pScrn->driverPrivate == NULL)
return;
- xfree(pScrn->driverPrivate);
+ free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
}
@@ -435,7 +435,7 @@ S3VProbe(DriverPtr drv, int flags)
numDevSections, drv, &usedChips);
/* Free it since we don't need that list after this */
- xfree(devSections);
+ free(devSections);
if (numUsed <= 0)
return FALSE;
@@ -463,7 +463,7 @@ S3VProbe(DriverPtr drv, int flags)
foundScreen = TRUE;
}
}
- xfree(usedChips);
+ free(usedChips);
PVERB5(" S3VProbe end\n");
return foundScreen;
}
@@ -601,7 +601,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
}
/* Process the options */
- if (!(ps3v->Options = xalloc(sizeof(S3VOptions))))
+ if (!(ps3v->Options = malloc(sizeof(S3VOptions))))
return FALSE;
memcpy(ps3v->Options, S3VOptions, sizeof(S3VOptions));
xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, ps3v->Options);
@@ -797,7 +797,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
#ifndef XSERVER_LIBPCIACCESS
if (pEnt->resources) {
- xfree(pEnt);
+ free(pEnt);
S3VFreeRec(pScrn);
return FALSE;
}
@@ -851,7 +851,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
} else {
ps3v->ChipRev = PCI_DEV_REVISION(ps3v->PciInfo);
}
- xfree(pEnt);
+ free(pEnt);
/*
* This shouldn't happen because such problems should be caught in
@@ -2526,7 +2526,7 @@ S3VInternalScreenInit( int scrnIndex, ScreenPtr pScreen)
if(ps3v->shadowFB) {
ps3v->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
- ps3v->ShadowPtr = xalloc(ps3v->ShadowPitch * height);
+ ps3v->ShadowPtr = malloc(ps3v->ShadowPitch * height);
displayWidth = ps3v->ShadowPitch / (pScrn->bitsPerPixel >> 3);
FBStart = ps3v->ShadowPtr;
} else {
@@ -3310,7 +3310,7 @@ S3VCloseScreen(int scrnIndex, ScreenPtr pScreen)
if (ps3v->AccelInfoRec)
XAADestroyInfoRec(ps3v->AccelInfoRec);
if (ps3v->DGAModes)
- xfree(ps3v->DGAModes);
+ free(ps3v->DGAModes);
pScrn->vtSema = FALSE;
diff --git a/src/s3v_xv.c b/src/s3v_xv.c
index 7e7c243..cc836d4 100644
--- a/src/s3v_xv.c
+++ b/src/s3v_xv.c
@@ -137,7 +137,7 @@ void S3VInitVideo(ScreenPtr pScreen)
adaptors = &newAdaptor;
} else {
newAdaptors = /* need to free this someplace */
- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
if(newAdaptors) {
memcpy(newAdaptors, adaptors, num_adaptors *
sizeof(XF86VideoAdaptorPtr));
@@ -152,7 +152,7 @@ void S3VInitVideo(ScreenPtr pScreen)
xf86XVScreenInit(pScreen, adaptors, num_adaptors);
if(newAdaptors)
- xfree(newAdaptors);
+ free(newAdaptors);
}
/* client libraries expect an encoding */
@@ -301,10 +301,10 @@ S3VAllocAdaptor(ScrnInfoPtr pScrn)
if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn)))
return NULL;
- if(!(pPriv = xcalloc(1, sizeof(S3VPortPrivRec) +
+ if(!(pPriv = calloc(1, sizeof(S3VPortPrivRec) +
(sizeof(DevUnion) * S3V_MAX_PORTS))))
{
- xfree(adapt);
+ free(adapt);
return NULL;
}
commit c6282487c4fc0f1180845292b425a241920af332
Author: Tormod Volden <debian.tormod@gmail.com>
Date: Thu Dec 29 18:06:25 2011 +0000
Add missing VERBLEV argument to xf86DrvMsgVerb()
Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 2cc04ce..0440014 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -1328,7 +1328,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
/* Load XAA if needed */
if (!ps3v->NoAccel || ps3v->hwcursor ) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, VERBLEV,
"Falling back to shadowfb\n");
ps3v->NoAccel = 1;
ps3v->hwcursor = 0;
commit 6085552878aaeeb4aede096b88aeb153ef73cd5d
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:20:00 2011 -0500
Fix for new vgahw ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index bd10258..2cc04ce 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -519,7 +519,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
*/
if (!vgaHWGetHWRec(pScrn))
return FALSE;
-
+ vgaHWSetStdFuncs(VGAHWPTR(pScrn));
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
commit 6a26a16af1495cb13969ae7596bdf2bce16eec28
Author: Adam Jackson <ajax@redhat.com>
Date: Mon Dec 19 17:19:07 2011 -0500
Fall back to shadowfb if XAA is unavailable
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 1631b25..bd10258 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -1328,8 +1328,11 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
/* Load XAA if needed */
if (!ps3v->NoAccel || ps3v->hwcursor ) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
- S3VFreeRec(pScrn);
- return FALSE;
+ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO,
+ "Falling back to shadowfb\n");
+ ps3v->NoAccel = 1;
+ ps3v->hwcursor = 0;
+ ps3v->shadowFB = 1;
}
}
commit 729e379f277ae94d4b1ae2d6bab46dceec9b30b1
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Nov 17 15:53:28 2011 -0500
Check ABI major not encoded ABI
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 0f754dd..1631b25 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -3523,7 +3523,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
hwp = VGAHWPTR(pScrn);
ps3v = S3VPTR(pScrn);
-#if ABI_VIDEODRV_VERSION < 12
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
PIOOffset = hwp->PIOOffset;
#endif
@@ -3591,7 +3591,7 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
ps3v = S3VPTR(pScrn);
vgaCRIndex = hwp->IOBase + 4;
-#if ABI_VIDEODRV_VERSION < 12
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
vgaCRIndex += hwp->PIOOffset;
#endif
vgaCRReg = vgaCRIndex + 1;
commit 92b4671ca75022a56ad9e85b347f81c12157c98f
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Nov 16 14:58:29 2011 -0500
Adapt to missing PIOOffset in videoabi 12
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/s3v_driver.c b/src/s3v_driver.c
index 2ced9ac..0f754dd 100644
--- a/src/s3v_driver.c
+++ b/src/s3v_driver.c
@@ -3516,11 +3516,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
S3VPtr ps3v;
IOADDRESS vgaCRIndex, vgaCRReg;
unsigned char val;
-
+ unsigned int PIOOffset = 0;
+
PVERB5(" S3VEnableMmio\n");
hwp = VGAHWPTR(pScrn);
ps3v = S3VPTR(pScrn);
+
+#if ABI_VIDEODRV_VERSION < 12
+ PIOOffset = hwp->PIOOffset;
+#endif
+
/*
* enable chipset (seen on uninitialized secondary cards)
* might not be needed once we use the VGA softbooter
@@ -3533,17 +3539,17 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
* to be set correctly already and MMIO _has_ to be
* enabled.
*/
- val = inb(hwp->PIOOffset + 0x3C3); /*@@@EE*/
- outb(hwp->PIOOffset + 0x3C3, val | 0x01);
+ val = inb(PIOOffset + 0x3C3); /*@@@EE*/
+ outb(PIOOffset + 0x3C3, val | 0x01);
/*
* set CR registers to color mode
* in mono mode extended CR registers
* are not accessible. (EE 05/04/99)
*/
- val = inb(hwp->PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/
- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val | 0x01);
+ val = inb(PIOOffset + VGA_MISC_OUT_R); /*@@@EE*/
+ outb(PIOOffset + VGA_MISC_OUT_W, val | 0x01);
vgaHWGetIOBase(hwp); /* Get VGA I/O base */
- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
+ vgaCRIndex = PIOOffset + hwp->IOBase + 4;
vgaCRReg = vgaCRIndex + 1;
#if 1
/*
@@ -3562,7 +3568,7 @@ S3VEnableMmio(ScrnInfoPtr pScrn)
/* Enable new MMIO, if TRIO mmio is already */
/* enabled, then it stays enabled. */
outb(vgaCRReg, ps3v->EnableMmioCR53 | 0x08);
- outb(hwp->PIOOffset + VGA_MISC_OUT_W, val);
+ outb(PIOOffset + VGA_MISC_OUT_W, val);
if (S3_TRIO_3D_SERIES(ps3v->Chipset)) {
outb(vgaCRIndex, 0x40);
val = inb(vgaCRReg);
@@ -3584,7 +3590,10 @@ S3VDisableMmio(ScrnInfoPtr pScrn)
hwp = VGAHWPTR(pScrn);
ps3v = S3VPTR(pScrn);
- vgaCRIndex = hwp->PIOOffset + hwp->IOBase + 4;
+ vgaCRIndex = hwp->IOBase + 4;
+#if ABI_VIDEODRV_VERSION < 12
+ vgaCRIndex += hwp->PIOOffset;
+#endif
vgaCRReg = vgaCRIndex + 1;
outb(vgaCRIndex, 0x53);
/* Restore register's original state */
commit a568407e74082cd2304b95e0abee083a03ad62b8
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:49:04 2010 -0400
config: add comments for main statements
diff --git a/configure.ac b/configure.ac
index 8bdafd1..1c7e9f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,18 +20,18 @@
#
# Process this file with autoconf to produce a configure script
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-s3virge],
[1.10.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-video-s3virge])
-
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR(.)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-
AM_MAINTAINER_MODE
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
@@ -40,25 +40,26 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-# Checks for programs.
+# Initialize libtool
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AH_TOP([#include "xorg-server.h"])
+# Define a configure option for an alternate module directory
AC_ARG_WITH(xorg-module-dir,
AS_HELP_STRING([--with-xorg-module-dir=DIR],
[Default xorg module directory [[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
-# Checks for extensions
+# Store the list of server defined optional extensions in REQUIRED_MODULES
XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
XORG_DRIVER_CHECK_EXT(XV, videoproto)
XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
-# Checks for pkg-config packages
+# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
@@ -80,7 +81,6 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then
fi
AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
-
AC_SUBST([moduledir])
DRIVER_NAME=s3virge
commit be262ccedd5910043be246efecc8a7a8157fce21
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 21 16:07:00 2010 -0400
config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 7a8a726..8bdafd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,8 +86,9 @@ AC_SUBST([moduledir])
DRIVER_NAME=s3virge
AC_SUBST([DRIVER_NAME])
Reply to: