diff options
Diffstat (limited to 'src/theatre_detect.c')
| -rw-r--r-- | src/theatre_detect.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/theatre_detect.c b/src/theatre_detect.c index 79dcfe4..7e7f813 100644 --- a/src/theatre_detect.c +++ b/src/theatre_detect.c @@ -45,18 +45,18 @@ #include "theatre_reg.h" #include "theatre_detect.h" -static Bool theatre_read(TheatrePtr t,CARD32 reg, CARD32 *data) +static Bool theatre_read(TheatrePtr t,uint32_t reg, uint32_t *data) { if(t->theatre_num<0)return FALSE; - return t->VIP->read(t->VIP, ((t->theatre_num & 0x3)<<14) | reg,4, (CARD8 *) data); + return t->VIP->read(t->VIP, ((t->theatre_num & 0x3)<<14) | reg,4, (uint8_t *) data); } /* Unused code - reference */ #if 0 -static Bool theatre_write(TheatrePtr t,CARD32 reg, CARD32 data) +static Bool theatre_write(TheatrePtr t,uint32_t reg, uint32_t data) { if(t->theatre_num<0)return FALSE; - return t->VIP->write(t->VIP,((t->theatre_num & 0x03)<<14) | reg,4, (CARD8 *) &data); + return t->VIP->write(t->VIP,((t->theatre_num & 0x03)<<14) | reg,4, (uint8_t *) &data); } #define RT_regw(reg,data) theatre_write(t,(reg),(data)) #endif @@ -69,7 +69,7 @@ _X_EXPORT TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b) { TheatrePtr t; int i; - CARD32 val; + uint32_t val; char s[20]; b->ioctl(b,GB_IOCTL_GET_TYPE,20,s); @@ -84,10 +84,10 @@ _X_EXPORT TheatrePtr DetectTheatre(GENERIC_BUS_Ptr b) t->theatre_num = -1; t->mode=MODE_UNINITIALIZED; - b->read(b, VIP_VIP_VENDOR_DEVICE_ID, 4, (CARD8 *)&val); + b->read(b, VIP_VIP_VENDOR_DEVICE_ID, 4, (uint8_t *)&val); for(i=0;i<4;i++) { - if(b->read(b, ((i & 0x03)<<14) | VIP_VIP_VENDOR_DEVICE_ID, 4, (CARD8 *)&val)) + if(b->read(b, ((i & 0x03)<<14) | VIP_VIP_VENDOR_DEVICE_ID, 4, (uint8_t *)&val)) { if(val)xf86DrvMsg(b->scrnIndex, X_INFO, "Device %d on VIP bus ids as 0x%08x\n", i, |