Commit Graph

172 Commits

Author SHA1 Message Date
Adam Jackson 4d76075dbb Death to RCS tags. 2007-06-29 14:06:52 -04:00
Ian Romanick ab7a6d860d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
2007-06-18 16:51:13 -07:00
Adam Jackson 2e7fef7d08 Make xf86{En,Dis}ableInterrupts no-ops on Linux. 2007-06-18 12:08:39 -04:00
Lennart Buytenhek 831d3b7f8d Compile fixes for Linux ARM platforms. 2007-06-18 12:05:55 -04:00
Bastian Blank 2267bf48b3 Fixes for s390 2007-05-28 21:55:05 -04:00
Adam Jackson a08d5157f7 VT activate or waitactive are fatal if they fail.
Also, be sure to waitactive on the way down, to make sure we're off the VT
before exiting.
2007-04-09 19:04:56 -04:00
Ian Romanick c279d5fdc5 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-01-19 12:59:54 -08:00
Ian Romanick f36a447d20 Eliminate use of Tag field.
The Tag field was removed from the int10 structures in commit
ca9c41e09d.  This file was over looked.
2007-01-16 14:49:19 -08:00
Alan Hourihane 78f9592c11 lnx_ev56.c has to be built with -mcpu=ev56. Fix it. 2007-01-10 16:04:20 +00:00
Ian Romanick da09964a93 Merge branch 'origin' into pci-rework
Conflicts:

	hw/xfree86/int10/generic.c
2007-01-09 15:27:34 -08:00
Alan Hourihane b88ad820fa Set Int10Current->Tag for the linux native int10 module
Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
2006-12-13 12:18:22 +00:00
Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
2006-12-08 17:24:15 -08:00
Eric Anholt b4b0d901d9 Merge branch 'randr-1.2'
Conflicts:

	dix/events.c
	dix/getevents.c
	hw/xfree86/common/xf86Mode.c
	hw/xfree86/dri/Makefile.am
	hw/xfree86/os-support/drm/xf86drm.c
	hw/xfree86/os-support/xf86drm.h
