From nobody Fri Mar 11 20:22:24 2022 X-Original-To: dev-commits-src-all@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 F12411A1F37D; Fri, 11 Mar 2022 20:22:24 +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 4KFcmc6Pc8z3M4Q; Fri, 11 Mar 2022 20:22:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647030144; 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=GJ6jiY4d6iw3O3CH5rzxmCYoztXYWa6gPWkjm/Od3ec=; b=pd75c/ma+/inq6zoz0QZR8gxGbKW7q+uY9MLWhUv5XjDYmVRWAjKmYKZYtE6feusV3qaGe 3VcrPnCchoeSJphD3fxO5X8JGjwpEkp7yfzUeM6RLAotWo6PCSvo74WY6pZQGOp4CAFnmo +G0d73lvu+7QSsOwNhwHWpAiywDkSL66umraY62iSvJxc98fMl191gggFXBdezgckslBHP 0gF6Mu6teAD2Oza8G7/IZ1zpLq3SqUuSyBjDOVnH2XfSn9TPnRKteaGNiu/2NsdbuT9IwE cbl7A2ycrw7uIdR6n9qB3UK0GORzYpjeigqqePnHbO8oZvc3LBXLCWZBip+oeA== 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 BD7CF1FD93; Fri, 11 Mar 2022 20:22:24 +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 22BKMOqs093515; Fri, 11 Mar 2022 20:22:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22BKMO3J093514; Fri, 11 Mar 2022 20:22:24 GMT (envelope-from git) Date: Fri, 11 Mar 2022 20:22:24 GMT Message-Id: <202203112022.22BKMO3J093514@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e9249ef9582b - main - loader: accept "yellow" as a named color List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e9249ef9582bec08b9afc3ae65b97f6ffffc6bdf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647030144; 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=GJ6jiY4d6iw3O3CH5rzxmCYoztXYWa6gPWkjm/Od3ec=; b=bkZVzjjHbg4YMSJpJKNFgL1RM7rZtj9ch7jdYMNvG62rlRzYwATzDKVHbyjP36PZ1+zb8y qAlVpxHepza5C607BmoHSAxWNS9BZBa6RKeTNenI+6Msn4kEyF7JHslhbzXzhSbAnpPhXh ZG0YP8smRXIBOrsONFjwsxNcBYXMbGw0KtVFQfiHlrOYlkkXWACxHtT9GWMU8M4tPLNiXO JF6JEpo87vKor7JcsdZHyhI7/4ON2XZLtkEdiU3ifTRlEVuJeiR7LJ8RPm8cXfHGhEigSd w9vyYaHX+2uv7geOQFsI1nVIOWJFhjo7EB2KOJ3QFXcNFgCh87+rHQV73exMvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647030144; a=rsa-sha256; cv=none; b=OcLJ7v6rPi7uv1zDa2af72Kyv2kN8F8N3oG6CVaj1JHX7rqbZPYLBJH8VRsCOcIR4uSHPr Jx/3YyXT8YszvGqjSwjetxz26ezBlkGH0bg9Wa5/8SgqNuW0EfK8IUenMVw1WgkXG4FKJ+ cAOAQ8nnxqooRaoOFvX6JGsiG/kklt5SkmUGt7X7/E0RMTH4FoGbQEBvWCcSP1aav95Wxg lBr21esg6CYQn1wQEsLL3xo0owm6uGMixGBmhCbhQ/jLU/i9gGfU2a50mlExAwndairREx sZo85NrIL6hSCYdoedBvmsKdwiLMDyOFwTB0KAGBownhvI+h64F73VND0l7aCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e9249ef9582bec08b9afc3ae65b97f6ffffc6bdf commit e9249ef9582bec08b9afc3ae65b97f6ffffc6bdf Author: Ed Maste AuthorDate: 2022-03-11 19:27:46 +0000 Commit: Ed Maste CommitDate: 2022-03-11 20:22:13 +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 --- 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 8cfb1a748a73..de4c26b2fd72 100644 --- a/stand/efi/libefi/efi_console.c +++ b/stand/efi/libefi/efi_console.c @@ -457,7 +457,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); }