Commit Graph

191 Commits

Author SHA1 Message Date
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
Matthias Hopf
f4dd2665b0 Added missing domain stripping in already domain aware code. 2006-11-03 18:59:51 +01:00
Ian Romanick
27d682fa03 Fix from HEAD accidentally reverted during merge. 2006-10-24 09:04:14 -07:00
Ian Romanick
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
Matthias Hopf
1b94c117e0 Fixing probably long-standing bug in domain support. 2006-10-10 19:37:22 +02:00
Donnie Berkholz
d812f486a0 Really fix sparc on 64-bit kernel/32-bit userland.
Commit b3a3020fd0 used a sparc64 ifdef instead of
sparc. But for 32-bit userland, __sparc64__ is not defined so the wrong code is
used.
2006-09-20 15:39:39 -07:00
Jesse Barnes
b3a3020fd0 the new PCI mapping routines are broken on sparc64 (in fact they look
broken for any 32 bit X server running on a 64 bit kernel) so #ifdef
them out for now.  the PCI rework tree will make all this crap go away,
so I think we can tolerate the extra #ifdef for the next release.
2006-09-10 11:13:18 -07:00
Ian Romanick
5508f7646f Remove prototypes from some functions that were previously removed. 2006-08-08 16:43:31 -07:00
Ian Romanick
9df53d903e Rename xf86ReadDomainMemory to xf86ReadLegacyVideoBIOS, since that's
what it is actually used for.  Modify a few routines in linuxPci.c to
take pci_device structures as parameters in stead of PCITAGs.
2006-08-08 16:42:23 -07:00
Ian Romanick
5bfb2ee965 Remove the last remants of the pci{Read,Write}{Long,Word,Byte}
functionality.  This also allows the removal of PCI_CPU, PCI_CPU16,
and a few other dangling bits of cruft.
2006-08-02 13:29:21 -07:00
Ian Romanick
23f44df900 Remove pciConfigPtr and all of the associated cruft. 2006-08-02 09:55:32 -07:00
Ian Romanick
a94176627c Eliminate all uses of the businfo field of pciDevice / pciConfigPtr. 2006-07-31 14:33:58 -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
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
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
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
18624a9b7c Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr. 2006-07-13 21:10:48 -07: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
Ian Romanick
4e3c9ab8c9 Remove some static declarations for things that were removed in
previous commits.
2006-06-09 16:56:54 -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
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
8e8c6faecd Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) 2006-06-03 10:48:37 +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
Dave Airlie
26fa45b642 Bug #6751: Use the Linux PCI ROM interface on Linux properly. The old
domain code, still modified BARs not a good idea, Just talk to sysfs,
    if 0 read, fallback to old methods.
2006-04-26 11:40:58 +00:00
Adam Jackson
a68c11bb1d Mark everything in xf86sym.c as _X_EXPORT. 2006-03-25 19:52:05 +00:00
Daniel Stone
d0d336efd5 Add support for ZX2 PCI-E local bus adaptors. (Alex Williamson, HP)
Use soft timeout register to avoid MCAs when probing for non-existent local
    bus adaptors on ZX2. (Alex Williamson, HP)
2006-03-16 16:29:17 +00:00
Ian Romanick
cfdacab33a Eliminate unused PCI BIOS reading functionality. The old code used several
function pointers to implement a level of flexability that was never
    used. The code also had unused support for extracting a single image
    type from a larger expansion ROM.
Fix the spelling of PCI_BIOS_OPEN_FIRMWARE.
Fix a couple errors in #ifdef debug code.
These changes have been tested on x86 and x86-64 Linux.
2006-02-21 00:02:08 +00:00
Ian Romanick
5fd0f94006 Eliminate all the code for querying the PCI class from the PCI ID database.
Class information is not, and never has been, stored there. Therefore,
    this is just a bunch of elaborate code to read 0x00000000.
This has received testing on x86 and x86-64 Linux.
2006-02-20 23:45:50 +00:00
Daniel Stone
2949c705f1 Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
Attempt to build xeglmodule.c, not xglxmodule.c.
Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
    treatment as _SOURCES in terms of automatically DISTing.
2006-01-10 03:23:05 +00:00
Dave Airlie
fc69a2e729 Remove PowerMAX_OS define it never worked , it'll never work again,
finishes running joke of OLS2005
2005-12-29 08:42:49 +00:00
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Eric Anholt
ccfaf82367 Bug #5160: Fix the modular build to try to use the same logic for choosing
the architecture/os-specific bus support as monolithic.
2005-12-01 05:04:07 +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
Kristian Høgsberg
f8430a1b86 Bug #2880, add functions for byte and word level access to pci config
space.
Fix broken utf8 again.
2005-11-08 19:04:56 +00:00
Adam Jackson
af211a9bc1 Fix PCI bus scan on ia64 E8870 chipsets. 2005-10-19 22:30:09 +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 Coopersmith
b623c60745 Linux/Alpha support (Stefaan De Roeck) 2005-09-19 22:44:49 +00:00
Daniel Stone
53e489c0e3 Work around ATI expansion ROM problem on IA64 caused by prototype HP
McKinley systems. (Bdale Garbee)
2005-08-26 05:47:36 +00:00
Daniel Stone
825a95a1fa Remove use of dix-config and xorg-config.h from public headers. 2005-08-24 11:18:35 +00:00
Daniel Stone
367f450739 Change xorg_bus_sbus to xorg_bus_sparc; build sparcPci.c on all SPARCs. 2005-08-21 08:43:46 +00:00
Daniel Stone
71b3fea94e Typo fix (SOURCE -> SOURCES). 2005-08-21 08:24:52 +00:00
Daniel Stone
db2909ce76 Add test for SPARC. Build SparcMulDiv.S on all SPARCs.
Make the default font path configurable.
2005-08-21 06:56:19 +00:00
Adam Jackson
d96e666686 Add sparcPci.c to EXTRA_DIST. 2005-08-20 18:52:07 +00:00