configure.ac | 2 +-
src/newport.h | 3 +++
src/newport_driver.c | 4 ++++
3 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d389e0a1de0b8861d6869866fc133bc970014c36
Author: Dave Airlie <airl...@redhat.com>
Date: Mon Sep 7 15:03:57 2009 +1000
bump to 0.2.3 for release
diff --git a/configure.ac b/configure.ac
index 4478cbc..6da5959 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-video-newport],
- 0.2.2,
+ 0.2.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-video-newport)
commit fc6ef5cfb34e26b2f391d1868501bebbaaef786c
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 15:22:40 2009 +1000
newport: change to using ABI version check
diff --git a/src/newport.h b/src/newport.h
index d4435b7..70b9665 100644
--- a/src/newport.h
+++ b/src/newport.h
@@ -24,7 +24,7 @@
#include "xf86_OSproc.h"
#include "compiler.h"
-#ifndef XSERVER_LIBPCIACCESS
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
#include "xf86Resources.h"
#endif
commit d0bc81e8d7af7df512e5556a2d1da0c2053c75cd
Author: Dave Airlie <airl...@redhat.com>
Date: Tue Jul 28 13:32:31 2009 +1000
newport: update for resources/RAC API removal
diff --git a/src/newport.h b/src/newport.h
index f7354e9..d4435b7 100644
--- a/src/newport.h
+++ b/src/newport.h
@@ -23,7 +23,10 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
+
+#ifndef XSERVER_LIBPCIACCESS
#include "xf86Resources.h"
+#endif
#include "xf86cmap.h"
diff --git a/src/newport_driver.c b/src/newport_driver.c
index 757fd12..64b643a 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -247,7 +247,9 @@ NewportProbe(DriverPtr drv, int flags)
Bool foundScreen = FALSE;
GDevPtr *devSections;
GDevPtr dev = NULL;
+#ifndef XSERVER_LIBPCIACCESS
resRange range[] = { {ResExcMemBlock ,0,0}, _END };
+#endif
unsigned probedIDs[NEWPORT_MAX_BOARDS];
memType base;
@@ -270,10 +272,12 @@ NewportProbe(DriverPtr drv, int flags)
ScrnInfoPtr pScrn = NULL;
entity = xf86ClaimNoSlot(drv, 0, dev,
TRUE);
+#ifndef XSERVER_LIBPCIACCESS
base = (NEWPORT_BASE_ADDR0
+ busID * NEWPORT_BASE_OFFSET);
RANGE(range[0], base, base +
sizeof(NewportRegs),\
ResExcMemBlock);
+#endif
pScrn = xf86AllocateScreen(drv, 0);
xf86AddEntityToScreen(pScrn, entity);
pScrn->driverVersion = NEWPORT_VERSION;
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
