move via_dri.h to server

diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.c b/src/mesa/drivers/dri/unichrome/server/via_dri.c
index 63c49757dad379438bc16cb1bda42b5988154240..d7217d205b32f42797a78a69212eba914b70f37a 100644 (file)
--- a/src/mesa/drivers/dri/unichrome/server/via_dri.c
+++ b/src/mesa/drivers/dri/unichrome/server/via_dri.c
@@ -33,8 +33,6 @@
 #include "drm.h"
 #include "imports.h"
 
-typedef int Bool; /* via_dri.h makes use of this */
-
 #include "dri_util.h"
 
 #include "via_context.h"
@@ -384,7 +382,6 @@ static int VIADRIScreenInit(DRIDriverContext * ctx)
     }
 
     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",
        pVIADRI->regs.handle);

diff --git a/src/mesa/drivers/dri/unichrome/server/via_dri.h b/src/mesa/drivers/dri/unichrome/server/via_dri.h
new file mode 100644 (file)
index 0000000..188c685
--- /dev/null
+++ b/src/mesa/drivers/dri/unichrome/server/via_dri.h
@@ -0,0 +1,49 @@
+#ifndef _VIA_DRI_
+#define _VIA_DRI_
+
+#include "xf86drm.h"
+
+#define VIA_MAX_DRAWABLES 256
+
+#define VIA_VERSION_MAJOR              4
+#define VIA_VERSION_MINOR              1
+
+typedef struct {
+    drm_handle_t handle;
+    drmSize size;
+} viaRegion, *viaRegionPtr;
+
+typedef int Bool;
+
+typedef struct {
+    viaRegion regs, agp;
+    int deviceID;
+    int width;
+    int height;
+    int mem;
+    int bytesPerPixel;
+    int priv1;
+    int priv2;
+    int fbOffset;
+    int fbSize;
+    Bool drixinerama;
+    int backOffset;
+    int depthOffset;
+    int textureOffset;
+    int textureSize;
+    int irqEnabled;
+    unsigned int scrnX, scrnY;
+    int sarea_priv_offset;
+    int ringBufActive;
+    unsigned int reg_pause_addr;
+} VIADRIRec, *VIADRIPtr;
+
+typedef struct {
+    int dummy;
+} VIAConfigPrivRec, *VIAConfigPrivPtr;
+
+typedef struct {
+    int dummy;
+} VIADRIContextRec, *VIADRIContextPtr;
+
+#endif

diff --git a/src/mesa/drivers/dri/unichrome/via_dri.h b/src/mesa/drivers/dri/unichrome/via_dri.h
deleted file mode 100644 (file)
index 188c685..0000000
--- a/src/mesa/drivers/dri/unichrome/via_dri.h
+++ /dev/null
@@ -1,49 +0,0 @@
-#ifndef _VIA_DRI_
-#define _VIA_DRI_
-
-#include "xf86drm.h"
-
-#define VIA_MAX_DRAWABLES 256
-
-#define VIA_VERSION_MAJOR              4
-#define VIA_VERSION_MINOR              1
-
-typedef struct {
-    drm_handle_t handle;
-    drmSize size;
-} viaRegion, *viaRegionPtr;
-
-typedef int Bool;
-
-typedef struct {
-    viaRegion regs, agp;
-    int deviceID;
-    int width;
-    int height;
-    int mem;
-    int bytesPerPixel;
-    int priv1;
-    int priv2;
-    int fbOffset;
-    int fbSize;
-    Bool drixinerama;
-    int backOffset;
-    int depthOffset;
-    int textureOffset;
-    int textureSize;
-    int irqEnabled;
-    unsigned int scrnX, scrnY;
-    int sarea_priv_offset;
-    int ringBufActive;
-    unsigned int reg_pause_addr;
-} VIADRIRec, *VIADRIPtr;
-
-typedef struct {
-    int dummy;
-} VIAConfigPrivRec, *VIAConfigPrivPtr;
-
-typedef struct {
-    int dummy;
-} VIADRIContextRec, *VIADRIContextPtr;
-
-#endif