2006-11-27 15:43:15 -08:00
Bram Verweij 0567a6337b xfree86/linux acpi: fix tokenising
Split on a space, rather on the 'video' string, as strtok takes a char,
not a string.
2006-11-08 18:00:52 +02:00
Daniel Stone 809e2841aa xfree86: add general handler, port ACPI to it (bug #5665)
Add 'general' handler registration, which will not trigger DPMS when an
event comes in.
Make ACPI use this.
2006-11-08 15:30:03 +02:00
Keith Packard 20e9144c07 Add $(DIX_CFLAGS) to remaining Makefile.am files 2006-11-07 12:49:28 -08:00
Bernhard Rosenkraenzer 8deaaa312a automake: avoid use of reserved _SOURCES keyword (bug #8866)
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead.  Shuts automake 1.10 up.
2006-11-04 19:08:28 +02:00
Matthias Hopf 072c022e73 Fix obviously wrong boundary checks + cleanup unused vars.
Also disable compilation of code that is no longer used anywhere in the whole
Xserver tree.
2006-11-03 18:59:51 +01:00
Matthias Hopf 5afc6c1a14 Added linux 2.6 compatible domain aware device scanning code.
Additional scanning code uses the /sys interface of 2.6 kernels.
Cleaned up the use of tags and already split domain/bus/dev/fn.
2006-11-03 18:59:51 +01:00
Daniel Stone 01afa533aa xfree86/os-support: axe more unused files 2006-11-02 04:32:37 +02:00
Daniel Stone 18c246a13b Merge branch 'input-hotplug' 2006-11-02 03:21:37 +02:00
Daniel Stone 81728558a0 input: add non-keyboard bell ringing function
Add a generic 'ring the bell' function (console bell on Linux and BSD,
/dev/audio on Solaris), and add DDX functions for this.  Make this the
core keyboard's bell.
Port Xvfb and Xnest to this.
Port XFree86 to this, with OS-specific hooks for Linux, BSD, and Solaris
taken from foo_io.c in the old layer.
2006-11-01 23:10:26 +02:00
Myron Stowe 794f2e7291 xfree86: re-enable chipset-specific drivers for Linux/ia64
Re-enable chipset-specific support for Linux/ia64, by linking in
lnx_ia64.c.
2006-10-26 20:38:58 +03:00
Ian Romanick 21291d6ca7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-08-25 09:34:21 -07:00
Daniel Stone d6433be3cc Merge branch 'master' into input-hotplug 2006-08-12 21:50:52 +03:00
Bastian Blank f7919c2879 xfree86: don't do legacy IO on ARM or S/390 (Debian #362641)
Don't attempt to poke legacy IO ranges on ARM or S/390.
2006-08-12 20:43:25 +03:00
Daniel Stone 59dcc62906 xfree86: remove Xqueue support completely 2006-08-12 20:39:08 +03:00
Daniel Stone 008aa7eb6e completely remove OS keyboard layer
Completely axe the keyboard layer from os-support.
2006-08-12 18:56:05 +03:00
Ian Romanick 23f44df900 Remove pciConfigPtr and all of the associated cruft. 2006-08-02 09:55:32 -07:00
Ian Romanick 380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
2006-07-25 11:30:04 -07:00
Ian Romanick 2fd6b995ff Global s/xf86MapDomainIO/xf86MapLegacyIO/. Let's call a duck a duck,
okay?  Since xf86MapLegacyIO is called from only one place, cut the
parameter list down to the one parameter that actually conveys some
information:  the one that gives a PCI device.  Change from using a
PCITAG to a pci_device.
2006-07-24 13:33:34 -07:00
Ian Romanick 525257eb98 Fix stupid typos. 2006-07-21 19:16:38 -07:00
Ian Romanick e18d34f423 Make the various implementations of xf86ExtendedInitInt10 use the
libpciaccess interfaces.  This eliminates all calls to mapPciRom,
which in turn allows the elimination of hw/xfree86/int10/pci.c.
2006-07-21 16:47:45 -07:00
Daniel Stone e7ac27ad81 revert accidental deletion of lnx_io.c; re-delete lnx_kbd.c
Thinko'd which file to remove after merging from master.
2006-07-21 19:29:28 -04:00
Daniel Stone 81913a1291 remove undead files from master
Remove dead files which worked their way back in when merging from master.
Ugh.
2006-07-21 19:10:26 -04:00
Daniel Stone 7465010d59 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Kristian Høgsberg 3eeb62e8f5 bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
2006-07-21 16:33:28 -04:00
Ian Romanick 2f98841fde Remove unused variable. 2006-07-20 16:08:27 -07:00
Ian Romanick c69c00d652 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-07-20 12:08:38 -07:00
Daniel Stone 84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Adam Jackson 881953813c Fix the Linux ACPI reopen code to use a repeating timer, rather than a
one-shot sleep-and-reopen attempt.
2006-07-17 13:50:38 -04:00
Ian Romanick d3ee49bcba Refactor common code from the generic.c and linux.c version of
xf86ExtendedInitInt10 to xf86int10GetBiosLocationType and
xf86int10GetBiosSegment.

These changes were tested on MGA hardware on x86-64 with various
combinations of InitPrimary and BiosLocation.
2006-07-14 15:13:35 -07:00
Ian Romanick 8793c7fd4b Refactor identical xf86InitInt10 function from generic.c and linux.c
to helper_exec.c.
2006-07-14 09:11:39 -07:00
Tilman Sauerbeck 39b2f7b218 Bug #3042: Use autoconf to get the correct name of a struct member.
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
2006-07-08 19:55:53 +02:00
Adam Jackson d7a96dd6f1 Switch the default mouse device on Linux to /dev/input/mice. 2006-07-06 17:39:14 -04:00
Eric Anholt 002e28c12c Correct AGP memory deallocation argument on *BSD.
This fixes leaks and eventual crashes with RandR resizing on Intel.
2006-07-03 12:48:12 -07:00
Daniel Stone 8444bb77c9 When we can, bound the maximum number of PCI devices to attempt to scan, by
the number found on the system. Only implemented for Linux right now.
2006-06-05 20:22:06 +00:00
Daniel Stone 56f21bda1c Bug #6583: Only open /proc/bus/pci/devices once. (Bill Nottingham) 2006-06-01 22:30:52 +00:00
Adam Jackson deebf6bd51 Bug #4139: Fix a BAR remapping bug that could lead to IERR and system hang.
(Egbert Eich)
2006-05-18 23:52:51 +00:00
Adam Jackson c11cfcfaff Bug #6377: Ignore disabled BARs, and allow matching BARs aligned to less
than 16 bytes. (Felix Kühling, ATI)
2006-05-18 23:48:57 +00:00
Adam Jackson fa9a49a92d Bug #5877: Avoid burning CPU when acpid dies. Require acpid to be running
for ACPI support on Linux. Minor errno handling fixes. (Valery
    Inozemtsev, Adam Jackson)
2006-05-18 18:18:41 +00:00
Adam Jackson 321dbed5f5 Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev) 2006-05-15 18:27:18 +00:00
Adam Jackson 86ffb46358 Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer) 2006-05-09 18:04:29 +00:00
Benjamin Herrenschmidt 79dc689261 When reading the kernel keyboard mapping (readKernelMapping in
os-support/linux/lnx_KbdMap.c) we overrun the usefully-named global
    array 'map', scribbling on other random static variables elsewhere.
    This is fixed by changing the size of at2lnx. (David Woodhouse). Bug
    #5169
