summaryrefslogtreecommitdiff
path: root/src/radeon_textured_video.c
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2008-05-12 12:06:33 -0400
committerAlex Deucher <alex@botch2.com>2008-05-12 12:06:33 -0400
commit908b7b940e3ef296836bc94680ebb8ab67650e31 (patch)
tree20edaba5bffdef2b3625f73ff5d297d3b0c952cb /src/radeon_textured_video.c
parent87e66ce76430890ab4939ffcd42f72b9288eb598 (diff)
Replace CARD{8,16,32} with uint{8,16,32}_t
As has been done with xf86-video-intel, replace all CARD* datatypes with uint*_t datatypes available from stdint.h.
Diffstat (limited to 'src/radeon_textured_video.c')
-rw-r--r--src/radeon_textured_video.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
index 5d153e74..cfa349d3 100644
--- a/src/radeon_textured_video.c
+++ b/src/radeon_textured_video.c
@@ -70,11 +70,11 @@ RADEONTilingEnabled(ScrnInfoPtr pScrn, PixmapPtr pPix)
}
}
-static __inline__ CARD32 F_TO_DW(float val)
+static __inline__ uint32_t F_TO_DW(float val)
{
union {
float f;
- CARD32 l;
+ uint32_t l;
} tmp;
tmp.f = val;
return tmp.l;
@@ -227,7 +227,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
pPriv->src_offset = pPriv->video_offset + info->fbLocation + pScrn->fbOffset;
- pPriv->src_addr = (CARD8 *)(info->FB + pPriv->video_offset + (top * dstPitch));
+ pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset + (top * dstPitch));
pPriv->src_pitch = dstPitch;
pPriv->size = size;
pPriv->pDraw = pDraw;