diff options
| author | Ian Romanick <[email protected]> | 2004-06-02 05:07:10 +0000 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2004-06-02 05:07:10 +0000 |
| commit | c06b25594e5effe34a90c067e1a3da0f61cf2b13 (patch) | |
| tree | b4566acb6bdd7aa99e92c064c38db907a6c9b182 /src/mesa/drivers/dri/mga | |
| parent | d203091d204ea2e543cd41ea85d0fc57aa794a4b (diff) | |
Replace drmHandle, drmContext, drmDrawable, drmMagic and related types with
drm_handle_t, drm_context_t, drm_drawable_t, drm_magic_t.
Diffstat (limited to 'src/mesa/drivers/dri/mga')
| -rw-r--r-- | src/mesa/drivers/dri/mga/mgacontext.h | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/mga/server/mga_dri.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/mga/mgacontext.h b/src/mesa/drivers/dri/mga/mgacontext.h index 2009634b13c..602f8aca9d4 100644 --- a/src/mesa/drivers/dri/mga/mgacontext.h +++ b/src/mesa/drivers/dri/mga/mgacontext.h @@ -295,7 +295,7 @@ struct mga_context_t { /* Mirrors of some DRI state. */ - drmContext hHWContext; + drm_context_t hHWContext; drm_hw_lock_t *driHwLock; int driFd; __DRIdrawablePrivate *driDrawable; diff --git a/src/mesa/drivers/dri/mga/server/mga_dri.c b/src/mesa/drivers/dri/mga/server/mga_dri.c index 0a193b258ac..896bb56ccec 100644 --- a/src/mesa/drivers/dri/mga/server/mga_dri.c +++ b/src/mesa/drivers/dri/mga/server/mga_dri.c @@ -315,7 +315,7 @@ static int MGADRIMapInit( struct DRIDriverContextRec *ctx, MGAPtr pMga ) pMga->registers.size = MGAIOMAPSIZE; if ( drmAddMap( ctx->drmFD, - (drmHandle)pMga->IOAddress, + (drm_handle_t)pMga->IOAddress, pMga->registers.size, DRM_REGISTERS, DRM_READ_ONLY, &pMga->registers.handle ) < 0 ) { @@ -718,7 +718,7 @@ static int MGAScreenInit( struct DRIDriverContextRec *ctx, MGAPtr pMga ) /* 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, 0, |