diff options
| author | Matt Turner <mattst88@gmail.com> | 2012-01-26 17:57:42 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2012-01-26 17:57:42 -0500 |
| commit | 99ed41779e28bace7c3321a6d05e6436d4784c48 (patch) | |
| tree | 5384a1b34b8dc88ed4f2dae50b9153995aa3cf2c | |
| parent | 5634e78e42d14ab2325854093a42536844cae07f (diff) | |
Use pci_device_map_legacy rather than xf86MapDomainMemory
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/ark_driver.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index cbd61e3..0eb7121 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, CPPFLAGS="$SAVE_CPPFLAGS" if test "x$XSERVER_LIBPCIACCESS" = xyes; then - PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901]) fi AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) diff --git a/src/ark_driver.c b/src/ark_driver.c index cf0242c..1f4589c 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -1035,8 +1035,9 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) pScrn->videoRam * 1024); #else - pARK->MMIOBase = xf86MapDomainMemory(pScrn->scrnIndex, VIDMEM_MMIO, - pARK->PciInfo, 0xb8000, 0x8000); + (void) pci_device_map_legacy(pARK->PciInfo, 0xb8000, 0x8000, + PCI_DEV_MAP_FLAG_WRITABLE, + (void **)&pARK->MMIOBase); { void** result = (void**)&pARK->FBBase; |