projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-usb
[platform/kernel/u-boot.git]
/
include
/
vbe.h
diff --git
a/include/vbe.h
b/include/vbe.h
index
c5deee9
..
16bb096
100644
(file)
--- a/
include/vbe.h
+++ b/
include/vbe.h
@@
-12,7
+12,7
@@
#define _VBE_H
/* these structs are for input from and output to OF */
#define _VBE_H
/* these structs are for input from and output to OF */
-struct __packed screen_info {
+struct __packed
vbe_
screen_info {
u8 display_type; /* 0=NONE, 1= analog, 2=digital */
u16 screen_width;
u16 screen_height;
u8 display_type; /* 0=NONE, 1= analog, 2=digital */
u16 screen_width;
u16 screen_height;
@@
-23,7
+23,7
@@
struct __packed screen_info {
u8 edid_block_zero[128];
};
u8 edid_block_zero[128];
};
-struct __packed screen_info_input {
+struct __packed
vbe_
screen_info_input {
u8 signature[4];
u16 size_reserved;
u8 monitor_number;
u8 signature[4];
u16 size_reserved;
u8 monitor_number;
@@
-102,7
+102,15
@@
struct vbe_ddc_info {
#define VESA_SET_MODE 0x4f02
#define VESA_GET_CUR_MODE 0x4f03
#define VESA_SET_MODE 0x4f02
#define VESA_GET_CUR_MODE 0x4f03
+extern struct vbe_mode_info mode_info;
+
struct graphic_device;
int vbe_get_video_info(struct graphic_device *gdev);
struct graphic_device;
int vbe_get_video_info(struct graphic_device *gdev);
+struct video_priv;
+struct video_uc_platdata;
+int vbe_setup_video_priv(struct vesa_mode_info *vesa,
+ struct video_priv *uc_priv,
+ struct video_uc_platdata *plat);
+int vbe_setup_video(struct udevice *dev, int (*int15_handler)(void));
#endif
#endif