[OpenBIOS] [commit] r1177 - in trunk/openbios-devel: include/libopenbios libopenbios

[repository service]

Author: mcayland
Date: Sat Jul 27 12:14:29 2013
New Revision: 1177
URL: http://tracker.coreboot.org/trac/openbios/changeset/1177

Log:
video_common.c: now fill_rect() is no longer called directly, merge it into the video_fill_rect()

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>

Modified:
   trunk/openbios-devel/include/libopenbios/video.h
   trunk/openbios-devel/libopenbios/video_common.c

Modified: trunk/openbios-devel/include/libopenbios/video.h
==============================================================================
--- trunk/openbios-devel/include/libopenbios/video.h	Sat Jul 27 12:14:26 2013	(r1176)
+++ trunk/openbios-devel/include/libopenbios/video.h	Sat Jul 27 12:14:29 2013	(r1177)
@@ -5,7 +5,6 @@
 int video_get_res(int *w, int *h);
 void draw_pixel(int x, int y, int colind);
 void video_scroll(int height);
-void fill_rect(int col_ind, int x, int y, int w, int h);
 void video_mask_blit(void);
 void video_invert_rect(void);
 void video_fill_rect(void);

Modified: trunk/openbios-devel/libopenbios/video_common.c
==============================================================================
--- trunk/openbios-devel/libopenbios/video_common.c	Sat Jul 27 12:14:26 2013	(r1176)
+++ trunk/openbios-devel/libopenbios/video_common.c	Sat Jul 27 12:14:29 2013	(r1177)
@@ -225,9 +225,16 @@
 	}
 }
 
+/* ( color_ind x y width height -- ) (?) */
 void
-fill_rect( int col_ind, int x, int y, int w, int h )
+video_fill_rect(void)
 {
+	int h = POP();
+	int w = POP();
+	int y = POP();
+	int x = POP();
+	int col_ind = POP();
+
 	char *pp;
 	unsigned long col = get_color(col_ind);
 
@@ -255,19 +262,6 @@
 	}
 }
 
-/* ( color_ind x y width height -- ) (?) */
-void
-video_fill_rect(void)
-{
-	int h = POP();
-	int w = POP();
-	int y = POP();
-	int x = POP();
-	int color_ind = POP();
-
-	fill_rect( color_ind, x, y, w, h );
-}
-
 void
 init_video( unsigned long fb, int width, int height, int depth, int rb )
 {