diff options
Diffstat (limited to 'src/i830_i2c.c')
| -rw-r--r-- | src/i830_i2c.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_i2c.c b/src/i830_i2c.c index 33a75a81..8392d0a5 100644 --- a/src/i830_i2c.c +++ b/src/i830_i2c.c @@ -59,7 +59,7 @@ static void i830_setscl(I2CBusPtr b, int state) { ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); - CARD32 val; + uint32_t val; OUTREG(b->DriverPrivate.uval, (state ? GPIO_CLOCK_VAL_OUT : 0) | GPIO_CLOCK_DIR_OUT | @@ -71,7 +71,7 @@ static void i830_setsda(I2CBusPtr b, int state) { ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); - CARD32 val; + uint32_t val; OUTREG(b->DriverPrivate.uval, (state ? GPIO_DATA_VAL_OUT : 0) | GPIO_DATA_DIR_OUT | @@ -83,7 +83,7 @@ static void i830_getscl(I2CBusPtr b, int *state) { ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); - CARD32 val; + uint32_t val; OUTREG(b->DriverPrivate.uval, GPIO_CLOCK_DIR_IN | GPIO_CLOCK_DIR_MASK); OUTREG(b->DriverPrivate.uval, 0); @@ -95,7 +95,7 @@ static int i830_getsda(I2CBusPtr b) { ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); - CARD32 val; + uint32_t val; OUTREG(b->DriverPrivate.uval, GPIO_DATA_DIR_IN | GPIO_DATA_DIR_MASK); OUTREG(b->DriverPrivate.uval, 0); @@ -272,7 +272,7 @@ i830I2CGetBits(I2CBusPtr b, int *clock, int *data) { ScrnInfoPtr pScrn = xf86Screens[b->scrnIndex]; I830Ptr pI830 = I830PTR(pScrn); - CARD32 val; + uint32_t val; val = INREG(b->DriverPrivate.uval); @@ -295,8 +295,8 @@ i830I2CGetBits(I2CBusPtr b, int *clock, int *data) static void i830I2CPutBits(I2CBusPtr b, int clock, int data) { - CARD32 reserved = 0; - CARD32 data_bits, clock_bits; + uint32_t reserved = 0; + uint32_t data_bits, clock_bits; #if I2C_DEBUG int cur_clock, cur_data; |