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

drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.

4 files changed, 13 insertions, 13 deletions

diff --git a/src/mesa/drivers/dri/i810/i810context.h b/src/mesa/drivers/dri/i810/i810context.h
index d3dd1a16c90..a2202e148f9 100644
--- a/src/mesa/drivers/dri/i810/i810context.h
+++ b/src/mesa/drivers/dri/i810/i810context.h
@@ -169,7 +169,7 @@ struct i810_context_t {
    drm_clip_rect_t draw_rect;
    drm_clip_rect_t scissor_rect;
 
-   drmContext hHWContext;
+   drm_context_t hHWContext;
    drm_hw_lock_t *driHwLock;
    int driFd;
 
diff --git a/src/mesa/drivers/dri/i810/i810screen.h b/src/mesa/drivers/dri/i810/i810screen.h
index 4625bc5e9f6..b29937665af 100644
--- a/src/mesa/drivers/dri/i810/i810screen.h
+++ b/src/mesa/drivers/dri/i810/i810screen.h
@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "dri_util.h"
 
 typedef struct {
-   drmHandle handle;
+   drm_handle_t handle;
    drmSize size;
    char *map;
 } i810Region, *i810RegionPtr;
diff --git a/src/mesa/drivers/dri/i810/server/i810_dri.c b/src/mesa/drivers/dri/i810/server/i810_dri.c
index e9c4b78e3ab..d1bd4b6a89c 100644
--- a/src/mesa/drivers/dri/i810/server/i810_dri.c
+++ b/src/mesa/drivers/dri/i810/server/i810_dri.c
@@ -505,14 +505,14 @@ static int I810MemoryInit( const DRIDriverContext *ctx, I810Ptr info )
    int        depthSize   = (((ctx->shared.virtualHeight+15) & ~15) * width_bytes);
    int        l;
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->BackBuffer.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->BackBuffer.Start,
 		 info->BackBuffer.Size, DRM_AGP, 0,
 		 &info->backbuffer) < 0) {
      fprintf(stderr, "[drm] drmAddMap(backbuffer) failed.  Disabling DRI\n");
      return 0;
    }
    
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->DepthBuffer.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->DepthBuffer.Start,
 		 info->DepthBuffer.Size, DRM_AGP, 0,
 		 &info->depthbuffer) < 0) {
      fprintf(stderr, "[drm] drmAddMap(depthbuffer) failed.  Disabling DRI.\n");
@@ -561,13 +561,13 @@ static int I810MemoryInit( const DRIDriverContext *ctx, I810Ptr info )
      return 0;
    }
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->BufferMem.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->BufferMem.Start,
 		 info->BufferMem.Size, DRM_AGP, 0, &info->buffer_map) < 0) {
      fprintf(stderr, "[drm] drmAddMap(buffer_map) failed.  Disabling DRI.\n");
      return 0;
    }
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->LpRing.mem.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->LpRing.mem.Start,
 		 info->LpRing.mem.Size, DRM_AGP, 0, &info->ring_map) < 0) {
      fprintf(stderr, "[drm] drmAddMap(ring_map) failed.  Disabling DRI. \n");
      return 0;
@@ -601,7 +601,7 @@ static int I810MemoryInit( const DRIDriverContext *ctx, I810Ptr info )
 
    I810AllocLow(&(info->TexMem), &(info->SysMem), info->textureSize);
 
-   if (drmAddMap(ctx->drmFD, (drmHandle) info->TexMem.Start,
+   if (drmAddMap(ctx->drmFD, (drm_handle_t) info->TexMem.Start,
 		 info->TexMem.Size, DRM_AGP, 0, &info->textures) < 0) {
      fprintf(stderr,
 		 "[drm] drmAddMap(textures) failed.  Disabling DRI.\n");
@@ -726,7 +726,7 @@ static int I810ScreenInit( DRIDriverContext *ctx, I810Ptr info )
    /* Need to AddMap the framebuffer and mmio regions here:
     */
    if (drmAddMap( ctx->drmFD,
-		  (drmHandle)ctx->FBStart,
+		  (drm_handle_t)ctx->FBStart,
 		  ctx->FBSize,
 		  DRM_FRAME_BUFFER,
 #ifndef _EMBEDDED
diff --git a/src/mesa/drivers/dri/i810/server/i810_dri.h b/src/mesa/drivers/dri/i810/server/i810_dri.h
index 2931988c879..2e710a414ac 100644
--- a/src/mesa/drivers/dri/i810/server/i810_dri.h
+++ b/src/mesa/drivers/dri/i810/server/i810_dri.h
@@ -9,20 +9,20 @@
 #define I810_MAX_DRAWABLES 256
 
 typedef struct {
-   drmHandle regs;
+   drm_handle_t regs;
    drmSize regsSize;
    drmAddress regsMap;
 
    drmSize backbufferSize;
-   drmHandle backbuffer;
+   drm_handle_t backbuffer;
 
    drmSize depthbufferSize;
-   drmHandle depthbuffer;
+   drm_handle_t depthbuffer;
 
-   drmHandle textures;
+   drm_handle_t textures;
    int textureSize;
 
-   drmHandle agp_buffers;
+   drm_handle_t agp_buffers;
    drmSize agp_buf_size;
 
    int deviceID;