summaryrefslogtreecommitdiffstats
path: root/drivers/radeon_vid.c
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-27 18:23:03 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-01-27 18:23:03 +0000
commite41ecd1a7e64ba0b753ce63570f4e53c145162b3 (patch)
treec3f5ffba3975174569d27aa619c0bc34db29401e /drivers/radeon_vid.c
parentf7906235ad181389b9c84c98f537db4c0a4ca44f (diff)
downloadmpv-e41ecd1a7e64ba0b753ce63570f4e53c145162b3.tar.bz2
mpv-e41ecd1a7e64ba0b753ce63570f4e53c145162b3.tar.xz
Rename some identifiers to not use leading underscores.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25890 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'drivers/radeon_vid.c')
-rw-r--r--drivers/radeon_vid.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/drivers/radeon_vid.c b/drivers/radeon_vid.c
index 3e5b9a5db0..4bc9075e8c 100644
--- a/drivers/radeon_vid.c
+++ b/drivers/radeon_vid.c
@@ -117,23 +117,23 @@ static int swap_fourcc __initdata = 0;
#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 @@ static char *fourcc_format_name(int format)
#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_engine_flush ( void )
}
-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_fifo_wait (int entries)
}
-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 @@ static __inline__ void _radeon_engine_idle ( void )
}
}
-#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 )
{