Egbert's 64bit fixes for mixed 32/64bit clients

3 files changed, 4 insertions, 7 deletions

diff --git a/src/via_dri.c b/src/via_dri.c
index 8c5b52f..d3782b5 100644
--- a/src/via_dri.c
+++ b/src/via_dri.c
@@ -711,9 +711,8 @@ Bool VIADRIScreenInit(ScreenPtr pScreen)
 	return FALSE;
     }
     pVIADRI->regs.size = VIA_MMIO_REGSIZE;
-    pVIADRI->regs.map = 0;
     pVIADRI->regs.handle = pVia->registerHandle;
-    xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] mmio Registers = 0x%08lx\n",
+    xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] mmio Registers = 0x%08x\n",
 	pVIADRI->regs.handle);
     
     pVIADRI->drixinerama = pVia->drixinerama;
@@ -908,7 +907,7 @@ static Bool VIADRIMapInit(ScreenPtr pScreen, VIAPtr pVia)
     }
     
     xf86DrvMsg(pScreen->myNum, X_INFO,
-	"[drm] register handle = 0x%08lx\n", pVia->registerHandle);
+	"[drm] register handle = 0x%08x\n", pVia->registerHandle);
 
     return TRUE;
 }
diff --git a/src/via_dri.h b/src/via_dri.h
index c1ac77c..6e4fd87 100644
--- a/src/via_dri.h
+++ b/src/via_dri.h
@@ -39,7 +39,6 @@ typedef drm_via_sarea_t VIASAREAPriv;
 typedef struct {
     drm_handle_t handle;
     drmSize size;
-    drmAddress map;
 } viaRegion, *viaRegionPtr;
 
 typedef struct {
diff --git a/src/via_driver.h b/src/via_driver.h
index 947fcd3..cb037c6 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -127,7 +127,6 @@ typedef struct {
     int nContexts,nSurfaces;
     drm_handle_t mmioBase,fbBase,sAreaBase;
     unsigned sAreaSize;
-    drmAddress sAreaAddr;
     unsigned activePorts;
 }ViaXvMC, *ViaXvMCPtr;
 
@@ -257,8 +256,8 @@ typedef struct _VIA {
     int 		numVisualConfigs;
     __GLXvisualConfig* 	pVisualConfigs;
     VIAConfigPrivPtr 	pVisualConfigsPriv;
-    unsigned long 	agpHandle;
-    unsigned long 	registerHandle;
+    drm_handle_t 	agpHandle;
+    drm_handle_t 	registerHandle;
     unsigned long 	agpAddr;
     drmAddress          agpMappedAddr;
     unsigned char 	*agpBase;