Module Name: xsrc
Committed By: mrg
Date: Fri Dec 17 04:19:50 UTC 2010
Modified Files:
xsrc/external/mit/xf86-video-crime/dist/src: crime_driver.c
xsrc/external/mit/xf86-video-newport/dist/src: newport.h
newport_driver.c
Log Message:
apply some #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 around the code
that uses features no longer part of xorg-server 1.9.
seems to fix sgimips builds.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-newport/dist/src/newport.h
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.8 xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.9
--- xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c:1.8 Wed Nov 24 02:54:07 2010
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime_driver.c Fri Dec 17 04:19:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: crime_driver.c,v 1.8 2010/11/24 02:54:07 mrg Exp $ */
+/* $NetBSD: crime_driver.c,v 1.9 2010/12/17 04:19:50 mrg Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -55,8 +55,10 @@
/* for visuals */
#include "fb.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#include "xf86RAC.h"
+#endif
#ifdef XvExtension
#include "xf86xv.h"
@@ -396,8 +398,10 @@
fPtr->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
pScrn->racIoFlags = pScrn->racMemFlags;
+#endif
dev = xf86FindOptionValue(fPtr->pEnt->device->options, "device");
fPtr->fd = crime_open(dev);
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport.h
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.2 xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.3
--- xsrc/external/mit/xf86-video-newport/dist/src/newport.h:1.2 Sat Feb 14 03:09:50 2009
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport.h Fri Dec 17 04:19:50 2010
@@ -23,7 +23,9 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
+#endif
#include "xf86cmap.h"
Index: xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c
diff -u xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.7 xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.8
--- xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c:1.7 Wed Nov 24 02:54:08 2010
+++ xsrc/external/mit/xf86-video-newport/dist/src/newport_driver.c Fri Dec 17 04:19:50 2010
@@ -262,7 +262,9 @@
Bool foundScreen = FALSE;
GDevPtr *devSections;
GDevPtr dev = NULL;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
resRange range[] = { {ResExcMemBlock ,0,0}, _END };
+#endif
unsigned probedIDs[NEWPORT_MAX_BOARDS];
memType base;
if ((numDevSections = xf86MatchDevice(NEWPORT_DRIVER_NAME, &devSections)) <= 0)
@@ -306,9 +308,11 @@
TRUE);
base = (NEWPORT_BASE_ADDR0
+ busID * NEWPORT_BASE_OFFSET);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
RANGE(range[0], base, base +
sizeof(NewportRegs),
ResExcMemBlock);
+#endif
pScrn = (void *)xf86ConfigFbEntity(NULL,
0, entity, NULL, NULL, NULL, NULL);
/* Allocate a ScrnInfoRec */
