From cb6b4073df7404822e2b553519c3a101f2ab0524 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@nwnk.net>
Date: Fri, 7 Apr 2006 19:40:34 +0000
Subject: Unlibcwrap. Bump server version requirement. Bump to 1.1.0.

---
 src/nv_const.h     |  4 ++--
 src/nv_include.h   |  4 +++-
 src/nv_local.h     | 15 +++++++--------
 src/nv_video.c     |  1 -
 src/riva_const.h   |  4 ++--
 src/riva_include.h |  3 ++-
 src/riva_local.h   |  1 -
 7 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

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"
 
-- 
cgit v1.2.3