From nobody Thu Apr 25 16:09:12 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) client-ip=78.46.105.101; envelope-from=seabios-bounces@seabios.org; helo=coreboot.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org ARC-Seal: i=1; a=rsa-sha256; t=1571602083; cv=none; d=zoho.com; s=zohoarc; b=DYszMA955eopfIkpoNK/pVTBOSwchZ8rKtHoSyOqPpUp3oSRefm8wYcuGZuU64YKIAQwO3iGukiR5MyanTAHkDNwn97aqurGVkZe5HPHkopsm8h8dPZp7pAd7YwU4/UmPVKPbg9frXWOkaVUPEgtELrAD6GInznecF7RdCGe90w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571602083; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:To; bh=uyOzaVGA1UVpE9Qq3v7oaq+A9+GtOvziyRyWnXXle2Y=; b=cUJCG5F1OBRU3OzNN7PEAoaXRznblhJeObG7kRTvQ6nmZw6T+6UbbWGp/2wmtnmVpOOFW6mpRhXvZdPy5MwG1BbDSpSANfZEbHvmTnIP5ZkWpqRnbOEeEFZAMVCotdkKKbeXI5/q+agr9pTF5YwIr6aAjjePEe8BoWojTLE8pso= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 78.46.105.101 is neither permitted nor denied by domain of seabios.org) smtp.mailfrom=seabios-bounces@seabios.org Return-Path: Received: from coreboot.org (coreboot.org [78.46.105.101]) by mx.zohomail.com with SMTPS id 1571602083212853.9336931890708; Sun, 20 Oct 2019 13:08:03 -0700 (PDT) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTPA id F2C7712A0FC1; Sun, 20 Oct 2019 20:07:58 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) by coreboot.org (Postfix) with ESMTP id 820AA12A0EFA for ; Sun, 20 Oct 2019 20:07:41 +0000 (UTC) Received: from authenticated-user (PRIMARY_HOSTNAME [PUBLIC_IP]) id 1467F80198D; Sun, 20 Oct 2019 22:07:41 +0200 (CEST) From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Gerd Hoffmann , Paul Menzel Date: Sun, 20 Oct 2019 22:07:26 +0200 Message-Id: <20191020200726.20116-1-uwe@kleine-koenig.org> In-Reply-To: <35b0e124-fb80-ab3f-fa8b-f132f334ca7a@molgen.mpg.de> References: <35b0e124-fb80-ab3f-fa8b-f132f334ca7a@molgen.mpg.de> MIME-Version: 1.0 Message-ID-Hash: OGFQYHZF2PYS43QZGPUX7YVDN5GUQ3FI X-Message-ID-Hash: OGFQYHZF2PYS43QZGPUX7YVDN5GUQ3FI X-MailFrom: uwe@kleine-koenig.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-seabios.seabios.org-0; header-match-seabios.seabios.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: seabios@seabios.org X-Mailman-Version: 3.2.3 Precedence: list Subject: [SeaBIOS] [PATCH] Remove dos line endings introduced in the last two commits List-Id: SeaBIOS mailing list Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ++++ X-Spam-Level: **** Authentication-Results: coreboot.org; auth=pass smtp.auth=mailman@coreboot.org smtp.mailfrom=seabios-bounces@seabios.org 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 Signed-off-by: Uwe Kleine-K=C3=B6nig --- vgasrc/cbvga.c | 18 +++++++++--------- vgasrc/svgamodes.c | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/vgasrc/cbvga.c b/vgasrc/cbvga.c index 78ff968e2440..b919137bb183 100644 --- a/vgasrc/cbvga.c +++ b/vgasrc/cbvga.c @@ -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 =20 static int CBmode VAR16; static struct vgamode_s CBmodeinfo VAR16; @@ -28,8 +28,8 @@ struct vgamode_s *cbvga_find_mode(int mode) return &CBemulinfo; =20 int i; - for (i =3D 0; i < GET_GLOBAL(svga_mcount); i++) { - struct generic_svga_mode *cbmode_g =3D &svga_modes[i]; + for (i =3D 0; i < GET_GLOBAL(svga_mcount); i++) { + struct generic_svga_mode *cbmode_g =3D &svga_modes[i]; if (GET_GLOBAL(cbmode_g->mode) =3D=3D 0xffff) continue; if (GET_GLOBAL(cbmode_g->mode) =3D=3D 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 =3D 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) { - struct generic_svga_mode *cbmode_g =3D &svga_modes[i]; + for (i =3D 0; i < GET_GLOBAL(svga_mcount) && dest < last; i++) { + struct generic_svga_mode *cbmode_g =3D &svga_modes[i]; u16 mode =3D GET_GLOBAL(cbmode_g->mode); if (mode =3D=3D 0xffff) continue; @@ -202,11 +202,11 @@ cbvga_setup_modes(u64 addr, u8 bpp, u32 xlines, u32 y= lines, u32 linelength) , get_global_seg(), &CBmodeinfo, sizeof(CBemulinfo)); =20 // Validate modes - for (i =3D 0; i < GET_GLOBAL(svga_mcount); i++) { - struct generic_svga_mode *cbmode_g =3D &svga_modes[i]; + for (i =3D 0; i < GET_GLOBAL(svga_mcount); i++) { + struct generic_svga_mode *cbmode_g =3D &svga_modes[i]; /* Skip VBE modes that doesn't fit into coreboot's framebuffer */ - if ((GET_GLOBAL(cbmode_g->info.memmodel) !=3D MM_DIRECT) - || (GET_GLOBAL(cbmode_g->info.height) > ylines) + if ((GET_GLOBAL(cbmode_g->info.memmodel) !=3D MM_DIRECT) + || (GET_GLOBAL(cbmode_g->info.height) > ylines) || (GET_GLOBAL(cbmode_g->info.width) > xlines) || (GET_GLOBAL(cbmode_g->info.depth) !=3D bpp)) { dprintf(3, "Removing mode %x\n", GET_GLOBAL(cbmode_g->mode)); diff --git a/vgasrc/svgamodes.c b/vgasrc/svgamodes.c index 78cc68ed2aa8..f89ebef950a8 100644 --- a/vgasrc/svgamodes.c +++ b/vgasrc/svgamodes.c @@ -76,13 +76,13 @@ struct generic_svga_mode svga_modes[] VAR16 =3D { { 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 =3D ARRAY_SIZE(svga_modes); --=20 2.23.0 _______________________________________________ SeaBIOS mailing list -- seabios@seabios.org To unsubscribe send an email to seabios-leave@seabios.org