Alan Coopersmith
73f4229960
Fix names/types of new vuidMouse{Get,Set}ScreenPrivates macros
2008-01-02 19:17:54 -08:00
David S. Miller
ae869fc766
[SBUS]: Fix build, use getpagesize() instead of xf86getpagesize().
...
xf86getpagesize() was removed, but this one call site was
not fixed up.
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-27 07:34:09 +01:00
Samuel Thibault
58c2898b62
xfree86: permit access to io port 0xffff on the hurd
2007-12-16 01:21:45 +01:00
Eamon Walsh
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
Adam Jackson
fe25f897c6
xf86getpagesize -> getpagesize elsewhere in os-support/
2007-12-03 18:34:40 -05:00
Alan Coopersmith
b84f2833a6
xf86getpagesize() -> getpagesize() in os-support/solaris/sun_bios.c
2007-12-03 14:52:46 -08:00
Adam Jackson
1faba797cb
Death to libcwrapper.
...
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
Alan Coopersmith
a55ec1a9f4
Restore checks for __i386 where needed for Sun compilers on Solaris
2007-11-20 18:31:07 -08:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Adam Jackson
22f0e3a8b0
Avoid PS/2 protocol probing for /dev/input/mice
...
The kernel will always upconvert to ExplorerPS/2 for all readers of
/dev/input/mice, so don't waste time on startup trying to figure
that out.
2007-11-02 12:04:56 -04:00
Daniel Stone
493b83bd09
XFree86: Remove ridiculous SIGIO debugging
...
YOU PRESSED A KEY
AND AGAIN
YOU RELEASED A KEY
AND AGAIN
YOU PRESSED A KEY
AND AGAIN
... not so much.
2007-10-28 15:50:18 +02:00
Eamon Walsh
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
Matthias Hopf
74e84b8d89
Only issue XF86_APM_CAPABILITY_CHANGED for video change ACPI events (not e.g. brightness etc.).
2007-10-19 17:28:15 +02:00
Matthias Hopf
6fdf3ddfef
Fix ids of ACPI events according to ACPI spec.
2007-10-19 17:20:21 +02:00
Eamon Walsh
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Ben Byer
3d4eb17b38
mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI
2007-10-14 18:07:03 -07:00
Alan Coopersmith
62a9fb4cda
Fix PCI rework build on Solaris (copy what BSD does)
2007-09-27 16:47:32 -07:00
Alan Coopersmith
1d938a80fd
Remove unused pciAddrHostToBus functions from ix86Pci.c
...
Matches linuxPci.c changes made in 8279444a54
Fixes compiler errors:
"ix86Pci.c", line 194: too many struct/union initializers
"ix86Pci.c", line 204: too many struct/union initializers
"ix86Pci.c", line 214: too many struct/union initializers
2007-09-26 19:42:46 -07:00
Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
Eric Anholt
d8ab2353cb
Remove dead xf86GetPciSizeFromOS and xf86GetPciOffsetFromOS.
2007-08-30 11:26:17 -07:00
Eric Anholt
c2d80529fc
Remove the now-dead PciAvoid symbol.
2007-08-30 11:26:17 -07:00
Eric Anholt
adf46b57ce
Replace BSD custom PCI code with a stub implementation thanks to pciaccess.
...
Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.
While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
2007-08-28 10:13:27 -07:00
Eamon Walsh
4017d31902
devPrivates rework: since API is already broken, switch everything
...
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04:00
Eric Anholt
3fe67d23ed
Remove the BusAccWindows resource code which is now unused.
...
This was a bunch of poorly defined resource ranges per OS/platform combination
which were supposed to represent what regions could potentially have resources
allocated into them.
2007-08-27 19:02:41 -07:00
Ian Romanick
8b6b40b727
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
Adam Jackson
1834cfb447
Fix an error message to not point to @xfree86.org.
2007-08-21 10:44:37 -04:00
Julien Cristau
a1fe36b772
xfree86: Fix build on Linux/alpha.
...
A bunch of CFLAGS had gone missing, so the build failed with errors like:
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:7:19: error: input.h: No such file or directory
../../../../../hw/xfree86/os-support/linux/lnx_ev56.c:8:24: error: scrnintstr.h: No such file or directory
2007-08-21 00:26:33 +02:00
Blair Sadewitz
65a49f0ca1
Autoconfiguration of wsmouse for NetBSD.
2007-08-19 20:29:22 +02:00
Jeremy C. Reed
be536b79f2
Update for support on NetBSD and DragonFly. From
...
Joerg Sonnenberger and pkgsrc.
2007-08-16 11:23:28 -05:00
Jeremy C. Reed
1d4bea6106
Add some more support for DragonFly. From Joerg Sonnenberger
...
and pkgsrc.
2007-08-16 11:20:12 -05:00
Samuel Thibault
03f9da6724
xfree86: Improve default mouse handling on the Hurd
...
Make /dev/mouse the default device. This makes Xorg works with empty
or missing InputDevice sections.
2007-08-12 03:08:49 +02:00
Dave Airlie
e717eb82dc
xserver: stop bcopy from going really slow
...
The outport is most likely unnecessary on any currently used hardware,
the byte copy is necessary from what I know on IA64 and friends so leave it.
Add a new API entry point which lets a driver select the old behaviour if
such a needs is ever found.
This gives me ~20% speed up on startup on 945 hardware.
2007-08-05 09:51:36 +10:00
Daniel Stone
1150969b82
Convert all my license statements to the standard form
...
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
http://lists.freedesktop.org/archives/xorg/2007-July/026451.html
keithp's license on configure.ac changed with his verbal permission.
2007-08-01 01:53:31 +03:00
Adam Jackson
f62beb6f36
Remove all trace of Option "BiosLocation".
...
This code was deeply dangerous. If anyone actually had a use for this code,
we should find a better way of doing it.
2007-07-27 13:24:38 -04:00
Julien Cristau
0f91abd5c6
Fix alpha build failures
...
Don't include <asm/pci.h> in os-support/linux/lnx_axp.c, use "lnx.h" and
<unistd.h> instead
2007-07-19 20:37:26 -04:00
Alan Coopersmith
9fcb30ebf7
Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10
2007-07-12 13:00:32 -07:00
Jonathan Lim
16e429bcbf
Bug 5000: Fix domain support for SGI Altix
2007-07-04 20:08:49 +02:00
Adam Jackson
4d76075dbb
Death to RCS tags.
2007-06-29 14:06:52 -04:00
Adam Jackson
f7f3fe7fe7
Remove the remnants of OS/2 support.
...
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
2007-06-28 18:59:05 -04:00
Adam Jackson
8a06ff9ffa
Fix another usage of MAX_PCI_DEVICES.
...
Fixes cases where the VGA device is above the 128th device on the system.
2007-06-28 16:41:28 -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
Samuel Thibault
99eae8bea6
I/O enable/disable update for the Hurd
2007-05-29 22:04:36 -04:00
Matthieu Herrb
60de6c7ef9
Merge branch 'master' of ssh://herrb@git.freedesktop.org/git/xorg/xserver
2007-05-29 12:14:49 -06:00
Matthieu Herrb
3a6549a163
Make this build on OpenBSD
2007-05-29 12:14:23 -06:00
Bastian Blank
2267bf48b3
Fixes for s390
2007-05-28 21:55:05 -04:00
David Nusinow
6bf8d50193
Read ROM in chunks
...
This patch speeds up reads of the ROM by reading in large chunks rather
than one byte at a time. This patch was by Dann Frazier.
2007-05-28 21:42:10 -04:00
Matthias Drochner
9616a04285
Fix build on NetBSD/amd64.
2007-05-24 11:20:59 -07:00
Matthias Hopf
ebaa6c920c
Disable Simba PCI bridge routing code (Bug #8020 ).
...
The code in hw/xfree86/os-support/bus/sparcPci.c:simbaCheckBus()
is trying to mimmick VGA routing by disabling I/O space responses
behind the Simba PCI-PCI controller.
Unfortunately, doing this also happens to disable access to the
IDE controller I/O space registers, thus crashing the system. The
granularity of the I/O disabling in the Simba controller is not
fine enough to disable VGA without also disabling the IDE controller
registers.
2007-05-10 15:25:31 +02:00
Adam Jackson
d322608dc9
Fix a buffer overrun on machines with excessively large PCI busses.
...
Formerly we sized an array with a compile time constant, then initialized
its size to the same constant, but the Linux PCI init code would increase
that "constant". So if you happened to have more than 128 PCI devices,
you'd happily scribble into whatever variables happened to be in .bss
after that array.
Only really fixed for Linux atm. Other OSes will simply (still) fail to
work on video devices above the 128th PCI device.
2007-04-25 16:29:48 -04:00
Jared D. McNeill
4aae2de74b
Add a real xf86EnableIO/xf86DisableIO for NetBSD/PPC.
2007-04-10 12:57:15 -07:00
Adam Jackson
67e1c98895
Look for the PCI ROM file elsewhere in sysfs.
...
/sys/devices reflects the bus topology, and we don't care that much.
Easier (and more reliable) to just look in /sys/bus/pci/devices, which
is a flat view.
2007-04-09 19:08:52 -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
2c6d471088
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/dri/dri.c
2007-03-28 08:08:04 -07:00
Adam Jackson
62224e3972
Static cleanup for xf86 ddx.
2007-03-25 17:55:15 -04:00
Jay Cotton
90ca76ba28
Add sun_apm.c for Suspend-and-Resume support on Solaris
...
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6205248 >
2007-02-28 17:40:58 -08:00
Alan Coopersmith
5680efc0d2
Sun bug 6529003: Xorg should not be including <sys/immu.h> on Solaris
...
<sys/immu.h> was removed from the latest Solaris Nevada build, but it's
been useless to Xorg for a long time (it only declared a couple of kernel
variables)
<http://bugs.opensolaris.org/view_bug.do?bug_id=6529003 >
2007-02-27 09:56:40 -08:00
Jay Estabrook
a16360733e
Fix root bus/domain selection on alpha
2007-02-25 21:00:25 +00:00
Ian Romanick
c4fe1bcce1
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
2007-02-14 15:39:52 -08:00
Ian Romanick
e540d572c5
Merge fix missed on previous commit.
2007-02-14 15:38:10 -08:00
Adam Jackson
a23b0b069c
Typo fix.
2007-02-12 17:50:00 -05:00
Ian Romanick
3814862a86
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
2007-01-29 15:14:31 -08:00
Jonathan Lim
1627af5449
Call linuxPciOpenFile() for r/w access if applicable.
...
Currently, the call to linuxPciOpenFile() is always made for read
only access which causes the subsequent mmap call to fail when the
memory is mapped read/write.
Xorg #9692
2007-01-26 13:00:45 +01:00
Ian Romanick
24506ea65b
Move xf86ReadLegacyBIOS to the one place that uses it.
...
xf86ReadLegacyBIOS is only used by one function in int10/generic.c.
Move a generic implementation of that function there, rename it to
read_legcay_BIOS, and delete all remnants of it from all other places.
2007-01-24 15:33:49 -08:00
Ian Romanick
637b19b3ee
Eliminate pciControlBridge, pciGetBridgeBuses, and pciGetBridgeResources.
2007-01-22 09:58:33 -08:00
Ian Romanick
a232e4ae93
Convert xf86GetPciHostConfigFromTag to get_parent_bridge.
...
Convert xf86GetPciHostConfigFromTag to a new function called
get_parent_bridge. This name better represents what
xf86GetPciHostConfigFromTag is used for: walking up the lists of PCI
bridges from a device.
2007-01-22 09:16:45 -08:00
Ian Romanick
844560a02f
Elminiate ARCH_PCI_OS_INIT.
...
Never, ever use the ix86Pci stuff on Linux. This renders the whole
ARCH_PCI_OS_INIT mechanism useless. Remove it.
2007-01-22 09:13:59 -08: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
Ian Romanick
780b55ec6f
Fix accidental commit (bug) in linuxOpenLegacy.
2007-01-15 15:30:16 -08:00
Ian Romanick
31bd8d1507
Fix domain insanity.
...
Eliminate xf86GetPciDomain. The domain from libpciaccess is the
domain. Period. This means that 0 is a valid domain. Make sure that
INCLUDE_XF86_NO_DOMAIN is *not* set. Always run in "domain mode,"
even if the only domain possible is 0.
2007-01-15 15:19:30 -08:00
Ian Romanick
1c326bf75f
Eliminate unused INCLUDE_XF86_MAP_PCI_MEM define.
2007-01-12 12:07:19 -08:00
Ian Romanick
1a493509e3
Fix typos in conditionally compiled code.
2007-01-12 10:58:59 -08:00
Ian Romanick
8279444a54
Eliminate unused pciAddrHostToBus infrastructure.
2007-01-12 10:41:03 -08:00
Ian Romanick
e32fa10a04
Remove prototype for pciGetBaseSize.
2007-01-12 10:33:17 -08:00
Ian Romanick
7411f5c389
Eliminate pciHostAddrToBusAddr from interface.
...
pciHostAddrToBusAddr is no longer used anywhere in the tree. Remove
it with extreme prejudice.
2007-01-12 10:32:04 -08:00
Ian Romanick
c3016a2996
Missed file from previous commit.
...
Convert xf86ReadLegacyVideoBIOS to take a 'struct pci_device *'
parameter instead of a PCITAG.
2007-01-12 09:56:00 -08:00
Ian Romanick
ca9c41e09d
Convert int10 and vgaHW to use 'struct pci_device' instead of PCITAG.
...
Convert all uses of PCITAG in int10 and vgaHW to 'struct pci_device'.
This allows the conversion of xf86ReadLegacyVideoBIOS and
xf86MapDomainMemory to 'struct pci_device' from PCITAG.
2007-01-11 21:09:20 -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 731952c561
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
Alan Coopersmith
82912ad770
Make solaris version of xf86OSRingBell return void like other OS'es
2006-11-30 20:13:52 -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
Bjorn Helgaas
ae3c9ad4ab
Bug 9041: Check the return code in xf86MapDomainMemory().
2006-11-16 17:29:06 +01:00
Eric Anholt
6ff7f2ad6a
Fix build on FreeBSD after input-hotplug.
...
(cherry picked from commit 4e6e4baead
)
2006-11-15 15:35:22 -08:00
George Sapountzis
5bfe7f4dfc
DRI: call drmSetServerInfo() before drmOpen().
...
Also, remove some libdrm remnants.
2006-11-13 01:54:32 +02:00
Eric Anholt
28337cc106
Fix typo before the last commit.
2006-11-09 19:51:17 -08:00
Eric Anholt
e1720b1089
Bug #8868 : Remove drm from SUBDIRS now that the directory is gone.
2006-11-09 18:53:37 -08:00
Dave Airlie
fd91630b73
make X server use system libdrm - this requires libdrm >= 2.3.0
...
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
2006-11-09 09:30:33 +11: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
Daniel Stone
61b570d0c1
xfree86/os-support: update prototype for OSRingBell
2006-11-08 15:29:15 +02:00
Eric Anholt
4e6e4baead
Fix build on FreeBSD after input-hotplug.
2006-11-07 13:36:54 -08:00
Keith Packard
20e9144c07
Add $(DIX_CFLAGS) to remaining Makefile.am files
2006-11-07 12:49:28 -08:00
Keith Packard
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
Keith Packard
8b87ce1974
Allow X server to build against libdrm 2.1
2006-11-04 17:41:25 -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
Samuel Thibault
f72927d26c
xfree86/hurd: remove OsMouseProc (bug #5613 )
...
Remove OsMouseProc, let the mouse driver deal with it.
2006-11-04 19:08:27 +02:00