debrix-driver-tdfx/tdfx Imakefile, 1.3, 1.4 tdfx_dri.c, 1.3, 1.4 tdfx_dri.h, 1.3, 1.4 tdfx_driver.c, 1.3, 1.4 tdfx_video.c, 1.2, 1.3

[Adam Jackson]

Committed by: ajax

Update of /cvs/xserver/debrix-driver-tdfx/tdfx
In directory pdx:/home/ajax/debrix-driver-tdfx/tdfx

Modified Files:
	Imakefile tdfx_dri.c tdfx_dri.h tdfx_driver.c tdfx_video.c 
Log Message:
Now that it's imported, make it work.


Index: Imakefile
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/Imakefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Imakefile	16 Jun 2004 09:44:00 -0000	1.3
+++ Imakefile	22 Jun 2004 04:01:27 -0000	1.4
@@ -12,8 +12,8 @@
 #if BuildXF86DRI
 DRISRCS = tdfx_dri.c
 DRIOBJS = tdfx_dri.o
-DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include \
-              -I$(DRMSRCDIR)/shared
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
+
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 

Index: tdfx_dri.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_dri.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tdfx_dri.c	16 Jun 2004 09:44:00 -0000	1.3
+++ tdfx_dri.c	22 Jun 2004 04:01:27 -0000	1.4
@@ -17,9 +17,9 @@
 static char TDFXClientDriverName[] = "tdfx";
 
 static Bool TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
-			      drm_context_t hwContext, void *pVisualConfigPriv,
+			      drmContext hwContext, void *pVisualConfigPriv,
 			      DRIContextType contextStore);
-static void TDFXDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
+static void TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
 			       DRIContextType contextStore);
 static void TDFXDRISwapContext(ScreenPtr pScreen, DRISyncType syncType,
 			       DRIContextType readContextType,
@@ -329,15 +329,11 @@
 
   pDRIInfo->drmDriverName = TDFXKernelDriverName;
   pDRIInfo->clientDriverName = TDFXClientDriverName;
-  if (xf86LoaderCheckSymbol("DRICreatePCIBusID")) {
-    pDRIInfo->busIdString = DRICreatePCIBusID(pTDFX->PciInfo);
-  } else {
-    pDRIInfo->busIdString = xalloc(64);
-    sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
-	    ((pciConfigPtr)pTDFX->PciInfo->thisCard)->busnum,
-	    ((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
-	    ((pciConfigPtr)pTDFX->PciInfo->thisCard)->funcnum);
-  }
+  pDRIInfo->busIdString = xalloc(64);
+  sprintf(pDRIInfo->busIdString, "PCI:%d:%d:%d",
+	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->busnum,
+	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->devnum,
+	  ((pciConfigPtr)pTDFX->PciInfo->thisCard)->funcnum);
   pDRIInfo->ddxDriverMajorVersion = TDFX_MAJOR_VERSION;
   pDRIInfo->ddxDriverMinorVersion = TDFX_MINOR_VERSION;
   pDRIInfo->ddxDriverPatchVersion = TDFX_PATCHLEVEL;
@@ -433,7 +429,7 @@
   }
 
   pTDFXDRI->regsSize=TDFXIOMAPSIZE;
-  if (drmAddMap(pTDFX->drmSubFD, (drm_handle_t)pTDFX->MMIOAddr[0],
+  if (drmAddMap(pTDFX->drmSubFD, (drmHandle)pTDFX->MMIOAddr[0],
 		pTDFXDRI->regsSize, DRM_REGISTERS, 0, &pTDFXDRI->regs)<0) {
     TDFXDRICloseScreen(pScreen);
     xf86DrvMsg(pScreen->myNum, X_ERROR, "drmAddMap failed, disabling DRI.\n");
@@ -474,14 +470,14 @@
 
 static Bool
 TDFXCreateContext(ScreenPtr pScreen, VisualPtr visual,
-		  drm_context_t hwContext, void *pVisualConfigPriv,
+		  drmContext hwContext, void *pVisualConfigPriv,
 		  DRIContextType contextStore)
 {
   return TRUE;
 }
 
 static void
-TDFXDestroyContext(ScreenPtr pScreen, drm_context_t hwContext,
+TDFXDestroyContext(ScreenPtr pScreen, drmContext hwContext,
 		   DRIContextType contextStore)
 {
 }

Index: tdfx_dri.h
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_dri.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tdfx_dri.h	16 Jun 2004 09:44:00 -0000	1.3
+++ tdfx_dri.h	22 Jun 2004 04:01:27 -0000	1.4
@@ -6,7 +6,7 @@
 #include "xf86drm.h"
 
 typedef struct {
-  drm_handle_t regs;
+  drmHandle regs;
   drmSize regsSize;
   drmAddress regsMap;
   int deviceID;

Index: tdfx_driver.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_driver.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tdfx_driver.c	16 Jun 2004 09:44:00 -0000	1.3
+++ tdfx_driver.c	22 Jun 2004 04:01:27 -0000	1.4
@@ -92,7 +92,7 @@
 #include "dixstruct.h"
 
 #include "xf86xv.h"
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
 
 #ifdef XF86DRI
 #include "dri.h"
@@ -264,7 +264,6 @@
     "DRIScreenInit",
     "DRIUnlock",
     "GlxSetVisualConfigs",
-    "DRICreatePCIBusID",
     NULL
 };
 

Index: tdfx_video.c
===================================================================
RCS file: /cvs/xserver/debrix-driver-tdfx/tdfx/tdfx_video.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tdfx_video.c	23 Apr 2004 19:49:53 -0000	1.2
+++ tdfx_video.c	22 Jun 2004 04:01:27 -0000	1.3
@@ -4,7 +4,7 @@
 #include "tdfx.h"
 #include "dixstruct.h"
 
-#include "Xv.h"
+#include "X11/extensions/Xv.h"
 #include "fourcc.h"
 
 static Atom xvColorKey, xvFilterQuality;