eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

video: Rename structs and functions to avoid VBE

Browse Source 
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>
This commit is contained in:
Simon Glass
2022-07-30 15:52:05 -06:00
committed by Tom Rini
parent cafe8712e8
commit da62e1e861
11 changed files with 42 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/bios_emul.h
View File

@@ -36,14 +36,14 @@ typedef struct {
u8 LowMem[1536];
} BE_VGAInfo;
struct vbe_mode_info;
struct vesa_state;
int BootVideoCardBIOS(struct udevice *pcidev, BE_VGAInfo **pVGAInfo,
int clean_up);
/* Run a BIOS ROM natively (only supported on x86 machines) */
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);
/**
* bios_set_interrupt_handler() - Install an interrupt handler for the BIOS
@@ -61,6 +61,6 @@ int biosemu_setup(struct udevice *pcidev, BE_VGAInfo **pVGAInfo);
int biosemu_run(struct udevice *dev, 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);
#endif

25
include/vesa.h
View File

@@ -11,7 +11,7 @@
#define _VESA_H
/* these structs are for input from and output to OF */
struct __packed vbe_screen_info {
struct __packed vesa_screen_info {
u8 display_type; /* 0=NONE, 1= analog, 2=digital */
u16 screen_width;
u16 screen_height;
@@ -22,7 +22,7 @@ struct __packed vbe_screen_info {
u8 edid_block_zero[128];
};
struct __packed vbe_screen_info_input {
struct __packed vesa_screen_info_input {
u8 signature[4];
u16 size_reserved;
u8 monitor_number;
@@ -30,8 +30,11 @@ struct __packed vbe_screen_info_input {
u8 color_depth;
};
/* these structs only store the required a subset of the VBE-defined fields */
struct __packed vbe_info {
/*
* These structs only store the required subset of fields in Vesa BIOS
* Extensions
*/
struct __packed vesa_bios_ext_info {
char signature[4];
u16 version;
u32 oem_string_ptr;
@@ -80,7 +83,7 @@ struct __packed vesa_mode_info {
u8 reserved[206];
};
struct vbe_mode_info {
struct vesa_state {
u16 video_mode;
bool valid;
union {
@@ -89,7 +92,7 @@ struct vbe_mode_info {
};
};
struct vbe_ddc_info {
struct vesa_ddc_info {
u8 port_number; /* i.e. monitor number */
u8 edid_transfer_time;
u8 ddc_level;
@@ -101,13 +104,13 @@ struct vbe_ddc_info {
#define VESA_SET_MODE 0x4f02
#define VESA_GET_CUR_MODE 0x4f03
extern struct vbe_mode_info mode_info;
extern struct vesa_state mode_info;
struct video_priv;
struct video_uc_plat;
int vbe_setup_video_priv(struct vesa_mode_info *vesa,
struct video_priv *uc_priv,
struct video_uc_plat *plat);
int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void));
int vesa_setup_video_priv(struct vesa_mode_info *vesa,
struct video_priv *uc_priv,
struct video_uc_plat *plat);
int vesa_setup_video(struct udevice *dev, int (*int15_handler)(void));
#endif