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 <adurbin@chromium.org> Signed-off-by: Nico Huber <nico.huber@secunet.com> Reviewed-on: https://review.coreboot.org/19729 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
@@ -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)
|
||||
|
@@ -763,8 +763,11 @@ void vbe_set_graphics(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
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 = le32_to_cpu(mode_info.vesa.phys_base_ptr);
|
||||
|
||||
framebuffer->x_resolution = le16_to_cpu(mode_info.vesa.x_resolution);
|
||||
@@ -783,6 +786,8 @@ 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;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void vbe_textmode_console(void)
|
||||
|
Reference in New Issue
Block a user