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 branch 'master' of git://git.denx.de/u-boot-video
[platform/kernel/u-boot.git]
/
include
/
gdsys_fpga.h
diff --git
a/include/gdsys_fpga.h
b/include/gdsys_fpga.h
index
1fccd27
..
c0b1b5c
100644
(file)
--- a/
include/gdsys_fpga.h
+++ b/
include/gdsys_fpga.h
@@
-50,6
+50,9
@@
typedef struct ihs_osd {
u16 features;
u16 control;
u16 xy_size;
u16 features;
u16 control;
u16 xy_size;
+ u16 xy_scale;
+ u16 x_pos;
+ u16 y_pos;
} ihs_osd_t;
#ifdef CONFIG_IO
} ihs_osd_t;
#ifdef CONFIG_IO
@@
-79,7
+82,7
@@
typedef struct ihs_fpga {
u16 reserved_2[93]; /* 0x0044 */
u16 reflection_high; /* 0x00fe */
ihs_osd_t osd; /* 0x0100 */
u16 reserved_2[93]; /* 0x0044 */
u16 reflection_high; /* 0x00fe */
ihs_osd_t osd; /* 0x0100 */
- u16 reserved_3[8
92]; /* 0x0108
*/
+ u16 reserved_3[8
8]; /* 0x010e
*/
u16 videomem; /* 0x0800 */
} ihs_fpga_t;
#endif
u16 videomem; /* 0x0800 */
} ihs_fpga_t;
#endif
@@
-94,13
+97,13
@@
typedef struct ihs_fpga {
u16 extended_interrupt; /* 0x001c */
u16 reserved_1[9]; /* 0x001e */
ihs_i2c_t i2c; /* 0x0030 */
u16 extended_interrupt; /* 0x001c */
u16 reserved_1[9]; /* 0x001e */
ihs_i2c_t i2c; /* 0x0030 */
- u16 reserved_2[
35
]; /* 0x0038 */
- u16
reflection_high; /* 0x007e
*/
- u16 reserved_3[
15]; /* 0x0080
*/
+ u16 reserved_2[
16
]; /* 0x0038 */
+ u16
mpc3w_control; /* 0x0058
*/
+ u16 reserved_3[
34]; /* 0x005a
*/
u16 videocontrol; /* 0x009e */
u16 reserved_4[176]; /* 0x00a0 */
ihs_osd_t osd; /* 0x0200 */
u16 videocontrol; /* 0x009e */
u16 reserved_4[176]; /* 0x00a0 */
ihs_osd_t osd; /* 0x0200 */
- u16 reserved_5[76
4]; /* 0x0208
*/
+ u16 reserved_5[76
1]; /* 0x020e
*/
u16 videomem; /* 0x0800 */
} ihs_fpga_t;
#endif
u16 videomem; /* 0x0800 */
} ihs_fpga_t;
#endif