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 /drivers/pci | |
| parent | cafe8712e8143ae8e5e5d733d74bc46bffe0be92 (diff) | |
| download | u-boot-da62e1e861b922866311bcb3e07c69c12e79730d.tar.gz u-boot-da62e1e861b922866311bcb3e07c69c12e79730d.tar.bz2 u-boot-da62e1e861b922866311bcb3e07c69c12e79730d.zip | |
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 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci_rom.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index ceeb59d1fe..27a24daa12 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -202,7 +202,7 @@ static int pci_rom_load(struct pci_rom_header *rom_header, return 0; } -struct vbe_mode_info mode_info; +struct vesa_state mode_info; void setup_video(struct screen_info *screen_info) { @@ -326,9 +326,9 @@ err: } #ifdef CONFIG_DM_VIDEO -int vbe_setup_video_priv(struct vesa_mode_info *vesa, - struct video_priv *uc_priv, - struct video_uc_plat *plat) +int vesa_setup_video_priv(struct vesa_mode_info *vesa, + struct video_priv *uc_priv, + struct video_uc_plat *plat) { if (!vesa->x_resolution) return log_msg_ret("No x resolution", -ENXIO); @@ -358,7 +358,7 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa, return 0; } -int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) +int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void)) { struct video_uc_plat *plat = dev_get_uclass_plat(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev); @@ -378,7 +378,7 @@ int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void)) return ret; } - ret = vbe_setup_video_priv(&mode_info.vesa, uc_priv, plat); + ret = vesa_setup_video_priv(&mode_info.vesa, uc_priv, plat); if (ret) { if (ret == -ENFILE) { /* |