[OpenBIOS] [PATCH 06/20] video_common.c: now fill_rect() is no longer called directly, merge it into the video_fill_rect()
Mark Cave-Ayland
mark.cave-ayland at ilande.co.uk
Sat Jun 15 10:38:44 CEST 2013
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland at ilande.co.uk>
---
openbios-devel/include/libopenbios/video.h | 1 -
openbios-devel/libopenbios/video_common.c | 22 ++++++++--------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/openbios-devel/include/libopenbios/video.h b/openbios-devel/include/libopenbios/video.h
index ae82007..b30d408 100644
--- a/openbios-devel/include/libopenbios/video.h
+++ b/openbios-devel/include/libopenbios/video.h
@@ -5,7 +5,6 @@ void set_color(int ind, unsigned long color);
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);
diff --git a/openbios-devel/libopenbios/video_common.c b/openbios-devel/libopenbios/video_common.c
index b853872..37c0498 100644
--- a/openbios-devel/libopenbios/video_common.c
+++ b/openbios-devel/libopenbios/video_common.c
@@ -225,9 +225,16 @@ video_scroll( int height )
}
}
+/* ( 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 @@ fill_rect( int col_ind, int x, int y, int w, int h )
}
}
-/* ( 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 )
{
--
1.7.10.4
More information about the OpenBIOS
mailing list