From nobody Tue Apr 12 21:59:44 2022 X-Original-To: dev-commits-src-main@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 5B9B41AFCF04; Tue, 12 Apr 2022 21:59:46 +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 4KdKQ90Kg6z4hxN; Tue, 12 Apr 2022 21:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800785; 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=1nTmV5Hz47PtkPv01bBJFkg8x3yDVMP5P2Ai9r+hi1w=; b=wpx4R51UFOJaJMnoDztf+HBhnooHeXCG0XiPMkum3GFq96s7OWEy2BHMO5m5i6CXdO40Gf OBu4RntwgXt3OvPkxqo1j5AtXqNGiemC5DfSdL8Zv8D6tkFmH6f5aGGLe1oM0TvWQYhNQX cQtKV8ZPt2S67RWLfKChm7iVWfGObJEmFm0xnqKAYd/AzLa1qv0gNhLpACBVuIV8JPhhyZ j2viU84Iq1MFcbP8hxA5kJXZmxtPttby5+1+Ib0XhODxUXr4QloTh+fz6n4UFjudR7s0Ae jZK7iXdJASqKWyE0QXw3EPRqDy4KwjQhqJpwBUXklpmWXuzsWpuA3MYEq8BfIA== 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 CA9F11F641; Tue, 12 Apr 2022 21:59:44 +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 23CLxiLt035927; Tue, 12 Apr 2022 21:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CLxiEf035926; Tue, 12 Apr 2022 21:59:44 GMT (envelope-from git) Date: Tue, 12 Apr 2022 21:59:44 GMT Message-Id: <202204122159.23CLxiEf035926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 113925b0b3b2 - main - syscons VGA draw_txtcharcursor: Move sc under #ifndef SC_NO_FONT_LOADING. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 113925b0b3b25e66af8f477da4d10380872ed929 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649800785; 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=1nTmV5Hz47PtkPv01bBJFkg8x3yDVMP5P2Ai9r+hi1w=; b=wXVrJsJu5784fDmtxBkswRUPyKycEF7EdaO4j6Thc7ZFKttVNjtKpzF5P6WOnxj6vR2A4Q pw1cGCkByPuJfk7WUvRJxlpOVdr9eA5MqCvEvmSAQ7iab+JqcKTEphIxspA426DrZCd4np 8Xf9rAOgohnGEZLNfPIJ40VAJNowQPEBWQdyToKd0MllErXl1TYLwA2S7lkTHTvXQQuMu/ /GQLk8OuVvvcauRLi2q51fvjcswOKlI4UTAWTMaIY0lYNAKeaOapLXrASLurYb2DGqcIg6 QPBIocFzvze9bTIcpF/jX9TBZ+UBPfTKI0MkzRCPE92VBzWWw5UhqSs9G5AeHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649800785; a=rsa-sha256; cv=none; b=al1c+YZgOeoay6z6TvATNbvgCAVmyEZTfXR7LA6W1mxPtfSARHuvKA/3A6xJY4QUrf87SG 3gxHcJzZNfsXDLhjGChfR1UH0xwF7OpC+Utyc95B9JWY2qcTILP0FqEHjBgI3Ijm9vUZkn stzb/BLdD0rXAOR0/PiEO3RHvs+ll8f8KuB/Qb/lFK/z/9OSX4amH12erAWVE4OWT06rSR f7mpcUiJmZvZItP0OCRZLg3RvZXu5/9YD80Wy9XKWQq6omtodYhktrBmESxvL4Oy7G7Ybc rVVHDV9opcs2NfFqK7Q0GW8e62TxbwdQ0a/Ak/Wzf5QNC3+P3odIoBdkbpn46w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=113925b0b3b25e66af8f477da4d10380872ed929 commit 113925b0b3b25e66af8f477da4d10380872ed929 Author: John Baldwin AuthorDate: 2022-04-12 21:59:00 +0000 Commit: John Baldwin CommitDate: 2022-04-12 21:59:00 +0000 syscons VGA draw_txtcharcursor: Move sc under #ifndef SC_NO_FONT_LOADING. --- sys/dev/syscons/scvgarndr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/syscons/scvgarndr.c b/sys/dev/syscons/scvgarndr.c index 446a6313f419..963bfec87f37 100644 --- a/sys/dev/syscons/scvgarndr.c +++ b/sys/dev/syscons/scvgarndr.c @@ -496,11 +496,11 @@ vga_txtcursor_shape(scr_stat *scp, int base, int height, int blink) static void draw_txtcharcursor(scr_stat *scp, int at, u_short c, u_short a, int flip) { +#ifndef SC_NO_FONT_LOADING sc_softc_t *sc; sc = scp->sc; -#ifndef SC_NO_FONT_LOADING if (scp->curs_attr.flags & CONS_CHAR_CURSOR) { unsigned char *font; int h;