This is an updated [PULL] request for the BUS cleanup changes I've been wrangling as well as various misc bugfixes.
As noted earlier, this [PULL] does *NOT* remove the xf86MapVidMem API as was done in my earlier set. Instead, this just deprecates the functionality that will be removed eventually. The following changes since commit fae7ed62ad476114bd37b566202cf6b6546c0a1f: XQuartz: pbproxy: Add missing AM_OBJCFLAGS (2011-10-04 21:40:41 -0700) are available in the git repository at: git://people.freedesktop.org/~jeremyhu/xserver master Adam Jackson (15): xfree86: Move xf86GetClocks to vgahw int10: Port to pciaccess' legacy IO API vgahw: Remove IO domain setup vgahw: Don't default to standard (port space) access routines vgahw: Port to pciaccess IO space routines pci: Port xf86MapLegacyIO to pciaccess linux: Use pci_device_get_parent_bridge instead of open-coding it bus: remove some dead struct fields linux: Remove pre-2.6 PCI interface support linux: Remove ia64 domain I/O support code xfree86: Remove unused bios_devmem.c pci: Deprecate the PCITAG type int10: Use pciaccess rom fetch for !PC machines pci: Remove xf86MapDomainMemory int10: Port internal users off xf86MapVidMem Jeremy Huddleston (12): loader: when creating sdksyms.c only include shmint.h if MITSHM is enabled #29109 Xnest: Remove socket and its lock file on exit Xephyr: Remove socket and its lock file on exit os: Remove Error() xfree86: Add stubs for os-support to help adding new architecture support xfree86: Work around issue where ar may be told to make an archive with no contents xfree86: fbdevhw: Remove unused include of pciaccess.h xfree86: Link modules with -module darwin: configure: Force some irrelevant options to off on darwin xorg-server.pc.in: Remove libpciaccess and pixman-1 from Requires xfree86: Deprecate xf86MapVidMem and friends Bump ABI_VIDEODRV_VERSION to 12 Julien Cristau (1): xfree86: fix build with xv disabled Tiago Vignatti (3): configure: change PCI function checking by a meaningful version of the library configure: make PCI configuration more sane configure: wrap PCI code with macro and set it at build time Ville Skyttä (1): Man page syntax and spelling fixes. configure.ac | 90 +++--- doc/Xserver-spec.xml | 10 +- hw/kdrive/ephyr/hostx.c | 11 + hw/kdrive/ephyr/man/Xephyr.man | 32 +- hw/xfree86/common/Makefile.am | 9 +- hw/xfree86/common/xf86.h | 16 +- hw/xfree86/common/xf86AutoConfig.c | 4 +- hw/xfree86/common/xf86Bus.c | 19 +- hw/xfree86/common/xf86Bus.h | 1 - hw/xfree86/common/xf86Config.c | 4 +- hw/xfree86/common/xf86Configure.c | 6 +- hw/xfree86/common/xf86DPMS.c | 3 +- hw/xfree86/common/xf86Helper.c | 90 ------ hw/xfree86/common/xf86Init.c | 7 +- hw/xfree86/common/xf86Module.h | 2 +- hw/xfree86/common/xf86VGAarbiter.c | 15 - hw/xfree86/common/xf86fbBus.c | 2 + hw/xfree86/common/xf86pciBus.c | 19 +- hw/xfree86/common/xf86str.h | 8 +- hw/xfree86/dixmods/Makefile.am | 12 +- hw/xfree86/dixmods/extmod/Makefile.am | 2 +- hw/xfree86/exa/Makefile.am | 2 +- hw/xfree86/fbdevhw/Makefile.am | 2 +- hw/xfree86/fbdevhw/fbdevhw.h | 2 - hw/xfree86/int10/generic.c | 72 +---- hw/xfree86/int10/helper_exec.c | 52 ++-- hw/xfree86/int10/xf86int10.c | 61 ++-- hw/xfree86/int10/xf86int10.h | 2 +- hw/xfree86/modes/xf86Crtc.c | 2 + hw/xfree86/modes/xf86Crtc.h | 2 + hw/xfree86/modes/xf86Cursors.c | 1 + hw/xfree86/os-support/Makefile.am | 5 +- hw/xfree86/os-support/bsd/i386_video.c | 2 - hw/xfree86/os-support/bus/Makefile.am | 9 +- hw/xfree86/os-support/bus/Pci.c | 8 +- hw/xfree86/os-support/bus/Pci.h | 16 +- hw/xfree86/os-support/bus/bsd_pci.c | 16 +- hw/xfree86/os-support/bus/linuxPci.c | 450 ---------------------------- hw/xfree86/os-support/bus/nobus.c | 1 + hw/xfree86/os-support/bus/xf86Pci.h | 10 +- hw/xfree86/os-support/linux/Makefile.am | 4 - hw/xfree86/os-support/linux/int10/linux.c | 3 - hw/xfree86/os-support/shared/bios_devmem.c | 75 ----- hw/xfree86/os-support/shared/ia64Pci.c | 188 ------------ hw/xfree86/os-support/shared/vidmem.c | 6 - hw/xfree86/os-support/stub/Makefile.am | 19 ++ hw/xfree86/os-support/stub/stub_bell.c | 10 + hw/xfree86/os-support/stub/stub_bios.c | 12 + hw/xfree86/os-support/stub/stub_init.c | 26 ++ hw/xfree86/os-support/stub/stub_video.c | 13 + hw/xfree86/os-support/xf86_OSproc.h | 10 +- hw/xfree86/sdksyms.sh | 12 +- hw/xfree86/shadowfb/Makefile.am | 2 +- hw/xfree86/vbe/Makefile.am | 2 +- hw/xfree86/vgahw/vgaHW.c | 184 +++++++++--- hw/xfree86/vgahw/vgaHW.h | 24 +- hw/xfree86/xaa/Makefile.am | 2 +- hw/xnest/Display.c | 15 +- hw/xnest/Events.c | 2 + include/os.h | 1 - include/xorg-config.h.in | 15 +- man/Xserver.man | 8 +- os/backtrace.c | 5 +- os/log.c | 14 - os/xprintf.c | 5 +- xorg-server.pc.in | 1 - 66 files changed, 507 insertions(+), 1228 deletions(-) delete mode 100644 hw/xfree86/os-support/bus/linuxPci.c create mode 100644 hw/xfree86/os-support/bus/nobus.c delete mode 100644 hw/xfree86/os-support/shared/bios_devmem.c delete mode 100644 hw/xfree86/os-support/shared/ia64Pci.c create mode 100644 hw/xfree86/os-support/stub/Makefile.am create mode 100644 hw/xfree86/os-support/stub/stub_bell.c create mode 100644 hw/xfree86/os-support/stub/stub_bios.c create mode 100644 hw/xfree86/os-support/stub/stub_init.c create mode 100644 hw/xfree86/os-support/stub/stub_video.c _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel