xf86-video-mach64: Branch 'master' - 2 commits

[Jeremy Huddleston]

 configure.ac    |    2 +-
 src/atiprint.c  |    4 ++--
 src/atiprobe.c  |    2 +-
 src/atistruct.h |    8 ++++----
 src/atividmem.c |   14 ++++++++++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

New commits:
commit 0de234329fa1c3365954498819da93d64a978911
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sat Oct 29 18:53:48 2011 -0700

    Use pci_device_map_legacy rather than xf86MapDomainMemory
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/configure.ac b/configure.ac
index e4ab861..087ef11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -206,7 +206,7 @@ CPPFLAGS="$SAVE_CPPFLAGS"
 AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
 
 if test "x$XSERVER_LIBPCIACCESS" = xyes; then
-    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])
+    PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.12.901])
     XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS"
 fi
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
diff --git a/src/atividmem.c b/src/atividmem.c
index 8950f84..0104a0a 100644
--- a/src/atividmem.c
+++ b/src/atividmem.c
@@ -84,7 +84,11 @@ ATIUnmapVGA
     if (!pATI->pBank)
         return;
 
+#ifndef XSERVER_LIBPCIACCESS
     xf86UnMapVidMem(iScreen, pATI->pBank, 0x00010000U);
+#else
+    (void) pci_device_unmap_legacy(pATI->PCIInfo, pATI->pBank, 0x00010000U);
+#endif
 
     pATI->pBank = NULL;
 }
@@ -219,8 +223,14 @@ ATIMapApertures
          * No relocation, resizing, caching or write-combining of this
          * aperture is supported.  Hence, the hard-coded values here...
          */
-            pATI->pBank = xf86MapDomainMemory(iScreen, VIDMEM_MMIO_32BIT,
-                Tag, 0x000A0000U, 0x00010000U);
+#ifndef XSERVER_LIBPCIACCESS
+        pATI->pBank = xf86MapDomainMemory(iScreen, VIDMEM_MMIO_32BIT,
+                                          Tag, 0x000A0000U, 0x00010000U);
+#else
+        (void) pci_device_map_legacy(Tag, 0x000A0000U, 0x00010000U,
+                                     PCI_DEV_MAP_FLAG_WRITABLE,
+                                     &pATI->pBank);
+#endif
 
         if (!pATI->pBank)
             return FALSE;
commit 75166a0fc92220b496eb67451ec1b11cb8b72091
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sat Oct 29 18:54:10 2011 -0700

    Use unsigned long rather than deprecated IOADDRESS
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/src/atiprint.c b/src/atiprint.c
index 3a1debb..f050d52 100644
--- a/src/atiprint.c
+++ b/src/atiprint.c
@@ -92,11 +92,11 @@ ATIPrintBIOS
 static void
 ATIPrintIndexedRegisters
 (
-    const IOADDRESS Port,
+    const unsigned long Port,
     const CARD8     StartIndex,
     const CARD8     EndIndex,
     const char      *Name,
-    const IOADDRESS GenS1
+    const unsigned long GenS1
 )
 {
     int Index;
diff --git a/src/atiprobe.c b/src/atiprobe.c
index 5092073..b065915 100644
--- a/src/atiprobe.c
+++ b/src/atiprobe.c
@@ -373,7 +373,7 @@ ATIMach64ProbeIO
 
 #ifndef AVOID_CPIO
 
-        static const IOADDRESS Mach64SparseIOBases[] = {
+        static const unsigned long Mach64SparseIOBases[] = {
             0x02ECU,
             0x01CCU,
             0x01C8U
diff --git a/src/atistruct.h b/src/atistruct.h
index 5225256..87f2a5d 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -234,19 +234,19 @@ typedef struct _ATIRec
      * Processor I/O decoding definitions.
      */
     CARD8 CPIODecoding;
-    IOADDRESS CPIOBase;
+    unsigned long CPIOBase;
 
 #ifndef AVOID_CPIO
 
     /*
      * Processor I/O port definition for VGA.
      */
-    IOADDRESS CPIO_VGABase;
+    unsigned long CPIO_VGABase;
 
     /*
      * Processor I/O port definitions for VGA Wonder.
      */
-    IOADDRESS CPIO_VGAWonder;
+    unsigned long CPIO_VGAWonder;
 
 #endif /* AVOID_CPIO */
 
@@ -256,7 +256,7 @@ typedef struct _ATIRec
 
 #ifndef AVOID_CPIO
 
-    IOADDRESS CPIO_DAC_MASK, CPIO_DAC_DATA, CPIO_DAC_READ, CPIO_DAC_WRITE,
+    unsigned long CPIO_DAC_MASK, CPIO_DAC_DATA, CPIO_DAC_READ, CPIO_DAC_WRITE,
               CPIO_DAC_WAIT;
 
 #endif /* AVOID_CPIO */