comparison vidix/s3_regs.h @ 27757:b5a46071062a

Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'. We were using an inconsistent mix of the three variants and 'volatile' should be the most correct and portable variant.
author diego
date Thu, 16 Oct 2008 20:17:56 +0000
parents 5b162ba7cee8
children 0f1b5b68af32
comparison
equal deleted inserted replaced
27756:1266470a5651 27757:b5a46071062a
194 #define VID_RD32(p,i) (((uint32_t *)(p))[(i)/4]) 194 #define VID_RD32(p,i) (((uint32_t *)(p))[(i)/4])
195 195
196 #ifndef USE_RMW_CYCLES 196 #ifndef USE_RMW_CYCLES
197 197
198 /* Can be used to inhibit READ-MODIFY-WRITE cycles. On by default. */ 198 /* Can be used to inhibit READ-MODIFY-WRITE cycles. On by default. */
199 #define MEM_BARRIER() __asm__ __volatile__ ("" : : : "memory") 199 #define MEM_BARRIER() __asm__ volatile ("" : : : "memory")
200 200
201 #undef VID_WR08 201 #undef VID_WR08
202 #define VID_WR08(p,i,val) ({ MEM_BARRIER(); ((uint8_t *)(p))[(i)]=(val); }) 202 #define VID_WR08(p,i,val) ({ MEM_BARRIER(); ((uint8_t *)(p))[(i)]=(val); })
203 #undef VID_RD08 203 #undef VID_RD08
204 #define VID_RD08(p,i) ({ MEM_BARRIER(); ((uint8_t *)(p))[(i)]; }) 204 #define VID_RD08(p,i) ({ MEM_BARRIER(); ((uint8_t *)(p))[(i)]; })