Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with

drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

3 files changed, 53 insertions, 148 deletions

diff --git a/xc/lib/GL/glx/XF86dri.c b/xc/lib/GL/glx/XF86dri.c
index 6ee6af836..be43c2973 100644
--- a/xc/lib/GL/glx/XF86dri.c
+++ b/xc/lib/GL/glx/XF86dri.c
@@ -176,7 +176,7 @@ Bool XF86DRIQueryDirectRenderingCapable(dpy, screen, isCapable)
 Bool XF86DRIOpenConnection(dpy, screen, hSAREA, busIdString)
     Display* dpy;
     int screen;
-    drmHandlePtr hSAREA;
+    drm_handle_t * hSAREA;
     char **busIdString;
 {
     XExtDisplayInfo *info = find_display (dpy);
@@ -200,7 +200,7 @@ Bool XF86DRIOpenConnection(dpy, screen, hSAREA, busIdString)
 
     *hSAREA = rep.hSAREALow;
 #ifdef LONG64
-    *hSAREA |= ((drmHandle)rep.hSAREAHigh) << 32;
+    *hSAREA |= ((drm_handle_t)rep.hSAREAHigh) << 32;
 #endif
 
     if (rep.length) {
@@ -224,7 +224,7 @@ Bool XF86DRIOpenConnection(dpy, screen, hSAREA, busIdString)
 Bool XF86DRIAuthConnection(dpy, screen, magic)
     Display* dpy;
     int screen;
-    drmMagic magic;
+    drm_magic_t magic;
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRIAuthConnectionReq *req;
@@ -329,7 +329,7 @@ Bool XF86DRICreateContextWithConfig(dpy, screen, configID, context, hHWContext)
     int screen;
     int configID;
     XID* context;
-    drmContextPtr hHWContext;
+    drm_context_t * hHWContext;
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRICreateContextReply rep;
@@ -364,7 +364,7 @@ Bool XF86DRICreateContext(dpy, screen, visual, context, hHWContext)
     int screen;
     Visual* visual;
     XID* context;
-    drmContextPtr hHWContext;
+    drm_context_t * hHWContext;
 {
     return XF86DRICreateContextWithConfig( dpy, screen, visual->visualid,
 					   context, hHWContext );
@@ -397,7 +397,7 @@ Bool XF86DRICreateDrawable(dpy, screen, drawable, hHWDrawable)
     Display* dpy;
     int screen;
     Drawable drawable;
-    drmDrawablePtr hHWDrawable;
+    drm_drawable_t * hHWDrawable;
 {
     XExtDisplayInfo *info = find_display (dpy);
     xXF86DRICreateDrawableReply rep;
@@ -537,7 +537,7 @@ Bool XF86DRIGetDeviceInfo(dpy, screen, hFrameBuffer,
 	fbOrigin, fbSize, fbStride, devPrivateSize, pDevPrivate)
     Display* dpy;
     int screen;
-    drmHandlePtr hFrameBuffer;
+    drm_handle_t * hFrameBuffer;
     int* fbOrigin;
     int* fbSize;
     int* fbStride;
@@ -565,7 +565,7 @@ Bool XF86DRIGetDeviceInfo(dpy, screen, hFrameBuffer,
 
     *hFrameBuffer = rep.hFrameBufferLow;
 #ifdef LONG64
-    *hFrameBuffer |= ((drmHandle)rep.hFrameBufferHigh) << 32;
+    *hFrameBuffer |= ((drm_handle_t)rep.hFrameBufferHigh) << 32;
 #endif
 
     *fbOrigin = rep.framebufferOrigin;
diff --git a/xc/lib/GL/glx/glxext.c b/xc/lib/GL/glx/glxext.c
index 5f8e8f4d1..8dcc99aab 100644
--- a/xc/lib/GL/glx/glxext.c
+++ b/xc/lib/GL/glx/glxext.c
@@ -728,7 +728,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
 		    CreateNewScreenFunc createNewScreen)
 {
     __DRIscreenPrivate *psp = NULL;
-    drmHandle hSAREA;
+    drm_handle_t hSAREA;
     drmAddress pSAREA;
     char *BusID;
     __DRIversion   ddx_version;
@@ -758,7 +758,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
 	err_extra = strerror( -fd );
 
 	if (fd >= 0) {
-	    drmMagic magic;
+	    drm_magic_t magic;
 
 	    err_msg = "drmGetMagic";
 	    err_extra = NULL;
@@ -792,7 +792,7 @@ CallCreateNewScreen(Display *dpy, int scrn, __DRIscreen *psc,
 						   &ddx_version.minor,
 						   &ddx_version.patch,
 						   &driverName)) {
-			drmHandle  hFB;
+			drm_handle_t  hFB;
 			int        junk;
 
 			/* No longer needed. */
diff --git a/xc/lib/GL/glx/xf86dri.h b/xc/lib/GL/glx/xf86dri.h
index b67c8d8be..2c7be46b1 100644
--- a/xc/lib/GL/glx/xf86dri.h
+++ b/xc/lib/GL/glx/xf86dri.h
@@ -67,143 +67,48 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 _XFUNCPROTOBEGIN
 
-Bool XF86DRIQueryExtension(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int*		/* event_base */,
-    int*		/* error_base */
-#endif
-);
-
-Bool XF86DRIQueryVersion(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int*		/* majorVersion */,
-    int*		/* minorVersion */,
-    int*		/* patchVersion */
-#endif
-);
-
-Bool XF86DRIQueryDirectRenderingCapable(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    Bool*		/* isCapable */
-#endif
-);
-
-Bool XF86DRIOpenConnection(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    drmHandlePtr	/* hSAREA */,
-    char**		/* busIDString */
-#endif
-);
-
-Bool XF86DRIAuthConnection(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    drmMagic            /* magic */
-#endif
-);
-
-Bool XF86DRICloseConnection(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */
-#endif
-);
-
-Bool XF86DRIGetClientDriverName(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    int*		/* ddxDriverMajorVersion */,
-    int*		/* ddxDriverMinorVersion */,
-    int*		/* ddxDriverPatchVersion */,
-    char**		/* clientDriverName */
-#endif
-);
-
-Bool XF86DRICreateContext(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    Visual*		/* visual */,
-    XID*		/* ptr to returned context id */,
-    drmContextPtr	/* hHWContext */
-#endif
-);
-
-Bool XF86DRICreateContextWithConfig(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    int			/* visual ID / fbconfig ID */,
-    XID*		/* ptr to returned context id */,
-    drmContextPtr	/* hHWContext */
-#endif
-);
-
-Bool XF86DRIDestroyContext(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    XID 	        /* context id */
-#endif
-);
-
-Bool XF86DRICreateDrawable(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    Drawable		/* drawable */,
-    drmDrawablePtr 	/* hHWDrawable */
-#endif
-);
-
-Bool XF86DRIDestroyDrawable(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    Drawable 		/* drawable */
-#endif
-);
-
-Bool XF86DRIGetDrawableInfo(
-#if NeedFunctionPrototypes
-    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 */    
-#endif
-);
-
-Bool XF86DRIGetDeviceInfo(
-#if NeedFunctionPrototypes
-    Display*		/* dpy */,
-    int			/* screen */,
-    drmHandlePtr	/* hFrameBuffer */,
-    int*		/* fbOrigin */,
-    int*		/* fbSize */,
-    int*		/* fbStride */,
-    int*		/* devPrivateSize */,
-    void**		/* pDevPrivate */
-#endif
-);
+Bool XF86DRIQueryExtension( Display *dpy, int *event_base, int *error_base );
+
+Bool XF86DRIQueryVersion( Display *dpy, int *majorVersion, int *minorVersion,
+    int *patchVersion );
+
+Bool XF86DRIQueryDirectRenderingCapable( Display *dpy, int screen,
+    Bool *isCapable );
+
+Bool XF86DRIOpenConnection( Display *dpy, int screen, drm_handle_t *hSAREA,
+    char **busIDString );
+
+Bool XF86DRIAuthConnection( Display *dpy, int screen, drm_magic_t magic );
+
+Bool XF86DRICloseConnection( Display *dpy, int screen );
+
+Bool XF86DRIGetClientDriverName( Display *dpy, int screen,
+    int *ddxDriverMajorVersion, int *ddxDriverMinorVersion,
+    int *ddxDriverPatchVersion, char **clientDriverName );
+
+Bool XF86DRICreateContext( Display *dpy, int screen, Visual *visual,
+    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
+
+Bool XF86DRICreateContextWithConfig( Display *dpy, int screen, int configID,
+    XID *ptr_to_returned_context_id, drm_context_t *hHWContext );
+
+Bool XF86DRIDestroyContext( Display *dpy, int screen, XID context_id );
+
+Bool XF86DRICreateDrawable( Display *dpy, int screen, Drawable drawable,
+    drm_drawable_t *hHWDrawable );
+
+Bool XF86DRIDestroyDrawable( Display *dpy, int screen, Drawable drawable );
+
+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 );
+
+Bool XF86DRIGetDeviceInfo( Display *dpy, int screen,
+    drm_handle_t *hFrameBuffer, int *fbOrigin, int *fbSize,
+    int *fbStride, int *devPrivateSize, void **pDevPrivate );
 
 _XFUNCPROTOEND