From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EDB4DC678D4 for ; Tue, 7 Mar 2023 10:23:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0309C85C49; Tue, 7 Mar 2023 11:22:21 +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="R0J5/5l0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97CEC85BDC; Tue, 7 Mar 2023 11:22:01 +0100 (CET) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (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 B981B85BD1 for ; Tue, 7 Mar 2023 11:21:50 +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-wm1-x335.google.com with SMTP id az36so7415695wmb.1 for ; Tue, 07 Mar 2023 02:21:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678184509; 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=T8rcjtdjfZ7NYyTtG1/nujH0YdRiJ2RV770Zq741qLA=; b=R0J5/5l0lZfeatAzHJTCbx0xCRYglSnKdK2hvYAsD6BCXbHEih1VSDKwGxEp+c3mXp GeRtiqHVCHPjXmnv284A1JV8Dk3hp3vWx8gn9Fzo6eEoQQmxJG3BK1q6JO8NfEIx3y8m 0HPU19mviD9F/f2LVAECdU172fQoc5KULDWjooqoU0pFTei5AYjM6GDN6hqGIUnSTOL4 Mpjt18rVnFe5aX5gf6EyyPXh7zO/rDi+P+t1Uj4G7W6Uh4mlXX1hUyf7eszUlnAIW50P aiyRb/30fJgCAr8iorx0JTCNS9VMv/toJ0hFoGz0w8sxxSJbO4WeZlM5vC4BHf35fKEa rahw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678184509; 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=T8rcjtdjfZ7NYyTtG1/nujH0YdRiJ2RV770Zq741qLA=; b=hgmhj7EqnfbQONUwPukY/vaiwS5Slg6ebu1KEGl0tmYjXLmd16PgKESpUMEb0nYT9G Js3kbZSXtyjT4Wv6UEaW4YNWJkiZsv6v/l2bEP/qRCcOi9jWYHDzfehTzTMR7Vpk3gIZ XRTjo8HNO5IAJflrWJZev/7XPAM7eQlV+P5Y7C8QiByc3fgY2I7v5umioGYx94gow56D H3Tk3HWYAXutExS0c3XTxlIGzlDHPLL2nqN+7vcJ58SJPQKAxNjx1mEadvosHe5gXEV8 E7CB4PVpRkctYfk5Jfcs2ZAokIFY8uZdmQBWxohL1QZAEBIwT6zdewwM6gxL6Wlw3VVH 7U9A== X-Gm-Message-State: AO0yUKVVDVqzHnUMkA8B1phSLApmqrGCSA5CI1f/3ZgliVqxaCXNoha9 z6DeAHhdWuDh3ZO5QkbBVXL2DHnmW2s= X-Google-Smtp-Source: AK7set+sV8xpjh8bBgP3NcxaIPFaqZbZq4MYaq2wlAkQQjPE/nf9/vqmawTYyk87tyEE7dwu6IRwug== X-Received: by 2002:a05:600c:3c90:b0:3eb:2b69:c3c6 with SMTP id bg16-20020a05600c3c9000b003eb2b69c3c6mr12105209wmb.1.1678184509733; Tue, 07 Mar 2023 02:21:49 -0800 (PST) Received: from debian.localdomain ([37.45.231.77]) by smtp.googlemail.com with ESMTPSA id d42-20020a05600c4c2a00b003e6efc0f91csm12306258wmp.42.2023.03.07.02.21.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 02:21:49 -0800 (PST) From: Dzmitry Sankouski To: U-Boot Mailing List Cc: Dzmitry Sankouski , Simon Glass , Anatolij Gustschin Subject: [PATCH v8 05/10] video console: move vidconsole_get_font_size() logic to driver ops Date: Tue, 7 Mar 2023 13:21:15 +0300 Message-Id: <20230307102121.1925581-6-dsankouski@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230307102121.1925581-1-dsankouski@gmail.com> References: <20230307102121.1925581-1-dsankouski@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.8 at phobos.denx.de X-Virus-Status: Clean Since multiple vidconsole drivers exists, vidconsole_get_font_size() implementation cannot longer live in vidconsole_uclass.c file. Move current vidconsole_get_font_size logic to truetype driver ops. Signed-off-by: Dzmitry Sankouski Reviewed-by: Simon Glass --- Changes in v8: none Changes in v7: N/A Changes in v6: N/A Changes in v5: N/A Changes in v4: N/A Changes in v3: N/A Changes in v2: N/A cmd/font.c | 6 +++++- drivers/video/console_truetype.c | 3 ++- drivers/video/vidconsole-uclass.c | 11 +++++++++++ include/video_console.h | 14 ++++++++++++-- test/cmd/font.c | 13 +++++++------ 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/cmd/font.c b/cmd/font.c index 7b4347f32b..fe2d65caaf 100644 --- a/cmd/font.c +++ b/cmd/font.c @@ -61,7 +61,11 @@ static int do_font_size(struct cmd_tbl *cmdtp, int flag, int argc, if (uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev)) return CMD_RET_FAILURE; - font_name = vidconsole_get_font_size(dev, &size); + ret = vidconsole_get_font_size(dev, &font_name, &size); + if (ret) { + printf("Failed (error %d)\n", ret); + return CMD_RET_FAILURE; + } size = dectoul(argv[1], NULL); diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index 9cac9a6de4..6b5390136a 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -724,7 +724,7 @@ static int truetype_select_font(struct udevice *dev, const char *name, return 0; } -const char *vidconsole_get_font_size(struct udevice *dev, uint *sizep) +const char *console_truetype_get_font_size(struct udevice *dev, uint *sizep) { struct console_tt_priv *priv = dev_get_priv(dev); struct console_tt_metrics *met = priv->cur_met; @@ -773,6 +773,7 @@ struct vidconsole_ops console_truetype_ops = { .backspace = console_truetype_backspace, .entry_start = console_truetype_entry_start, .get_font = console_truetype_get_font, + .get_font_size = console_truetype_get_font_size, .select_font = truetype_select_font, }; diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 72a13d3052..a5f2350ca1 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -575,6 +575,17 @@ int vidconsole_get_font(struct udevice *dev, int seq, return ops->get_font(dev, seq, info); } +int vidconsole_get_font_size(struct udevice *dev, const char **name, uint *sizep) +{ + struct vidconsole_ops *ops = vidconsole_get_ops(dev); + + if (!ops->get_font_size) + return -ENOSYS; + + *name = ops->get_font_size(dev, sizep); + return 0; +} + int vidconsole_select_font(struct udevice *dev, const char *name, uint size) { struct vidconsole_ops *ops = vidconsole_get_ops(dev); diff --git a/include/video_console.h b/include/video_console.h index 3e1e00c23f..770103284b 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -160,6 +160,15 @@ struct vidconsole_ops { int (*get_font)(struct udevice *dev, int seq, struct vidfont_info *info); + /** + * get_font_size() - get the current font name and size + * + * @dev: vidconsole device + * @sizep: Place to put the font size (nominal height in pixels) + * Returns: Current font name + */ + const char *(*get_font_size)(struct udevice *dev, uint *sizep); + /** * select_font() - Select a particular font by name / size * @@ -303,9 +312,10 @@ void vidconsole_list_fonts(struct udevice *dev); * * @dev: vidconsole device * @sizep: Place to put the font size (nominal height in pixels) - * Returns: Current font name + * @name: pointer to font name, a placeholder for result + * Return: 0 if OK, -ENOSYS if not implemented in driver */ -const char *vidconsole_get_font_size(struct udevice *dev, uint *sizep); +int vidconsole_get_font_size(struct udevice *dev, const char **name, uint *sizep); #ifdef CONFIG_VIDEO_COPY /** diff --git a/test/cmd/font.c b/test/cmd/font.c index adb353965a..40682e5ce4 100644 --- a/test/cmd/font.c +++ b/test/cmd/font.c @@ -19,6 +19,7 @@ static int font_test_base(struct unit_test_state *uts) { struct udevice *dev; + const char *name; int max_metrics; uint size; int ret; @@ -32,8 +33,8 @@ static int font_test_base(struct unit_test_state *uts) ut_assert_nextline("cantoraone_regular"); ut_assertok(ut_check_console_end(uts)); - ut_asserteq_str("nimbus_sans_l_regular", - vidconsole_get_font_size(dev, &size)); + ut_assertok(vidconsole_get_font_size(dev, &name, &size)); + ut_asserteq_str("nimbus_sans_l_regular", name); ut_asserteq(18, size); max_metrics = 1; @@ -52,15 +53,15 @@ static int font_test_base(struct unit_test_state *uts) ut_assertok(ret); ut_assertok(ut_check_console_end(uts)); - ut_asserteq_str("cantoraone_regular", - vidconsole_get_font_size(dev, &size)); + ut_assertok(vidconsole_get_font_size(dev, &name, &size)); + ut_asserteq_str("cantoraone_regular", name); ut_asserteq(40, size); ut_assertok(run_command("font size 30", 0)); ut_assertok(ut_check_console_end(uts)); - ut_asserteq_str("cantoraone_regular", - vidconsole_get_font_size(dev, &size)); + ut_assertok(vidconsole_get_font_size(dev, &name, &size)); + ut_asserteq_str("cantoraone_regular", name); ut_asserteq(30, size); return 0; -- 2.30.2