[PULL] bus cleanup, darwin hw/xfree86, build regression fixes

Jeremy Huddleston jeremyhu at apple.com
Thu Sep 22 19:52:05 PDT 2011


The following changes since commit 7fb4bef0394a5d09680985d34bce8252b61493cb:

  Merge remote-tracking branch 'mattst88/for-keith' (2011-09-21 14:34:27 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~jeremyhu/xserver master

Adam Jackson (16):
      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: Remove the PCITAG type
      int10: Use pciaccess rom fetch for !PC machines
      pci: Remove xf86MapDomainMemory
      int10: Port internal users off xf86MapVidMem
      incomplete: Remove xf86{Un,}MapVidMem

Jeremy Huddleston (8):
      Address regressions from e8ff555b95ba and d206d52f657c to work with other compilers
      XQuartz: Use set_front_process rather than X11ApplicationSetFrontProcess since we're already in the AppKit thread
      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

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

 configure.ac                               |   99 +++---
 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/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/os-support/Makefile.am          |    5 +-
 hw/xfree86/os-support/bsd/alpha_video.c    |  151 ---------
 hw/xfree86/os-support/bsd/arm_video.c      |  102 ------
 hw/xfree86/os-support/bsd/i386_video.c     |  413 ------------------------
 hw/xfree86/os-support/bsd/ppc_video.c      |   33 --
 hw/xfree86/os-support/bsd/sparc64_video.c  |   34 --
 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        |    8 +-
 hw/xfree86/os-support/hurd/hurd_video.c    |   71 -----
 hw/xfree86/os-support/linux/Makefile.am    |    4 -
 hw/xfree86/os-support/linux/int10/linux.c  |    3 -
 hw/xfree86/os-support/linux/lnx_video.c    |  471 ----------------------------
 hw/xfree86/os-support/shared/bios_devmem.c |   75 -----
 hw/xfree86/os-support/shared/ia64Pci.c     |  188 -----------
 hw/xfree86/os-support/shared/vidmem.c      |  235 --------------
 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/xf86OSpriv.h         |   14 -
 hw/xfree86/os-support/xf86_OSproc.h        |   23 --
 hw/xfree86/sdksyms.sh                      |   10 +-
 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/xquartz/X11Application.m                |    2 +-
 include/misc.h                             |   14 +-
 include/xorg-config.h.in                   |   15 +-
 xorg-server.pc.in                          |    1 -
 61 files changed, 455 insertions(+), 2720 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




More information about the xorg-devel mailing list