coreboot-mirror
/
seabios
mirror of https://review.coreboot.org/seabios.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove dos line endings introduced in the last two commits 

These were added somewhere between the mailing list server and Gerd's
working copy (as the patch I got via the mailing list is fine). These
don't disturb the compiler, but they look ugly so remove them.

Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Message-Id: <20191020200726.20116-1-uwe@kleine-koenig.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Uwe Kleine-König 2019-10-20 22:07:26 +02:00 committed by Gerd Hoffmann
parent fc92d092ea
commit 120996f147
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vgasrc/cbvga.c
View File

@ -13,7 +13,7 @@
#include "vgabios.h" // SET_VGA
#include "vgafb.h" // handle_gfx_op
#include "vgautil.h" // VBE_total_memory
#include "svgamodes.h" // svga_modes
#include "svgamodes.h" // svga_modes
static int CBmode VAR16;
static struct vgamode_s CBmodeinfo VAR16;
@ -28,8 +28,8 @@ struct vgamode_s *cbvga_find_mode(int mode)
return &CBemulinfo;
int i;
for (i = 0; i < GET_GLOBAL(svga_mcount); i++) {
struct generic_svga_mode *cbmode_g = &svga_modes[i];
for (i = 0; i < GET_GLOBAL(svga_mcount); i++) {
struct generic_svga_mode *cbmode_g = &svga_modes[i];
if (GET_GLOBAL(cbmode_g->mode) == 0xffff)
continue;
if (GET_GLOBAL(cbmode_g->mode) == mode)
@ -51,8 +51,8 @@ cbvga_list_modes(u16 seg, u16 *dest, u16 *last)
* + 24 Bpp and 32 Bpp are supported
*/
int i;
for (i = 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) {
struct generic_svga_mode *cbmode_g = &svga_modes[i];
for (i = 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) {
struct generic_svga_mode *cbmode_g = &svga_modes[i];
u16 mode = GET_GLOBAL(cbmode_g->mode);
if (mode == 0xffff)
continue;
@ -202,11 +202,11 @@ cbvga_setup_modes(u64 addr, u8 bpp, u32 xlines, u32 ylines, u32 linelength)
, get_global_seg(), &CBmodeinfo, sizeof(CBemulinfo));
// Validate modes
for (i = 0; i < GET_GLOBAL(svga_mcount); i++) {
struct generic_svga_mode *cbmode_g = &svga_modes[i];
for (i = 0; i < GET_GLOBAL(svga_mcount); i++) {
struct generic_svga_mode *cbmode_g = &svga_modes[i];
/* Skip VBE modes that doesn't fit into coreboot's framebuffer */
if ((GET_GLOBAL(cbmode_g->info.memmodel) != MM_DIRECT)
|| (GET_GLOBAL(cbmode_g->info.height) > ylines)
if ((GET_GLOBAL(cbmode_g->info.memmodel) != MM_DIRECT)
|| (GET_GLOBAL(cbmode_g->info.height) > ylines)
|| (GET_GLOBAL(cbmode_g->info.width) > xlines)
|| (GET_GLOBAL(cbmode_g->info.depth) != bpp)) {
dprintf(3, "Removing mode %x\n", GET_GLOBAL(cbmode_g->mode));

16
vgasrc/svgamodes.c
View File

@ -76,13 +76,13 @@ struct generic_svga_mode svga_modes[] VAR16 = {
{ 0x190, { MM_DIRECT, 1920, 1080, 16, 8, 16, SEG_GRAPH } },
{ 0x191, { MM_DIRECT, 1920, 1080, 24, 8, 16, SEG_GRAPH } },
{ 0x192, { MM_DIRECT, 1920, 1080, 32, 8, 16, SEG_GRAPH } },
/* custom resolutions for 16:9 displays */
{ 0x193, { MM_DIRECT, 1600, 900, 16, 8, 16, SEG_GRAPH } },
{ 0x194, { MM_DIRECT, 1600, 900, 24, 8, 16, SEG_GRAPH } },
{ 0x195, { MM_DIRECT, 1600, 900, 32, 8, 16, SEG_GRAPH } },
{ 0x196, { MM_DIRECT, 2560, 1440, 16, 8, 16, SEG_GRAPH } },
{ 0x197, { MM_DIRECT, 2560, 1440, 24, 8, 16, SEG_GRAPH } },
{ 0x198, { MM_DIRECT, 2560, 1440, 32, 8, 16, SEG_GRAPH } },
/* custom resolutions for 16:9 displays */
{ 0x193, { MM_DIRECT, 1600, 900, 16, 8, 16, SEG_GRAPH } },
{ 0x194, { MM_DIRECT, 1600, 900, 24, 8, 16, SEG_GRAPH } },
{ 0x195, { MM_DIRECT, 1600, 900, 32, 8, 16, SEG_GRAPH } },
{ 0x196, { MM_DIRECT, 2560, 1440, 16, 8, 16, SEG_GRAPH } },
{ 0x197, { MM_DIRECT, 2560, 1440, 24, 8, 16, SEG_GRAPH } },
{ 0x198, { MM_DIRECT, 2560, 1440, 32, 8, 16, SEG_GRAPH } },
};
unsigned int svga_mcount VAR16 = ARRAY_SIZE(svga_modes);