Mercurial > mplayer.hg
changeset 25862:4be9faee0360
Rename some identifiers to not use leading underscores.
| author | diego |
|---|---|
| date | Sun, 27 Jan 2008 18:23:03 +0000 |
| parents | 5442946cade2 |
| children | 3bb953467710 |
| files | drivers/radeon_vid.c |
| diffstat | 1 files changed, 11 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/drivers/radeon_vid.c Sun Jan 27 18:01:19 2008 +0000 +++ b/drivers/radeon_vid.c Sun Jan 27 18:23:03 2008 +0000 @@ -117,23 +117,23 @@ #if defined(__i386__) /* Ugly but only way */ #undef AVOID_FPU -static double inline __FastSin(double x) +static inline double FastSin(double x) { register double res; __asm __volatile("fsin":"=t"(res):"0"(x)); return res; } #undef sin -#define sin(x) __FastSin(x) +#define sin(x) FastSin(x) -static double inline __FastCos(double x) +static inline double FastCos(double x) { register double res; __asm __volatile("fcos":"=t"(res):"0"(x)); return res; } #undef cos -#define cos(x) __FastCos(x) +#define cos(x) FastCos(x) #else #include "generic_math.h" #endif /*__386__*/ @@ -381,10 +381,10 @@ #define OUTREG(addr,val) writel(val, (radeon_mmio_base)+addr) #define OUTREGP(addr,val,mask) \ do { \ - unsigned int _tmp = INREG(addr); \ - _tmp &= (mask); \ - _tmp |= (val); \ - OUTREG(addr, _tmp); \ + unsigned int tmp = INREG(addr); \ + tmp &= (mask); \ + tmp |= (val); \ + OUTREG(addr, tmp); \ } while (0) static uint32_t radeon_vid_get_dbpp( void ) @@ -427,7 +427,7 @@ } -static __inline__ void _radeon_fifo_wait (int entries) +static __inline__ void radeon_fifo_wait (int entries) { int i; @@ -437,12 +437,12 @@ } -static __inline__ void _radeon_engine_idle ( void ) +static __inline__ void radeon_engine_idle ( void ) { int i; /* ensure FIFO is empty before waiting for idle */ - _radeon_fifo_wait (64); + radeon_fifo_wait (64); for (i=0; i<2000000; i++) { if (((INREG(RBBM_STATUS) & GUI_ACTIVE)) == 0) { @@ -452,9 +452,6 @@ } } -#define radeon_engine_idle() _radeon_engine_idle() -#define radeon_fifo_wait(entries) _radeon_fifo_wait(entries) - #if 0 static void __init radeon_vid_save_state( void ) {