Unlibcwrap. Bump server version requirement. Bump to 1.1.0.nv-1_1_0

9 files changed, 30 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index 14b1807..42e6d78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-04-07  Adam Jackson  <ajax@freedesktop.org>
+
+	* configure.ac:
+	* src/nv_const.h:
+	* src/nv_include.h:
+	* src/nv_local.h:
+	* src/nv_video.c:
+	* src/riva_const.h:
+	* src/riva_include.h:
+	* src/riva_local.h:
+	Unlibcwrap.  Bump server version requirement.  Bump to 1.1.0.
+
 2006-03-27  Aaron Plattner  <aplattner@nvidia.com>
 
 	Bump version to 1.0.2.0 for release.
diff --git a/configure.ac b/configure.ac
index 154c40f..632616f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([xf86-video-nv],
-        1.0.2.0,
+        1.1.0,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         xf86-video-nv)
 
@@ -54,7 +54,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
 XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto $REQUIRED_MODULES])
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
 # Checks for libraries.
diff --git a/src/nv_const.h b/src/nv_const.h
index fce3ee9..3ffcd00 100644
--- a/src/nv_const.h
+++ b/src/nv_const.h
@@ -7,8 +7,8 @@
 #define NV_NAME "NV"
 #define NV_DRIVER_NAME "nv"
 #define NV_MAJOR_VERSION 1
-#define NV_MINOR_VERSION 0
-#define NV_PATCHLEVEL 2
+#define NV_MINOR_VERSION 1
+#define NV_PATCHLEVEL 0
 
 #endif /* __NV_CONST_H__ */
           
diff --git a/src/nv_include.h b/src/nv_include.h
index 23ad9b7..eb32143 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -3,11 +3,13 @@
 #ifndef __NV_INCLUDE_H__
 #define __NV_INCLUDE_H__
 
+#include <string.h>
+#include <math.h>
+
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 /* Drivers for PCI hardware need this */
diff --git a/src/nv_local.h b/src/nv_local.h
index dc29a6f..3d5d202 100644
--- a/src/nv_local.h
+++ b/src/nv_local.h
@@ -36,7 +36,7 @@
 |*     those rights set forth herein.                                        *|
 |*                                                                           *|
  \***************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.8 2003/07/31 20:24:29 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_local.h,v 1.8tsi Exp $ */
 
 #ifndef __NV_LOCAL_H__
 #define __NV_LOCAL_H__
@@ -46,7 +46,6 @@
  * HW.  Put all affected includes, typdefs, etc. here so the riva_hw.* files
  * can stay generic in nature.
  */ 
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86_OSproc.h"
 
@@ -60,12 +59,12 @@ typedef unsigned int   U032;
 /*
  * HW access macros.  These assume memory-mapped I/O, and not normal I/O space.
  */
-#define NV_WR08(p,i,d)  MMIO_OUT8((volatile pointer)(p), (i), (d))
-#define NV_RD08(p,i)    MMIO_IN8((volatile pointer)(p), (i))
-#define NV_WR16(p,i,d)  MMIO_OUT16((volatile pointer)(p), (i), (d))
-#define NV_RD16(p,i)    MMIO_IN16((volatile pointer)(p), (i))
-#define NV_WR32(p,i,d)  MMIO_OUT32((volatile pointer)(p), (i), (d))
-#define NV_RD32(p,i)    MMIO_IN32((volatile pointer)(p), (i))
+#define NV_WR08(p,i,d)  MMIO_OUT8((pointer)(p), (i), (d))
+#define NV_RD08(p,i)    MMIO_IN8((pointer)(p), (i))
+#define NV_WR16(p,i,d)  MMIO_OUT16((pointer)(p), (i), (d))
+#define NV_RD16(p,i)    MMIO_IN16((pointer)(p), (i))
+#define NV_WR32(p,i,d)  MMIO_OUT32((pointer)(p), (i), (d))
+#define NV_RD32(p,i)    MMIO_IN32((pointer)(p), (i))
 
 /* VGA I/O is now always done through MMIO */
 #define VGA_WR08(p,i,d) NV_WR08(p,i,d)
diff --git a/src/nv_video.c b/src/nv_video.c
index 85d48d6..9153112 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -7,7 +7,6 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
diff --git a/src/riva_const.h b/src/riva_const.h
index c3b9794..8221dca 100644
--- a/src/riva_const.h
+++ b/src/riva_const.h
@@ -7,8 +7,8 @@
 #define RIVA_NAME "RIVA128"
 #define RIVA_DRIVER_NAME "riva128"
 #define RIVA_MAJOR_VERSION 1
-#define RIVA_MINOR_VERSION 0
-#define RIVA_PATCHLEVEL 1
+#define RIVA_MINOR_VERSION 1
+#define RIVA_PATCHLEVEL 0
 
 #endif /* __RIVA_CONST_H__ */
           
diff --git a/src/riva_include.h b/src/riva_include.h
index 9e15010..2f269df 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -3,11 +3,12 @@
 #ifndef __RIVA_INCLUDE_H__
 #define __RIVA_INCLUDE_H__
 
+#include <string.h>
+
 /* All drivers should typically include these */
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86Resources.h"
-#include "xf86_ansic.h"
 #include "compiler.h"
 
 /* Drivers for PCI hardware need this */
diff --git a/src/riva_local.h b/src/riva_local.h
index b060acc..833ed04 100644
--- a/src/riva_local.h
+++ b/src/riva_local.h
@@ -46,7 +46,6 @@
  * HW.  Put all affected includes, typdefs, etc. here so the riva_hw.* files
  * can stay generic in nature.
  */ 
-#include "xf86_ansic.h"
 #include "compiler.h"
 #include "xf86_OSproc.h"