[OpenBIOS] [PATCH 12/20] video_common.c: remove the video_get_res() function
Mark Cave-Ayland
mark.cave-ayland at ilande.co.uk
Sat Jun 15 10:38:50 CEST 2013
Now that we've unified the video variables between C and Forth, there is no
need to have a dedicated C function to return the current dimensions.
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 | 12 ------------
openbios-devel/packages/molvideo.c | 6 ++----
3 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/openbios-devel/include/libopenbios/video.h b/openbios-devel/include/libopenbios/video.h
index 20ba6c8..bcd024e 100644
--- a/openbios-devel/include/libopenbios/video.h
+++ b/openbios-devel/include/libopenbios/video.h
@@ -23,7 +23,6 @@ void setup_video(phys_addr_t phys, ucell virt);
void init_video(void);
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);
void video_fill_rect(void);
diff --git a/openbios-devel/libopenbios/video_common.c b/openbios-devel/libopenbios/video_common.c
index 64e43cc..9d45e69 100644
--- a/openbios-devel/libopenbios/video_common.c
+++ b/openbios-devel/libopenbios/video_common.c
@@ -69,18 +69,6 @@ video_set_color( int ind, unsigned long color )
#endif
}
-int
-video_get_res( int *w, int *h )
-{
- if( !video.has_video ) {
- *w = *h = 0;
- return -1;
- }
- *w = VIDEO_DICT_VALUE(video.w);
- *h = VIDEO_DICT_VALUE(video.h);
- return 0;
-}
-
/* ( fbaddr maskaddr width height fgcolor bgcolor -- ) */
void
diff --git a/openbios-devel/packages/molvideo.c b/openbios-devel/packages/molvideo.c
index df70749..742f516 100644
--- a/openbios-devel/packages/molvideo.c
+++ b/openbios-devel/packages/molvideo.c
@@ -44,10 +44,8 @@ molvideo_refresh_palette( void )
static void
molvideo_dimensions( void )
{
- int w, h;
- (void) video_get_res( &w, &h );
- PUSH( w );
- PUSH( h );
+ fword("screen-width");
+ fword("screen-height");
}
/* ( table start count -- ) (?) */
--
1.7.10.4
More information about the OpenBIOS
mailing list