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>

7 files changed, 19 insertions, 19 deletions

diff --git a/drivers/bios_emulator/atibios.c b/drivers/bios_emulator/atibios.c
index 09da76bc5d9..7ebead6bfad 100644
--- a/drivers/bios_emulator/atibios.c
+++ b/drivers/bios_emulator/atibios.c
@@ -83,13 +83,13 @@ static const void *bios_ptr(const void *buf, BE_VGAInfo *vga_info,
 }
 
 static int atibios_debug_mode(BE_VGAInfo *vga_info, RMREGS *regs,
-			      int vesa_mode, struct vbe_mode_info *mode_info)
+			      int vesa_mode, struct vesa_state *mode_info)
 {
 	void *buffer = (void *)(M.mem_base + vbe_offset);
 	u16 buffer_seg = (((unsigned long)vbe_offset) >> 4) & 0xff00;
 	u16 buffer_adr = ((unsigned long)vbe_offset) & 0xffff;
 	struct vesa_mode_info *vm;
-	struct vbe_info *info;
+	struct vesa_bios_ext_info *info;
 	const u16 *modes_bios, *ptr;
 	u16 *modes;
 	int size;
@@ -140,7 +140,7 @@ static int atibios_debug_mode(BE_VGAInfo *vga_info, RMREGS *regs,
 		int attr;
 
 		debug("Mode %x: ", mode);
-		memset(buffer, '\0', sizeof(struct vbe_mode_info));
+		memset(buffer, '\0', sizeof(struct vesa_state));
 		regs->e.eax = VESA_GET_MODE_INFO;
 		regs->e.ebx = 0;
 		regs->e.ecx = mode;
@@ -174,7 +174,7 @@ static int atibios_debug_mode(BE_VGAInfo *vga_info, RMREGS *regs,
 }
 
 static int atibios_set_vesa_mode(RMREGS *regs, int vesa_mode,
-				 struct vbe_mode_info *mode_info)
+				 struct vesa_state *mode_info)
 {
 	void *buffer = (void *)(M.mem_base + vbe_offset);
 	u16 buffer_seg = (((unsigned long)vbe_offset) >> 4) & 0xff00;
@@ -192,7 +192,7 @@ static int atibios_set_vesa_mode(RMREGS *regs, int vesa_mode,
 		return -ENOSYS;
 	}
 
-	memset(buffer, '\0', sizeof(struct vbe_mode_info));
+	memset(buffer, '\0', sizeof(struct vesa_state));
 	debug("VBE: Geting info for VESA mode %#04x\n", vesa_mode);
 	regs->e.eax = VESA_GET_MODE_INFO;
 	regs->e.ecx = vesa_mode;
@@ -231,7 +231,7 @@ at this stage the controller has its I/O and memory space enabled and
 that all other controllers are in a disabled state.
 ****************************************************************************/
 static void PCI_doBIOSPOST(struct udevice *pcidev, BE_VGAInfo *vga_info,
-			   int vesa_mode, struct vbe_mode_info *mode_info)
+			   int vesa_mode, struct vesa_state *mode_info)
 {
 	RMREGS regs;
 	RMSREGS sregs;
@@ -416,7 +416,7 @@ image we can extract over the PCI bus.
 ****************************************************************************/
 static int PCI_postController(struct udevice *pcidev, uchar *bios_rom,
 			      int bios_len, BE_VGAInfo *vga_info,
-			      int vesa_mode, struct vbe_mode_info *mode_info)
+			      int vesa_mode, struct vesa_state *mode_info)
 {
 	u32 bios_image_len;
 	uchar *mapped_bios;
@@ -496,7 +496,7 @@ void biosemu_set_interrupt_handler(int intnum, int (*int_func)(void))
 
 int biosemu_run(struct udevice *pcidev, uchar *bios_rom, int bios_len,
 		BE_VGAInfo *vga_info, int clean_up, int vesa_mode,
-		struct vbe_mode_info *mode_info)
+		struct vesa_state *mode_info)
 {
 	/*Post all the display controller BIOS'es*/
 	if (!PCI_postController(pcidev, bios_rom, bios_len, vga_info,
diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c
index ceeb59d1fe4..27a24daa12a 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) {
 			/*
diff --git a/drivers/video/broadwell_igd.c b/drivers/video/broadwell_igd.c
index 81f0fd8c019..6aa4e27071d 100644
--- a/drivers/video/broadwell_igd.c
+++ b/drivers/video/broadwell_igd.c
@@ -681,7 +681,7 @@ static int broadwell_igd_probe(struct udevice *dev)
 	debug("%s: is_broadwell=%d\n", __func__, is_broadwell);
 	ret = igd_pre_init(dev, is_broadwell);
 	if (!ret) {
-		ret = vbe_setup_video(dev, broadwell_igd_int15_handler);
+		ret = vesa_setup_video(dev, broadwell_igd_int15_handler);
 		if (ret)
 			debug("failed to run video BIOS: %d\n", ret);
 	}
diff --git a/drivers/video/coreboot.c b/drivers/video/coreboot.c
index 3efc65daa2b..d2d87c75c89 100644
--- a/drivers/video/coreboot.c
+++ b/drivers/video/coreboot.c
@@ -57,7 +57,7 @@ static int coreboot_video_probe(struct udevice *dev)
 		goto err;
 	}
 
-	ret = vbe_setup_video_priv(vesa, uc_priv, plat);
+	ret = vesa_setup_video_priv(vesa, uc_priv, plat);
 	if (ret) {
 		ret = log_msg_ret("setup", ret);
 		goto err;
diff --git a/drivers/video/efi.c b/drivers/video/efi.c
index d60b6e27569..b11e42c0ebf 100644
--- a/drivers/video/efi.c
+++ b/drivers/video/efi.c
@@ -149,7 +149,7 @@ static int efi_video_probe(struct udevice *dev)
 	if (ret)
 		goto err;
 
-	ret = vbe_setup_video_priv(vesa, uc_priv, plat);
+	ret = vesa_setup_video_priv(vesa, uc_priv, plat);
 	if (ret)
 		goto err;
 
diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c
index 18672a18973..9264dd6770d 100644
--- a/drivers/video/ivybridge_igd.c
+++ b/drivers/video/ivybridge_igd.c
@@ -762,7 +762,7 @@ static int bd82x6x_video_probe(struct udevice *dev)
 	rev = gma_func0_init(dev);
 	if (rev < 0)
 		return rev;
-	ret = vbe_setup_video(dev, int15_handler);
+	ret = vesa_setup_video(dev, int15_handler);
 	if (ret)
 		return ret;
 
diff --git a/drivers/video/vesa.c b/drivers/video/vesa.c
index 91da939e59b..cac3bb0c331 100644
--- a/drivers/video/vesa.c
+++ b/drivers/video/vesa.c
@@ -17,7 +17,7 @@ static int vesa_video_probe(struct udevice *dev)
 	ulong fbbase;
 	int ret;
 
-	ret = vbe_setup_video(dev, NULL);
+	ret = vesa_setup_video(dev, NULL);
 	if (ret)
 		return log_ret(ret);