Commit Graph

237 Commits

Author SHA1 Message Date
Ian Romanick 23f44df900 Remove pciConfigPtr and all of the associated cruft. 2006-08-02 09:55:32 -07:00
Ian Romanick 26c9587f90 Build fixes for last pull from HEAD. 2006-07-31 13:54:36 -07:00
Ian Romanick 69533fc04f Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86AutoConfig.c
2006-07-31 09:26:04 -07:00
Luc Verhaegen 79016d4036 Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
export it from the X server to modules.
2006-07-28 16:02:02 -04:00
Adam Jackson 990a400905 Remove getconfig horrorshow. Replace with a static built-in rule list for now. 2006-07-26 19:03:39 -04:00
Adam Jackson 39158e98ac Remove another latent PowerMAX hunk.
All your favorite running jokes of 2005, today!
2006-07-26 18:39:28 -04:00
Ian Romanick ef1aecaaf6 Pass correct pointer to xf86MapLegacyIO. 2006-07-26 13:25:13 -07:00
Ian Romanick 28ba8d5691 Gut anything having to do with the PciBusPtr (or PciBusRec) type.
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
2006-07-25 15:38:09 -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 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 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
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 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 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
Adam Jackson 985c34bf06 Remove the DDXTIME conditional, for being unused. 2006-07-20 17:33:13 -04: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
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
Adam Jackson b3e4d1d1f4 PPC64 build fix. 2006-07-06 18:51:29 -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
Jens Granseuer 179737d4a0 Bug 7145: fix build with gcc 2.95 & other c89 compilers
Move variable declarations to start of blocks as required by c89
2006-06-30 15:56:40 -07:00
Ian Romanick 7c4e540253 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-06-26 14:39:44 -07:00
Michel Dänzer 36756fdb2d Make sure <execinfo.h> is actually included when needed.
configure only defines HAVE_BACKTRACE, not HAVE_EXECINFO_H.

This could cause problems on platforms where the size of a pointer is greater
than that of an integer, see
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=363218 .
2006-06-24 15:09:24 +02:00
Ian Romanick a3c26d01a1 Move declaration of "j" inside #ifdef block where it is used to
eliminate compiler warning.
2006-06-21 14:38:07 -07:00
Ian Romanick 75398cff82 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c
2006-06-20 15:49:47 -07:00
Ian Romanick 1f91b5726c Fix a compiler warning about varibles being used without being set.
Add some const qualifiers.

Remove some "ugly" space around parenthesis.
2006-06-20 15:03:13 -07:00
Matthieu Herrb 2b58685402 Check setuid() return value. Bugzilla #7116. 2006-06-20 21:07:53 +02:00
Adam Jackson 98a602fab1 Don't bother building RAC as a module, that's just absurd. 2006-06-18 23:54:04 -04:00
Ian Romanick 8b6596b1e1 Move probe_devices_from_device_sections,
add_matching_devices_to_configure_list, and check_for_matching_devices
from xf86Helper.c to xf86Init.c.  These functions are only called from
a single place in xf86Init.c, so it makes sense for them to live
there.  They were originally in xf86Helper.c because they evolved out
another function that was already in that file.
2006-06-09 16:08:06 -07:00
Ian Romanick caffac3843 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-08 10:38:43 -07:00
Greg Kroah-Hartman 9fa73721f0 fix up EnableDisableExtension() and EnableDisableExtensionError() prototypes 2006-06-08 10:27:28 -07:00
Ian Romanick bc05158a5a Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-07 14:09:12 -07:00
Ian Romanick 46f55f5dea Initial batch of changes for PCI rework. All future changes will be
tracked individually.
2006-06-07 14:09:02 -07:00
Adam Jackson f90761b06e Add a token for EDID-supplied modes. 2006-06-07 13:58:24 -04:00
Adam Jackson d00aa6b855 Delete a (now misleading) message from the crash handler. 2006-06-07 11:44:36 -04:00
Daniel Stone 5b703f847d Fix type confusion. 2006-06-02 12:05:32 +00:00
Daniel Stone 6d594ebc66 Ditch more alternate-loader braindamage. 2006-06-01 20:22:39 +00:00
Adam Jackson a3a4221495 Add bitmap to the ignored module list. 2006-06-01 19:53:06 +00:00
Daniel Stone ee689c1042 Ignore requests to load GLcore and speedo. 2006-06-01 19:49:55 +00:00
Adam Jackson 07c731a2bc Bug #5089: Die, libbitmap, die! 2006-06-01 19:37:53 +00:00
Daniel Stone a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Daniel Stone fd8bde8bb0 Remove -xkbmap argument. 2006-05-29 11:14:03 +00:00
Jeremy C. Reed 354086d7e8 Don't do fixup_video_driver_list if no drivers. (I had signal 11 and core
dump when drivers not installed yet.)
TODO: fix fixup_video_driver_list to handle NULL argument.
2006-05-25 23:32:33 +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