diff options
| author | Simon Glass <sjg@chromium.org> | 2022-07-30 15:52:05 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-08-12 08:14:23 -0400 |
| commit | da62e1e861b922866311bcb3e07c69c12e79730d (patch) | |
| tree | 9e4fa4da0a135dd2a6b7fbebfab4886a5b8985fd /arch/x86 | |
| parent | cafe8712e8143ae8e5e5d733d74bc46bffe0be92 (diff) | |
| download | u-boot-da62e1e861b922866311bcb3e07c69c12e79730d.zip u-boot-da62e1e861b922866311bcb3e07c69c12e79730d.tar.gz u-boot-da62e1e861b922866311bcb3e07c69c12e79730d.tar.bz2 | |
video: Rename structs and functions to avoid VBE
Rename these to VESA, itself an abbreviation, to avoid a conflict with
Verified Boot for Embedded.
Rename this to avoid referencing VBE.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/lib/bios.c | 10 | ||||
| -rw-r--r-- | arch/x86/lib/fsp/fsp_graphics.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/lib/bios.c b/arch/x86/lib/bios.c index 087539b..94349ba 100644 --- a/arch/x86/lib/bios.c +++ b/arch/x86/lib/bios.c @@ -190,7 +190,7 @@ static void setup_realmode_idt(void) } #ifdef CONFIG_FRAMEBUFFER_SET_VESA_MODE -static u8 vbe_get_mode_info(struct vbe_mode_info *mi) +static u8 vbe_get_mode_info(struct vesa_state *mi) { u16 buffer_seg; u16 buffer_adr; @@ -204,13 +204,13 @@ static u8 vbe_get_mode_info(struct vbe_mode_info *mi) realmode_interrupt(0x10, VESA_GET_MODE_INFO, 0x0000, mi->video_mode, 0x0000, buffer_seg, buffer_adr); - memcpy(mi->mode_info_block, buffer, sizeof(struct vbe_mode_info)); + memcpy(mi->mode_info_block, buffer, sizeof(struct vesa_state)); mi->valid = true; return 0; } -static u8 vbe_set_mode(struct vbe_mode_info *mi) +static u8 vbe_set_mode(struct vesa_state *mi) { int video_mode = mi->video_mode; @@ -225,7 +225,7 @@ static u8 vbe_set_mode(struct vbe_mode_info *mi) return 0; } -static void vbe_set_graphics(int vesa_mode, struct vbe_mode_info *mode_info) +static void vbe_set_graphics(int vesa_mode, struct vesa_state *mode_info) { unsigned char *framebuffer; @@ -249,7 +249,7 @@ static void vbe_set_graphics(int vesa_mode, struct vbe_mode_info *mode_info) #endif /* CONFIG_FRAMEBUFFER_SET_VESA_MODE */ void bios_run_on_x86(struct udevice *dev, unsigned long addr, int vesa_mode, - struct vbe_mode_info *mode_info) + struct vesa_state *mode_info) { pci_dev_t pcidev = dm_pci_get_bdf(dev); u32 num_dev; diff --git a/arch/x86/lib/fsp/fsp_graphics.c b/arch/x86/lib/fsp/fsp_graphics.c index 6a7552e..b07c666 100644 --- a/arch/x86/lib/fsp/fsp_graphics.c +++ b/arch/x86/lib/fsp/fsp_graphics.c @@ -106,7 +106,7 @@ static int fsp_video_probe(struct udevice *dev) vesa->phys_base_ptr = dm_pci_read_bar32(dev, 2); gd->fb_base = vesa->phys_base_ptr; - ret = vbe_setup_video_priv(vesa, uc_priv, plat); + ret = vesa_setup_video_priv(vesa, uc_priv, plat); if (ret) goto err; |