Update to xf86-video-cirrus 1.3.2
This commit is contained in:
matthieu
parent
eccc1caedd
commit
aec1eae93c
@ -1,12 +1,64 @@
|
||||
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 (C) 1994-2003 The XFree86 Project, Inc. All Rights Reserved.
|
||||
|
||||
Please submit updated COPYING files to the Xorg bugzilla:
|
||||
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 fur-
|
||||
nished to do so, subject to the following conditions:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
All licensing questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
|
||||
NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
|
||||
NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
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 deal-
|
||||
ings in this Software without prior written authorization from the XFree86
|
||||
Project.
|
||||
|
||||
Copyright 2000 by Egbert Eich
|
||||
|
||||
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.
|
||||
|
||||
EGBERT EICH 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.
|
||||
|
||||
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.
|
||||
|
||||
@ -1,67 +1,433 @@
|
||||
2006-04-06 Adam Jackson <ajax@freedesktop.org>
|
||||
commit 4ecaa548a996475fbb4c6403698b2ecaf35e9d6b
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jul 28 15:22:40 2009 +1000
|
||||
|
||||
* configure.ac:
|
||||
* src/CirrusClk.c:
|
||||
* src/alp_driver.c:
|
||||
* src/alp_hwcurs.c:
|
||||
* src/alp_i2c.c:
|
||||
* src/alp_xaa.c:
|
||||
* src/alp_xaam.c:
|
||||
* src/cir.h:
|
||||
* src/cir_dga.c:
|
||||
* src/cir_driver.c:
|
||||
* src/cir_shadow.c:
|
||||
* src/lg_driver.c:
|
||||
* src/lg_hwcurs.c:
|
||||
* src/lg_i2c.c:
|
||||
* src/lg_xaa.c:
|
||||
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
|
||||
cirrus: change to using ABI version check
|
||||
|
||||
* src/cir_driver.c:
|
||||
VERSION -> CIR_VERSION
|
||||
commit 2765aba56fe66038ab7de554474b8d30995f3ef0
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jul 28 13:32:29 2009 +1000
|
||||
|
||||
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
cirrus: update for resources/RAC API removal
|
||||
|
||||
* configure.ac:
|
||||
Update package version for X11R7 release.
|
||||
commit ecdf94e86d44bdbeff1bb944fb372da92d2fa907
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu Jul 2 10:28:20 2009 -0400
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
cirrus 1.3.1
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
commit 2939b59585d96bb9b6f852ddb1eaa5ffd4df1cfb
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Wed Jun 10 14:16:32 2009 +1000
|
||||
|
||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
cirrus: add inputstr.h explicitly
|
||||
|
||||
using inputInfo requires inputstr.h this got included by accident before
|
||||
|
||||
* man/Makefile.am:
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
commit f07b4a3c5dd3e6834367e223aa454054c34a2ac8
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Thu May 28 14:53:06 2009 -0400
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Remove useless loader symbol lists.
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
commit 15b1632d4136d4d20e006626836fb1f73c5a61f7
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu May 7 06:56:57 2009 -0700
|
||||
|
||||
2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Version 1.3.0
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* configure.ac:
|
||||
Remove extraneous AC_MSG_RESULT.
|
||||
commit b2dd1f8616e0863710abe1efd0d6444d749b6c49
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu May 7 06:45:12 2009 -0700
|
||||
|
||||
2005-11-29 Adam Jackson <ajax@freedesktop.org>
|
||||
Updates to COPYING, README, & cirrus.man
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* configure.ac:
|
||||
Only build dlloader modules by default.
|
||||
commit 5db201643fc0e1554fb522db3a215f55938dd1e3
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu May 7 06:43:12 2009 -0700
|
||||
|
||||
2005-11-28 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
renamed: {man,src}/.cvsignore -> {man,src}/.gitignore
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* src/Makefile.am:
|
||||
Separate cirrus driver into _drv, _alpine and _laguna components
|
||||
as they are in the monolithic tree.
|
||||
commit 8676a781c9fcbf03e61f9805c436d21555220e9a
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Wed Apr 29 18:30:25 2009 -0700
|
||||
|
||||
2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Raise minimum xorg-server required to 1.4 for miGetPointerPosition
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC2 release.
|
||||
commit 6e13b31347c298e72f0f4bcaf94b56172a48bd5c
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Apr 24 02:31:23 2009 -0700
|
||||
|
||||
2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
Replace static ChangeLog with XORG_CHANGELOG, use XORG_CWARNFLAGS too
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
* configure.ac:
|
||||
Update pkgcheck dependencies to work with separate build roots.
|
||||
commit 19b9d2335a89269b271583101d4fe377c5dfdddf
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 30 20:38:04 2009 -0800
|
||||
|
||||
Add README with pointers to mailing list, bugzilla & git repos
|
||||
|
||||
commit c5c3a60d085efdc32132f0a19de50b559dcf3827
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Fri Jan 9 16:26:50 2009 -0800
|
||||
|
||||
Remove xorgconfig & xorgcfg from See Also list in man page
|
||||
|
||||
commit d92459edcb8917d51435110f6b30a133d8ce7d52
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Tue Sep 16 23:48:07 2008 +0200
|
||||
|
||||
alpine: fix order of arguments of PCI_WRITE_LONG().
|
||||
|
||||
commit 6dcbf42d6ddf0f8b55feb72008c4f79b18a1603a
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Thu Jul 17 19:06:42 2008 -0300
|
||||
|
||||
Update to use miPointerGetPosition.
|
||||
|
||||
miPointerPosition is deprecated.
|
||||
|
||||
commit 8341f8b0298eef41ff9db582305e3b7006cdf27a
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Mon Jul 28 19:09:16 2008 -0300
|
||||
|
||||
Export symbols used by different cirrus driver modules.
|
||||
|
||||
Symbols are used by cirrus_drv.so, cirrus_alpine.so, and cirrus_laguna.so.
|
||||
|
||||
These must have public visibility if compiling with hidden symbols.
|
||||
|
||||
commit 5dfd5d1772e2119c6b54f4548ae359cc9483e8fc
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed May 21 15:43:45 2008 -0400
|
||||
|
||||
cirrus 1.2.1
|
||||
|
||||
commit e44db96ed07ff1425a1a465ab32fd2d53a81b10c
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Mon Mar 24 14:54:13 2008 -0400
|
||||
|
||||
Bug #10715: Fix depth configuration for alpine chips.
|
||||
|
||||
In particular, don't try to set up 24+32 on the chip that qemu emulates,
|
||||
since it doesn't work, either in qemu or in hardware.
|
||||
|
||||
commit e9d517d8bd7398aa9ca33ceb64db46d659f70707
|
||||
Author: Adam Jackson <ajax@redhat.com>
|
||||
Date: Wed Mar 19 13:45:30 2008 -0400
|
||||
|
||||
chips 1.2.0
|
||||
|
||||
commit 0bb813fa212b0c349b92c3ae2f9165738003533d
|
||||
Author: Dave Airlie <airlied@linux.ie>
|
||||
Date: Thu Mar 13 12:44:21 2008 +1000
|
||||
|
||||
cirrus: set default depth to 24bpp
|
||||
|
||||
this fixes autoconfiguation and it shouldn't override anything else.
|
||||
|
||||
commit 2cece73303455fb9a28e723d6b8c1e3eb867b8ed
|
||||
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
|
||||
Date: Sat Mar 8 23:27:13 2008 +0100
|
||||
|
||||
Makefile.am: nuke RCS Id
|
||||
|
||||
commit 78ce737e57867472c8166135a4dccd06eb1b2023
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Mon Jan 21 18:16:33 2008 +1000
|
||||
|
||||
fixup iomapsize so we only map the 4k not 16k which is an error
|
||||
|
||||
commit 25abf8e9b55efe51b9ef0fcde3b98c38bf3a7ba6
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jan 8 15:49:24 2008 +1000
|
||||
|
||||
make dist check pass
|
||||
|
||||
commit 8a33d2b5a820789309688855c81a4b11f8283500
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jan 8 15:48:00 2008 +1000
|
||||
|
||||
test for 1/4 bpp in case server is configured with them off
|
||||
|
||||
commit 46e982ec0208bf7a32d47cd7cf7b1895e7bbfe1d
|
||||
Author: Dave Airlie <airlied@redhat.com>
|
||||
Date: Tue Jan 8 15:06:33 2008 +1000
|
||||
|
||||
cirrus initial pci access support
|
||||
|
||||
commit 6d114041dc22763aa89ef6a4f4af3246de3e3b1b
|
||||
Author: Brice Goglin <bgoglin@debian.org>
|
||||
Date: Tue Aug 7 10:26:40 2007 +0200
|
||||
|
||||
Define CIR_*_VERSION* using PACKAGE_VERSION_*
|
||||
|
||||
commit 6438659655d3cc23e39be9c0c9673c3247282997
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Mar 1 10:42:30 2007 -0800
|
||||
|
||||
renamed: .cvsignore -> .gitignore
|
||||
|
||||
commit 43d9703ddf79314015b66c81c671ef254fbb3934
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Mar 1 10:41:58 2007 -0800
|
||||
|
||||
Replace references to XFree86/XF86Config in man page
|
||||
|
||||
commit 1ba52ebddd605c9341ff7f0a880c272a78f467ed
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Apr 7 18:57:40 2006 +0000
|
||||
|
||||
VERSION -> CIR_VERSION
|
||||
|
||||
commit e6588f26e12bb737551b9448911c31129978ea85
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Apr 7 18:44:20 2006 +0000
|
||||
|
||||
Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
|
||||
|
||||
commit 9ca7e7fcfc53ae9054661219aa366409089c3f8d
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Dec 21 02:29:59 2005 +0000
|
||||
|
||||
Update package version for X11R7 release.
|
||||
|
||||
commit 2d8e201ee988646bd8601dbc2b8c32571fdac017
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Dec 19 16:25:52 2005 +0000
|
||||
|
||||
Stub COPYING files
|
||||
|
||||
commit dbf028bd0148d2317e7b87fad857ad0f7accd234
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:16 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit 4456ba0a597443aed32bf686b79c22ef19ac0102
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Dec 6 22:48:33 2005 +0000
|
||||
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
|
||||
commit 134440cd4ab932803b100bf7767776fb0ffb2d0d
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:33 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit 2f48ba72c2009bc3c7b83d2b1415df897a2b26e4
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Dec 2 02:16:07 2005 +0000
|
||||
|
||||
Remove extraneous AC_MSG_RESULT.
|
||||
|
||||
commit 444b38c206b6a7c037615694c2a7ada84380698e
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Tue Nov 29 23:29:58 2005 +0000
|
||||
|
||||
Only build dlloader modules by default.
|
||||
|
||||
commit 6d3a17ba84343fb5c0cf75039a4e5cbd3274cfc3
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Nov 28 22:04:08 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)
|
||||
|
||||
commit 2820e709f8d2366cdaf2aa7df8b9ad44fafc1886
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Mon Nov 28 16:05:38 2005 +0000
|
||||
|
||||
Separate cirrus driver into _drv, _alpine and _laguna components as they
|
||||
are in the monolithic tree.
|
||||
|
||||
commit 53e79befceacccee15bfa47b56b34b180f3039cb
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Mon Nov 21 10:49:11 2005 +0000
|
||||
|
||||
Add .cvsignores for drivers.
|
||||
|
||||
commit ad036f9f6ef53fa454f63f4426a17e55d7598343
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Nov 9 21:15:14 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC2 release.
|
||||
|
||||
commit 4c88ee7e2f5297a260b8d4871869cfa0494d157f
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Nov 1 15:08:52 2005 +0000
|
||||
|
||||
Update pkgcheck depedencies to work with separate build roots.
|
||||
|
||||
commit 44e282ad51518a06f6c5cd8c871b0bcd08ec0477
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:48:02 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit 2fe8297b577524e052987756a4902a20b7f41606
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
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
|
||||
|
||||
commit 2b3c8a3d754b4511ae7f90051c5ed995b1e45765
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Oct 17 22:57:32 2005 +0000
|
||||
|
||||
More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
|
||||
of indirectly
|
||||
|
||||
commit a5f509023c24021c5eb1a272a4423cbfe4b634c5
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Oct 17 00:09:02 2005 +0000
|
||||
|
||||
Use sed & cpp to substitute variables in driver man pages
|
||||
|
||||
commit 96c957a338d3aca2756b86680c052f602fee1e10
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Sep 27 20:53:19 2005 +0000
|
||||
|
||||
Update build system for apm, chips, cirrus, glint, i740, mga, neomagic,
|
||||
newport to accomodate various new documentation and utility files.
|
||||
|
||||
commit 60d397b933810bf2a377c00b3b2ce1ea5048b384
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Thu Aug 18 09:03:46 2005 +0000
|
||||
|
||||
Update autogen.sh to one that does objdir != srcdir.
|
||||
|
||||
commit 31a03e7fac786df5b3e51586a9f338cf019210a9
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:43 2005 +0000
|
||||
|
||||
Various changes preparing packages for RC0:
|
||||
- Verify and update package version numbers as needed
|
||||
- Implement versioning scheme
|
||||
- Change bug address to point to bugzilla bug entry form
|
||||
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||
reenable it)
|
||||
- Fix makedepend to use pkgconfig and pass distcheck
|
||||
- Update build script to build macros first
|
||||
- Update modular Xorg version
|
||||
|
||||
commit 269bb85534031d11bd008b530e39e52b86734832
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon Jul 25 23:46:27 2005 +0000
|
||||
|
||||
src/Makefile.am
|
||||
|
||||
commit 6ced8240c5d328b1edc2ba54d49f3d362e596244
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon Jul 25 23:46:15 2005 +0000
|
||||
|
||||
man/Makefile.am
|
||||
|
||||
commit c8160cf29932bef0a9b850c068587d1f1ad579ba
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Mon Jul 25 23:45:41 2005 +0000
|
||||
|
||||
Build system for Cirrus driver
|
||||
|
||||
commit 133e8b674546c50db80cb39d0ca526d6fb1ed12b
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Jul 11 02:29:46 2005 +0000
|
||||
|
||||
Prep for modular builds by adding guarded #include "config.h" everywhere.
|
||||
|
||||
commit 88c1e79c6b3fff064ca5ba2cc500714707d605be
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Sun Jun 26 04:38:12 2005 +0000
|
||||
|
||||
Bug #3628: Fix video driver submodule visibility.
|
||||
|
||||
commit 57144d6c9ea250b1d9a40bac4c70180593c1ca2c
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Sat Jun 25 21:16:54 2005 +0000
|
||||
|
||||
Bug #3626: _X_EXPORT tags for video and input drivers.
|
||||
|
||||
commit 264b155fdc7f0f860a5cfa5932fb683e5d1934ef
|
||||
Author: Daniel Stone <daniel@fooishbar.org>
|
||||
Date: Wed Apr 20 12:25:23 2005 +0000
|
||||
|
||||
Fix includes right throughout the Xserver tree:
|
||||
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
|
||||
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
|
||||
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
|
||||
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
|
||||
|
||||
commit 979f1e0c830891c9e4f0b4837980766cc7eac3d7
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Fri Jul 30 20:30:52 2004 +0000
|
||||
|
||||
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, all
|
||||
framebuffer formats except cfb and the overlay modes should work, and
|
||||
r128 and radeon need to be loaded from the ati driver (both issues to
|
||||
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
|
||||
drivers. elfloader users shouldn't be affected.
|
||||
|
||||
commit c15b8a386fc6915e2ec13b0b8b9a15eb7277d665
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Wed Jun 16 09:23:02 2004 +0000
|
||||
|
||||
DRI XFree86-4_3_99_12-merge import
|
||||
|
||||
commit 5308a983f77e8cd96538c4637062aa29a705caa3
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 19:28:21 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit fb8a70faaa717c7b998ad531e8b0c0620f56a731
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:33:20 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit d54af9086282437c9928ba667a763bff2cbaf740
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:12:18 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit cc1c352f76fc1138223cab6449bdbf5538400e27
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:35:52 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit 99774def5b55af0af2d53f78c4e09000c9105c29
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:23:18 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit 08e4d07d7203d7db746839725d632756ede8816d
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Tue Nov 25 19:28:36 2003 +0000
|
||||
|
||||
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
|
||||
|
||||
commit 2c120fef2e3e4fa5751e29e6e80e70edba6e3e7a
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:55 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit 97c9ec2c1201ec09c359f92817033281045c537e
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:48:55 2003 +0000
|
||||
|
||||
Initial revision
|
||||
|
||||
@ -21,4 +21,14 @@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
|
||||
EXTRA_DIST = README.multihead
|
||||
EXTRA_DIST = README.multihead ChangeLog
|
||||
|
||||
MAINTAINERCLEANFILES=ChangeLog
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@ PRE_UNINSTALL = :
|
||||
POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure COPYING ChangeLog config.guess \
|
||||
config.sub depcomp install-sh ltmain.sh missing
|
||||
@ -90,7 +90,6 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
@ -107,8 +106,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -130,6 +131,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -170,15 +172,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -195,31 +191,40 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
SUBDIRS = src man
|
||||
EXTRA_DIST = README.multihead
|
||||
EXTRA_DIST = README.multihead ChangeLog
|
||||
MAINTAINERCLEANFILES = ChangeLog
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
|
||||
@ -461,6 +466,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@ -587,6 +595,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-recursive
|
||||
|
||||
clean-am: clean-generic clean-libtool mostlyclean-am
|
||||
@ -642,7 +651,7 @@ uninstall-info: uninstall-info-recursive
|
||||
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
|
||||
check-am clean clean-generic clean-libtool clean-recursive \
|
||||
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
|
||||
dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-generic distclean-hdr distclean-libtool \
|
||||
distclean-recursive distclean-tags distcleancheck distdir \
|
||||
distuninstallcheck dvi dvi-am html html-am info info-am \
|
||||
@ -654,6 +663,13 @@ uninstall-info: uninstall-info-recursive
|
||||
mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
|
||||
tags tags-recursive uninstall uninstall-am uninstall-info-am
|
||||
|
||||
|
||||
.PHONY: ChangeLog
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
24
driver/xf86-video-cirrus/README
Normal file
24
driver/xf86-video-cirrus/README
Normal file
@ -0,0 +1,24 @@
|
||||
xf86-video-cirrus - Cirrus Logic video driver for the Xorg X server
|
||||
|
||||
Please submit bugs & patches to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/driver/xf86-video-cirrus
|
||||
|
||||
http://cgit.freedesktop.org/xorg/driver/xf86-video-cirrus
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
260
driver/xf86-video-cirrus/aclocal.m4
vendored
260
driver/xf86-video-cirrus/aclocal.m4
vendored
@ -7631,6 +7631,7 @@ AC_SUBST([am__tar])
|
||||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl
|
||||
@ -7667,27 +7668,24 @@ dnl of the copyright holder.
|
||||
# your configure.ac with the minimum required version, such as:
|
||||
# XORG_MACROS_VERSION(1.1)
|
||||
#
|
||||
# To force at least a version with this macro defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
# To ensure that this macro is defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION],
|
||||
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
#
|
||||
#
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
[XORG_MACROS_needed_version=$1
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.6
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
||||
fi
|
||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
||||
fi
|
||||
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.3.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
|
||||
m4_if(m4_version_compare(vers_have, [$1]), -1,
|
||||
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
|
||||
m4_undefine([vers_have])
|
||||
m4_undefine([maj_have])
|
||||
m4_undefine([maj_needed])
|
||||
]) # XORG_MACROS_VERSION
|
||||
|
||||
# XORG_PROG_RAWCPP()
|
||||
@ -7712,6 +7710,10 @@ else
|
||||
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS=-undef
|
||||
AC_MSG_RESULT([yes])
|
||||
# under Cygwin unix is still defined even with -undef
|
||||
elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS="-undef -ansi"
|
||||
AC_MSG_RESULT([yes, with -ansi])
|
||||
else
|
||||
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
||||
fi
|
||||
@ -7824,7 +7826,9 @@ AC_SUBST([ADMIN_MAN_DIR])
|
||||
# Whether or not the necessary tools and files are found can be checked
|
||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
@ -7880,7 +7884,9 @@ AC_SUBST(MAKE_HTML)
|
||||
# indicates whether the necessary tools and files are found and, if set,
|
||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
BUILDTXTDOC=no
|
||||
BUILDPDFDOC=no
|
||||
@ -7946,7 +7952,7 @@ AC_SUBST(MAKE_HTML)
|
||||
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
||||
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
||||
AC_ARG_ENABLE(malloc0returnsnull,
|
||||
AC_HELP_STRING([--enable-malloc0returnsnull],
|
||||
AS_HELP_STRING([--enable-malloc0returnsnull],
|
||||
[malloc(0) returns NULL (default: auto)]),
|
||||
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
||||
[MALLOC_ZERO_RETURNS_NULL=auto])
|
||||
@ -7998,7 +8004,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||
AC_DEFUN([XORG_WITH_LINT],[
|
||||
|
||||
# Allow checking code with lint, sparse, etc.
|
||||
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
||||
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
||||
[Use a lint-style source code checker (default: disabled)])],
|
||||
[use_lint=$withval], [use_lint=no])
|
||||
if test "x$use_lint" = "xyes" ; then
|
||||
@ -8039,7 +8045,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||
AC_REQUIRE([XORG_WITH_LINT])
|
||||
# Build lint "library" for more indepth checks of programs calling this library
|
||||
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
||||
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
||||
[Create lint library (default: disabled)])],
|
||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||
if test "x$make_lint_lib" != "xno" ; then
|
||||
@ -8057,6 +8063,154 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
|
||||
]) # XORG_LINT_LIBRARY
|
||||
|
||||
# XORG_CWARNFLAGS
|
||||
# ---------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||
#
|
||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
CWARNFLAGS="-v"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CWARNFLAGS)
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
]) # XORG_CWARNFLAGS
|
||||
|
||||
# XORG_STRICT_OPTION
|
||||
# -----------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Add configure option to enable strict compilation
|
||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||
|
||||
AC_ARG_ENABLE(strict-compilation,
|
||||
AS_HELP_STRING([--enable-strict-compilation],
|
||||
[Enable all warnings from compiler and make them errors (default: disabled)]),
|
||||
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
|
||||
if test "x$STRICT_COMPILE" = "xyes"; then
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
|
||||
if test "x$GCC" = xyes ; then
|
||||
STRICT_CFLAGS="-pedantic -Werror"
|
||||
elif test "x$SUNCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-errwarn"
|
||||
elif test "x$INTELCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-Werror"
|
||||
fi
|
||||
fi
|
||||
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
|
||||
AC_SUBST([CWARNFLAGS])
|
||||
]) # XORG_STRICT_OPTION
|
||||
|
||||
# XORG_DEFAULT_OPTIONS
|
||||
# --------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Defines default options for X.Org modules.
|
||||
#
|
||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||
XORG_CWARNFLAGS
|
||||
XORG_STRICT_OPTION
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
XORG_MANPAGE_SECTIONS
|
||||
]) # XORG_DEFAULT_OPTIONS
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
dnl copyright notice and this permission notice appear in supporting
|
||||
dnl documentation.
|
||||
dnl
|
||||
dnl The above copyright notice and this permission notice shall be included
|
||||
dnl in all copies or substantial portions of the Software.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
dnl OTHER DEALINGS IN THE SOFTWARE.
|
||||
dnl
|
||||
dnl Except as contained in this notice, the name of the copyright holders shall
|
||||
dnl not be used in advertising or otherwise to promote the sale, use or
|
||||
dnl other dealings in this Software without prior written authorization
|
||||
dnl from the copyright holders.
|
||||
dnl
|
||||
|
||||
# XORG_RELEASE_VERSION
|
||||
# --------------------
|
||||
# Adds --with/without-release-string and changes the PACKAGE and
|
||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AS_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
if test "x$RELEASE_VERSION" != "x"; then
|
||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||
[$PVP],
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
# XORG_CHANGELOG()
|
||||
# ----------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines the variable CHANGELOG_CMD as the command to generate
|
||||
# ChangeLog from git.
|
||||
#
|
||||
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
|
||||
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -8106,65 +8260,3 @@ AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
|
||||
fi
|
||||
])
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
dnl copyright notice and this permission notice appear in supporting
|
||||
dnl documentation.
|
||||
dnl
|
||||
dnl The above copyright notice and this permission notice shall be included
|
||||
dnl in all copies or substantial portions of the Software.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
dnl OTHER DEALINGS IN THE SOFTWARE.
|
||||
dnl
|
||||
dnl Except as contained in this notice, the name of the copyright holders shall
|
||||
dnl not be used in advertising or otherwise to promote the sale, use or
|
||||
dnl other dealings in this Software without prior written authorization
|
||||
dnl from the copyright holders.
|
||||
dnl
|
||||
|
||||
# XORG_RELEASE_VERSION
|
||||
# --------------------
|
||||
# Adds --with/without-release-string and changes the PACKAGE and
|
||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AC_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
if test "x$RELEASE_VERSION" != "x"; then
|
||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||
[$PVP],
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
|
||||
9649
driver/xf86-video-cirrus/configure
vendored
9649
driver/xf86-video-cirrus/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -22,7 +22,7 @@
|
||||
|
||||
AC_PREREQ(2.57)
|
||||
AC_INIT([xf86-video-cirrus],
|
||||
1.2.1,
|
||||
1.3.2,
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
xf86-video-cirrus)
|
||||
|
||||
@ -34,10 +34,15 @@ AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
|
||||
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.2)
|
||||
|
||||
# Checks for programs.
|
||||
AC_DISABLE_STATIC
|
||||
AC_PROG_LIBTOOL
|
||||
AC_PROG_CC
|
||||
XORG_CWARNFLAGS
|
||||
|
||||
AH_TOP([#include "xorg-server.h"])
|
||||
|
||||
@ -54,7 +59,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
|
||||
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])
|
||||
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES])
|
||||
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
|
||||
|
||||
# Checks for libraries.
|
||||
@ -84,6 +89,7 @@ AC_SUBST([DRIVER_NAME])
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
|
||||
@ -2127,17 +2127,6 @@ EOF
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
# The preopen pass in lib mode reverses $deplibs; put it back here
|
||||
# so that -L comes before libs that need it for instance...
|
||||
if test "$linkmode,$pass" = "lib,link"; then
|
||||
## FIXME: Find the place where the list is rebuilt in the wrong
|
||||
## order, and fix it there properly
|
||||
tmp_deplibs=
|
||||
for deplib in $deplibs; do
|
||||
tmp_deplibs="$deplib $tmp_deplibs"
|
||||
done
|
||||
deplibs="$tmp_deplibs"
|
||||
fi
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan"; then
|
||||
libs="$deplibs"
|
||||
|
||||
@ -99,8 +99,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -122,6 +124,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -162,15 +165,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -187,24 +184,32 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
|
||||
@ -25,6 +25,7 @@ Please refer to __xconfigfile__(__filemansuffix__) for general configuration
|
||||
details. This section only covers configuration details specific to this
|
||||
driver.
|
||||
.SH "SEE ALSO"
|
||||
__xservername__(1), __xconfigfile__(__filemansuffix__), xorgconfig(1), Xserver(1), X(__miscmansuffix__)
|
||||
__xservername__(1), __xconfigfile__(__filemansuffix__), Xserver(1), X(__miscmansuffix__)
|
||||
.SH AUTHORS
|
||||
Authors include: ...
|
||||
Authors include: Corin Anderson, Egbert Eich, Derek Fawcus, Koen Gadeyne,
|
||||
Harm Hanemaayer, David Monniaux, Itai Nahshon
|
||||
|
||||
@ -88,7 +88,7 @@ static cirrusClockRec cirrusClockTab[] = {
|
||||
* use the tested clock since others can be unstable.
|
||||
*/
|
||||
|
||||
Bool
|
||||
_X_EXPORT Bool
|
||||
CirrusFindClock(int *rfreq, int max_clock, int *num_out, int *den_out)
|
||||
{
|
||||
int n, i;
|
||||
|
||||
@ -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)
|
||||
|
||||
cirrus_drv_la_LTLIBRARIES = cirrus_drv.la
|
||||
cirrus_drv_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
@ -125,8 +125,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -148,6 +150,7 @@ F77 = @F77@
|
||||
FFLAGS = @FFLAGS@
|
||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GREP = @GREP@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -188,15 +191,9 @@ XORG_CFLAGS = @XORG_CFLAGS@
|
||||
XORG_LIBS = @XORG_LIBS@
|
||||
XSERVER_LIBPCIACCESS_FALSE = @XSERVER_LIBPCIACCESS_FALSE@
|
||||
XSERVER_LIBPCIACCESS_TRUE = @XSERVER_LIBPCIACCESS_TRUE@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
|
||||
ac_ct_F77 = @ac_ct_F77@
|
||||
ac_ct_NMEDIT = @ac_ct_NMEDIT@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
@ -213,24 +210,32 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
moduledir = @moduledir@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
@ -241,7 +246,7 @@ target_alias = @target_alias@
|
||||
# -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)
|
||||
cirrus_drv_la_LTLIBRARIES = cirrus_drv.la
|
||||
cirrus_drv_la_LDFLAGS = -module -avoid-version
|
||||
cirrus_drv_ladir = @moduledir@/drivers
|
||||
|
||||
@ -36,8 +36,10 @@
|
||||
/* This driver needs to be modified to not use vgaHW for multihead operation */
|
||||
#include "vgaHW.h"
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86RAC.h"
|
||||
#include "xf86Resources.h"
|
||||
#endif
|
||||
|
||||
/* All drivers initialising the SW cursor need this */
|
||||
#include "mipointer.h"
|
||||
@ -152,86 +154,6 @@ static int gd5446_MaxClocks[] = { 135100, 135100, 85500, 85500, 0 };
|
||||
static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 };
|
||||
static int gd7548_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 };
|
||||
|
||||
/*
|
||||
* List of symbols from other modules that this module references. This
|
||||
* list is used to tell the loader that it is OK for symbols here to be
|
||||
* unresolved providing that it hasn't been told that they haven't been
|
||||
* told that they are essential via a call to xf86LoaderReqSymbols() or
|
||||
* xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
|
||||
* unresolved symbols that are not required.
|
||||
*/
|
||||
|
||||
static const char *vgahwSymbols[] = {
|
||||
"vgaHWFreeHWRec",
|
||||
"vgaHWGetHWRec",
|
||||
"vgaHWGetIOBase",
|
||||
"vgaHWGetIndex",
|
||||
"vgaHWHandleColormaps",
|
||||
"vgaHWInit",
|
||||
"vgaHWLock",
|
||||
"vgaHWMapMem",
|
||||
"vgaHWProtect",
|
||||
"vgaHWRestore",
|
||||
"vgaHWSave",
|
||||
"vgaHWSaveScreen",
|
||||
"vgaHWSetMmioFuncs",
|
||||
"vgaHWSetStdFuncs",
|
||||
"vgaHWUnlock",
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
static const char *miscfbSymbols[] = {
|
||||
"xf1bppScreenInit",
|
||||
"xf4bppScreenInit",
|
||||
NULL
|
||||
};
|
||||
#endif
|
||||
|
||||
static const char *fbSymbols[] = {
|
||||
"fbScreenInit",
|
||||
"fbPictureInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *xaaSymbols[] = {
|
||||
"XAACreateInfoRec",
|
||||
"XAADestroyInfoRec",
|
||||
"XAAInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *ramdacSymbols[] = {
|
||||
"xf86CreateCursorInfoRec",
|
||||
"xf86DestroyCursorInfoRec",
|
||||
"xf86InitCursor",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *int10Symbols[] = {
|
||||
"xf86FreeInt10",
|
||||
"xf86InitInt10",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *shadowSymbols[] = {
|
||||
"ShadowFBInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *ddcSymbols[] = {
|
||||
"xf86PrintEDID",
|
||||
"xf86DoEDID_DDC2",
|
||||
"xf86SetDDCproperties",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *i2cSymbols[] = {
|
||||
"xf86CreateI2CBusRec",
|
||||
"xf86I2CBusInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
|
||||
#define ALP_MAJOR_VERSION 1
|
||||
@ -270,9 +192,6 @@ alpSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
static Bool setupDone = FALSE;
|
||||
if (!setupDone) {
|
||||
setupDone = TRUE;
|
||||
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
|
||||
miscfbSymbols, ramdacSymbols,int10Symbols,
|
||||
ddcSymbols, i2cSymbols, shadowSymbols, NULL);
|
||||
}
|
||||
return (pointer)1;
|
||||
}
|
||||
@ -549,8 +468,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if (!xf86LoadSubModule(pScrn, "vgahw"))
|
||||
return FALSE;
|
||||
|
||||
xf86LoaderReqSymLists(vgahwSymbols, NULL);
|
||||
|
||||
/*
|
||||
* Allocate a vgaHWRec
|
||||
*/
|
||||
@ -582,7 +499,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
PCI_DEV_FUNC(pCir->PciInfo));
|
||||
|
||||
if (xf86LoadSubModule(pScrn, "int10")) {
|
||||
xf86LoaderReqSymLists(int10Symbols,NULL);
|
||||
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
|
||||
pInt = xf86InitInt10(pCir->pEnt->index);
|
||||
xf86FreeInt10(pInt);
|
||||
@ -781,7 +697,8 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
(unsigned long)pCir->IOAddress);
|
||||
} else
|
||||
xf86DrvMsg(pScrn->scrnIndex, from1, "Not Using MMIO\n");
|
||||
|
||||
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
/*
|
||||
* XXX Check if this is correct
|
||||
*/
|
||||
@ -798,18 +715,17 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
"xf86RegisterResources() found resource conflicts\n");
|
||||
return FALSE;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!xf86LoadSubModule(pScrn, "i2c")) {
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(i2cSymbols,NULL);
|
||||
|
||||
if (!xf86LoadSubModule(pScrn, "ddc")) {
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(ddcSymbols, NULL);
|
||||
|
||||
if(!AlpI2CInit(pScrn)) {
|
||||
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
|
||||
@ -1102,7 +1018,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymbols("xf1bppScreenInit",NULL);
|
||||
break;
|
||||
#endif
|
||||
#ifdef HAVE_XF4BPP
|
||||
@ -1111,7 +1026,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymbols("xf4bppScreenInit",NULL);
|
||||
break;
|
||||
#endif
|
||||
case 8:
|
||||
@ -1122,7 +1036,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(fbSymbols, NULL);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -1132,7 +1045,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(xaaSymbols, NULL);
|
||||
}
|
||||
|
||||
/* Load ramdac if needed */
|
||||
@ -1141,7 +1053,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(ramdacSymbols, NULL);
|
||||
}
|
||||
|
||||
if (pCir->shadowFB) {
|
||||
@ -1149,7 +1060,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
AlpFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(shadowSymbols, NULL);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
@ -67,7 +67,7 @@ DGAFunctionRec CirDGAFuncs = {
|
||||
|
||||
|
||||
|
||||
Bool
|
||||
_X_EXPORT Bool
|
||||
CirDGAInit(ScreenPtr pScreen)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
|
||||
|
||||
@ -21,8 +21,9 @@
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86Resources.h"
|
||||
|
||||
#endif
|
||||
/* All drivers need this */
|
||||
|
||||
/* Drivers for PCI hardware need this */
|
||||
@ -93,7 +94,7 @@ SymTabRec CIRChipsets[] = {
|
||||
};
|
||||
|
||||
/* List of PCI chipset names */
|
||||
PciChipsets CIRPciChipsets[] = {
|
||||
_X_EXPORT PciChipsets CIRPciChipsets[] = {
|
||||
{ PCI_CHIP_GD5430, PCI_CHIP_GD5430, RES_SHARED_VGA },
|
||||
{ PCI_CHIP_GD5434_4,PCI_CHIP_GD5434_4, RES_SHARED_VGA },
|
||||
{ PCI_CHIP_GD5434_8,PCI_CHIP_GD5434_8, RES_SHARED_VGA },
|
||||
@ -109,33 +110,6 @@ PciChipsets CIRPciChipsets[] = {
|
||||
{ -1, -1, RES_UNDEFINED}
|
||||
};
|
||||
|
||||
/*
|
||||
* List of symbols from other modules that this module references. This
|
||||
* list is used to tell the loader that it is OK for symbols here to be
|
||||
* unresolved providing that it hasn't been told that they haven't been
|
||||
* told that they are essential via a call to xf86LoaderReqSymbols() or
|
||||
* xf86LoaderReqSymLists(). The purpose of this is to avoid warnings about
|
||||
* unresolved symbols that are not required.
|
||||
*/
|
||||
|
||||
static const char *alpSymbols[] = {
|
||||
"AlpAvailableOptions",
|
||||
"AlpProbe",
|
||||
NULL
|
||||
};
|
||||
static const char *lgSymbols[] = {
|
||||
"LgAvailableOptions",
|
||||
"LgProbe",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *vbeSymbols[] = {
|
||||
"VBEInit",
|
||||
"vbeDoEDID",
|
||||
"vbeFree",
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
|
||||
static MODULESETUPPROTO(cirSetup);
|
||||
@ -171,7 +145,6 @@ cirSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
setupDone = TRUE;
|
||||
xf86AddDriver(&CIRRUS, module, 0);
|
||||
|
||||
LoaderRefSymLists(alpSymbols, lgSymbols, vbeSymbols, NULL);
|
||||
return (pointer)1;
|
||||
}
|
||||
if (errmaj) *errmaj = LDR_ONCEONLY;
|
||||
@ -236,13 +209,11 @@ CIRProbe(DriverPtr drv, int flags)
|
||||
if (flags & PROBE_DETECT) {
|
||||
if (!lg_loaded) {
|
||||
if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) {
|
||||
xf86LoaderReqSymLists(lgSymbols, NULL);
|
||||
lg_loaded = TRUE;
|
||||
}
|
||||
}
|
||||
if (!alp_loaded) {
|
||||
if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) {
|
||||
xf86LoaderReqSymLists(alpSymbols, NULL);
|
||||
alp_loaded = TRUE;
|
||||
}
|
||||
}
|
||||
@ -288,7 +259,6 @@ CIRProbe(DriverPtr drv, int flags)
|
||||
if (!lg_loaded) {
|
||||
if (!xf86LoadDrvSubModule(drv, "cirrus_laguna"))
|
||||
continue;
|
||||
xf86LoaderReqSymLists(lgSymbols, NULL);
|
||||
lg_loaded = TRUE;
|
||||
}
|
||||
pScrn = LgProbe(usedChips[i]);
|
||||
@ -296,7 +266,6 @@ CIRProbe(DriverPtr drv, int flags)
|
||||
if (!alp_loaded) {
|
||||
if (!xf86LoadDrvSubModule(drv, "cirrus_alpine"))
|
||||
continue;
|
||||
xf86LoaderReqSymLists(alpSymbols, NULL);
|
||||
alp_loaded = TRUE;
|
||||
}
|
||||
pScrn = AlpProbe(usedChips[i]);
|
||||
@ -320,7 +289,7 @@ CIRProbe(DriverPtr drv, int flags)
|
||||
* Map the framebuffer and MMIO memory.
|
||||
*/
|
||||
|
||||
Bool
|
||||
_X_EXPORT Bool
|
||||
CirMapMem(CirPtr pCir, int scrnIndex)
|
||||
{
|
||||
int mmioFlags;
|
||||
@ -410,7 +379,7 @@ CirMapMem(CirPtr pCir, int scrnIndex)
|
||||
* Unmap the framebuffer and MMIO memory.
|
||||
*/
|
||||
|
||||
Bool
|
||||
_X_EXPORT Bool
|
||||
CirUnmapMem(CirPtr pCir, int scrnIndex)
|
||||
{
|
||||
#ifdef CIR_DEBUG
|
||||
@ -438,13 +407,12 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirProbeDDC(ScrnInfoPtr pScrn, int index)
|
||||
{
|
||||
vbeInfoPtr pVbe;
|
||||
|
||||
if (xf86LoadSubModule(pScrn, "vbe")) {
|
||||
xf86LoaderReqSymLists(vbeSymbols,NULL);
|
||||
pVbe = VBEInit(NULL,index);
|
||||
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
|
||||
vbeFree(pVbe);
|
||||
|
||||
@ -11,7 +11,6 @@
|
||||
|
||||
#include "xf86.h"
|
||||
#include "xf86_OSproc.h"
|
||||
#include "xf86Resources.h"
|
||||
#include "xf86PciInfo.h"
|
||||
#include "xf86Pci.h"
|
||||
#include "shadowfb.h"
|
||||
@ -19,7 +18,7 @@
|
||||
#include "cir.h"
|
||||
#include "alp.h"
|
||||
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
{
|
||||
CirPtr pCir = CIRPTR(pScrn);
|
||||
@ -46,7 +45,7 @@ cirRefreshArea(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirPointerMoved(int index, int x, int y)
|
||||
{
|
||||
ScrnInfoPtr pScrn = xf86Screens[index];
|
||||
@ -64,7 +63,7 @@ cirPointerMoved(int index, int x, int y)
|
||||
(*pCir->PointerMoved)(index, newX, newY);
|
||||
}
|
||||
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
{
|
||||
CirPtr pCir = CIRPTR(pScrn);
|
||||
@ -110,7 +109,7 @@ cirRefreshArea8(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
{
|
||||
CirPtr pCir = CIRPTR(pScrn);
|
||||
@ -157,7 +156,7 @@ cirRefreshArea16(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
|
||||
|
||||
/* this one could be faster */
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
{
|
||||
CirPtr pCir = CIRPTR(pScrn);
|
||||
@ -208,7 +207,7 @@ cirRefreshArea24(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
_X_EXPORT void
|
||||
cirRefreshArea32(ScrnInfoPtr pScrn, int num, BoxPtr pbox)
|
||||
{
|
||||
CirPtr pCir = CIRPTR(pScrn);
|
||||
|
||||
@ -39,12 +39,17 @@
|
||||
/* This driver needs to be modified to not use vgaHW for multihead operation */
|
||||
#include "vgaHW.h"
|
||||
|
||||
#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
||||
#include "xf86RAC.h"
|
||||
#include "xf86Resources.h"
|
||||
#endif
|
||||
|
||||
/* All drivers initialising the SW cursor need this */
|
||||
#include "mipointer.h"
|
||||
|
||||
/* need this for inputInfo */
|
||||
#include "inputstr.h"
|
||||
|
||||
/* All drivers implementing backing store need this */
|
||||
#include "mibstore.h"
|
||||
|
||||
@ -161,80 +166,6 @@ static int LgLinePitches[4][11] = {
|
||||
/* 32 */ { 160, 256, 320, 416, 512, 640, 832, 1024, 1280, 1664, 0 }
|
||||
};
|
||||
|
||||
/*
|
||||
* List of symbols from other modules that this module references. This
|
||||
* list is used to tell the loader that it is OK for symbols here to be
|
||||
* unresolved providing that it hasn't been told that they haven't been
|
||||
* told that they are essential via a call to xf86LoaderReqSymbols() or
|
||||
* xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
|
||||
* unresolved symbols that are not required.
|
||||
*/
|
||||
|
||||
static const char *vgahwSymbols[] = {
|
||||
"vgaHWFreeHWRec",
|
||||
"vgaHWGetHWRec",
|
||||
"vgaHWGetIOBase",
|
||||
"vgaHWGetIndex",
|
||||
"vgaHWHandleColormaps",
|
||||
"vgaHWInit",
|
||||
"vgaHWLock",
|
||||
"vgaHWMapMem",
|
||||
"vgaHWProtect",
|
||||
"vgaHWRestore",
|
||||
"vgaHWSave",
|
||||
"vgaHWSaveScreen",
|
||||
"vgaHWUnlock",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *fbSymbols[] = {
|
||||
"fbScreenInit",
|
||||
"fbPictureInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *xaaSymbols[] = {
|
||||
"XAACreateInfoRec",
|
||||
"XAADestroyInfoRec",
|
||||
"XAAInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *ramdacSymbols[] = {
|
||||
"xf86CreateCursorInfoRec",
|
||||
"xf86DestroyCursorInfoRec",
|
||||
"xf86InitCursor",
|
||||
NULL
|
||||
};
|
||||
|
||||
#define LGuseI2C 1
|
||||
|
||||
static const char *ddcSymbols[] = {
|
||||
"xf86PrintEDID",
|
||||
#if LGuseI2C
|
||||
"xf86DoEDID_DDC2",
|
||||
#endif
|
||||
"xf86SetDDCproperties",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *i2cSymbols[] = {
|
||||
"xf86CreateI2CBusRec",
|
||||
"xf86I2CBusInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *int10Symbols[] = {
|
||||
"xf86FreeInt10",
|
||||
"xf86InitInt10",
|
||||
NULL
|
||||
};
|
||||
|
||||
static const char *shadowSymbols[] = {
|
||||
"ShadowFBInit",
|
||||
NULL
|
||||
};
|
||||
|
||||
#ifdef XFree86LOADER
|
||||
|
||||
#define LG_MAJOR_VERSION 1
|
||||
@ -274,9 +205,6 @@ lgSetup(pointer module, pointer opts, int *errmaj, int *errmin)
|
||||
|
||||
if (!setupDone) {
|
||||
setupDone = TRUE;
|
||||
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
|
||||
ramdacSymbols, ddcSymbols, i2cSymbols,
|
||||
int10Symbols, NULL);
|
||||
}
|
||||
return (pointer)1;
|
||||
}
|
||||
@ -430,8 +358,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
if (!xf86LoadSubModule(pScrn, "vgahw"))
|
||||
return FALSE;
|
||||
|
||||
xf86LoaderReqSymLists(vgahwSymbols, NULL);
|
||||
|
||||
/*
|
||||
* Allocate a vgaHWRec
|
||||
*/
|
||||
@ -463,7 +389,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
|
||||
if (xf86LoadSubModule(pScrn, "int10")) {
|
||||
xf86Int10InfoPtr int10InfoPtr;
|
||||
xf86LoaderReqSymLists(int10Symbols, NULL);
|
||||
|
||||
int10InfoPtr = xf86InitInt10(pCir->pEnt->index);
|
||||
|
||||
@ -648,6 +573,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
pCir->FbMapSize = pScrn->videoRam * 1024;
|
||||
pCir->IoMapSize = 0x4000; /* 16K for moment, will increase */
|
||||
|
||||
#ifndef XSERVER_LIBPCIACCESS
|
||||
pScrn->racIoFlags = RAC_COLORMAP
|
||||
#ifndef EXPERIMENTAL
|
||||
| RAC_VIEWPORT
|
||||
@ -661,19 +587,17 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
"xf86RegisterResources() found resource conflicts\n");
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#endif
|
||||
if (!xf86LoadSubModule(pScrn, "ddc")) {
|
||||
LgFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(ddcSymbols, NULL);
|
||||
|
||||
#if LGuseI2C
|
||||
if (!xf86LoadSubModule(pScrn, "i2c")) {
|
||||
LgFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(i2cSymbols, NULL);
|
||||
#endif
|
||||
|
||||
/* Read and print the monitor DDC information */
|
||||
@ -866,7 +790,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
LgFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(fbSymbols, NULL);
|
||||
break;
|
||||
}
|
||||
|
||||
@ -876,7 +799,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
LgFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(xaaSymbols, NULL);
|
||||
}
|
||||
|
||||
/* Load ramdac if needed */
|
||||
@ -885,7 +807,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
LgFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(ramdacSymbols, NULL);
|
||||
}
|
||||
|
||||
if (pCir->shadowFB) {
|
||||
@ -893,7 +814,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
|
||||
LgFreeRec(pScrn);
|
||||
return FALSE;
|
||||
}
|
||||
xf86LoaderReqSymLists(shadowSymbols, NULL);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
@ -1547,7 +1467,7 @@ LgAdjustFrame(int scrnIndex, int x, int y, int flags)
|
||||
(PCI_CHIP_GD5465 == pCir->Chipset) ? 1 : (24==pScrn->bitsPerPixel?3:1);
|
||||
|
||||
/* Where's the pointer? */
|
||||
miPointerPosition(&cursorX, &cursorY);
|
||||
miPointerGetPosition(inputInfo.pointer, &cursorX, &cursorY);
|
||||
|
||||
/* Where's the middle of the screen? We want to eventually know
|
||||
which side of the screen the pointer is on. */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user