From f7906235ad181389b9c84c98f537db4c0a4ca44f Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 27 Jan 2008 18:01:19 +0000 Subject: Fix illegal identifiers, names starting with __ are reserved for the system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25889 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_vesa.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libvo') diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 20d97b57a5..0e64c6621f 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -170,7 +170,7 @@ static void vesa_term( void ) #define VALID_WIN_FRAME(offset) (offset >= win.low && offset < win.high) #define VIDEO_PTR(offset) (win.ptr + offset - win.low) -static inline void __vbeSwitchBank(unsigned long offset) +static inline void vbeSwitchBank(unsigned long offset) { unsigned long gran; unsigned new_offset; @@ -190,7 +190,7 @@ static inline void __vbeSwitchBank(unsigned long offset) win.high = win.low + video_mode_info.WinSize*1024; } -static void __vbeSetPixel(int x, int y, int r, int g, int b) +static void vbeSetPixel(int x, int y, int r, int g, int b) { int x_res = video_mode_info.XResolution; int y_res = video_mode_info.YResolution; @@ -208,7 +208,7 @@ static void __vbeSetPixel(int x, int y, int r, int g, int b) b >>= 8 - video_mode_info.BlueMaskSize; color = (r << shift_r) | (g << shift_g) | (b << shift_b); offset = y * bpl + (x * pixel_size); - if(!VALID_WIN_FRAME(offset)) __vbeSwitchBank(offset); + if(!VALID_WIN_FRAME(offset)) vbeSwitchBank(offset); memcpy(VIDEO_PTR(offset), &color, pixel_size); } @@ -216,17 +216,17 @@ static void __vbeSetPixel(int x, int y, int r, int g, int b) Copies part of frame to video memory. Data should be in the same format as video memory. */ -static void __vbeCopyBlockFast(unsigned long offset,uint8_t *image,unsigned long size) +static void vbeCopyBlockFast(unsigned long offset,uint8_t *image,unsigned long size) { fast_memcpy(&win.ptr[offset],image,size); } -static void __vbeCopyBlock(unsigned long offset,uint8_t *image,unsigned long size) +static void vbeCopyBlock(unsigned long offset,uint8_t *image,unsigned long size) { unsigned long delta,src_idx = 0; while(size) { - if(!VALID_WIN_FRAME(offset)) __vbeSwitchBank(offset); + if(!VALID_WIN_FRAME(offset)) vbeSwitchBank(offset); delta = min(size,win.high - offset); fast_memcpy(VIDEO_PTR(offset),&image[src_idx],delta); src_idx += delta; @@ -244,7 +244,7 @@ static void __vbeCopyBlock(unsigned long offset,uint8_t *image,unsigned long siz #define SCREEN_LINE_SIZE(pixel_size) (video_mode_info.XResolution*(pixel_size) ) #define IMAGE_LINE_SIZE(pixel_size) (dstW*(pixel_size)) -static void __vbeCopyData(uint8_t *image) +static void vbeCopyData(uint8_t *image) { unsigned long i,j,image_offset,offset; unsigned pixel_size,image_line_size,screen_line_size,x_shift; @@ -375,7 +375,7 @@ static void flip_page(void) mp_msg(MSGT_VO,MSGL_DBG3, "vo_vesa: flip_page was called\n"); if(flip_trigger) { - if(!HAS_DGA()) __vbeCopyData(dga_buffer); + if(!HAS_DGA()) vbeCopyData(dga_buffer); flip_trigger = 0; } if(vo_doublebuffering && multi_size > 1) @@ -491,7 +491,7 @@ static void paintBkGnd( void ) g = y * 255 / y_res; b = 255 - y * 255 / y_res; } - __vbeSetPixel(x, y, r, g, b); + vbeSetPixel(x, y, r, g, b); } } } @@ -504,7 +504,7 @@ static void clear_screen( void ) for (y = 0; y < y_res; ++y) for (x = 0; x < x_res; ++x) - __vbeSetPixel(x, y, 0, 0, 0); + vbeSetPixel(x, y, 0, 0, 0); } static char *model2str(unsigned char type) @@ -895,11 +895,11 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin if(HAS_DGA()) { dga_buffer = win.ptr; /* Trickly ;) */ - cpy_blk_fnc = __vbeCopyBlockFast; + cpy_blk_fnc = vbeCopyBlockFast; } else { - cpy_blk_fnc = __vbeCopyBlock; + cpy_blk_fnc = vbeCopyBlock; if(!lvo_name #ifdef CONFIG_VIDIX && !vidix_name -- cgit v1.2.3