Replace all occurances of XF86DRIClipRect (and related typedefs) with

drm_clip_rect_t. All of the Imakefile changes are so that drm.h can be found. DRM SOURCES (i.e., shared/drm.h) MUST ALSO BE UPDATED FOR THIS TO COMPILE!
author: idr <idr> 2004-06-01 16:15:58 +0000
committer: idr <idr> 2004-06-01 16:15:58 +0000
commit: 3eb6d448c90d51a7f0f18999813c1ff7726a81bd (patch)
tree: 693800b7b0050f7e417770f70776f59e89ed8670
parent: a029972e9d293987ca0c6c54a20668907d69fac8 (diff)
27 files changed, 111 insertions, 114 deletions
diff --git a/xc/lib/GL/dri/drm/Imakefile b/xc/lib/GL/dri/drm/Imakefile
index c5edebc9a..d8cbef6d3 100644
--- a/xc/lib/GL/dri/drm/Imakefile
+++ b/xc/lib/GL/dri/drm/Imakefile
@@ -23,7 +23,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
 		-I$(XF86OSSRC)/$(OS_SUBDIR)/drm \
 		-I$(DRMSRCDIR)/$(OS_SUBDIR) \
 		-I$(DRMSRCDIR)/$(OS_SUBDIR2) \
-		-I$(XF86OSSRC)
+		-I$(XF86OSSRC) -I$(DRMSRCDIR)/shared
          SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
          OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
 
diff --git a/xc/lib/GL/glx/XF86dri.c b/xc/lib/GL/glx/XF86dri.c
index 82ffb3035..6ee6af836 100644
--- a/xc/lib/GL/glx/XF86dri.c
+++ b/xc/lib/GL/glx/XF86dri.c
@@ -448,27 +448,12 @@ Bool XF86DRIDestroyDrawable(dpy, screen, drawable)
     return True;
 }
 