2006-04-22 03:22:17 +00:00
Adam Jackson a68c11bb1d Mark everything in xf86sym.c as _X_EXPORT. 2006-03-25 19:52:05 +00:00
Benjamin Herrenschmidt 1a4f20541a Fix linux build without libc wrappers (From Fredrik Höglund) 2006-02-13 04:56:27 +00:00
Eric Anholt c3d1403672 Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
Adam Jackson f1ba3b4f33 Bug #4718: Command line flag to disable ACPI. 2005-12-14 20:11:16 +00:00
Adam Jackson f9ccebe8c5 Bug #4928: Fix compilation for Alpha. (Stefaan DeRoeck) 2005-12-08 19:27:13 +00:00
Kevin E Martin 7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Adam Jackson e3ec048ff2 Bug #4928: Unbreak Makefile.am for Alpha chips. (Stefan DeRoeck) 2005-11-18 22:43:50 +00:00
Kevin E Martin 56101c9d6e Fix fd leak by closing them in the ACPI code instead of just using
shutdown.
2005-10-31 05:45:40 +00:00
Kevin E Martin 1859c62607 include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
2005-10-17 07:18:59 +00:00
Alan Hourihane 57abb5b171 remove reference to non-existent agpgart.h 2005-10-14 08:29:16 +00:00
Luc Verhaegen 9f3ad65251 Fix lnx_pci.c's xf86GetOSOffsetFromPCI return value. Clears up the resource
ranges awkwardness and the "INVALID MEM ALLOCATION" warning.
2005-10-05 07:27:52 +00:00
Alan Coopersmith 6d4b350dee Bug #3815 <https://bugs.freedesktop.org/show_bug.cgi?id=3815> Patch #3463
<https://bugs.freedesktop.org/attachment.cgi?id=3463> GNU/kFreeBSD
    Xserver support (Robert Millan)
