88f248e671
Replace PciBusId with 'struct pci_device *'
...
There's no need to store the slot information for a PCI device as its
ID. Instead, skip the middle man and just store a pointer to the
pci_device structure.
2007-01-17 14:04:43 -08:00
0361611080
Convert xf86IsolateDevice to a 'struct pci_slot_match'.
...
This change was accidentally not committed on the previous commit.
2007-01-17 13:06:04 -08:00
c1808f1484
Convert xf86IsolateDevice to a 'struct pci_slot_match'.
2007-01-17 13:02:27 -08:00
d2f8c42c48
Convert xf86FindPrimaryDevice to use a static buffer and snprintf.
...
Rather than allocate a 9 byte buffer on each invocation, use a static
16 byte buffer. Use snprintf for safety. This commit should probably
be cherry-picked to the trunk.
2007-01-17 12:59:17 -08:00
28976bebec
Eliminate unused fields in pciAccRec.
2007-01-17 12:15:09 -08:00
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
d8bd0c41de
Convert to new pci_device_cfg_write_u* interface.
2007-01-15 11:38:22 -08:00
3936caa005
Refactor pciTagConvertRange2Host and pciConvertRange2Host.
2007-01-12 10:59:35 -08:00
60c5e023e8
Eliminate some dead code.
2007-01-12 10:24:03 -08:00
dd12a94885
Eliminate xf86GetPciEntity from public interface.
...
xf86GetPciEntity was folded into the only place (xf86CheckPciSlot) in
the tree that still called it.
2007-01-12 10:21:25 -08:00
da09964a93
Merge branch 'origin' into pci-rework
...
Conflicts:
hw/xfree86/int10/generic.c
2007-01-09 15:27:34 -08:00
83080809f9
xfree86: deal with pitch that isn't a multiple of the granularity
...
When the pitch isn't a multiple of the granularity, allocate more space to
compensate.
2006-12-24 06:28:52 +02:00
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
e59aeac1ff
xfree86: remove stray debug line
2006-12-08 21:31:50 +02:00
729fca33a4
Revert "xfree86 DDX: Delete DDX screens in ddxGiveUp()."
...
This reverts commit a6381e6984https://bugs.freedesktop.org/show_bug.cgi?id=9224 .
2006-12-07 12:09:18 +01:00
8884a73a3f
xfree86/input: re-add support for disabling drag events
2006-12-06 23:24:24 +02:00
f9f7d7f3be
Check for __sparc as well as __sparc__ for compatibility with Sun cc
...
(gcc defines __sparc__, Sun cc defines __sparc)
2006-12-04 13:36:30 -08:00
a6381e6984
xfree86 DDX: Delete DDX screens in ddxGiveUp().
...
This allows video drivers to clean up in the FreeScreen hook things they set up
in the PreInit hook.
2006-11-29 19:25:09 +01:00
16f8f10dc2
Move mode handling helpers from ddcProperty.c to xf86Mode.c.
2006-11-27 16:21:31 -08:00
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
d6cd0313c7
Add some mode helper functions from the intel driver.
...
This also removes static from some other functions that had been copied out
to at least the intel driver, but perhaps others that were doing mode list
handling.
2006-11-27 14:46:50 -08:00
64de3baf85
Add a -showDefaultLibPath option.
...
A corollary to the previous change, this option prints $libdir.
2006-11-22 14:46:51 -08:00
0a2a6e4070
Add a -showDefaultModulePath option.
...
As discussed on the mailing list, people would rather have an X command-line
option to print the module path so installers can know where to put modules,
rather than the installers using `pkg-config --variable=moduledir xorg-server`,
since some distros choose not to install xorg-server.pc.
2006-11-22 14:43:37 -08:00
26d2e45bdb
Bug #9023 : Only check mice for "mouse" or "void" if identifier is != NULL.
2006-11-14 15:33:07 +01:00
ec77a95a02
Allow RandR objects to be created before the associated ScreenRec.
...
xf86 drivers need to create RandR object in the PreInit stage,
before the ScreenRec is allocated. Changing the RandR DIX code
to permit this required the addition of functions that later associate the
objects with the related screen.
An additional change is that modes are now global, and no longer associated
with a specific screen. This change actually makes mode management cleaner
as there is no more per-screen list of modes to deal with.
This changes the RandR 1.2 ABI/API for drivers.
2006-11-08 21:36:35 -08:00
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
e7900d68c3
remove trailing whitespace
...
Whitespace police in full effect.
2006-11-08 15:36:47 +02:00
2035f115b7
xfree86: remove xf86Keymap.h
2006-11-08 15:30:03 +02:00
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
844090a5b5
xfree86/xf86misc: warning fixes
2006-11-08 15:29:15 +02:00
05f1c30246
Merge branch 'autoconfig-for-7.2'
2006-11-07 18:42:54 -05:00
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
97fd471a62
Fix standard VESA modes.
...
The built-in mode timings were off slightly for the 640x480@60, 640x480@72,
and 1024x768@75 modes.
2006-11-03 14:06:32 -08:00
16c5043fc0
Fix 2 warnings.
2006-11-03 18:59:51 +01:00
543b397277
Merge branch 'origin' into randr-1.2
2006-11-02 19:00:35 -08:00
1d65429a9e
xfree86: don't attempt to enable and disable non-DIX devices
...
Don't try to enable and disable devices with no entry in the DIX, such as
the evdev brain.
2006-11-02 04:12:55 +02:00
ba9f5138fc
xfree86: allow starting with no input devices
...
Add a server flag (AllowEmptyInput), which will inhibit adding the
standard keyboard and mouse drivers, if there are no input devices in the
config file.
2006-11-02 03:16:10 +02:00
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
96e32805d1
Xi: disallow changing core keyboard and pointer
...
Just short-circuit the change core keyboard/pointer requests.
2006-10-29 03:43:34 +03:00
cdc8a4b7b2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-26 00:28:30 +03:00
becbda6d51
Fix test for Option "IgnoreABI".
...
This option has plenty of potential for wasting the time of bug triagers
without pretending it's always on.
2006-10-25 11:39:27 +02:00
59511974db
Merge branch 'master' into randr-1.2
2006-10-24 17:26:20 -07:00
0514d53e10
xfree86: remove motion history handling
...
Remove motion history handling, as we now deal with this in the DIX.
2006-10-25 01:10:44 +03:00
2a74b8a91d
xfree86: re-bump input abi to 1.0, yet again
2006-10-25 01:04:53 +03:00
8b90913566
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/Makefile.am
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/scanpci/extrapci.ids
hw/xfree86/scanpci/pci.ids
hw/xfree86/scanpci/pciid2c.pl
hw/xfree86/scanpci/xf86PciStdIds.h
2006-10-24 08:57:59 -07:00
0cd6a3d8ef
xfree86/input: add proximity support, free valuators
...
Re-add support for proximity events, and remember to both va_end our
varargs, and free our valuators.
2006-10-23 06:56:07 +03:00
c8f76fb3a4
xfree86/input: disallow pointer device changes, fix drag event calculation
...
Don't allow users to change the core pointer.
Fix xf86SendDragEvents to check the device button state, not the core
pointer's.
Remove unused xf86CheckButton.
2006-10-23 05:12:15 +03:00
c5b5b046e8
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-23 02:58:30 +03:00
fab1d37ecb
xfree86/options: don't blindly dereference NULL pointers
...
Sure, conf_idev should be initialised, but if it's not, try to make the
best of a bad situation.
2006-10-23 02:57:00 +03:00
e26a494f41
Merge branch 'input-hotplug' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-10-21 04:26:14 -04:00
Ian Romanick
Marc Aurele La France
Daniel Stone
Michel Dänzer
Alan Coopersmith
Eric Anholt
Aaron Plattner
Matthias Hopf
Keith Packard
Dave Airlie
Adam Jackson
Keith Packard
Zephaniah E. Hull