From nobody Fri Mar 18 01:59:50 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 14D871A1EFD8; Fri, 18 Mar 2022 01:59:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KKRzB6Shfz3Mbf; Fri, 18 Mar 2022 01:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647568791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvqlSAD/cAvKld+z/GmacTtbDYuOWSum/DCrwa70BJ0=; b=RDKIaMm/TbmQUAmm5RAIPTp8/eWvBMH8mQjC0mGziHe6Q8UyaR4trAtpxqTVvh2KcwGdQT SzlmQscOtra4T5uJzWqHcenZdNbCgyevWGCOlzCTIjrkngH+coW49+s9FRW4kZohwSDKuO XeQSEkTG5ic7u9Kw+q+B192Jw7MJJM6RZSAVBfNrYj5a8JrEgeIpX8SWcBN4i3Yb4yCkiH hUwr8zqxjcrkMCTZOn+0RuNc2/5RW7yYlFSC7Px+iU5ePjw/+2D82aKfFfJvvWcohG+FwE muHayYlvYvj1s+eKpkwM5AFjlaRxZC3V812Ae8HV1EFQ7TEXz7Mz1DwgZ7WcNA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8E365162CC; Fri, 18 Mar 2022 01:59:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22I1xo9n073516; Fri, 18 Mar 2022 01:59:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22I1xojh073515; Fri, 18 Mar 2022 01:59:50 GMT (envelope-from git) Date: Fri, 18 Mar 2022 01:59:50 GMT Message-Id: <202203180159.22I1xojh073515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 7d59a9451d3b - stable/13 - loader: accept "yellow" as a named color List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7d59a9451d3baf8c2d506b7b7ffab302f1fd7d15 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647568791; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvqlSAD/cAvKld+z/GmacTtbDYuOWSum/DCrwa70BJ0=; b=xTe1brkpKGuCF9v0Y52Wjz+TrmO7r9CNPVx6S/CIFk969j+U8TLunUYk8ZgjzpZ+d0j6Ze CxnxweC5uGEzAJEHT1PAo7zazYTL6NJVEURZSg20LU8Kg8sB1B0Azvqx61OPJi1ovhQc5M yVbhRdv1oG5tPRqJNmL0rtaQctGlli7O9dRSYQTbFBz02fthUZ6+DLlLdwWwHFe0NbX7s1 rsjW/kGEnSicdwhuPYRLq7LLGTZHS+2xTyhOwTPxBXoaMSml9Xp3CJ/YAG/N3HcwYuhFri YynFHfnq69Fa6Np1V5o9cjrngMzacN9ZvlZpbCnoZ14F1oGosppAHbmiaVjWkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647568791; a=rsa-sha256; cv=none; b=n8hnSaHyNOriI5tfaisbxUjS5XrxcRjn09uhNAOIfr8MQhlxVmV7A2ZpE+oXnog8DrBvGh f7O63f8MkHu0h1yNCeIrEmT3vNfuXuDerRqF0g2z/9KfIGcdsNywVJNyej+oITWsIogpyL Gr9/qkYU56GAvfIYIObyL1dcw6r0U/vl9V1rCyijmjhq/zymt/rpk2SrojZD18VkR3mIu5 GHlOg+ek0mTI4ZjZY+Y4ZKhYrb6IlXxB9J5nlyeaHUVk9t7aZ3oscKmNjZsFr1zFId1uTA uztvBp9X+5KGV5DTBtUB2P+fXgavu7RxfRncORgrZu3u3+qsj/ookiwrd3jCoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=7d59a9451d3baf8c2d506b7b7ffab302f1fd7d15 commit 7d59a9451d3baf8c2d506b7b7ffab302f1fd7d15 Author: Ed Maste AuthorDate: 2022-03-11 19:27:46 +0000 Commit: Ed Maste CommitDate: 2022-03-18 01:58:51 +0000 loader: accept "yellow" as a named color For historical reasons console color number 3 may be either yellow (most consoles) or brown (VGA palette). The console escape code standard uses "yellow", but teken color name constants appear to be based on the VGA scheme and use TC_BROWN for color 3. Even so, the palette table used 50,50,0 as the RGB percentage tuple, resulting in a dim yellow for framebuffer consoles at the time teken was introduced. Amusingly, in 19e2ce2d8367 the comment on the palette entry was changed from "brown" to "dark yellow" but the colour itself was changed from a pure yellow to being somewhat brown. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit e9249ef9582bec08b9afc3ae65b97f6ffffc6bdf) --- stand/efi/libefi/efi_console.c | 2 +- stand/i386/libi386/vidconsole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/libefi/efi_console.c b/stand/efi/libefi/efi_console.c index a000b8872c84..010c949faf38 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -456,7 +456,7 @@ color_name_to_teken(const char *name, int *val) *val = TC_GREEN | light; return (true); } - if (strcasecmp(name, "brown") == 0) { + if (strcasecmp(name, "yellow") == 0 || strcasecmp(name, "brown") == 0) { *val = TC_BROWN | light; return (true); } diff --git a/stand/i386/libi386/vidconsole.c b/stand/i386/libi386/vidconsole.c index 3a6cba8f1561..4f1f22234dc3 100644 --- a/stand/i386/libi386/vidconsole.c +++ b/stand/i386/libi386/vidconsole.c @@ -544,7 +544,7 @@ color_name_to_teken(const char *name, int *val) *val = TC_GREEN | light; return (true); } - if (strcasecmp(name, "brown") == 0) { + if (strcasecmp(name, "yellow") == 0 || strcasecmp(name, "brown") == 0) { *val = TC_BROWN | light; return (true); }