From nobody Mon Mar 7 16:26:11 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 69A1119FF5E7; Mon, 7 Mar 2022 16:26:12 +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 4KC3jw0YYfz4Zm9; Mon, 7 Mar 2022 16:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646670372; 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=EPd9heYlEa4AEt/zlf7NbJR0BX1lzBE4TzzWptH2lOU=; b=qLUpAsm2WmpDUIWnfyaY5wRIFrMXgVfaHpjliOlJteRqpS2svzf1V3DE7W4d3xiusi1LYg nJ9ngEHU3g304wYh7BvZ0Cvdpj7+qzKfn7UGRk83qqUHpjvrrNg5fCcIAeY7tAE97enZs6 BI+CYuUU0M1UyHWYmsBJSBzE0AbYB9PIQh3b2Q+27lOJVf01KjeVpMHyumByeqNT1arYhw bCkFFtb9/C5/8Rx93Ghb1du3xDLvKYd0ybixRDmObLzUu67ovzglSzAl+2flRTX1t2i5PC fhAzxHPOkLb8o9ycbsQDK60PfIwMpV/2rSjHq42iMKTBbXCZMuMujgfgSo4bPQ== 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 C13B036E7; Mon, 7 Mar 2022 16:26:11 +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 227GQB7X004252; Mon, 7 Mar 2022 16:26:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227GQBOx004251; Mon, 7 Mar 2022 16:26:11 GMT (envelope-from git) Date: Mon, 7 Mar 2022 16:26:11 GMT Message-Id: <202203071626.227GQBOx004251@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: 42aa873f64b2 - stable/12 - vt_vga: Correct "plane" spelling 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/stable/12 X-Git-Reftype: branch X-Git-Commit: 42aa873f64b2d4b2361d618e2a0453578ef1e8e5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646670372; 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=EPd9heYlEa4AEt/zlf7NbJR0BX1lzBE4TzzWptH2lOU=; b=t3RhkWybGYvKy2xrR20lbkoY7dqRr50NaX+2AM9vLC/uZfiYJgCN74nqpcMQiSbexTeule 4aHOQSFUila2FuSFytPoM3V6lRqHTXRqEQd65fSiPWh9MbzX5IU0YLfyqbIOBWSj4UOwah SazDiApCRkkvwu1fZdvYq7qAlprXg0h0WxfaOPoKH9fZm2CiRJezjh15kctARG6KQQNcE/ 51fGyXruy+tabXSCdPKqc7RxwX8zOFACKzZ8HQOBqMQOWGFuaov1LPmJgVa9DYnv3LFuZK BF3yXAT87nhoFt9bteSuOH/zdRuwbrFOvxF5VAo07zJTHAfjhH3FxTtb3QZF3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646670372; a=rsa-sha256; cv=none; b=bhKMMmEFFo3+G/n6KRMrftEq+yt9+V8MexICq9lBz+stM+qP2AXjbv8dJ5pbkWt9UljHqw c5U/hZTjHjKx5Cy6lpiOQlwsbTIrRa+QO+TUV/9XI9ZhvoyPVVgatANTye5KKJlljMWcKU X0OS8j789a2siXcvI8rTKSIOWVe7PKHFodGnj0CPCotPJVXfq+mrdz5sPG42VfRlyLDTof yL8f5FgFLUbHK2Vv8Hfy2/rcSowv4cH8KQ3NTcP6QO2Ql02bmw8cPkZO5qBUhg9BJDjdnF 6pDqxDBlahzYqWXyYUofiW9q+23K9XtvxOt+N6F/K4vJKK+hD973O2I+gz9T1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=42aa873f64b2d4b2361d618e2a0453578ef1e8e5 commit 42aa873f64b2d4b2361d618e2a0453578ef1e8e5 Author: Ed Maste AuthorDate: 2022-03-02 14:08:25 +0000 Commit: Ed Maste CommitDate: 2022-03-07 16:25:58 +0000 vt_vga: Correct "plane" spelling I suspect the variable names and comments were accidentally French. MFC after: 1 week Sponsored by: The FreeBSD Foundation (cherry picked from commit 731a929ac908774cdb74f0444b075be6248190bd) --- sys/dev/vt/hw/vga/vt_vga.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sys/dev/vt/hw/vga/vt_vga.c b/sys/dev/vt/hw/vga/vt_vga.c index 563867399e53..c0d001d09659 100644 --- a/sys/dev/vt/hw/vga/vt_vga.c +++ b/sys/dev/vt/hw/vga/vt_vga.c @@ -138,7 +138,7 @@ vga_setwmode(struct vt_device *vd, int wmode) switch (wmode) { case 3: - /* Re-enable all plans. */ + /* Re-enable all planes. */ REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_MAP_MASK); REG_WRITE1(sc, VGA_SEQ_DATA, VGA_SEQ_MM_EM3 | VGA_SEQ_MM_EM2 | VGA_SEQ_MM_EM1 | VGA_SEQ_MM_EM0); @@ -533,21 +533,21 @@ static void vga_bitblt_pixels_block_ncolors(struct vt_device *vd, const uint8_t *masks, unsigned int x, unsigned int y, unsigned int height) { - unsigned int i, j, plan, color, offset; + unsigned int i, j, plane, color, offset; struct vga_softc *sc; - uint8_t mask, plans[height * 4]; + uint8_t mask, planes[height * 4]; sc = vd->vd_softc; - memset(plans, 0, sizeof(plans)); + memset(planes, 0, sizeof(planes)); /* * To write a group of pixels using 3 or more colors, we select - * Write Mode 0 and write one byte to each plan separately. + * Write Mode 0 and write one byte to each plane separately. */ /* - * We first compute each byte: each plan contains one bit of the + * We first compute each byte: each plane contains one bit of the * color code for each of the 8 pixels. * * For example, if the 8 pixels are like this: @@ -559,10 +559,10 @@ vga_bitblt_pixels_block_ncolors(struct vt_device *vd, const uint8_t *masks, * * The corresponding for bytes are: * GBBBBBBY - * Plan 0: 10000001 = 0x81 - * Plan 1: 10000001 = 0x81 - * Plan 2: 10000000 = 0x80 - * Plan 3: 00000000 = 0x00 + * Plane 0: 10000001 = 0x81 + * Plane 1: 10000001 = 0x81 + * Plane 2: 10000000 = 0x80 + * Plane 3: 00000000 = 0x00 * | | | * | | +-> 0b0011 (Y) * | +-----> 0b0000 (B) @@ -580,28 +580,28 @@ vga_bitblt_pixels_block_ncolors(struct vt_device *vd, const uint8_t *masks, continue; /* The pixel "j" uses color "color". */ - for (plan = 0; plan < 4; ++plan) - plans[i * 4 + plan] |= - ((color >> plan) & 0x1) << (7 - j); + for (plane = 0; plane < 4; ++plane) + planes[i * 4 + plane] |= + ((color >> plane) & 0x1) << (7 - j); } } } /* * The bytes are ready: we now switch to Write Mode 0 and write - * all bytes, one plan at a time. + * all bytes, one plane at a time. */ vga_setwmode(vd, 0); REG_WRITE1(sc, VGA_SEQ_ADDRESS, VGA_SEQ_MAP_MASK); - for (plan = 0; plan < 4; ++plan) { - /* Select plan. */ - REG_WRITE1(sc, VGA_SEQ_DATA, 1 << plan); + for (plane = 0; plane < 4; ++plane) { + /* Select plane. */ + REG_WRITE1(sc, VGA_SEQ_DATA, 1 << plane); - /* Write all bytes for this plan, from Y to Y+height. */ + /* Write all bytes for this plane, from Y to Y+height. */ for (i = 0; i < height; ++i) { offset = (VT_VGA_WIDTH * (y + i) + x) / 8; - MEM_WRITE1(sc, offset, plans[i * 4 + plan]); + MEM_WRITE1(sc, offset, planes[i * 4 + plane]); } } }