-Bool XF86DRIGetDrawableInfo(dpy, screen, drawable, 
-			    index, stamp, X, Y, W, H, 
-			    numClipRects, pClipRects,
-			    backX, backY, 
-			    numBackClipRects, pBackClipRects
-			    )
-    Display* dpy;
-    int screen;
-    Drawable drawable;
-    unsigned int* index;
-    unsigned int* stamp;
-    int* X;
-    int* Y;
-    int* W;
-    int* H;
-    int* numClipRects;
-    XF86DRIClipRectPtr* pClipRects;
-    int* backX;
-    int* backY;
-    int* numBackClipRects;
-    XF86DRIClipRectPtr*	pBackClipRects;    
+Bool XF86DRIGetDrawableInfo(Display* dpy, int screen, Drawable drawable,
+    unsigned int* index, unsigned int* stamp,
+    int* X, int* Y, int* W, int* H,
+    int* numClipRects, drm_clip_rect_t ** pClipRects,
+    int* backX, int* backY,
+    int* numBackClipRects, drm_clip_rect_t ** pBackClipRects )
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIGetDrawableInfoReply rep;
@@ -513,7 +498,7 @@ Bool XF86DRIGetDrawableInfo(dpy, screen, drawable,
      */
     if (rep.length !=  ((((SIZEOF(xXF86DRIGetDrawableInfoReply) - 
 		       SIZEOF(xGenericReply) + 
-		       total_rects * sizeof(XF86DRIClipRectRec)) + 3) & ~3) >> 2)) {
+		       total_rects * sizeof(drm_clip_rect_t)) + 3) & ~3) >> 2)) {
         _XEatData(dpy, rep.length);
 	UnlockDisplay(dpy);
 	SyncHandle();
@@ -523,9 +508,9 @@ Bool XF86DRIGetDrawableInfo(dpy, screen, drawable,
 #endif
 
     if (*numClipRects) {
-       int len = sizeof(XF86DRIClipRectRec) * (*numClipRects);
+       int len = sizeof(drm_clip_rect_t) * (*numClipRects);
 
-       *pClipRects = (XF86DRIClipRectPtr)Xcalloc(len, 1);
+       *pClipRects = (drm_clip_rect_t *)Xcalloc(len, 1);
        if (*pClipRects) 
 	  _XRead(dpy, (char*)*pClipRects, len);
     } else {
@@ -533,9 +518,9 @@ Bool XF86DRIGetDrawableInfo(dpy, screen, drawable,
     }
 
     if (*numBackClipRects) {
-       int len = sizeof(XF86DRIClipRectRec) * (*numBackClipRects);
+       int len = sizeof(drm_clip_rect_t) * (*numBackClipRects);
 
-       *pBackClipRects = (XF86DRIClipRectPtr)Xcalloc(len, 1);
+       *pBackClipRects = (drm_clip_rect_t *)Xcalloc(len, 1);
        if (*pBackClipRects) 
 	  _XRead(dpy, (char*)*pBackClipRects, len);
     } else {
diff --git a/xc/lib/GL/glx/xf86dri.h b/xc/lib/GL/glx/xf86dri.h
index 013f5b32d..b67c8d8be 100644
--- a/xc/lib/GL/glx/xf86dri.h
+++ b/xc/lib/GL/glx/xf86dri.h
@@ -27,12 +27,13 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
-/*
- * Authors:
- *   Kevin E. Martin <martin@valinux.com>
- *   Jens Owen <jens@tungstengraphics.com>
- *   Rickard E. (Rik) Faith <faith@valinux.com>
+/**
+ * \file xf86dri.h
+ * Protocol numbers and function prototypes for DRI X protocol.
  *
+ * \author Kevin E. Martin <martin@valinux.com>
+ * \author Jens Owen <jens@tungstengraphics.com>
+ * \author Rickard E. (Rik) Faith <faith@valinux.com>
  */
 
 #ifndef _XF86DRI_H_
@@ -62,15 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define XF86DRIOperationNotSupported	1
 #define XF86DRINumberErrors		(XF86DRIOperationNotSupported + 1)
 
-/* Warning : Do not change XF86DRIClipRect without changing the kernel 
- * structure! */
-typedef struct _XF86DRIClipRect {
-    unsigned short	x1; /* Upper left: inclusive */
-    unsigned short	y1;
-    unsigned short	x2; /* Lower right: exclusive */
-    unsigned short	y2;
-} XF86DRIClipRectRec, *XF86DRIClipRectPtr;
-
 #ifndef _XF86DRI_SERVER_
 
 _XFUNCPROTOBEGIN
@@ -192,11 +184,11 @@ Bool XF86DRIGetDrawableInfo(
     int*		/* W */,
     int*		/* H */,
     int*		/* numClipRects */,
-    XF86DRIClipRectPtr*,/* pClipRects */
+    drm_clip_rect_t **,/* pClipRects */
     int*		/* backX */,
     int*		/* backY */,
     int*		/* numBackClipRects */,
-    XF86DRIClipRectPtr*	/* pBackClipRects */    
+    drm_clip_rect_t **	/* pBackClipRects */    
 #endif
 );
 
diff --git a/xc/programs/Xserver/GL/dri/Imakefile b/xc/programs/Xserver/GL/dri/Imakefile
index 82a26d76b..960891ed7 100644
--- a/xc/programs/Xserver/GL/dri/Imakefile
+++ b/xc/programs/Xserver/GL/dri/Imakefile
@@ -15,6 +15,7 @@ MOBJ = drimodule.o
 		-I$(EXTINCSRC) -I$(MESASRCDIR)/include \
 		-I$(XF86OSSRC) -I$(XF86COMSRC) \
 		-I../include -I../glx -I$(LIBSRC)/GL/include \
+		-I$(DRMSRCDIR)/shared \
 		-I$(SERVERSRC)/mi -I$(FONTINCSRC)
       DEFINES = $(GLX_DEFINES)
 
diff --git a/xc/programs/Xserver/GL/dri/dri.c b/xc/programs/Xserver/GL/dri/dri.c
index d41ff8439..eed69cbf6 100644
--- a/xc/programs/Xserver/GL/dri/dri.c
+++ b/xc/programs/Xserver/GL/dri/dri.c
@@ -1124,11 +1124,11 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
                    int* W,
                    int* H,
                    int* numClipRects,
-                   XF86DRIClipRectPtr* pClipRects,
+                   drm_clip_rect_t ** pClipRects,
                    int* backX,
                    int* backY,
                    int* numBackClipRects,
-                   XF86DRIClipRectPtr* pBackClipRects)
+                   drm_clip_rect_t ** pBackClipRects)
 {
     DRIScreenPrivPtr    pDRIPriv = DRI_SCREEN_PRIV(pScreen);
     DRIDrawablePrivPtr	pDRIDrawablePriv, pOldDrawPriv;
@@ -1224,7 +1224,7 @@ DRIGetDrawableInfo(ScreenPtr pScreen,
 	    *W = (int)(pWin->drawable.width);
 	    *H = (int)(pWin->drawable.height);
 	    *numClipRects = REGION_NUM_RECTS(&pWin->clipList);
-	    *pClipRects = (XF86DRIClipRectPtr)REGION_RECTS(&pWin->clipList);
+	    *pClipRects = (drm_clip_rect_t *)REGION_RECTS(&pWin->clipList);
 
 	    if (!*numClipRects && pDRIPriv->fullscreen) {
 				/* use fake full-screen clip rect */
@@ -2026,7 +2026,7 @@ DRIOpenFullScreen(ScreenPtr pScreen, DrawablePtr pDrawable)
     DRIScreenPrivPtr   pDRIPriv    = DRI_SCREEN_PRIV(pScreen);
     ScrnInfoPtr        pScrn       = xf86Screens[pScreen->myNum];
     WindowPtr	       pWin        = (WindowPtr)pDrawable;
-    XF86DRIClipRectPtr pClipRects  = (void *)REGION_RECTS(&pWin->clipList);
+    drm_clip_rect_t * pClipRects  = (void *)REGION_RECTS(&pWin->clipList);
 
     _DRIAdjustFrame(pScrn, pDRIPriv, pScrn->frameX0, pScrn->frameY0);
 
diff --git a/xc/programs/Xserver/GL/dri/dri.h b/xc/programs/Xserver/GL/dri/dri.h
index beb704427..cfe0450b2 100644
--- a/xc/programs/Xserver/GL/dri/dri.h
+++ b/xc/programs/Xserver/GL/dri/dri.h
@@ -218,11 +218,11 @@ extern Bool DRIGetDrawableInfo(ScreenPtr pScreen,
                                int* W,
                                int* H,
                                int* numClipRects,
-                               XF86DRIClipRectPtr* pClipRects,
+                               drm_clip_rect_t ** pClipRects,
                                int* backX,
                                int* backY,
                                int* numBackClipRects,
-                               XF86DRIClipRectPtr* pBackClipRects);
+                               drm_clip_rect_t ** pBackClipRects);
 
 extern Bool DRIGetDeviceInfo(ScreenPtr pScreen,
                              drmHandlePtr hFrameBuffer,
diff --git a/xc/programs/Xserver/GL/dri/dristruct.h b/xc/programs/Xserver/GL/dri/dristruct.h
index e733ac210..ef7aedeef 100644
--- a/xc/programs/Xserver/GL/dri/dristruct.h
+++ b/xc/programs/Xserver/GL/dri/dristruct.h
@@ -88,9 +88,9 @@ typedef struct _DRIScreenPrivRec
     void**		partial3DContextStore; /* parital 3D context        */
     DRIInfoPtr		pDriverInfo;
     int                 nrWindows;
-    XF86DRIClipRectRec  private_buffer_rect; /* management of private buffers */
+    drm_clip_rect_t  private_buffer_rect; /* management of private buffers */
     DrawablePtr         fullscreen; /* pointer to fullscreen drawable */
-    XF86DRIClipRectRec  fullscreen_rect; /* fake rect for fullscreen mode */
+    drm_clip_rect_t  fullscreen_rect; /* fake rect for fullscreen mode */
     DRIWrappedFuncsRec	wrap;
     DrawablePtr		DRIDrawables[SAREA_MAX_DRAWABLES];
     DRIContextPrivPtr   dummyCtxPriv; /* Pointer to dummy context */
diff --git a/xc/programs/Xserver/GL/dri/xf86dri.c b/xc/programs/Xserver/GL/dri/xf86dri.c
index 7920b217d..1c542f6c1 100644
--- a/xc/programs/Xserver/GL/dri/xf86dri.c
+++ b/xc/programs/Xserver/GL/dri/xf86dri.c
@@ -442,8 +442,8 @@ ProcXF86DRIGetDrawableInfo(
     xXF86DRIGetDrawableInfoReply	rep;
     DrawablePtr pDrawable;
     int X, Y, W, H;
-    XF86DRIClipRectPtr pClipRects;
-    XF86DRIClipRectPtr pBackClipRects;
+    drm_clip_rect_t * pClipRects;
+    drm_clip_rect_t * pBackClipRects;
     int backX, backY;
 
     REQUEST(xXF86DRIGetDrawableInfoReq);
@@ -492,10 +492,10 @@ ProcXF86DRIGetDrawableInfo(
     rep.backY = backY;
         
     if (rep.numBackClipRects) 
-       rep.length += sizeof(XF86DRIClipRectRec) * rep.numBackClipRects;    
+       rep.length += sizeof(drm_clip_rect_t) * rep.numBackClipRects;    
 
     if (rep.numClipRects) 
-       rep.length += sizeof(XF86DRIClipRectRec) * rep.numClipRects;
+       rep.length += sizeof(drm_clip_rect_t) * rep.numClipRects;
     
     rep.length = ((rep.length + 3) & ~3) >> 2;
 
@@ -503,13 +503,13 @@ ProcXF86DRIGetDrawableInfo(
 
     if (rep.numClipRects) {
 	WriteToClient(client,  
-		      sizeof(XF86DRIClipRectRec) * rep.numClipRects,
+		      sizeof(drm_clip_rect_t) * rep.numClipRects,
 		      (char *)pClipRects);
     }
 
     if (rep.numBackClipRects) {
        WriteToClient(client, 
-		     sizeof(XF86DRIClipRectRec) * rep.numBackClipRects,
+		     sizeof(drm_clip_rect_t) * rep.numBackClipRects,
 		     (char *)pBackClipRects);
     }
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
index e85125dda..220dff6f0 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/Imakefile
@@ -52,7 +52,8 @@ DRIOBJS2 = atidri.o
 DRIOBJS3 = r128_dri.o
 DRIOBJS4 = radeon_dri.o
 
-DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include \
+              -I$(DRMSRCDIR)/shared
 DRIDEFINES  = $(GLX_DEFINES)
 
 #endif
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/mach64_sarea.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/mach64_sarea.h
index 7cd99afab..47a4bf9aa 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/mach64_sarea.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/mach64_sarea.h
@@ -133,7 +133,7 @@ typedef struct {
 #ifdef XF86DRI
    /* The current cliprects, or a subset thereof.
     */
-   XF86DRIClipRectRec boxes[MACH64_NR_SAREA_CLIPRECTS];
+   drm_clip_rect_t boxes[MACH64_NR_SAREA_CLIPRECTS];
    unsigned int nbox;
 #endif
    /* Counter for throttling of rendering clients.
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h
index 6ffdb412d..63f432b88 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/r128_sarea.h
@@ -161,7 +161,7 @@ typedef struct {
 #ifdef XF86DRI
     /* The current cliprects, or a subset thereof.
      */
-    XF86DRIClipRectRec boxes[R128_NR_SAREA_CLIPRECTS];
+    drm_clip_rect_t boxes[R128_NR_SAREA_CLIPRECTS];
     unsigned int nbox;
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h
index 95db1f37a..556fca6f8 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_sarea.h
@@ -195,7 +195,7 @@ typedef struct {
     unsigned int vc_format;
 
     /* The current cliprects, or a subset thereof */
-    XF86DRIClipRectRec boxes[RADEON_NR_SAREA_CLIPRECTS];
+    drm_clip_rect_t boxes[RADEON_NR_SAREA_CLIPRECTS];
     unsigned int nbox;
 
     /* Counters for throttling of rendering clients */
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile
index 2290d16b8..ac97bb299 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/glint/Imakefile
@@ -15,7 +15,7 @@ XCOMM
 #if BuildXF86DRI /* || BuildXF86DRIDriverSupport -- does not currently work */
 DRISRC=glint_dri.c
 DRIOBJ=glint_dri.o
-DRIINCLUDES=-I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri
+DRIINCLUDES=-I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(DRMSRCDIR)/shared
 DRIDEFINES=$(GLX_DEFINES)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
index 5b980fe14..aada15f5b 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/Imakefile
@@ -26,7 +26,7 @@ I830DRIOBJS = i830_dri.o
 DRISRCS = $(I810DRISRCS) $(I830DRISRCS)
 DRIOBJS = $(I810DRIOBJS) $(I830DRIOBJS)
 DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
-	-I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include
+	-I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include -I$(DRMSRCDIR)/shared
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
index 3d6acbaae..253ea26a2 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_dri.h
@@ -79,7 +79,7 @@ typedef struct {
    unsigned int dirty;
 
    unsigned int nbox;
-   XF86DRIClipRectRec boxes[I810_NR_SAREA_CLIPRECTS];
+   drm_clip_rect_t boxes[I810_NR_SAREA_CLIPRECTS];
 
    /* Maintain an LRU of contiguous regions of texture space.  If
     * you think you own a region of texture memory, and it has an
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
index 1c21a7cb3..4c5d88c3a 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/i810/i830_dri.h
@@ -83,7 +83,7 @@ typedef struct _I830SAREA {
    unsigned int dirty;
 
    unsigned int nbox;
-   XF86DRIClipRectRec boxes[I830_NR_SAREA_CLIPRECTS];
+   drm_clip_rect_t boxes[I830_NR_SAREA_CLIPRECTS];
 
    /* Maintain an LRU of contiguous regions of texture space.  If
     * you think you own a region of texture memory, and it has an
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
index 3564099c8..826489353 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/Imakefile
@@ -15,7 +15,7 @@ SUBDIRS=hallib
 DRISRCS = mga_dri.c
 DRIOBJS = mga_dri.o
 DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
-	-I$(TOP)/include
+	-I$(TOP)/include -I$(DRMSRCDIR)/shared
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h
index 616dee587..c124747da 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h
+++ b/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_sarea.h
@@ -176,7 +176,7 @@ typedef struct {
 
    /* The current cliprects, or a subset thereof.
     */
-   XF86DRIClipRectRec boxes[MGA_NR_SAREA_CLIPRECTS];
+   drm_clip_rect_t boxes[MGA_NR_SAREA_CLIPRECTS];
    unsigned int nbox;
 
    /* Information about the most recently used 3d drawable.  The
@@ -197,7 +197,7 @@ typedef struct {
    unsigned int exported_nback;
    int exported_back_x, exported_front_x, exported_w;
    int exported_back_y, exported_front_y, exported_h;
-   XF86DRIClipRectRec exported_boxes[MGA_NR_SAREA_CLIPRECTS];
+   drm_clip_rect_t exported_boxes[MGA_NR_SAREA_CLIPRECTS];
 
    /* Counters for aging textures and for client-side throttling.
     */
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile
index f7e775172..95bb4e071 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/savage/Imakefile
@@ -29,7 +29,7 @@
 DRISRCS = savage_dri.c
 DRIOBJS = savage_dri.o
 DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(LIBSRC)/GL/dri/drm \
-        -I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include
+        -I$(XF86OSSRC)/linux/drm/kernel -I$(TOP)/include -I$(DRMSRCDIR)/shared
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile
index e5ee0edbb..33a226330 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/sis/Imakefile
@@ -16,7 +16,7 @@ XCOMM
 DRISRCS = sis_dri.c
 DRIOBJS = sis_dri.o
 DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri \
-              -I$(XTOP)/include
+              -I$(XTOP)/include -I$(DRMSRCDIR)/shared
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile
index 9968798a4..b26762f76 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile
@@ -1,7 +1,7 @@
 XCOMM
 XCOMM This is an Imakefile for the ffb driver.  
 XCOMM
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile,v 1.4 2000/06/26 23:46:13 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile,v 1.7 2002/09/16 18:06:01 eich Exp $
 
 #define IHaveModules
 #include <Server.tmpl>
@@ -9,7 +9,8 @@ XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/Imakefile,v 1.4 20
 #if BuildXF86DRI
 DRISRCS = ffb_dri.c
 DRIOBJS = ffb_dri.o
-DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include \
+              -I$(DRMSRCDIR)/shared
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
@@ -19,28 +20,37 @@ VISOPTIONS = -DUSE_VIS
 ASVISOPTION = AsVISOption
 GCCVISOPTION = -Wa,$(ASVISOPTION)
 #if AsOutputArchSize == 32
-#define FFBCObjectRule(name)										@@\
-name.o: name.c												@@\
-	ObjectCompile(-mv8 -mtune=ultrasparc $(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))				@@\
-	dd if=/dev/zero bs=1 count=3 | dd of=$@ bs=1 count=3 seek=36 conv=notrunc			@@\
-	echo -e '\002' | dd of=$@ bs=1 count=1 seek=19 conv=notrunc					@@\
-													@@\
-name.i: name.c												@@\
-	CPPOnlyCompile(name.c,-mv8 $(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))					@@\
-													@@\
-CenterLoadTarget(debug_src,name.c,NullParameter,$(ALLDEFINES) -mv8 $(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))
-#define FFBsObjectRule(name)										@@\
-name.o: name.s												@@\
-	$(RM) $@											@@\
-	$(CPP) $*.s | $(AS) $(ASVISOPTION) -o $@ -							@@\
-	dd if=/dev/zero bs=1 count=3 | dd of=$@ bs=1 count=3 seek=36 conv=notrunc			@@\
-	echo -e '\002' | dd of=$@ bs=1 count=1 seek=19 conv=notrunc
+#define FFBCObjectRule(name)						@@\
+name.o: name.c								@@\
+	ObjectCompile(-mv8 -mtune=ultrasparc \
+		$(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))		@@\
+	dd if=/dev/zero bs=1 count=3 2>/dev/null | \
+		dd of=$@ bs=1 count=3 seek=36 conv=notrunc 2>/dev/null	@@\
+	dd if=/dev/zero bs=1 count=1 2>/dev/null | \
+		tr '\000' '\002' | \
+		dd of=$@ bs=1 count=1 seek=19 conv=notrunc 2>/dev/null	@@\
+									@@\
+name.i: name.c								@@\
+	CPPOnlyCompile(name.c,-mv8 \
+		$(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))		@@\
+									@@\
+CenterLoadTarget(debug_src,name.c,NullParameter,$(ALLDEFINES) -mv8 \
+	$(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))
+#define FFBsObjectRule(name)						@@\
+name.o: name.s								@@\
+	$(RM) $@							@@\
+	$(CPP) $*.s | $(AS) $(GCCVISOPTION) -o $@ -			@@\
+	dd if=/dev/zero bs=1 count=3 2>/dev/null | \
+		dd of=$@ bs=1 count=3 seek=36 conv=notrunc 2>/dev/null	@@\
+	dd if=/dev/zero bs=1 count=1 2>/dev/null | \
+		tr '\000' '\002' | \
+		dd of=$@ bs=1 count=1 seek=19 conv=notrunc 2>/dev/null
 #else
 #define FFBCObjectRule(name) SpecialCObjectRule(name,,$(GCCVISOPTION) $(VISOPTIONS) $(DRIDEFINES))
-#define FFBsObjectRule(name)										@@\
-name.o: name.s												@@\
-	$(RM) $@											@@\
-	$(CPP) $*.s | $(AS) $(ASVISOPTION) -o $@ -
+#define FFBsObjectRule(name)						@@\
+name.o: name.s								@@\
+	$(RM) $@							@@\
+	$(CPP) $*.s | $(AS) $(GCCVISOPTION) -o $@ -
 #endif
 #else
 VISOBJS =
@@ -50,16 +60,17 @@ ASVISOPTION =
 #define FFBsObjectRule(name)
 #endif
 
-SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c ffb_cplane.c \
-	ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c ffb_line.c ffb_glyph.c \
-	ffb_frect.c ffb_circle.c ffb_checks.c ffb_stubs.c ffb_gc.c \
-	ffb_gspans.c ffb_sspans.c ffb_zeroarc.c ffb_cursor.c ffb_dga.c ffb_dac.c \
-	ffb_wid.c ffb_dbe.c $(DRISRCS)
-OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o ffb_cplane.o \
-	ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o ffb_line.o ffb_glyph.o \
-	ffb_frect.o ffb_circle.o ffb_checks.o ffb_stubs.o ffb_gc.o \
-	ffb_gspans.o ffb_sspans.o ffb_zeroarc.o ffb_cursor.o ffb_dga.o ffb_dac.o \
-	ffb_wid.o ffb_dbe.o $(VISOBJS) $(DRIOBJS)
+SRCS = ffb_driver.c ffb_accel.c ffb_attr.c ffb_stip.c ffb_bcopy.c \
+       ffb_cplane.c ffb_fspans.c ffb_point.c ffb_seg.c ffb_plygon.c \
+       ffb_line.c ffb_glyph.c ffb_frect.c ffb_circle.c ffb_checks.c \
+       ffb_stubs.c ffb_gc.c ffb_gspans.c ffb_sspans.c ffb_zeroarc.c \
+       ffb_cursor.c ffb_dga.c ffb_dac.c ffb_wid.c ffb_dbe.c $(DRISRCS)
+OBJS = ffb_driver.o ffb_accel.o ffb_attr.o ffb_stip.o ffb_bcopy.o \
+       ffb_cplane.o ffb_fspans.o ffb_point.o ffb_seg.o ffb_plygon.o \
+       ffb_line.o ffb_glyph.o ffb_frect.o ffb_circle.o ffb_checks.o \
+       ffb_stubs.o ffb_gc.o ffb_gspans.o ffb_sspans.o ffb_zeroarc.o \
+       ffb_cursor.o ffb_dga.o ffb_dac.o ffb_wid.o ffb_dbe.o $(VISOBJS) \
+       $(DRIOBJS)
 
 #if defined(XF86DriverSDK)
 INCLUDES = -I. -I../../include
@@ -88,7 +99,6 @@ ObjectModuleTarget(sunffb,$(OBJS))
 InstallObjectModule(sunffb,$(MODULEDIR),drivers)
 
 #if !defined(XF86DriverSDK)
-CppManTarget(sunffb,)
 InstallModuleManPage(sunffb)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile
index be482e80a..1afea1f30 100644
--- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/Imakefile
@@ -12,8 +12,8 @@ XCOMM
 #if BuildXF86DRI
 DRISRCS = tdfx_dri.c
 DRIOBJS = tdfx_dri.o
-DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include
-
+DRIINCLUDES = -I$(SERVERSRC)/GL/dri -I$(LIBSRC)/GL/dri -I$(TOP)/include \
+              -I$(DRMSRCDIR)/shared
 DRIDEFINES = $(GLX_DEFINES)
 #endif
 
diff --git a/xc/programs/Xserver/hw/xfree86/dummylib/Imakefile b/xc/programs/Xserver/hw/xfree86/dummylib/Imakefile
index d6520ea99..242feefcb 100644
--- a/xc/programs/Xserver/hw/xfree86/dummylib/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/dummylib/Imakefile
@@ -1,18 +1,19 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/Imakefile,v 1.1 2000/02/13 03:06:38 dawes Exp $
+XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/Imakefile,v 1.4 2003/09/09 03:20:38 dawes Exp $
 
 #include <Server.tmpl>
 
 INCLUDES = -I. -I$(XF86COMSRC) -I$(XF86OSSRC) \
-	   -I$(SERVERSRC)/include -I$(XINCLUDESRC)
+	   -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(DRMSRCDIR)/shared
 
 SRCS = \
 	fatalerror.c \
 	getvalidbios.c \
+	logvwrite.c \
 	pcitestmulti.c \
 	verrorf.c \
-	verrorfverb.c \
 	xalloc.c \
 	xf86allocscripi.c \
+	xf86addrestolist.c \
 	xf86drvmsg.c \
 	xf86drvmsgverb.c \
 	xf86errorf.c \
@@ -25,16 +26,18 @@ SRCS = \
 	xf86opt.c \
 	xf86screens.c \
 	xf86servisinit.c \
-	xf86verbose.c
+	xf86verbose.c \
+	sigiostubs.c
 
 OBJS = \
 	fatalerror.o \
 	getvalidbios.o \
+	logvwrite.o \
 	pcitestmulti.o \
 	verrorf.o \
-	verrorfverb.o \
 	xalloc.o \
 	xf86allocscripi.o \
+	xf86addrestolist.o \
 	xf86drvmsg.o \
 	xf86drvmsgverb.o \
 	xf86errorf.o \
@@ -47,8 +50,10 @@ OBJS = \
 	xf86opt.o \
 	xf86screens.o \
 	xf86servisinit.o \
-	xf86verbose.o
+	xf86verbose.o \
+	sigiostubs.o
 
+LinkSourceFile(sigiostubs.c,../os-support/shared)
 NormalLibraryObjectRule()
 NormalLibraryTarget(dummy,$(OBJS))
 
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
index 04d7e72db..df84c75ef 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
@@ -164,7 +164,7 @@ OBJS = bsd_init.o $(VIDEO_OBJ) bsd_io.o bsd_VTsw.o \
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/mi $(APINCLUDES) \
-	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared
+	    $(LIBUSBINCLUDES) -I$(XF86OSSRC)/shared -I$(DRMSRCDIR)/shared
 
 CONSDEFINES = XFree86ConsoleDefines
 RESDEFINES = -DUSESTDRES
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
index 0af1e3fb1..a6e051b24 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/linux/Imakefile
@@ -53,7 +53,8 @@ OBJS = lnx_init.o lnx_video.o lnx_io.o libc_wrapper.o bios_mmap.o \
        $(AXP_OBJ) lnx_kmod.o lnx_agp.o $(KBDOBJ) /*wcHelper.o*/
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
-           -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC)/shared
+           -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC)/shared \
+	   -I$(DRMSRCDIR)/shared
 
 RESDEFINES = -DUSESTDRES
 
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile b/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile
index 33d5d912f..65bd977a9 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile
+++ b/xc/programs/Xserver/hw/xfree86/os-support/lynxos/Imakefile
@@ -29,7 +29,7 @@ OBJS = lynx_init.o lynx_video.o lynx_io.o lynx_mmap.o \
 
 INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \
            -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-           -I$(ENV_PREFIX)/sys/lynx.os
+           -I$(ENV_PREFIX)/sys/lynx.os -I$(DRMSRCDIR)/shared
 
 RESDEFINES = -DUSESTDRES
 
diff --git a/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h b/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
index c9f100749..5a7ff05ad 100644
--- a/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
+++ b/xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h
@@ -36,6 +36,8 @@
 #ifndef _XF86DRM_H_
 #define _XF86DRM_H_
 
+#include <drm.h>
+
 				/* Defaults, if nothing set in xf86config */
 #define DRM_DEV_UID	 0
 #define DRM_DEV_GID	 0
author	idr <idr>	2004-06-01 16:15:58 +0000
committer	idr <idr>	2004-06-01 16:15:58 +0000
commit	3eb6d448c90d51a7f0f18999813c1ff7726a81bd (patch)
tree	693800b7b0050f7e417770f70776f59e89ed8670
parent	a029972e9d293987ca0c6c54a20668907d69fac8 (diff)