Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b20947aa authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Ralf Baechle
Browse files

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: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1137/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 9eed4124

arch/mips/jazz/setup.c

+3 −9
Original line number Diff line number Diff line
@@ -76,15 +76,9 @@ void __init plat_mem_setup(void) 


#ifdef CONFIG_VT

	screen_info = (struct screen_info) {

		0, 0,		/* orig-x, orig-y */

		0,		/* unused */

		0,		/* orig_video_page */

		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 */

		.orig_video_cols	= 160,

		.orig_video_lines	= 64,

		.orig_video_points	= 16,

	};

#endif

arch/mips/loongson/common/setup.c

+6 −9
Original line number Diff line number Diff line
@@ -41,15 +41,12 @@ void __init plat_mem_setup(void) 
	conswitchp = &vga_con;



	screen_info = (struct screen_info) {

		0, 25,		/* orig-x, orig-y */

		    0,		/* unused */

		    0,		/* orig-video-page */

		    0,		/* orig-video-mode */

		    80,		/* orig-video-cols */

		    0, 0, 0,	/* ega_ax, ega_bx, ega_cx */

		    25,		/* orig-video-lines */

		    VIDEO_TYPE_VGAC,	/* orig-video-isVGA */

		    16		/* orig-video-points */

		.orig_x			= 0,

		.orig_y			= 25,

		.orig_video_cols	= 80,

		.orig_video_lines	= 25,

		.orig_video_isVGA	= VIDEO_TYPE_VGAC,

		.orig_video_points	= 16,

	};

#elif defined(CONFIG_DUMMY_CONSOLE)

	conswitchp = &dummy_con;

arch/mips/sibyte/swarm/setup.c

+8 −9
Original line number Diff line number Diff line
@@ -145,15 +145,14 @@ void __init plat_mem_setup(void) 


#ifdef CONFIG_VT

	screen_info = (struct screen_info) {

		0, 0,           /* orig-x, orig-y */

		0,              /* unused */

		52,             /* orig_video_page */

		3,              /* orig_video_mode */

		80,             /* orig_video_cols */

		4626, 3, 9,     /* unused, ega_bx, unused */

		25,             /* orig_video_lines */

		0x22,           /* orig_video_isVGA */

		16              /* orig_video_points */

		.orig_video_page	= 52,

		.orig_video_mode	= 3,

		.orig_video_cols	= 80,

		.flags			= 12,

		.orig_video_ega_bx	= 3,

		.orig_video_lines	= 25,

		.orig_video_isVGA	= 0x22,

		.orig_video_points	= 16,

       };

       /* XXXKW for CFE, get lines/cols from environment */

#endif