.cvsignore | 19 +++++++++++++++++++
autogen.sh | 12 ++++++++++++
debian/changelog | 3 ++-
man/.cvsignore | 2 ++
man/Makefile.am | 2 +-
man/imstt.man | 8 ++++----
src/.cvsignore | 6 ++++++
src/imstt_reg.h | 4 ++--
8 files changed, 48 insertions(+), 8 deletions(-)
New commits:
commit 11d81756d800f7281bf5f47324c2c60a281890ae
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Sun Feb 11 22:17:21 2007 -0500
Note merge from upstream with minor updates
diff --git a/debian/changelog b/debian/changelog
index dbbc244..bf46542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xserver-xorg-video-imstt (1:1.1.0-5) UNRELEASED; urgency=low
* Bump xserver ABI metadata to 1.1 for use with server 1.2
+ * Minor updates from upstream
- -- David Nusinow <[EMAIL PROTECTED]> Sat, 10 Feb 2007 21:23:40 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 11 Feb 2007 22:17:03 -0500
xserver-xorg-video-imstt (1:1.1.0-4) UNRELEASED; urgency=low
commit 164274aa66ca490aaf04c54a23fc4e97547c1061
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Fri Apr 7 19:13:05 2006 +0000
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
diff --git a/ChangeLog b/ChangeLog
index 7585dc9..405d40b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-07 Adam Jackson <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ * src/imstt.h:
+ * src/imstt_accel.c:
+ * src/imstt_driver.c:
+ Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+
2006-02-08 Luc Verhaegen <[EMAIL PROTECTED]>
* src/imstt_driver.c: (IMSTTPreInit):
diff --git a/configure.ac b/configure.ac
index bca8fd3..f33643b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0.5,
+ 1.1.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
@@ -52,7 +52,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto
$REQUIRED_MODULES])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
diff --git a/src/imstt.h b/src/imstt.h
index b714aaf..483002f 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4
2001/04/05 21:29:14 dawes Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
@@ -7,7 +7,6 @@ #include "xf86.h"
#include "xf86Pci.h"
#include "xf86PciInfo.h"
#include "xaa.h"
-#include "xf86_ansic.h"
typedef struct _IMSTTRec {
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index e62868a..9c756f1 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -30,7 +30,6 @@ #endif
#include <X11/Xarch.h>
#include "xf86.h"
-#include "xf86_ansic.h"
#include "compiler.h"
#include "xf86_OSproc.h"
#include "xaa.h"
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index 5990137..186b97f 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -34,9 +34,9 @@ #ifdef HAVE_CONFIG_H
#include "config.h"
#endif
+#include <string.h>
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86_ansic.h"
#include "xf86PciInfo.h"
#include "xf86Pci.h"
#include "xf86Version.h"
@@ -99,9 +99,9 @@ static void IMSTTSetClock(ScrnInfoPtr pS
static void IMSTTWriteMode(ScrnInfoPtr pScrn);
#define DRIVER_NAME "imstt"
-#define DRIVER_VERSION "1.0.0"
+#define DRIVER_VERSION "1.1.0"
#define VERSION_MAJOR 1
-#define VERSION_MINOR 0
+#define VERSION_MINOR 1
#define PATCHLEVEL 0
#define IMSTT_VERSION ((VERSION_MAJOR << 24) | \
(VERSION_MINOR << 16) | \
commit 0c37cdb702bbaa7e1bce7c0be77ea8f15e7f39ca
Author: Luc Verhaegen <[EMAIL PROTECTED]>
Date: Wed Feb 8 16:35:50 2006 +0000
imstt: Remove idiotic usage of pScrn->clock, useless anyway.
diff --git a/ChangeLog b/ChangeLog
index e6c8681..7585dc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-08 Luc Verhaegen <[EMAIL PROTECTED]>
+
+ * src/imstt_driver.c: (IMSTTPreInit):
+
+ Remove idiotic usage of pScrn->clock, useless anyway.
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index bd5d5e8..5990137 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -506,11 +506,6 @@ #endif
pScrn->videoRam / 1024);
}
- /* XXX this is sorta a guess, got some info from the TVP3030 manual */
- pScrn->numClocks = 2;
- pScrn->clock[0] = 110000;
- pScrn->clock[1] = 220000;
-
clockRanges = xnfcalloc(sizeof(ClockRange), 1);
clockRanges->next = NULL;
clockRanges->minClock = 20000;
commit 42218b7de901f6fec51bbb9a7837e0c663058057
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Dec 21 02:30:00 2005 +0000
Update package version for X11R7 release.
diff --git a/ChangeLog b/ChangeLog
index 253fecf..e6c8681 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version for X11R7 release.
+
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index cf7a055..bca8fd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0.4,
+ 1.0.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
commit 27b6a1901c86e9fba6a183665172f805f9ef3523
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Dec 19 16:25:53 2005 +0000
Stub COPYING files
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..7f33cbf
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,12 @@
+This is a stub file. This package has not yet had its complete licensing
+information compiled. Please see the individual source files for details on
+your rights to use and modify this software.
+
+Please submit updated COPYING files to the Xorg bugzilla:
+
+https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All licensing questions regarding this software should be directed at the
+Xorg mailing list:
+
+http://lists.freedesktop.org/mailman/listinfo/xorg
commit 7e941b7550f5965e9a5ec75e2fea900c6d902420
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Thu Dec 15 00:24:17 2005 +0000
Update package version number for final X11R7 release candidate.
diff --git a/ChangeLog b/ChangeLog
index f1bd720..253fecf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for final X11R7 release candidate.
+
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
* man/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 4245537..cf7a055 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0.3,
+ 1.0.0.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
commit cc4740ec057b5c3f876091e360296333a6a439b9
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Tue Dec 6 22:48:35 2005 +0000
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
diff --git a/ChangeLog b/ChangeLog
index e56beeb..f1bd720 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * man/Makefile.am:
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/man/Makefile.am b/man/Makefile.am
index 27106a2..bf7ec17 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -27,9 +27,9 @@ #
drivermandir = $(DRIVER_MAN_DIR)
-driverman_SOURCES = @[EMAIL PROTECTED]
+driverman_PRE = @[EMAIL PROTECTED]
-driverman_DATA = $(driverman_SOURCES:[EMAIL PROTECTED]@)
+driverman_DATA = $(driverman_PRE:[EMAIL PROTECTED]@)
EXTRA_DIST = @[EMAIL PROTECTED]
commit f1174b23c366f906cf3f4d978206de185bfff4fe
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Sat Dec 3 05:49:33 2005 +0000
Update package version number for X11R7 RC3 release.
diff --git a/ChangeLog b/ChangeLog
index 749c638..e56beeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC3 release.
+
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8f552a5..4245537 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0.2,
+ 1.0.0.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
commit f5c842c17331bf418f7da714137940b95b1b4046
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Fri Dec 2 02:16:08 2005 +0000
Remove extraneous AC_MSG_RESULT.
diff --git a/ChangeLog b/ChangeLog
index 1cc1dfb..749c638 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Remove extraneous AC_MSG_RESULT.
+
2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index ae958af..8f552a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,6 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderprot
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
-AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 910bd2e5b47e21879900b36a1e8964ff52479ba9
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Tue Nov 29 23:29:59 2005 +0000
Only build dlloader modules by default.
diff --git a/ChangeLog b/ChangeLog
index be8ef2c..1cc1dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-29 Adam Jackson <[EMAIL PROTECTED]>
+
+ * configure.ac:
+ Only build dlloader modules by default.
+
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 066d8ec..ae958af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,7 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Checks for programs.
+AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
commit 2b7642308e5c48a0d503dd05579147fa541a64e3
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Mon Nov 28 22:04:09 2005 +0000
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
diff --git a/man/Makefile.am b/man/Makefile.am
index a16ec06..27106a2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -25,7 +25,7 @@ # other dealings in this Software withou
# from the copyright holders.
#
-drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+drivermandir = $(DRIVER_MAN_DIR)
driverman_SOURCES = @[EMAIL PROTECTED]
commit 8d74f834e4c3f1b30a280a28553de3d8189b4a94
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Mon Nov 21 10:49:15 2005 +0000
Add .cvsignores for drivers.
diff --git a/.cvsignore b/.cvsignore
new file mode 100644
index 0000000..fb1befd
--- /dev/null
+++ b/.cvsignore
@@ -0,0 +1,19 @@
+Makefile
+Makefile.in
+*.la
+*.lo
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
new file mode 100644
index 0000000..282522d
--- /dev/null
+++ b/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 0000000..9730646
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,6 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.la
+*.lo
commit b34b787d2fcf294b5591d23d1ad9571c53b0ab4c
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Nov 9 21:15:15 2005 +0000
Update package version number for X11R7 RC2 release.
diff --git a/ChangeLog b/ChangeLog
index e4d905b..be8ef2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update package version number for X11R7 RC2 release.
+
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/configure.ac b/configure.ac
index 8a8b3bf..066d8ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0.1,
+ 1.0.0.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
commit bf631614053b424f7828c25fdc2f72764fbf9335
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Tue Nov 1 15:08:53 2005 +0000
Update pkgcheck depedencies to work with separate build roots.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..e4d905b
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,4 @@
+2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
+ * configure.ac:
+ Update pkgcheck dependencies to work with separate build roots.
diff --git a/configure.ac b/configure.ac
index 413bea6..8a8b3bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,8 +45,14 @@ AC_ARG_WITH(xorg-module-dir,
[Default xorg module directory
[[default=$libdir/xorg/modules]]]),
[moduledir="$withval"],
[moduledir="$libdir/xorg/modules"])
+
+# Checks for extensions
+XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
+XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
+
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+AC_MSG_RESULT([yes])
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
# Checks for libraries.
commit 03dd0ebe8b968cf92966a94fd5d2bd0777964424
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Wed Oct 19 02:48:03 2005 +0000
Update package version number for RC1 release.
diff --git a/configure.ac b/configure.ac
index 2d31e86..413bea6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 1.0.0,
+ 1.0.0.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
commit d76efb3522319cbac1e3a0ffd75baf4cb25f3cd9
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Tue Oct 18 00:01:53 2005 +0000
Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
substitutions to work better with BSD make
diff --git a/man/Makefile.am b/man/Makefile.am
index eb3fe06..a16ec06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -29,7 +29,7 @@ drivermandir = $(mandir)/man$(DRIVER_MAN
driverman_SOURCES = @[EMAIL PROTECTED]
-driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+driverman_DATA = $(driverman_SOURCES:[EMAIL PROTECTED]@)
EXTRA_DIST = @[EMAIL PROTECTED]
commit e80b44e19273f849f89c3367c919f8ec747fcbb6
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Oct 17 22:57:33 2005 +0000
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
of indirectly
diff --git a/man/Makefile.am b/man/Makefile.am
index 0eabf46..eb3fe06 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -31,7 +31,7 @@ driverman_SOURCES = @[EMAIL PROTECTED]
driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
-EXTRA_DIST = $(driverman_SOURCES)
+EXTRA_DIST = @[EMAIL PROTECTED]
CLEANFILES = $(driverman_DATA)
commit d84d94cd3e36d71f17eabc0d3b603d91ab3c9ab1
Author: Alan Coopersmith <[EMAIL PROTECTED]>
Date: Mon Oct 17 00:09:03 2005 +0000
Use sed & cpp to substitute variables in driver man pages
diff --git a/configure.ac b/configure.ac
index 010df14..2d31e86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,10 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+DRIVER_NAME=imstt
+AC_SUBST([DRIVER_NAME])
+
+XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([
diff --git a/man/Makefile.am b/man/Makefile.am
index 0c5ff23..0eabf46 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,22 +1,59 @@
-# Copyright 2005 Adam Jackson.
+# $Id$
#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
-# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-dist_man_MANS = \
- imstt.4
+# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation.
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the copyright holders shall
+# not be used in advertising or otherwise to promote the sale, use or
+# other dealings in this Software without prior written authorization
+# from the copyright holders.
+#
+
+drivermandir = $(mandir)/man$(DRIVER_MAN_SUFFIX)
+
+driverman_SOURCES = @[EMAIL PROTECTED]
+
+driverman_DATA = $(driverman_SOURCES:man=$(DRIVER_MAN_SUFFIX))
+
+EXTRA_DIST = $(driverman_SOURCES)
+
+CLEANFILES = $(driverman_DATA)
+
+SED = sed
+
+# Strings to replace in man pages
+XORGRELSTRING = @PACKAGE_STRING@
+ XORGMANNAME = X Version 11
+
+MAN_SUBSTS = \
+ -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|$(prefix)|g' \
+ -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+
+SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
+
+.man.$(DRIVER_MAN_SUFFIX):
+ sed $(MAN_SUBSTS) < $< > $@
commit e5931cb1d1be18d9c3859cdd0558146e24bfb37f
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Thu Aug 18 09:03:47 2005 +0000
Update autogen.sh to one that does objdir != srcdir.
diff --git a/autogen.sh b/autogen.sh
index e81f989..904cd67 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,4 +10,3 @@ autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"
-
commit 3b573527ca4ded55fcf211d64737d909879322a9
Author: Kevin E Martin <[EMAIL PROTECTED]>
Date: Fri Jul 29 21:22:43 2005 +0000
Various changes preparing packages for RC0:
- Verify and update package version numbers as needed
- Implement versioning scheme
- Change bug address to point to bugzilla bug entry form
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
reenable it)
- Fix makedepend to use pkgconfig and pass distcheck
- Update build script to build macros first
- Update modular Xorg version
diff --git a/configure.ac b/configure.ac
index 9f55448..010df14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,8 +22,8 @@ # Process this file with autoconf to pro
AC_PREREQ(2.57)
AC_INIT([xf86-video-imstt],
- 0.1.0,
- [EMAIL PROTECTED],
+ 1.0.0,
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-imstt)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -57,6 +57,8 @@ AC_HEADER_STDC
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
+XORG_RELEASE_VERSION
+
AC_OUTPUT([
Makefile
src/Makefile
commit bf656fe79e9cf83516e513eb440b903d4f435058
Author: Søren Sandmann Pedersen <[EMAIL PROTECTED]>
Date: Tue Jul 26 00:44:14 2005 +0000
"Build system for `basename $PWD | sed s/xf86-video-//`"
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7052905
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+AUTOMAKE_OPTIONS = foreign
+SUBDIRS = src man
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..e81f989
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,13 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
+
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..9f55448
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,64 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Process this file with autoconf to produce a configure script
+
+AC_PREREQ(2.57)
+AC_INIT([xf86-video-imstt],
+ 0.1.0,
+ [EMAIL PROTECTED],
+ xf86-video-imstt)
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AM_CONFIG_HEADER([config.h])
+AC_CONFIG_AUX_DIR(.)
+
+AM_INIT_AUTOMAKE([dist-bzip2])
+
+AM_MAINTAINER_MODE
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+AC_PROG_CC
+
+AH_TOP([#include "xorg-server.h"])
+
+AC_ARG_WITH(xorg-module-dir,
+ AC_HELP_STRING([--with-xorg-module-dir=DIR],
+ [Default xorg module directory
[[default=$libdir/xorg/modules]]]),
+ [moduledir="$withval"],
+ [moduledir="$libdir/xorg/modules"])
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(XORG, [xorg-server xproto])
+sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_HEADER_STDC
+
+AC_SUBST([XORG_CFLAGS])
+AC_SUBST([moduledir])
+
+AC_OUTPUT([
+ Makefile
+ src/Makefile
+ man/Makefile
+])
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 0000000..0c5ff23
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,22 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+dist_man_MANS = \
+ imstt.4
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..35b1748
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,35 @@
+# Copyright 2005 Adam Jackson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# on the rights to use, copy, modify, merge, publish, distribute, sub
+# license, and/or sell copies of the Software, and to permit persons to whom
+# the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+# ADAM JACKSON BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# this is obnoxious:
+# -module lets us name the module exactly how we want
+# -avoid-version prevents gratuitous .0.0.0 version numbers on the end
+# _ladir passes a dummy rpath to libtool so the thing will actually link
+# TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = @XORG_CFLAGS@
+imstt_drv_la_LTLIBRARIES = imstt_drv.la
+imstt_drv_la_LDFLAGS = -module -avoid-version
+imstt_drv_ladir = @moduledir@/drivers
+
+imstt_drv_la_SOURCES = \
+ imstt_accel.c \
+ imstt_driver.c \
+ imstt.h \
+ imstt_reg.h
commit c6c680e231fc8d6ea8feda1a1c5b0d46f03b1683
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Mon Jul 11 02:29:51 2005 +0000
Prep for modular builds by adding guarded #include "config.h" everywhere.
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index d960890..e62868a 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -24,6 +24,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include <X11/Xarch.h>
#include "xf86.h"
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index 4835c6a..bd5d5e8 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -30,6 +30,9 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "xf86.h"
#include "xf86_OSproc.h"
commit 0d46bb44526681c0018b850e26f083cdcda8530e
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Sat Jun 25 21:16:55 2005 +0000
Bug #3626: _X_EXPORT tags for video and input drivers.
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index a8b870d..4835c6a 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -105,7 +105,7 @@ #define IMSTT_VERSION ((VERSION_MAJOR <<
PATCHLEVEL)
-DriverRec IMSTT =
+_X_EXPORT DriverRec IMSTT =
{
IMSTT_VERSION,
DRIVER_NAME,
@@ -200,7 +200,7 @@ static XF86ModuleVersionInfo IMSTTVersRe
{0, 0, 0, 0}
};
-XF86ModuleData imsttModuleData = { &IMSTTVersRec, IMSTTSetup, NULL };
+_X_EXPORT XF86ModuleData imsttModuleData = { &IMSTTVersRec, IMSTTSetup, NULL };
pointer IMSTTSetup(pointer module, pointer opts, int *errmaj,
int *errmin)
commit 5b8602c5a1723c71130c79920754f8c87248fcca
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed Apr 20 12:25:28 2005 +0000
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index 86dca58..d960890 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5
2001/04/05 21:29:14 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
@@ -25,7 +25,7 @@
*/
-#include "Xarch.h"
+#include <X11/Xarch.h>
#include "xf86.h"
#include "xf86_ansic.h"
#include "compiler.h"
commit e2fb23691989c5f9ae2f740719e93d9993acefa5
Author: Adam Jackson <[EMAIL PROTECTED]>
Date: Thu Aug 12 01:03:06 2004 +0000
Factor out R{128,ADEON}Chipsets into their own headers so they can be
sanely included in both the ati core and the r128/radeon submodules;
r128 and radeon can now be directly loaded under dlloader. Teach imstt
about the dlloader- frendly way to talk to fbdevhw. (Partial for bugs
#393 and #400.)
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index be57c46..a8b870d 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.20 2002/09/24 15:23:55 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
@@ -160,20 +160,20 @@ static const char *xaaSymbols[] = {
static const char *fbdevHWSymbols[] = {
- "fbdevHWAdjustFrame",
- "fbdevHWEnterVT",
+ "fbdevHWAdjustFrameWeak",
+ "fbdevHWEnterVTWeak",
"fbdevHWGetVidmem",
"fbdevHWInit",
- "fbdevHWLeaveVT",
- "fbdevHWLoadPalette",
+ "fbdevHWLeaveVTWeak",
+ "fbdevHWLoadPaletteWeak",
"fbdevHWMapVidmem",
"fbdevHWModeInit",
"fbdevHWSave",
- "fbdevHWSwitchMode",
+ "fbdevHWSwitchModeWeak",
"fbdevHWUnmapMMIO",
"fbdevHWUnmapVidmem",
"fbdevHWUseBuildinMode",
- "fbdevHWValidMode",
+ "fbdevHWValidModeWeak",
NULL
};
@@ -192,7 +192,7 @@ static XF86ModuleVersionInfo IMSTTVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -417,11 +417,11 @@ #endif
xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
if (!fbdevHWInit(pScrn, iptr->PciInfo, NULL))
return FALSE;
- pScrn->SwitchMode = fbdevHWSwitchMode;
- pScrn->AdjustFrame = fbdevHWAdjustFrame;
- pScrn->EnterVT = fbdevHWEnterVT;
- pScrn->LeaveVT = fbdevHWLeaveVT;
- pScrn->ValidMode = fbdevHWValidMode;
+ pScrn->SwitchMode = fbdevHWSwitchModeWeak();
+ pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
+ pScrn->EnterVT = fbdevHWEnterVTWeak();
+ pScrn->LeaveVT = fbdevHWLeaveVTWeak();
+ pScrn->ValidMode = fbdevHWValidModeWeak();
}
if (pScrn->numEntities > 1) {
@@ -441,6 +441,9 @@ #endif
xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+ pScrn->memPhysBase = iptr->PciInfo->memBase[0];
+ pScrn->fbOffset = 0;
+
if (pEnt->device->chipset && *pEnt->device->chipset) {
pScrn->chipset = pEnt->device->chipset;
iptr->Chipset = xf86StringToToken(IMSTTChipsets,
pScrn->chipset);
@@ -830,7 +833,7 @@ static Bool IMSTTScreenInit(int scrnInde
if (!miCreateDefColormap(pScreen))
return FALSE;
- if (!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPalette,
+ if (!xf86HandleColormaps(pScreen, 256, 8, fbdevHWLoadPaletteWeak(),
NULL, CMAP_PALETTED_TRUECOLOR))
return FALSE;
commit 2309c6d8e5e3c10a6c461d554a65d876e0e3c0b2
Author: Eric Anholt <[EMAIL PROTECTED]>
Date: Wed Jun 16 09:23:19 2004 +0000
DRI XFree86-4_3_99_12-merge import
diff --git a/man/imstt.man b/man/imstt.man
index 22134b6..377d117 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1
2001/01/24 00:06:20 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2
2001/01/27 18:20:48 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH IMSTT __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ imstt \- Integrated Micro Solutions Twin
.fi
.SH DESCRIPTION
.B imstt
-is an __xservername__ driver for Integrated Micro Solutions Twin Turbo 128
video chips.
+is an XFree86 driver for Integrated Micro Solutions Twin Turbo 128 video chips.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B imstt
driver supports...
.SH CONFIGURATION DETAILS
-Please refer to __xconfigfile__(__filemansuffix__) for general configuration
+Please refer to XF86Config(__filemansuffix__) for general configuration
details. This section only covers configuration details specific to this
driver.
.SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
+XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1),
X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff --git a/src/imstt.h b/src/imstt.h
index 624d416..b714aaf 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4
2001/04/05 21:29:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index d52e03d..86dca58 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5
2001/04/05 21:29:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index bf7adad..be57c46 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.20 2002/09/24 15:23:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
@@ -192,7 +192,7 @@ static XF86ModuleVersionInfo IMSTTVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XORG_VERSION_CURRENT,
+ XF86_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
@@ -441,9 +441,6 @@ #endif
xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
- pScrn->memPhysBase = iptr->PciInfo->memBase[0];
- pScrn->fbOffset = 0;
-
if (pEnt->device->chipset && *pEnt->device->chipset) {
pScrn->chipset = pEnt->device->chipset;
iptr->Chipset = xf86StringToToken(IMSTTChipsets,
pScrn->chipset);
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 9870f49..343fb6c 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -9,7 +9,7 @@ #if defined(__powerpc__)
static __inline__ void regw(unsigned long base_addr, unsigned long regindex,
unsigned long regdata)
{
- __asm__ __volatile__ ("stwbrx %1,%2,%3; eieio"
+ asm volatile ("stwbrx %1,%2,%3; eieio"
: "=m" (*(volatile unsigned *)(base_addr+regindex))
: "r" (regdata), "b" (regindex), "r" (base_addr));
}
@@ -19,7 +19,7 @@ static __inline__ unsigned long regr(uns
{
register unsigned long val;
- __asm__ __volatile__ ("lwbrx %0,%1,%2; eieio"
+ asm volatile ("lwbrx %0,%1,%2; eieio"
: "=r" (val)
: "b" (regindex), "r" (base_addr),
"m" (*(volatile unsigned *)(base_addr+regindex)));
commit 06beef65dc3fb205f84cfe3c026111cdbbd53bfd
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Wed May 26 16:24:08 2004 +0000
Fixing setting of physical framebuffer base for several drivers. C&T
driver: Fixed setting of minimal clocks for HiQV chipsets. Neomagic
driver: improved support for lowres double scan modes.
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index f25e3e0..bf7adad 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -441,6 +441,9 @@ #endif
xf86SetOperatingState(resVgaIo, pEnt->index, ResUnusedOpr);
xf86SetOperatingState(resVgaMem, pEnt->index, ResDisableOpr);
+ pScrn->memPhysBase = iptr->PciInfo->memBase[0];
+ pScrn->fbOffset = 0;
+
if (pEnt->device->chipset && *pEnt->device->chipset) {
pScrn->chipset = pEnt->device->chipset;
iptr->Chipset = xf86StringToToken(IMSTTChipsets,
pScrn->chipset);
commit 36831fdc2a99af36f68204fd6e88ab7dd9e6e155
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Fri Apr 23 19:36:46 2004 +0000
Merging XORG-CURRENT into trunk
diff --git a/man/imstt.man b/man/imstt.man
index 377d117..22134b6 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2
2001/01/27 18:20:48 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1
2001/01/24 00:06:20 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH IMSTT __drivermansuffix__ __vendorversion__
@@ -14,17 +14,17 @@ imstt \- Integrated Micro Solutions Twin
.fi
.SH DESCRIPTION
.B imstt
-is an XFree86 driver for Integrated Micro Solutions Twin Turbo 128 video chips.
+is an __xservername__ driver for Integrated Micro Solutions Twin Turbo 128
video chips.
THIS MAN PAGE NEEDS TO BE FILLED IN.
.SH SUPPORTED HARDWARE
The
.B imstt
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__(__appmansuffix__), __xconfigfile__(__filemansuffix__),
xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__)
.SH AUTHORS
Authors include: ...
diff --git a/src/imstt.h b/src/imstt.h
index b714aaf..624d416 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4
2001/04/05 21:29:14 dawes Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index 86dca58..d52e03d 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5
2001/04/05 21:29:14 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index be57c46..f25e3e0 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.20 2002/09/24 15:23:55 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
@@ -192,7 +192,7 @@ static XF86ModuleVersionInfo IMSTTVersRe
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
+ XORG_VERSION_CURRENT,
VERSION_MAJOR, VERSION_MINOR, PATCHLEVEL,
ABI_CLASS_VIDEODRV,
ABI_VIDEODRV_VERSION,
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 92545b4..9870f49 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.6
2004/02/19 22:38:14 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.5
2002/08/06 19:57:30 herrb Exp $ */
#ifndef _IMSTT_REG_H
#define _IMSTT_REG_H
commit 0438da3e2a06bdd5259e484610932e73c2fec12e
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Sun Mar 14 08:33:22 2004 +0000
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
diff --git a/man/imstt.man b/man/imstt.man
index bc34a38..377d117 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1
2001/01/24 00:06:20 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2
2001/01/27 18:20:48 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH IMSTT __drivermansuffix__ __vendorversion__
diff --git a/src/imstt.h b/src/imstt.h
index 624d416..b714aaf 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4
2001/04/05 21:29:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index d52e03d..86dca58 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5
2001/04/05 21:29:14 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index 8ce2876..be57c46 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.20 2002/09/24 15:23:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 9870f49..92545b4 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.5
2002/08/06 19:57:30 herrb Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.6
2004/02/19 22:38:14 tsi Exp $ */
#ifndef _IMSTT_REG_H
#define _IMSTT_REG_H
commit 830913db0cbf1e75f805666836f03ff9110e5f75
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Wed Mar 3 12:12:19 2004 +0000
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
diff --git a/man/imstt.man b/man/imstt.man
index 377d117..bc34a38 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2
2001/01/27 18:20:48 dawes Exp $
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.1
2001/01/24 00:06:20 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH IMSTT __drivermansuffix__ __vendorversion__
diff --git a/src/imstt.h b/src/imstt.h
index b714aaf..624d416 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.4
2001/04/05 21:29:14 dawes Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index 86dca58..d52e03d 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.5
2001/04/05 21:29:14 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index be57c46..8ce2876 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.20 2002/09/24 15:23:55 tsi Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 343fb6c..9870f49 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -9,7 +9,7 @@ #if defined(__powerpc__)
static __inline__ void regw(unsigned long base_addr, unsigned long regindex,
unsigned long regdata)
{
- asm volatile ("stwbrx %1,%2,%3; eieio"
+ __asm__ __volatile__ ("stwbrx %1,%2,%3; eieio"
: "=m" (*(volatile unsigned *)(base_addr+regindex))
: "r" (regdata), "b" (regindex), "r" (base_addr));
}
@@ -19,7 +19,7 @@ static __inline__ unsigned long regr(uns
{
register unsigned long val;
- asm volatile ("lwbrx %0,%1,%2; eieio"
+ __asm__ __volatile__ ("lwbrx %0,%1,%2; eieio"
: "=r" (val)
: "b" (regindex), "r" (base_addr),
"m" (*(volatile unsigned *)(base_addr+regindex)));
commit 87a550e821164514bdf6886155a74f45903fdfcc
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Thu Feb 26 13:35:53 2004 +0000
readding XFree86's cvs IDs
diff --git a/man/imstt.man b/man/imstt.man
index 4693cbc..377d117 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86$
+.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2
2001/01/27 18:20:48 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH IMSTT __drivermansuffix__ __vendorversion__
diff --git a/src/imstt.h b/src/imstt.h
index 966f322..b714aaf 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
#ifndef _IMSTT_H
#define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index 12208d4..86dca58 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index acc68bb..be57c46 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 570df0d..343fb6c 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86$ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.5
2002/08/06 19:57:30 herrb Exp $ */
#ifndef _IMSTT_REG_H
#define _IMSTT_REG_H
commit 37f62808e7528db2815cbf07ced41e0589f46ad8
Author: Egbert Eich <[EMAIL PROTECTED]>
Date: Thu Feb 26 09:23:19 2004 +0000
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
diff --git a/man/imstt.man b/man/imstt.man
index 377d117..4693cbc 100644
--- a/man/imstt.man
+++ b/man/imstt.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.man,v 1.2
2001/01/27 18:20:48 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH IMSTT __drivermansuffix__ __vendorversion__
diff --git a/src/imstt.h b/src/imstt.h
index b714aaf..966f322 100644
--- a/src/imstt.h
+++ b/src/imstt.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt.h,v 1.5
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86$ */
#ifndef _IMSTT_H
#define _IMSTT_H
diff --git a/src/imstt_accel.c b/src/imstt_accel.c
index 86dca58..12208d4 100644
--- a/src/imstt_accel.c
+++ b/src/imstt_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_accel.c,v 1.6
2001/05/16 06:48:09 keithp Exp $ */
+/* $XFree86$ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index be57c46..acc68bb 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
+/* $XFree86$ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
diff --git a/src/imstt_reg.h b/src/imstt_reg.h
index 343fb6c..570df0d 100644
--- a/src/imstt_reg.h
+++ b/src/imstt_reg.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_reg.h,v 1.5
2002/08/06 19:57:30 herrb Exp $ */
+/* $XFree86$ */
#ifndef _IMSTT_REG_H
#define _IMSTT_REG_H
commit fc9b230c4cc99b5fb0e4d87a17f2313b3fb24dc0
Author: Kaleb Keithley <[EMAIL PROTECTED]>
Date: Tue Nov 25 19:28:37 2003 +0000
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
diff --git a/src/imstt_driver.c b/src/imstt_driver.c
index f0c5a53..be57c46 100644
--- a/src/imstt_driver.c
+++ b/src/imstt_driver.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.20 2002/09/24 15:23:55 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/imstt/imstt_driver.c,v
1.21 2003/08/23 15:03:02 dawes Exp $ */
/*
* Copyright 2000 Ani Joshi <[EMAIL PROTECTED]>
@@ -330,7 +330,7 @@ static Bool IMSTTPreInit(ScrnInfoPtr pSc
pScrn->monitor = pScrn->confScreen->monitor;
- if (!xf86SetDepthBpp(pScrn, 8, 8, 8, Support24bppFb | Support32bppFb |
+ if (!xf86SetDepthBpp(pScrn, 0, 0, 0, Support24bppFb | Support32bppFb |
SupportConvert32to24 | PreferConvert32to24))
return FALSE;
else {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
