Ian Romanick
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
Adam Jackson
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
Michel Dänzer
0ede39a25c
Fix build when int10 doesn't use x86emu.
2007-07-03 10:55:13 +02:00
Adam Jackson
028a00bc51
Make x86emu's I/O cycle tracing more useful.
...
Print debug messages only when the appropriate debug bit is set in the
8086 state vector, so you can focus in on the call you're actually
interested in.
2007-07-02 18:41:55 -04:00
Ian Romanick
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
Ian Romanick
d8bd0c41de
Convert to new pci_device_cfg_write_u* interface.
2007-01-15 11:38:22 -08:00
Ian Romanick
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
Alan Hourihane
b88ad820fa
Set Int10Current->Tag for the linux native int10 module
...
Fixes bug #9296
(cherry picked from 731952c561
commit)
2006-12-13 12:18:22 +00:00
Ian Romanick
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
Keith Packard
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
Egbert Eich
6319f7d713
Make int10 fully domain aware.
2006-11-03 18:59:51 +01:00
Matthias Hopf
46901063e8
Build with -D_PC on ix86 only.
2006-11-03 18:59:51 +01:00
Keith Packard
2be1ac15ae
Remove smashing of CFLAGS from server build.
...
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
2006-09-18 12:11:18 -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
a0f2e1cae4
Move xf86FindPciDeviceVendor and xf86FindPciClass from xf86pciBus.c to
...
xf86int10.c. Refactor common code from those functions to do_find.
2006-08-02 10:54:41 -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
525257eb98
Fix stupid typos.
2006-07-21 19:16:38 -07: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
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
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
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
1708b0c7d9
Eliminate "ugly" spaces around parenthesis. Add const qualifier.
...
General code clean-ups.
2006-06-21 14:39:39 -07:00
Ian Romanick
c5b3aa120b
Added a comment about some suspicious code.
2006-06-07 17:46:23 -07:00
Ian Romanick
50112dfcc8
Fixed severly broken calls to pci_device_find_by_slot. I mis-read the
...
tag bits when I originally coded it. I mistakenly thought that the
original code masked off the PCI function bits, so I just always
passed 0 as the function. That was a mistake.
2006-06-07 17:46:05 -07:00
Ian Romanick
f9e7128d94
Added missing include of Pci.h. This caused the server to terminate
...
when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time.
2006-06-07 17:44:06 -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
52fc7c8dc7
Ensure all *ModuleData symbols are marked _X_EXPORT. Start removing
...
XFree86LOADER ifdefs, non-loadable hasn't been supported for a while
now. Remove completely gratuitious REMOVE_LOADER_CHECK_MODULE_INFO
ifdefs surrounding a call to a function added in XFree86 4.1 (!).
Miscellaneous static markings.
2006-06-05 03:00:24 +00:00
Eric Anholt
1bc72dce5f
Coverity #857 : Fix resource leak in error path by freeing earlier.
2006-03-10 08:03:24 +00:00
Eric Anholt
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
Kevin E Martin
7c00afd0ec
Define XFree86Server only where it is required.
2005-12-02 06:02:45 +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
Alan Coopersmith
13e0db19d8
Adding more doc files & fbdevhw man page
2005-10-01 06:19:02 +00:00
Eric Anholt
133edff1b4
Don't define POSIX_SOURCE on any BSDs, since it breaks things.
...
Define NO_SYS_HEADERS, as the monolithic build does. Helps FreeBSD.
Don't include validate.c in the library, since it seems to be a userland
test program.
2005-09-13 05:44:47 +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
Kevin E Martin
4a19a33db6
bugzilla #2880 ( https://bugs.freedesktop.org/show_bug.cgi?id=2880 )
...
attachment #2987 (https://bugs.freedesktop.org/attachment.cgi?id=2987 )
Use system method to access PCI config space for inb and inw in
addition to inl (Olivier Baudron and Kevin Martin).
2005-08-22 21:29:18 +00:00
Daniel Stone
05071ae0fb
Don't link in libx86emu.a as this a) fails badly on non-x86 systems, and b)
...
is done via x86emu.c including all the source files anyway.
2005-08-13 07:41:33 +00:00
Adam Jackson
4f9e76ed6a
Dear libtool: Loadable modules do not need version numbers. kthnxbye.
2005-07-13 22:09:52 +00:00
Daniel Stone
66bc36473c
Use builddir, not srcdir, for built files.
2005-07-12 23:36:27 +00:00
Lars Knoll
cda9c7b267
add x86emu.
2005-07-12 14:50:10 +00:00
Daniel Stone
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
Daniel Stone
826a6f029f
Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere.
2005-07-02 18:59:44 +00:00
Daniel Stone
ded56b1a74
Adding initial build system.
2005-07-01 20:29:53 +00:00
Daniel Stone
292c4cff26
Fix includes right throughout the Xserver tree:
...
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
<X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
Kevin E Martin
ef60998a82
bugzilla #2880 ( https://bugs.freedesktop.org/show_bug.cgi?id=2880 )
...
attachment #2285 (https://bugs.freedesktop.org/attachment.cgi?id=2285 )
Use system method to access PCI config space.
2005-04-01 20:21:38 +00:00
Egbert Eich
05a3dbf5dc
Updated x86emu and resynced with upsteam at Scitech.
2004-05-26 17:44:29 +00:00
Egbert Eich
2fb5886200
Merging XORG-CURRENT into trunk
2004-04-23 19:54:30 +00:00
Egbert Eich
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
Egbert Eich
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
Egbert Eich
df0313d35b
readding XFree86's cvs IDs
2004-02-26 13:36:15 +00:00
Egbert Eich
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
Egbert Eich
3c64b65d80
Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
2004-01-29 08:08:57 +00:00
Kaleb Keithley
adc7f9a4eb
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
2003-11-25 19:29:01 +00:00
Kaleb Keithley
9508a382f8
Initial revision
2003-11-14 16:48:57 +00:00