From bdb5c8feaed4cf914b474deeb30686e327ee9228 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 16 May 2017 21:39:50 -0500 Subject: coreboot_tables: specify clear interface for lb_framebuffer() For some reason the "interface" for adding framebuffer information is sitting in src/include/vbe.h while also guarding the call to fill_lb_framebuffer() with vbe_mode_info_valid() along with some macro if CONFIG_* for good measure. Move the fill_lb_framebuffer() declaration to coreboot_tables.h and provide a comment about how it should be used. Also, now that there's no need for the notion of a global vbe_mode_info_valid() remove it from the conditional call path of fill_lb_framebuffer(). Change-Id: Ib3ade6314624091ae70424664527a02b279d0c9b Signed-off-by: Aaron Durbin Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/19729 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/device/oprom/realmode/x86.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'src/device/oprom/realmode') diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 83d068bcd6..0534d42db8 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -290,8 +290,11 @@ void vbe_textmode_console(void) 0x0000, 0x0000, 0x0000); } -void fill_lb_framebuffer(struct lb_framebuffer *framebuffer) +int fill_lb_framebuffer(struct lb_framebuffer *framebuffer) { + if (!vbe_mode_info_valid()) + return -1; + framebuffer->physical_address = mode_info.vesa.phys_base_ptr; framebuffer->x_resolution = le16_to_cpu(mode_info.vesa.x_resolution); @@ -311,19 +314,10 @@ void fill_lb_framebuffer(struct lb_framebuffer *framebuffer) framebuffer->reserved_mask_pos = mode_info.vesa.reserved_mask_pos; framebuffer->reserved_mask_size = mode_info.vesa.reserved_mask_size; -} -#else - -int vbe_mode_info_valid(void) -{ return 0; } -void fill_lb_framebuffer(struct lb_framebuffer *framebuffer) -{ -} - #endif void run_bios(struct device *dev, unsigned long addr) -- cgit v1.2.3