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
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
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
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
b88ad820fa
Set Int10Current->Tag for the linux native int10 module
...
Fixes bug #9296
(cherry picked from 731952c561a3972d09d1315f4fd31466e459ccb9 commit)
2006-12-13 12:18:22 +00:00
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
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
525257eb98
Fix stupid typos.
2006-07-21 19:16:38 -07:00
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
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
0aaac95b0d
Remove RCS tags. Fix Xprint makefile braindamage.
2006-07-21 17:56:00 -04:00
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
8793c7fd4b
Refactor identical xf86InitInt10 function from generic.c and linux.c
...
to helper_exec.c.
2006-07-14 09:11:39 -07:00
c5b3aa120b
Added a comment about some suspicious code.
2006-06-07 17:46:23 -07:00
46f55f5dea
Initial batch of changes for PCI rework. All future changes will be
...
tracked individually.
2006-06-07 14:09:02 -07:00
1bc72dce5f
Coverity #857 : Fix resource leak in error path by freeing earlier.
2006-03-10 08:03:24 +00:00
c3d1403672
Remove libcwrapper usage from xorg server modules. The libcwrapper is only
...
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
e03198972c
Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
...
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
source files in the xserver/xorg tree, predicated on defines of
HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
<X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
dae90c3af9
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2004-03-14 08:34:49 +00:00
867451f1ab
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
2004-03-03 12:12:50 +00:00
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
147aae87fd
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
2004-02-26 09:23:53 +00:00
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
9508a382f8
Initial revision
2003-11-14 16:48:57 +00:00
Ian Romanick
Adam Jackson
Alan Hourihane
Ian Romanick
Adam Jackson
Ian Romanick
Eric Anholt
Daniel Stone
Egbert Eich
Kaleb Keithley