diff options
| author | Matt Turner <mattst88@gmail.com> | 2008-05-12 12:06:33 -0400 |
|---|---|---|
| committer | Alex Deucher <alex@botch2.com> | 2008-05-12 12:06:33 -0400 |
| commit | 908b7b940e3ef296836bc94680ebb8ab67650e31 (patch) | |
| tree | 20edaba5bffdef2b3625f73ff5d297d3b0c952cb /src/radeon_macros.h | |
| parent | 87e66ce76430890ab4939ffcd42f72b9288eb598 (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_macros.h')
| -rw-r--r-- | src/radeon_macros.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/radeon_macros.h b/src/radeon_macros.h index 7f532a84..f19bc3e7 100644 --- a/src/radeon_macros.h +++ b/src/radeon_macros.h @@ -67,12 +67,12 @@ #define OUTREG16(addr, val) MMIO_OUT16(RADEONMMIO, addr, val) #define OUTREG(addr, val) MMIO_OUT32(RADEONMMIO, addr, val) -#define ADDRREG(addr) ((volatile CARD32 *)(pointer)(RADEONMMIO + (addr))) +#define ADDRREG(addr) ((volatile uint32_t *)(pointer)(RADEONMMIO + (addr))) #define OUTREGP(addr, val, mask) \ do { \ - CARD32 tmp = INREG(addr); \ + uint32_t tmp = INREG(addr); \ tmp &= (mask); \ tmp |= ((val) & ~(mask)); \ OUTREG(addr, tmp); \ @@ -84,7 +84,7 @@ do { \ #define OUTPLLP(pScrn, addr, val, mask) \ do { \ - CARD32 tmp_ = INPLL(pScrn, addr); \ + uint32_t tmp_ = INPLL(pScrn, addr); \ tmp_ &= (mask); \ tmp_ |= ((val) & ~(mask)); \ OUTPLL(pScrn, addr, tmp_); \ @@ -108,7 +108,7 @@ do { \ } \ } while (0) -#define OUTPAL_NEXT_CARD32(v) \ +#define OUTPAL_NEXT_uint32_t(v) \ do { \ OUTREG(RADEON_PALETTE_DATA, (v & 0x00ffffff)); \ } while (0) @@ -148,7 +148,7 @@ do { \ } else { \ if (!idx) { \ OUTREG(RADEON_DAC_CNTL2, INREG(RADEON_DAC_CNTL2) & \ - (CARD32)~RADEON_DAC2_PALETTE_ACC_CTL); \ + (uint32_t)~RADEON_DAC2_PALETTE_ACC_CTL); \ } else { \ OUTREG(RADEON_DAC_CNTL2, INREG(RADEON_DAC_CNTL2) | \ RADEON_DAC2_PALETTE_ACC_CTL); \ |