From bc9d002299a38f40073b455ab00a382510a82485 Mon Sep 17 00:00:00 2001
From: dawes <dawes>
Date: Wed, 8 Nov 2000 00:06:24 +0000
Subject: merge with 4.0.1d

---
 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h        |  6 +++---
 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c  |  2 +-
 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c    | 10 ++--------
 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c |  2 +-
 xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h    |  2 +-
 5 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'xc/programs/Xserver/hw/xfree86/drivers/tdfx')

diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
index 74eab72e8..17221f249 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h
@@ -5,7 +5,7 @@
 
    Copyright: 1998,1999
 */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h,v 1.10 2000/06/17 00:03:24 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx.h,v 1.11 2000/09/26 15:57:14 tsi Exp $ */
 
 #ifndef _TDFX_H_
 #define _TDFX_H_
@@ -149,8 +149,8 @@ typedef struct _TDFXRec {
   int MaxClock;
   int ChipType;
   pciVideoPtr PciInfo;
-  int LinearAddr[MAXCHIPS];
-  int MMIOAddr[MAXCHIPS];
+  unsigned long LinearAddr[MAXCHIPS];
+  unsigned long MMIOAddr[MAXCHIPS];
   EntityInfoPtr pEnt;
   int numChips;
   PCITAG PciTag[MAXCHIPS];
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c
index 87960acf3..89ba45a50 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c,v 1.14 2000/08/25 16:25:36 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_accel.c,v 1.15 2000/09/24 13:51:30 alanh Exp $ */
 
 /* All drivers should typically include these */
 #include "xf86.h"
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
index 0831c92b4..a9fc4499b 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v 1.10 2000/06/23 23:43:45 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_dri.c,v 1.12 2000/09/26 15:57:15 tsi Exp $ */
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
@@ -307,7 +307,7 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
   pDRIInfo = DRICreateInfoRec();
   if (!pDRIInfo) {
     xf86DrvMsg(pScreen->myNum, X_ERROR,
-               "DRICreatInfoRect() failed, disabling DRI.\n");
+               "DRICreateInfoRect() failed, disabling DRI.\n");
     return FALSE;
   }
 
@@ -449,10 +449,6 @@ TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
 		  drmContext hwContext, void *pVisualConfigPriv,
 		  DRIContextType contextStore)
 {
-  TDFXConfigPrivPtr pTDFXConfig = (TDFXConfigPrivPtr)pVisualConfigPriv;
-  TDFXDRIContextPtr ctx;
-
-  ctx=(TDFXDRIContextPtr)contextStore;
   return TRUE;
 }
 
@@ -460,8 +456,6 @@ static void
 TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext, 
 		   DRIContextType contextStore)
 {
-  TDFXDRIContextPtr ctx;
-  ctx=(TDFXDRIContextPtr)contextStore;
 }
 
 Bool
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
index 201216076..48c16e61e 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c
@@ -25,7 +25,7 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c,v 1.42 2000/09/20 00:09:30 keithp Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c,v 1.43 2000/09/24 13:51:31 alanh Exp $ */
 
 /*
  * Authors:
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
index b5ea9f908..850f35398 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h,v 1.6 2000/06/17 00:03:25 martin Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfxdefs.h,v 1.7 2000/09/24 13:51:31 alanh Exp $ */
 /*
    Voodoo Banshee driver version 1.0.1
 
-- 
cgit v1.2.3