Author: mcayland Date: Sat Jul 27 12:14:34 2013 New Revision: 1179 URL: http://tracker.coreboot.org/trac/openbios/changeset/1179
Log: video_common.c: rename get_color() and set_color() functions
These are now called video_get_color() and video_set_color() respectively.
Signed-off-by: Mark Cave-Ayland mark.cave-ayland@ilande.co.uk
Modified: trunk/openbios-devel/include/libopenbios/video.h trunk/openbios-devel/libopenbios/video_common.c trunk/openbios-devel/packages/molvideo.c
Modified: trunk/openbios-devel/include/libopenbios/video.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/include/libopenbios/video.h Sat Jul 27 12:14:34 2013 (r1179) @@ -1,7 +1,7 @@
void init_video(unsigned long fb, int width, int height, int depth, int rb); -unsigned long get_color(int col_ind); -void set_color(int ind, unsigned long color); +unsigned long video_get_color(int col_ind); +void video_set_color(int ind, unsigned long color); int video_get_res(int *w, int *h); void video_mask_blit(void); void video_invert_rect(void);
Modified: trunk/openbios-devel/libopenbios/video_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/libopenbios/video_common.c Sat Jul 27 12:14:34 2013 (r1179) @@ -26,7 +26,7 @@ struct video_info video;
unsigned long -get_color( int col_ind ) +video_get_color( int col_ind ) { unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) @@ -42,7 +42,7 @@ }
void -set_color( int ind, unsigned long color ) +video_set_color( int ind, unsigned long color ) { if( !video.has_video || ind < 0 || ind > 255 ) return; @@ -95,8 +95,8 @@ unsigned char *dst, *rowdst; int x, y, m, b, d, depthbytes;
- fgcolor = get_color(fgcolor); - bgcolor = get_color(bgcolor); + fgcolor = video_get_color(fgcolor); + bgcolor = video_get_color(bgcolor); d = video.fb.depth; depthbytes = (video.fb.depth + 1) >> 3;
@@ -142,8 +142,8 @@ int x = POP(); char *pp;
- bgcolor = get_color(bgcolor); - fgcolor = get_color(fgcolor); + bgcolor = video_get_color(bgcolor); + fgcolor = video_get_color(fgcolor);
if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > video.fb.w || y + h > video.fb.h) @@ -195,7 +195,7 @@ int col_ind = POP();
char *pp; - unsigned long col = get_color(col_ind); + unsigned long col = video_get_color(col_ind);
if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || x + w > video.fb.w || y + h > video.fb.h) @@ -298,7 +298,7 @@ #endif
for( i=0; i<256; i++ ) - set_color( i, i * 0x010101 ); + video_set_color( i, i * 0x010101 );
- set_color( 254, 0xffffcc ); + video_set_color( 254, 0xffffcc ); }
Modified: trunk/openbios-devel/packages/molvideo.c ============================================================================== --- trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:32 2013 (r1178) +++ trunk/openbios-devel/packages/molvideo.c Sat Jul 27 12:14:34 2013 (r1179) @@ -61,7 +61,7 @@
for( i=0; i<count; i++, p+=3 ) { unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; - set_color( i + start, col ); + video_set_color( i + start, col ); } molvideo_refresh_palette(); } @@ -76,7 +76,7 @@ int r = POP(); unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ - set_color( index, col ); + video_set_color( index, col ); molvideo_refresh_palette(); }