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
82f6b7e75e
Don't re-look-up pointers that are already stored in structures.
2006-07-24 13:52:58 -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
aed6fe0bb1
Refactor linuxGetSizesStruct to take a pci_device pointer instead of a
...
PCITAG. Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to call
linuxGetSizesStruct directly with a pci_device pointer. Remove
linuxGetSizes.
2006-07-24 13:13:05 -07:00
Ian Romanick
e487627992
Modify xf86BusAccWindowsFromOS and xf86AccResFromOS to use the
...
libpciaccess interfaces.
2006-07-24 12:23:23 -07:00
Ian Romanick
4b474cbc1a
The functions xf86PciBusAccWindowsFromOS and xf86BusAccWindowsFromOS
...
are identical. Just have one call the other.
2006-07-24 12:17:27 -07:00
Ian Romanick
7dff8d98a9
Remove source files that have been dead since day-1 of this branch.
2006-07-24 11:56:37 -07:00
Ian Romanick
eb95128f61
Changes that were missed on the previous commit. Perhaps oddness
...
caused by doing git-update-index at the wrong time.
2006-07-24 11:53:37 -07:00
Ian Romanick
05f8b772ae
ScanPciDisplayPCICardInfo now uses pci_device interface for PCI
...
scanning. Log messages simplified to make the code shorter and less
convoluted. ScanPciDisplayPCICardInfo is now void since it was only
called from one place with a constant parameter.
2006-07-24 11:23:03 -07:00
Adam Jackson
70869fc677
Yet more dead code.
2006-07-21 23:39:37 -04:00
Adam Jackson
7c1b2ee7a8
static markup, more dead code.
2006-07-21 23:35:13 -04:00
Adam Jackson
1c4f90b1d0
Open-coded path checks make baby Jesus cry.
2006-07-21 23:03:21 -04:00
Adam Jackson
114264584c
Remove a useless open() of the module we're about to load.
2006-07-21 22:55:41 -04:00
Ian Romanick
525257eb98
Fix stupid typos.
2006-07-21 19:16:38 -07:00
Daniel Stone
6cf844ab69
loader: walk directory paths with readdir(), don't stat() everything
...
Walk the directories with readdir, and don't stat everything we can
find. Thanks to davej for the public humiliation reminding me to go back
and re-fix this one.
2006-07-21 19:58:15 -04: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
Adam Jackson
63dfaa1d5b
Delete internal usage of the symbol ref/req lists.
2006-07-21 18:47:18 -04:00
Adam Jackson
bca9364f3f
Remove the loader's required and referenced symbol lists, dead code.
2006-07-21 18:41:46 -04:00
Ian Romanick
07ad92d2c4
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/common/xf86DoScanPci.c
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
2006-07-21 15:25:35 -07:00
Adam Jackson
aff404f293
Detach xf4bpp from cfb.
2006-07-21 18:24:37 -04:00
Adam Jackson
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
Aaron Plattner
eeaad0e956
Fix the RandR failure path for rotated screens.
2006-07-21 15:20:40 -07:00
Ian Romanick
22db3fdb54
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-07-21 13:55:37 -07:00
Ian Romanick
2f98841fde
Remove unused variable.
2006-07-20 16:08:27 -07:00
Adam Jackson
985c34bf06
Remove the DDXTIME conditional, for being unused.
2006-07-20 17:33:13 -04: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
46369350d4
Add some const qualifiers to serveral function parameters.
2006-07-14 15:51:55 -07:00
Ian Romanick
490fb30459
Rearrange code in xf86int10ParseBiosLocation to use strncasecmp. This
...
eliminates the need for the first use of xstrdup in this function.
The second use of xstrdup was *never* necessary and has also been
eliminated.
2006-07-14 15:26:56 -07: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
Ian Romanick
1450fd5964
Trivial refactor of libint10_la_SOURCES.
2006-07-14 09:10:32 -07:00
Ian Romanick
18624a9b7c
Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr.
2006-07-13 21:10:48 -07:00
Ian Romanick
12595a77d6
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-13 12:48:03 -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
Tilman Sauerbeck
63f13e01ee
Bug #7097 : do case-insensitive comparison for some hotkeys.
...
xkb's strcasecmp implementation has been moved to the dix so it's now
safe to just use strcasecmp().
2006-07-08 11:33:44 +02:00
Adam Jackson
b3e4d1d1f4
PPC64 build fix.
2006-07-06 18:51:29 -04:00
Adam Jackson
d7a96dd6f1
Switch the default mouse device on Linux to /dev/input/mice.
2006-07-06 17:39:14 -04:00
Ian Romanick
37838de62e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/os-support/bus/linuxPci.c
2006-07-06 13:01:57 -07:00
Ian Romanick
8d07ee070e
Refactor linuxGetIOSize and linuxGetSizes. Eliminate the unnecessary
...
optimization in the search loop.
2006-07-06 12:48:51 -07:00
Adam Jackson
704e645207
Remind dlloader that it needs to search the global scope as well as the
...
loaded modules. Fixes LoaderSymbol() on symbols provided by the server.
Spotted by Aaron Plattner.
2006-07-06 14:22:33 -04:00
Ian Romanick
e66e7b48e1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-05 15:21:36 -07:00
Greg Kroah-Hartman
863f5cc31b
fix compiler warning in hw/xfree86/common/xf86Config.c
2006-07-05 13:26:34 -07:00
Greg Kroah-Hartman
cc3e99f747
fix some more compiler warnings due to defines being declared differently
2006-07-05 10:13:19 -07: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
Eric Anholt
7106a77df3
Fix bugs in support for new repeatTypes in XAA and EXA.
...
EXA now won't pass pictures with new repeatTypes to drivers. We can add a flag
for them to support it at a later time.
2006-07-03 16:41:44 +02:00
Rudo Thomas
50a3e1ad18
Missing close parenthesis in one of the setuid() fixes.
2006-07-01 12:34:36 -07:00
Keith Packard
124a81eb38
Merge branch 'origin'
2006-07-01 11:12:50 -07:00
Paul Mackerras
d3d6c5f4d0
Bug #7381 : Coordinates get wrapped in accelerated line drawing on pixmap
...
XAAPolylinesWideSolid was adding the drawable origin onto each element in the
pPts array. Since the values got stored back into the pPts array, they got
truncated to 16 bits, causing the overflow I saw. This patch avoids storing
the coords back into the pPts array (and actually reduces the size of the
code too :). Now the 32-bit sum of coords + origin doesn't get truncated to
16 bits, and the problem is solved.
2006-07-01 11:10:18 -07:00