提交 b20947aa 编写于 作者: S Sebastian Andrzej Siewior 提交者: Ralf Baechle

MIPS: Fixup screen_info struct initializations

|arch/mips/sibyte/swarm/setup.c:153:
| warning: large integer implicitly truncated to unsigned type

The field was changed in d9b26352 aka ("x86, setup: Store the boot
cursor state").  This patch changes the values back they way they were
before this extra field got introduced.

While here, the other two boards are also converted to C99 initializer.
Signed-off-by: NSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1137/Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
上级 9eed4124
...@@ -76,15 +76,9 @@ void __init plat_mem_setup(void) ...@@ -76,15 +76,9 @@ void __init plat_mem_setup(void)
#ifdef CONFIG_VT #ifdef CONFIG_VT
screen_info = (struct screen_info) { screen_info = (struct screen_info) {
0, 0, /* orig-x, orig-y */ .orig_video_cols = 160,
0, /* unused */ .orig_video_lines = 64,
0, /* orig_video_page */ .orig_video_points = 16,
0, /* orig_video_mode */
160, /* orig_video_cols */
0, 0, 0, /* unused, ega_bx, unused */
64, /* orig_video_lines */
0, /* orig_video_isVGA */
16 /* orig_video_points */
}; };
#endif #endif
......
...@@ -41,15 +41,12 @@ void __init plat_mem_setup(void) ...@@ -41,15 +41,12 @@ void __init plat_mem_setup(void)
conswitchp = &vga_con; conswitchp = &vga_con;
screen_info = (struct screen_info) { screen_info = (struct screen_info) {
0, 25, /* orig-x, orig-y */ .orig_x = 0,
0, /* unused */ .orig_y = 25,
0, /* orig-video-page */ .orig_video_cols = 80,
0, /* orig-video-mode */ .orig_video_lines = 25,
80, /* orig-video-cols */ .orig_video_isVGA = VIDEO_TYPE_VGAC,
0, 0, 0, /* ega_ax, ega_bx, ega_cx */ .orig_video_points = 16,
25, /* orig-video-lines */
VIDEO_TYPE_VGAC, /* orig-video-isVGA */
16 /* orig-video-points */
}; };
#elif defined(CONFIG_DUMMY_CONSOLE) #elif defined(CONFIG_DUMMY_CONSOLE)
conswitchp = &dummy_con; conswitchp = &dummy_con;
......
...@@ -145,15 +145,14 @@ void __init plat_mem_setup(void) ...@@ -145,15 +145,14 @@ void __init plat_mem_setup(void)
#ifdef CONFIG_VT #ifdef CONFIG_VT
screen_info = (struct screen_info) { screen_info = (struct screen_info) {
0, 0, /* orig-x, orig-y */ .orig_video_page = 52,
0, /* unused */ .orig_video_mode = 3,
52, /* orig_video_page */ .orig_video_cols = 80,
3, /* orig_video_mode */ .flags = 12,
80, /* orig_video_cols */ .orig_video_ega_bx = 3,
4626, 3, 9, /* unused, ega_bx, unused */ .orig_video_lines = 25,
25, /* orig_video_lines */ .orig_video_isVGA = 0x22,
0x22, /* orig_video_isVGA */ .orig_video_points = 16,
16 /* orig_video_points */
}; };
/* XXXKW for CFE, get lines/cols from environment */ /* XXXKW for CFE, get lines/cols from environment */
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册