From patchwork Mon Feb 27 17:37:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dzmitry Sankouski X-Patchwork-Id: 1749021 X-Patchwork-Delegate: agust@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=DiA6h2/S; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PQSQG4QlBz1yX2 for ; Tue, 28 Feb 2023 04:38:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 292BC85AE2; Mon, 27 Feb 2023 18:37:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="DiA6h2/S"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DEFF085AA2; Mon, 27 Feb 2023 18:37:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E214485AAB for ; Mon, 27 Feb 2023 18:37:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=dsankouski@gmail.com Received: by mail-ed1-x536.google.com with SMTP id s26so28892677edw.11 for ; Mon, 27 Feb 2023 09:37:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PlMc/SQy7irYjnnHM1HYN2zdyHcoiA1z2EC7w30RXZE=; b=DiA6h2/Saxldu+E7M7ECYi/5Ad5eFXm3Ue8KTBrwMsH+BsAsVaUBPmzwIGL319mJBt WT/FnDF5iFt9fq1pHyJLcsRRbLSszHQ+bDWZuDBnsohgiaX8QjP/SEqF9VxfHt907arW Tx8gmz7Kkks3mZ6si1RW93of6TXsrm4UCcO499qwcYtP5LPw7kllVU0NS0alpGSEb9O2 njk7CEVxsCzNgpN2zdutJpwXpCrlwbh+sqglAIsKWh4QZseb1lo/ZdtM1Tv965QlxdAY YuNskW0IpIemseNUxwQ4eXZbJdFb59Xjo2NaCv/Gw03Trmuz5xMvYZoaDhI2PEUdR5ml RAiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PlMc/SQy7irYjnnHM1HYN2zdyHcoiA1z2EC7w30RXZE=; b=q4NxVaBQ1H6uwx5MIel2ApIsBLPHvcqp3Qm/FQ/Mc3f5CQ9s12y3uqCZ7jCiqmVju6 iKjsYBZjg9msi/qjzEJyfR3PzYszfrJeIx4ZsqPVitVTD2LljrdjqS60gjZ5vRuQSgf/ QJIc6sn2pKRyzJRKTXktcnqtBScCpK6wjzDTNQpOapLp7622q8A6215iHvig3xS2qNy2 k0OJWaVZDFt+dH9H/irx9Ntqs79Lih31fclX0TODlN4cORd9uMTUFl1oy6t3Sktj+b4l mDq8be3k+BGCd9ISUkIBhj9aQfyQ44rAlKHR7Ms5at68ZEUFVQOCCdzYjFCqO50csK/x MMrw== X-Gm-Message-State: AO0yUKWIvu8ukG88p1nCMFOja6+ZECiRil4HnNKFb9qw1XdXj9Pour6W R3UQkhr3GcA4YYb7xyXJfgn9WdejEA0= X-Google-Smtp-Source: AK7set9lovAWGLpC33R4ZE2X3NyOVRFjBlzujaoXDnpqhvXdIk9h/JzVD96pbAjv0qXg489ZzIshvw== X-Received: by 2002:a17:906:ad82:b0:8b1:7eb4:6bea with SMTP id la2-20020a170906ad8200b008b17eb46beamr36901746ejb.38.1677519439146; Mon, 27 Feb 2023 09:37:19 -0800 (PST) Received: from debian.localdomain ([37.45.144.86]) by smtp.googlemail.com with ESMTPSA id c89-20020a509fe2000000b004aeeb476c5bsm3349912edf.24.2023.02.27.09.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Feb 2023 09:37:18 -0800 (PST) From: Dzmitry Sankouski To: u-boot@lists.denx.de Cc: Dzmitry Sankouski , Anatolij Gustschin , Simon Glass Subject: [PATCH v7 03/10] video console: move 8x16 font data in named header Date: Mon, 27 Feb 2023 20:37:03 +0300 Message-Id: <20230227173710.1688611-4-dsankouski@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230227173710.1688611-1-dsankouski@gmail.com> References: <20230227173710.1688611-1-dsankouski@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Consistent font data header names needed to add new fonts. Signed-off-by: Dzmitry Sankouski Reviewed-by: Simon Glass --- Changes for v2: N/A Changes for v3: N/A Charges for v4: N/A Charges for v5: N/A Charges for v6: rebase only Charges for v7: none include/video_font.h | 2 +- include/{video_font_data.h => video_font_8x16.h} | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) rename include/{video_font_data.h => video_font_8x16.h} (99%) diff --git a/include/video_font.h b/include/video_font.h index 5e23f70f85..b07c07662c 100644 --- a/include/video_font.h +++ b/include/video_font.h @@ -10,7 +10,7 @@ #ifdef CONFIG_VIDEO_FONT_4X6 #include #else -#include +#include #endif #endif /* _VIDEO_FONT_ */ diff --git a/include/video_font_data.h b/include/video_font_8x16.h similarity index 99% rename from include/video_font_data.h rename to include/video_font_8x16.h index 6e64198d1a..d3d4295032 100644 --- a/include/video_font_data.h +++ b/include/video_font_8x16.h @@ -6,8 +6,8 @@ * This file contains an 8x16 bitmap font for code page 437. */ -#ifndef _VIDEO_FONT_DATA_ -#define _VIDEO_FONT_DATA_ +#ifndef _VIDEO_FONT_8X16 +#define _VIDEO_FONT_8X16 #define VIDEO_FONT_CHARS 256 #define VIDEO_FONT_WIDTH 8 @@ -4623,7 +4623,6 @@ static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = { 0x00, /* 00000000 */ 0x00, /* 00000000 */ 0x00, /* 00000000 */ - }; #endif