2005-10-03 16:46:14 +00:00
Alan Hourihane 99793543c0 put back some agp related allocation messages 2005-09-22 12:40:41 +00:00
Alan Hourihane 02566dff4a fix typo 2005-09-22 12:33:36 +00:00
Adam Jackson b7e723ed6f Missing backslash 2005-09-20 23:32:21 +00:00
Alan Coopersmith b623c60745 Linux/Alpha support (Stefaan De Roeck) 2005-09-19 22:44:49 +00:00
Alan Coopersmith 535cd292c8 #include "xf86Axp.h" -> "shared/xf86Axp.h" for modular build. (Stefaan De
Roeck)
2005-09-19 18:38:26 +00:00
Adam Jackson 0e50af8b7f typo fix 2005-08-30 19:35:06 +00:00
Adam Jackson 5ffff7cb86 Bug #4160: Fix Altix kernel version check. 2005-08-26 20:08:09 +00:00
Daniel Stone 3075df24e7 Subvert SIGUSR2 to reload all input devices. (Ubuntu #020) 2005-08-26 07:35:55 +00:00
Daniel Stone 89c84575ea Undo rate/period change after function body, so the damage doesn't leak
into other functions. (Debian #050)
2005-08-26 07:24:21 +00:00
Daniel Stone bb5e934df7 Only open /proc/bus/pci/devices once. (Ubuntu #029) 2005-08-26 07:15:04 +00:00
Daniel Stone c937faadd0 Better error message on failure to set iopl. (Debian #021) 2005-08-26 06:48:24 +00:00
Alan Hourihane 7693f668ef programs/Xserver/hw/xfree86/os-support/linux/lnx_acpi.c
programs/Xserver/hw/xfree86/os-support/linux/lnx_apm.c
programs/Xserver/hw/xfree86/os-support/linux/Imakefile Add basic ACPI Linux
    support so that events can be passed to the driver. (Alan Hourihane)
2005-08-22 12:05:18 +00:00
Adam Jackson d31de217e6 distcheck fixes 2005-08-02 03:36:09 +00:00
Adam Jackson 2d7b1893be - Workaround for AS_HELP_STRING compatibility with older autoconf.
- New intermediate build target for Xorg server
- ia64 fixes
2005-08-02 00:41:07 +00:00
Alan Hourihane bf32f4739c programs/Xserver/hw/xfree86/os-support/shared/agp_noop.c
programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
//bugs.freedesktop.org/show_bug.cgi?id=3164> Add xf86DeallocateGARTMemory()
    function call (Austin Yuan)
2005-07-19 20:51:46 +00:00
Kevin E Martin a407fa373b Move drm up to os-support since the files are shared by multiple platforms.
Fix the dri and drm build. Fix server-side DMX extension build. Make
    xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef
    _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.
2005-07-15 22:51:05 +00:00
Kevin E Martin defeb56fc9 Fix the build when DRI is enabled 2005-07-14 22:20:16 +00:00
Adam Jackson 7586ac6ede Bug #2216: Multiseat support. From various Debian and Ubuntu patches by
Aivils Stoss, Andreas Schuldei, Branden Robinson, and Daniel Stone.
2005-07-04 18:41:04 +00:00
Daniel Stone 4e501d35e2 Remove needless usage of DECkeysym.h. 2005-07-03 10:51:16 +00:00
Daniel Stone 0bb669638f Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". 2005-07-03 08:53:54 +00:00
Daniel Stone e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone 826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone 9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Daniel Stone ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00
Thomas Hellstrom a90af4a2e6 Bug 2750: Prevent mtrr_remove_offending from ending up in an endless loop
if the offending region refuses to be removed.
2005-05-15 17:45:47 +00:00
Adam Jackson 6c37648754 Bug #2141: Rework misleading warning message when APM support is
unavailable. (Previous patch on 2005-04-14 changed the wrong message.)
2005-04-25 00:11:21 +00:00
Adam Jackson 16c2499b8f Bug #2373: SGI Altix platform support. (Shrijeet Mukherjee, Jesse Barnes,
Bjorn Helgaas, Egbert Eich.)
2005-04-22 16:49:22 +00:00
Daniel Stone 292c4cff26 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.
2005-04-20 12:25:48 +00:00
Adam Jackson 7472fcfdd4 Bug #2141: Rework misleading warning message when APM support is
unavailable.
2005-04-15 00:18:58 +00:00
Thomas Hellstrom f4e9f522fe Bugzilla #2750 (https://bugs.freedesktop.org/show_bug.cgi?id=2750)
Linux-only fixes: Fix case where a smaller write-combining region
    blocks write-combining setting of the whole frame buffer. Fix bug in wc
    setting code when regions are first splitted and setting of
    write-combining then fails.
2005-03-23 21:03:41 +00:00
Roland Mainz 3f79c5eefc xc/config/cf/DragonFly.cf
xc/config/cf/Imake.cf
xc/config/cf/Imakefile
xc/config/imake/imake.c
xc/config/imake/imakemdep.h
xc/extras/drm/shared/drm.h
xc/include/Xos_r.h
xc/lib/xtrans/Xtranssock.c
xc/programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
xc/programs/Xserver/hw/xfree86/os-support/xf86_libc.h
xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
//bugs.freedesktop.org/show_bug.cgi?id=1712) attachment #2004
    (https://bugs.freedesktop.org/attachment.cgi?id=2004): Add support for
    DragonFly/BSD platform. Patch by Jeroen Ruigrok <asmodai@tendra.org>
    and Mike Verona <firedragonfly@gmail.com>.
2005-03-02 11:20:30 +00:00
Egbert Eich ea5b09f95d Save gs register before calling the vm86_old syscall thru int 0x80. This is
required for linuxthreads as the TLS uses this register to keep track
    of local thread storage (Bugzilla #2431, J. Scott Berg).
2005-02-07 18:16:05 +00:00