summaryrefslogtreecommitdiff
path: root/src/i830_memory.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-03-11 12:07:52 -0700
committerEric Anholt <eric@anholt.net>2008-03-11 12:07:52 -0700
commit9a62d3b598cca3c28fa8b6313bba82983cc29ecf (patch)
treeb0775977594e601cba20d8d9bf53913bfac5b662 /src/i830_memory.c
parent15f17aa682129c57d3864a355834edff06e91540 (diff)
Remove i830+ driver's use of CARD*/INT* types for great justice.
Several uses are actually left, which are determined by the X Server interfaces we're implementing.
Diffstat (limited to 'src/i830_memory.c')
-rw-r--r--src/i830_memory.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c
index e9097ecb..ec4d699a 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -543,7 +543,7 @@ static uint64_t
i830_get_gtt_physical(ScrnInfoPtr pScrn, unsigned long offset)
{
I830Ptr pI830 = I830PTR(pScrn);
- CARD32 gttentry;
+ uint32_t gttentry;
/* We don't have GTTBase set up on i830 yet. */
if (pI830->GTTBase == NULL)
@@ -1712,8 +1712,8 @@ i830_set_tiling(ScrnInfoPtr pScrn, unsigned int offset,
enum tile_format tile_format)
{
I830Ptr pI830 = I830PTR(pScrn);
- CARD32 val;
- CARD32 fence_mask = 0;
+ uint32_t val;
+ uint32_t fence_mask = 0;
unsigned int fence_pitch;
unsigned int max_fence;
unsigned int fence_nr;