summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
Diffstat (limited to 'src/device')
-rw-r--r--src/device/oprom/realmode/x86.c14
-rw-r--r--src/device/oprom/yabel/vbe.c7
2 files changed, 10 insertions, 11 deletions
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)
diff --git a/src/device/oprom/yabel/vbe.c b/src/device/oprom/yabel/vbe.c
index 219ef91496..913386458b 100644
--- a/src/device/oprom/yabel/vbe.c
+++ b/src/device/oprom/yabel/vbe.c
@@ -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)