attempt to make this build with xserver 1.7 and later.obsd-2.7

This means removing all the resource manager code.

13 files changed, 16 insertions, 12 deletions

diff --git a/src/ch7017/ch7017.c b/src/ch7017/ch7017.c
index 759fc24b..90f41542 100644
--- a/src/ch7017/ch7017.c
+++ b/src/ch7017/ch7017.c
@@ -34,7 +34,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/ch7xxx/ch7xxx.c b/src/ch7xxx/ch7xxx.c
index 8a439e42..0883b4f5 100644
--- a/src/ch7xxx/ch7xxx.c
+++ b/src/ch7xxx/ch7xxx.c
@@ -34,7 +34,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/i810_driver.c b/src/i810_driver.c
index 22cbbde9..71405090 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -67,10 +67,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 /*
  * These are X and server generic header files.
  */
+#include "xorgVersion.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
 #include "xf86Resources.h"
 #include "xf86RAC.h"
+#endif
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
@@ -721,10 +724,11 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
    pI810->PciTag = pciTag(pI810->PciInfo->bus, pI810->PciInfo->device,
 			  pI810->PciInfo->func);
 #endif
-
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
    if (xf86RegisterResources(pI810->pEnt->index, NULL, ResNone))
       return FALSE;
    pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+#endif
 
    /* Set pScrn->monitor */
    pScrn->monitor = pScrn->confScreen->monitor;
@@ -1155,9 +1159,11 @@ I810PreInit(ScrnInfoPtr pScrn, int flags)
 #endif
 
    /*  We won't be using the VGA access after the probe */
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
    I810SetMMIOAccess(pI810);
    xf86SetOperatingState(resVgaIo, pI810->pEnt->index, ResUnusedOpr);
    xf86SetOperatingState(resVgaMem, pI810->pEnt->index, ResDisableOpr);
+#endif
 
    return TRUE;
 }
diff --git a/src/i810_hwmc.c b/src/i810_hwmc.c
index d56dfc40..30abeb54 100644
--- a/src/i810_hwmc.c
+++ b/src/i810_hwmc.c
@@ -42,7 +42,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i810_video.c b/src/i810_video.c
index 418f2952..7b608b8e 100644
--- a/src/i810_video.c
+++ b/src/i810_video.c
@@ -42,7 +42,6 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i830_dri.c b/src/i830_dri.c
index 04154cc4..311aa6cd 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -1862,8 +1862,10 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 
 #ifdef USE_DRI2_1_1_0
     info.version = 2;
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
     info.CreateBuffers = NULL;
     info.DestroyBuffers = NULL;
+#endif
     info.CreateBuffer = I830DRI2CreateBuffer;
     info.DestroyBuffer = I830DRI2DestroyBuffer;
 #else
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 04033b8d..3f0d7df4 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -173,10 +173,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <stdio.h>
 #include <errno.h>
 
+#include "xorgVersion.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
 #include "xf86Resources.h"
 #include "xf86RAC.h"
+#endif
 #include "xf86Priv.h"
 #include "xf86cmap.h"
 #include "compiler.h"
@@ -1838,12 +1841,14 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
 			  pI830->PciInfo->func);
 #endif
 
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
    if (xf86RegisterResources(pI830->pEnt->index, NULL, ResNone)) {
       PreInitCleanup(pScrn);
       return FALSE;
    }
 
    pScrn->racMemFlags = RAC_FB | RAC_COLORMAP;
+#endif
    pScrn->monitor = pScrn->confScreen->monitor;
    pScrn->progClock = TRUE;
    pScrn->rgbBits = 8;
@@ -1967,9 +1972,11 @@ I830PreInit(ScrnInfoPtr pScrn, int flags)
        I830UnmapMMIO(pScrn);
 
        /*  We won't be using the VGA access after the probe. */
+#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,7,0,0,0)
        I830SetMMIOAccess(pI830);
        xf86SetOperatingState(resVgaIo, pI830->pEnt->index, ResUnusedOpr);
        xf86SetOperatingState(resVgaMem, pI830->pEnt->index, ResDisableOpr);
+#endif
    }
 
 #if defined(XF86DRI)
diff --git a/src/i830_i2c.c b/src/i830_i2c.c
index 8392d0a5..4ba073d4 100644
--- a/src/i830_i2c.c
+++ b/src/i830_i2c.c
@@ -31,8 +31,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
-#include "xf86RAC.h"
 #include "xf86cmap.h"
 #include "compiler.h"
 #include "mibstore.h"
diff --git a/src/i830_video.c b/src/i830_video.c
index a62d7a13..a9e459b0 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -57,7 +57,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/i915_hwmc.c b/src/i915_hwmc.c
index 659638e1..9e0cdab9 100644
--- a/src/i915_hwmc.c
+++ b/src/i915_hwmc.c
@@ -32,7 +32,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/ivch/ivch.c b/src/ivch/ivch.c
index 873afcc9..f97f4f66 100644
--- a/src/ivch/ivch.c
+++ b/src/ivch/ivch.c
@@ -31,7 +31,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/sil164/sil164.c b/src/sil164/sil164.c
index 410a681f..13c375a8 100644
--- a/src/sil164/sil164.c
+++ b/src/sil164/sil164.c
@@ -35,7 +35,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"
diff --git a/src/tfp410/tfp410.c b/src/tfp410/tfp410.c
index c2c4fc3d..fb8244f3 100644
--- a/src/tfp410/tfp410.c
+++ b/src/tfp410/tfp410.c
@@ -34,7 +34,6 @@
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
-#include "xf86Resources.h"
 #include "compiler.h"
 #include "miscstruct.h"
 #include "xf86i2c.h"