.gitignore | 69 ++++++++++++-- COPYING | 89 ++++++++++++++++-- ChangeLog | 259 ----------------------------------------------------- Makefile.am | 12 ++ README | 20 ++++ configure.ac | 18 +-- man/.cvsignore | 3 man/Makefile.am | 41 +++----- man/tseng.man | 2 src/.cvsignore | 6 - src/Makefile.am | 2 src/tseng.h | 6 - src/tseng_driver.c | 86 ++--------------- src/tseng_mode.c | 2 14 files changed, 220 insertions(+), 395 deletions(-)
New commits: commit f80842085c790c3acf611d3944939f9515e4bee2 Author: Dave Airlie <[email protected]> Date: Mon Jul 5 14:16:09 2010 +1000 bump for release 1.2.4 diff --git a/configure.ac b/configure.ac index 51376c9..62cc318 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tseng], - 1.2.3, + 1.2.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tseng) commit eb4a39b11ece5dc4e34519286b3f406fecf9b5ae Author: Gaetan Nadon <[email protected]> Date: Sun Jun 13 12:49:55 2010 -0400 COPYING: replace stub file with actual Copyright notices. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/COPYING b/COPYING index 7f33cbf..461c4d5 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,85 @@ -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. +Copyright 2000 by Rainer Keller, <[email protected]>. -Please submit updated COPYING files to the Xorg bugzilla: +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. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +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. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. + +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 Thomas Roell not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Thomas Roell makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THOMAS ROELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THOMAS ROELL 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 2005-2006 Luc Verhaegen. +Copyright 1993-1997 The XFree86 Project, Inc. +Copyright 1990-1991 Thomas Roell. + + +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, 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 +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. + +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. -http://lists.freedesktop.org/mailman/listinfo/xorg commit 9bb1b4995b8825944531d495262a0bb049a45f3e Author: Gaetan Nadon <[email protected]> Date: Thu Apr 8 13:21:52 2010 -0400 config: remove redundant compiler flags These are available using --enable-strict-compilation Use same configure option as all x.org modules Only GCC was covered, not SUNCC or INTELCC Introduced in commit 85397a4ef7a3a13f7e2940cb0e5c2fdbfea4c695 Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 9daadc6..51376c9 100644 --- a/configure.ac +++ b/configure.ac @@ -45,10 +45,6 @@ AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC -if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall -pedantic" -fi - AH_TOP([#include "xorg-server.h"]) AC_ARG_WITH(xorg-module-dir, diff --git a/src/Makefile.am b/src/Makefile.am index 114f8e9..bf3a03a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,7 +23,7 @@ # -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@ +AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) tseng_drv_la_LTLIBRARIES = tseng_drv.la tseng_drv_la_LDFLAGS = -module -avoid-version tseng_drv_ladir = @moduledir@/drivers commit bd71f657daa44b8e5fc416f6eb48e5bc8216e838 Author: Adam Jackson <[email protected]> Date: Tue May 18 13:13:44 2010 -0400 Remove mibank.h reference Signed-off-by: Adam Jackson <[email protected]> diff --git a/src/tseng.h b/src/tseng.h index fbb0fd3..ce2f174 100644 --- a/src/tseng.h +++ b/src/tseng.h @@ -25,9 +25,6 @@ /* All Tseng chips _need_ VGA register access, so multihead operation is out of the question */ #include "vgaHW.h" -/* Drivers using the mi banking wrapper need this */ -#include "mibank.h" - /* All drivers using the mi colormap manipulation need this */ #include "micmap.h" commit 5bf78ef9a273b4bc56b9a2548e9715333aa885ad Author: Tiago Vignatti <[email protected]> Date: Thu May 6 20:16:21 2010 +0300 Check xf86EnableAccess only in old servers On new X servers this function is dummy. Similar functionality is now in place using lock/unlock mechanism of the VGA arbitration, triggered inside the server. Signed-off-by: Tiago Vignatti <[email protected]> diff --git a/src/tseng_mode.c b/src/tseng_mode.c index 7237f1b..f075226 100644 --- a/src/tseng_mode.c +++ b/src/tseng_mode.c @@ -1522,7 +1522,9 @@ TsengCrtcDPMSSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) vgaHWPtr hwp = VGAHWPTR(pScrn); CARD8 seq1, crtc34; +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 xf86EnableAccess(pScrn); +#endif switch (PowerManagementMode) { case DPMSModeOn: default: commit b918f6d35409a2c5e74232b540dffad57f85cf0a Author: Alan Coopersmith <[email protected]> Date: Fri Jan 15 15:54:57 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/man/Makefile.am b/man/Makefile.am index f0eb29b..8f2454b 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # 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. +# +# 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. # drivermandir = $(DRIVER_MAN_DIR) commit 78d94fb6981e5bb9ff19be9b9362a9b1f3707bb6 Author: Gaetan Nadon <[email protected]> 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 <[email protected]> Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index b664295..9daadc6 100644 --- a/configure.ac +++ b/configure.ac @@ -65,7 +65,6 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) # Checks for libraries. SAVE_CPPFLAGS="$CPPFLAGS" commit 96b5eebb07ca02e607c02bd22911e8002882fbcd Author: Gaetan Nadon <[email protected]> Date: Mon Nov 23 09:25:06 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index d451f3e..4c278ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = src man +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL commit 4d3c8e7e1f1eebcad01418d2a312c8791a1773fb Author: Gaetan Nadon <[email protected]> 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 diff --git a/Makefile.am b/Makefile.am index 882733f..d451f3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,6 @@ # 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 .PHONY: ChangeLog INSTALL commit 7dcae998561f95b79a981433a9b264cfe727918e Author: Gaetan Nadon <[email protected]> Date: Wed Oct 28 14:09:10 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. diff --git a/Makefile.am b/Makefile.am index 8b7c3c7..882733f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,9 +21,12 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man -.PHONY: ChangeLog +.PHONY: ChangeLog INSTALL + +INSTALL: + $(INSTALL_CMD) ChangeLog: $(CHANGELOG_CMD) -dist-hook: ChangeLog +dist-hook: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index fd820d9..b664295 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) -AM_INIT_AUTOMAKE([dist-bzip2]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_MAINTAINER_MODE commit 9ef01ab3f2420c4fb27f605834fd165c919abdf6 Author: Gaetan Nadon <[email protected]> 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 diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index e402090..0000000 --- a/ChangeLog +++ /dev/null @@ -1,259 +0,0 @@ -2006-04-11 Luc Verhaegen <[email protected]> - - * src/tseng_mode.c: (TsengSave), (TsengRestore): - - Fix dotclock breakage on ET6000. - The fish crawled out of the swamp, but still had gills and fins. - The internal ramdac still has multiple dotclock registers, and the - previous change only fixed up the external ramdacs of ET4000W32ps. - (Reported by the other tseng owner: Adam Jackson) - -2006-03-08 Luc Verhaegen <[email protected]> - - * src/tseng_mode.c: (STG1703Restore), (CH8398Store), - (TsengModeInit): - - Remove daft dependance on mode->ClockIndex. We used it to tell - vgaHWInit to use clock 2, while ClockIndex = -1 is clock 3. So - just use clock 3 for the ramdacs and be done with. - -2006-01-31 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_driver.c: (TsengPreInit): - * src/tseng_mode.c: (STG1703Mode), (CH8398Mode), - (TsengSetupClockRange), (TsengSave), (TsengRestore), - (TsengModeInit): - - Remove dual clockranges. ET4000W32p now always uses the dac bus - as 16bits wide. - -2006-01-29 Luc Verhaegen <[email protected]> - - * src/tseng_driver.c: (TsengPreInit): - * src/tseng_mode.c: (STG1703Detect), (STG1703Restore), - (STG1703Clock), (STG1703Mode), (CH8398Detect), (CH8398PrintRegs), - (CH8398Store), (CH8398Restore), (CH8398Clock), (CH8398Mode), - (TsengRAMDACProbe), (TsengSave), (TsengRestore), (TsengModeInit): - - Fully implement the Chrontel CH8398. This has the exact same - 24bpp weirdness, so i guess this is an fb issue. - -2006-01-28 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_driver.c: (TsengGetRec), (TsengFreeRec), - (TsengPreInit): - * src/tseng_mode.c: (STG1703Detect), (STG1703PrintRegs), - (STG1703Store), (STG1703Restore), (STG1703Clock), (STG1703Mode), - (TsengRAMDACProbe), (tseng_set_ramdac_bpp), (TsengSave), - (TsengRestore), (TsengModeInit): - - Fully implement the SGS-Thomson STG-1703. This is working great - except for 24bpp, where there seems to be an offset issue. Red is - blue, green is red, blue is green. Will dig that one out later on. - 8bpp and 16bpp (both with 8 and 16bit dac bus) and 32bpp are great. - -2006-01-28 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_mode.c: (tseng_set_ramdac_bpp), (ET6000CalcClock), - (TsengSave), (TsengRestore), (TsengModeInit): - - - Remove pTseng->ModeReg - - Split ET6000 bpp, dotclock and ram clock handling from the - ET4000s ramdac code. - -2006-01-27 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_mode.c: (tseng_set_ramdac_bpp), (tseng_clock_setup), - (TsengModeInit): - - Clear duplicate PrivFlag. - -2006-01-26 Luc Verhaegen <[email protected]> - - * src/tseng.h: - * src/tseng_cursor.c: (ET4000CursorRead), (ET4000CursorWrite), - (TsengShowCursor), (TsengHideCursor), (TsengSetCursorPosition), - (TsengSetCursorColors), (TsengLoadCursorImage), - (TsengHWCursorInit), (TsengCursorStore), (TsengCursorRestore): - * src/tseng_driver.c: (TsengUnlock), (TsengLock), - (TsengPreInitPCI), (et6000_check_videoram), (TsengDetectMem), - (TsengProcessHibit), (TsengPreInit), (TsengEnterVT), - (TsengLeaveVT), (TsengSaveScreen): - * src/tseng_mode.c: (vgaHWReadDacReadAddr), (vgaHWWriteBank), - (vgaHWReadBank), (vgaHWWriteSegment), (vgaHWReadSegment), - (vgaHWWriteModeControl), (vgaHWHerculesSecondPage), (ET6000IORead), - (ET6000IOWrite), (TsengRAMDACProbe), (tseng_set_ramdac_bpp), - (TsengAdjustFrame), (TsengSave), (TsengRestore), (TsengModeInit), - (TsengCrtcDPMSSet), (TsengHVSyncDPMSSet): - - Improve tseng driver transparency. - - move all VGA inbs/outbs to vgahw calls, provide our own when - relevant callbacks are missing. - - move ET4000 sprite accesses to ET4000CursorRead/Write. - - move ET6000 IO accesses to ET6000IORead/Write. - - fix regression with CH8398, introduced with the ramdac cleanup. - -2006-01-23 Luc Verhaegen <[email protected]> - - * src/Makefile.am: - * src/tseng.h: - * src/tseng_accel.c: (tseng_terminate_acl), - (tseng_recover_timeout), (tseng_init_acl), - (TsengSubsequentScanlineCPUToScreenColorExpandFill), - (TsengSubsequentColorExpandScanline), - (TsengSubsequentColorExpandScanline_8bpp), - (TsengSubsequentColorExpandScanline_16bpp), - (TsengSubsequentColorExpandScanline_24bpp), - (TsengSubsequentColorExpandScanline_32bpp), - (TsengSetupForCPUToScreenColorExpandFill), - (TsengSubsequentCPUToScreenColorExpandFill), - (TsengSetupForScreenToScreenColorExpandFill), - (TsengSubsequentScreenToScreenColorExpandFill), - (TsengXAAInit_Colexp), (TsengXAAInit): - * src/tseng_accel.h: - * src/tseng_acl.c: - * src/tseng_acl.h: - * src/tseng_clock.c: - * src/tseng_colexp.c: - * src/tseng_dpms.c: - * src/tseng_driver.c: (TsengSaveScreen), (TsengSwitchMode): - * src/tseng_inline.h: - * src/tseng_mode.c: (vgaHWReadDacWriteAddr), (tsengSTG170xDetect), - (tsengCH8398Detect), (TsengRAMDACProbe), (tseng_set_ramdac_bpp), - (tseng_clock_setup), (TsengcommonCalcClock), (TsengAdjustFrame), - (TsengValidMode), (TsengSave), (TsengRestore), (TsengModeInit), - (TsengCrtcDPMSSet), (TsengHVSyncDPMSSet): - * src/tseng_ramdac.c: - - Reorganise code: - - move tseng_ramdac.c, tseng_clock.c, tseng_dpms.c, and - TsengAdjustFrame, TsengValidMode, TsengSave, TsengRestore, - TsengModeInit from tseng_driver.c into tseng_mode.c. - - move tseng_acl.c and tseng_colexp.c into tseng_accel.c - - move tseng_acl.h and tseng_inline.g into tseng_accel.h - - move all accel functions except for 2 to static, ifdef - out unused ones. - -2006-01-22 Luc Verhaegen <[email protected]> - - * .cvsignore: - * man/.cvsignore: - * src/tseng.h: - * src/tseng_clock.c: (tseng_clock_setup): - * src/tseng_driver.c: (TsengProcessOptions), (TsengPreInit), - (TsengModeInit), (TsengSave), (TsengRestore), (ET4000Probe), (if): - * src/tseng_ramdac.c: (vgaHWReadDacWriteAddr), - (tsengSTG170xDetect), (tsengCH8398Detect), (TsengRAMDACProbe), - (tseng_set_ramdac_bpp): - - Clean up ramdac handling. - - Remove all ramdacs except STG1703 and CH8398. Both are in my - possession, both are currently broken and have been for ages, - but both will be fixed. ICS5341 is out there somewhere too, - will be added when i get my hands on it. - - Cleanly split up ET4000 handling and ET6000 code, both for - dotclock, memory clocking and ramdac. - - Limit driver to either 8, 16, 24 or 32bits. - -2006-01-22 Luc Verhaegen <[email protected]> - - * src/Makefile.am: - * src/tseng.h: - * src/tseng_accel.c: (TsengXAAInit): - * src/tseng_acl.c: (tseng_init_acl): - * src/tseng_bank.c: - * src/tseng_colexp.c: (TsengXAAInit_Colexp): - * src/tseng_cursor.c: (TsengHWCursorInit): - * src/tseng_dga.c: (TsengDGAInit), (Tseng_OpenFramebuffer): - * src/tseng_driver.c: (TsengPreInitPCI), (TsengLimitMem), - (TsengProcessOptions), (TsengGetFbAddress), (TsengPreInit), - (TsengSetupAccelMemory), (TsengScreenInit), (TsengMapMem), - (TsengUnmapMem), (TsengModeInit): - - Tseng in the PCI era: Remove banked memory. - -2006-01-22 Luc Verhaegen <[email protected]> - - * configure.ac: - * src/tseng.h: - * src/tseng_accel.c: (TsengXAAInit), (Tseng_setup_screencopy): - * src/tseng_acl.c: (tseng_recover_timeout), (tseng_init_acl): - * src/tseng_acl.h: - * src/tseng_clock.c: (tseng_clock_setup), - (Tseng_ET4000ClockSelect): - * src/tseng_colexp.c: (TsengXAAInit_Colexp), - (TsengSubsequentScanlineCPUToScreenColorExpandFill): - * src/tseng_cursor.c: (TsengShowCursor), (TsengHideCursor), - (TsengSetCursorPosition), (TsengSetCursorColors), - (TsengLoadCursorImage): - * src/tseng_driver.c: (TsengIdentify), (TsengProbe), - (TsengPreInitPCI), (TsengLimitMem), (TsengDetectMem), - (TsengProcessOptions), (TsengGetLinFbAddress), (TsengPreInit), - (TsengScreenInit), (TsengSaveScreen), (TsengModeInit), (TsengSave): - * src/tseng_inline.h: - * src/tseng_ramdac.c: (Check_Tseng_Ramdac), (tseng_set_ramdac_bpp): - - - -Wall and -pedantic are gccisms (Alan Coopersmith). - - Remove ET4000, ET4000W32 and ET4000W32I devices. - - Rework handling of remaining devices. - - Clean up Probe and PreInit to only handle pci devices. - -2006-01-21 Luc Verhaegen <[email protected]> - - * configure.ac: - * src/tseng.h: - * src/tseng_driver.c: (TsengAssignFPtr), (TsengModeInit), - (TsengSave): - * src/tseng_ramdac.c: (tseng_set_ramdac_bpp): - It's 2006, maybe it's time to inform the tseng driver that humankind - survived the millenium bug. - - First phase of changes: - - Fix a glaring problem that's been there since 1998: RegRec arrays - used beyond their boundaries. - - Add -Wall and -pedantic to CFLAGS. - - Fix VERSION redefinition. - -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: - Update package version number for final X11R7 release candidate. - -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: - Update package version number for X11R7 RC3 release. - -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: - Only build dlloader modules by default. - -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: - Update pkgcheck dependencies to work with separate build roots. diff --git a/Makefile.am b/Makefile.am index 7052905..8b7c3c7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,3 +20,10 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = src man + +.PHONY: ChangeLog + +ChangeLog: + $(CHANGELOG_CMD) + +dist-hook: ChangeLog diff --git a/configure.ac b/configure.ac index 7a0da70..fd820d9 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,12 @@ AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE +# Require xorg-macros: XORG_DEFAULT_OPTIONS +m4_ifndef([XORG_MACROS_VERSION], + [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.3) +XORG_DEFAULT_OPTIONS + # Checks for programs. AC_DISABLE_STATIC AC_PROG_LIBTOOL @@ -86,9 +92,6 @@ AC_SUBST([moduledir]) DRIVER_NAME=tseng AC_SUBST([DRIVER_NAME]) -XORG_MANPAGE_SECTIONS -XORG_RELEASE_VERSION - AC_OUTPUT([ Makefile src/Makefile commit b9f6b124cf293cc508590774c0bd3f896326b4ba Author: Gaetan Nadon <[email protected]> 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. diff --git a/.gitignore b/.gitignore index 54018b8..c91ac19 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,78 @@ -Makefile -Makefile.in -*.la -*.lo +# +# X.Org module default exclusion patterns +# The next section if for module specific patterns +# +# Do not edit the following section +# GNU Build System (Autotools) aclocal.m4 -autom4te.cache +autom4te.cache/ +autoscan.log +ChangeLog +compile config.guess config.h config.h.in config.log +config-ml.in +config.py config.status +config.status.lineno config.sub configure +configure.scan depcomp +.deps/ +INSTALL install-sh +.libs/ libtool +libtool.m4 ltmain.sh +lt~obsolete.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +Makefile +Makefile.in +mdate-sh missing mkinstalldirs -stamp-h1 +*.pc +py-compile +stamp-h? +symlink-tree +texinfo.tex +ylwrap + +# Do not edit the following section +# Edit Compile Debug Document Distribute *~ +*.[0-9] +*.[0-9]x +*.bak +*.bin +core +*.dll +*.exe +*-ISO*.bdf +*-JIS*.bdf +*-KOI8*.bdf +*.kld +*.ko +*.ko.cmd +*.lai +*.l[oa] +*.[oa] +*.obj +*.patch +*.so +*.pcf.gz +*.pdb +*.tar.bz2 +*.tar.gz +# +# Add & Override patterns for xf86-video-tseng +# +# Edit the following section as needed +# For example, !report.pc overrides *.pc. See 'man gitignore' +# commit ebd3672b8e4f3ad97fd900304ed955558e2b181a Author: Gaetan Nadon <[email protected]> Date: Mon Sep 7 11:12:13 2009 -0400 xf86-video-tseng: Remove unused .cvsignore file #23776 Signed-off-by: Peter Hutterer <[email protected]> diff --git a/man/.cvsignore b/man/.cvsignore deleted file mode 100644 index e70d922..0000000 --- a/man/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -*.4 diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 9730646..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.libs -Makefile -Makefile.in -*.la -*.lo commit 5734845c91179a1138d75aaad48102cb077a2b12 Author: Dave Airlie <[email protected]> Date: Mon Sep 7 14:52:01 2009 +1000 bump version to 1.2.3 diff --git a/configure.ac b/configure.ac index 3707413..7a0da70 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tseng], - 1.2.2, + 1.2.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tseng) commit d095c1d51b1a895471ce0b1970ae21ee6499ae51 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 15:22:41 2009 +1000 tseng: change to using ABI version check diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 1b61da8..445c17e 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -42,7 +42,7 @@ #include "fb.h" -#ifndef XSERVER_LIBPCIACCESS +#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 #include "xf86RAC.h" #include "xf86Resources.h" #endif commit 17ebee6804a99af32747b801c5b979ba5248a9d8 Author: Dave Airlie <[email protected]> Date: Tue Jul 28 13:32:40 2009 +1000 tseng: update for resources/RAC API removal diff --git a/src/tseng_driver.c b/src/tseng_driver.c index efa19c8..1b61da8 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -42,8 +42,10 @@ #include "fb.h" +#ifndef XSERVER_LIBPCIACCESS #include "xf86RAC.h" #include "xf86Resources.h" +#endif #include "xf86int10.h" #include "xf86xv.h" @@ -889,10 +891,12 @@ TsengGetFbAddress(ScrnInfoPtr pScrn) pTseng->FbAddress = PCI_REGION_BASE(pTseng->PciInfo, 0, REGION_MEM); +#ifndef XSERVER_LIBPCIACCESS if (xf86RegisterResources(pTseng->pEnt->index,NULL,ResNone)) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Cannot register FB memory.\n"); return FALSE; } +#endif /* The W32 linear map address space is always 4Mb (mainly because the * memory-mapped registers are located near the top of the 4MB area). @@ -1089,13 +1093,14 @@ TsengPreInit(ScrnInfoPtr pScrn, int flags) else VGAHWPTR(pScrn)->MapSize = 0x10000; +#ifndef XSERVER_LIBPCIACCESS /* * XXX At least part of this range does appear to be disabled, * but to play safe, it is marked as "unused" for now. * Changed this to "disable". Otherwise it might interfere with DGA. */ xf86SetOperatingState(resVgaMem, pTseng->pEnt->index, ResDisableOpr); - +#endif /* hibit processing (TsengProcessOptions() must have been called first) */ pTseng->save_divide = 0x40; /* default */ if (pTseng->ChipType == ET4000) { @@ -1466,9 +1471,10 @@ TsengScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) if (pScrn->depth == 4 || pScrn->depth == 8) { /* fb and xf4bpp */ vgaHWHandleColormaps(pScreen); } +#ifndef XSERVER_LIBPCIACCESS pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; pScrn->racMemFlags = pScrn->racIoFlags; - +#endif /* Wrap the current CloseScreen and SaveScreen functions */ pScreen->SaveScreen = TsengSaveScreen; commit 25548be8814796925625b11f390dca29b1e47358 Author: Adam Jackson <[email protected]> Date: Thu Jul 2 11:53:03 2009 -0400 tseng 1.2.2 diff --git a/configure.ac b/configure.ac index 2fd20f7..3707413 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-video-tseng], - 1.2.1, + 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-tseng) commit 1ce0bf811255b1faa00aa279e8972a1a027849ab Author: Adam Jackson <[email protected]> Date: Thu May 28 15:23:41 2009 -0400 Remove useless loader symbol lists. diff --git a/src/tseng_driver.c b/src/tseng_driver.c index 46fc3ae..efa19c8 100644 --- a/src/tseng_driver.c +++ b/src/tseng_driver.c @@ -180,58 +180,6 @@ static const OptionInfoRec TsengOptions[] = {0}, FALSE} }; -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
