From patchwork Sat Jan 17 00:56:50 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1554 Return-Path: X-Original-To: u-boot-concept@u-boot.org Delivered-To: u-boot-concept@u-boot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768611493; bh=HWK4SN2+4+NCRzXvOleU3wEXCDRIAYUfFzmaQcjWGxM=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=a1C/oJo2HYFidqVpzWZ3hlVQMYCttyH/HmFaNTJViXxC447hwHCUd4crdx0Y5E0F3 lAJqmHTR8SD/EgWZtOFW5zbyL87Onc3swkw+ddHSxnYecatmN5Fs1/h7+lmU51B7jE l7I/9qoKHWYZyMe1FascA6PZTnDMyqPF4/aFHzNnn1/GeWm2/z5ptvJwOKcnJKmCpy Vz4P553lSWASBPYkZNSehW+i+vkMGDUuVR7d4ZjV2RwhALwh7l0eXmp/M/fkTKCSdK /Xx0kZMRn42aHz6y31npKMI0679yBebMtYD69MsXODu7Kp7QbRQINhxxgOXXZuiD5p Cd3QGVRUwkjTg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id E9D04693E9 for ; Fri, 16 Jan 2026 17:58:13 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qSa1bJiTWgt4 for ; Fri, 16 Jan 2026 17:58:13 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768611493; bh=HWK4SN2+4+NCRzXvOleU3wEXCDRIAYUfFzmaQcjWGxM=; h=From:To:Date:In-Reply-To:References:CC:Subject:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=a1C/oJo2HYFidqVpzWZ3hlVQMYCttyH/HmFaNTJViXxC447hwHCUd4crdx0Y5E0F3 lAJqmHTR8SD/EgWZtOFW5zbyL87Onc3swkw+ddHSxnYecatmN5Fs1/h7+lmU51B7jE l7I/9qoKHWYZyMe1FascA6PZTnDMyqPF4/aFHzNnn1/GeWm2/z5ptvJwOKcnJKmCpy Vz4P553lSWASBPYkZNSehW+i+vkMGDUuVR7d4ZjV2RwhALwh7l0eXmp/M/fkTKCSdK /Xx0kZMRn42aHz6y31npKMI0679yBebMtYD69MsXODu7Kp7QbRQINhxxgOXXZuiD5p Cd3QGVRUwkjTg== Received: from mail.u-boot.org (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id D9A19693E0 for ; Fri, 16 Jan 2026 17:58:13 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768611491; bh=D+nRfyjbTyXLAFQ/zHYhDWIXYDGqNYT+I/M4lpTdZ+w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uV0z7TqhBpX0hXKntmfcySI9ccVWVXYOIm75+usLwSfRpmDYO4HmrPlEPo72WtW9K UcmW4TneAFSuAjO7o2DvgzQLhaIcl/XymPTQERAri1kfX4BWIshdnvUDSO7OYEemZL 4fnJZTczyIYJMsEQrOvGmMBT2BwOSGx9mHWq5dUpHTXKrBUTxKhWtbH4op/8cnsFuA pvxfUwYhs7WCvgTlQTUUnNMg/bWYn3/swwdzf/v7OV9y2U4f7PD29vLq5StHiHfh6V YekbPq1EqwUUO0UU1fIUgDNrriM5ewF7VQHNRGnd1TMqAICVILX/RYUOcFwVLd6wOL siNKHjwsiMYVg== Received: from localhost (localhost [127.0.0.1]) by mail.u-boot.org (Postfix) with ESMTP id 60215693D7; Fri, 16 Jan 2026 17:58:11 -0700 (MST) X-Virus-Scanned: Debian amavis at Received: from mail.u-boot.org ([127.0.0.1]) by localhost (mail.u-boot.org [127.0.0.1]) (amavis, port 10026) with ESMTP id 00ozfmmPrNw7; Fri, 16 Jan 2026 17:58:11 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=u-boot.org; s=default; t=1768611487; bh=uRNEAUsHGlHCezx1BL03CnlmNqVOzCrWZ0Fsi+X0uc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aE/MngERYaK4swAr/srrTM7VFwOOTPsXmKfjGO9m7dpsfWCxngKgMtnfFfqnPeXZH EOy9nXq4rmduJXKO+kctFzU27aMVqA3TYcmNtqLdEfVoiyLtON7j96IOEJnnNVI5Pc qBJsi2NzhqExx4sBclpTU97dfxkLNng7WWYz5/y1lk13p8CCLk5cmmdTZqdDTAN0GV k04KiRz+zf89hlxnPdLDr47aSOfBgRnq+5xjrK2HXTqvwU+pkxzII0FUxdQ7g2EWQX Dv4TI+Js6RQTLd5eczzwpq8UCEZt+egKCe3fPKP8ul0m+WQSlFZfokJyss2VuvAWrj D4fcAPknIpdmg== Received: from u-boot.org (unknown [73.34.74.121]) by mail.u-boot.org (Postfix) with ESMTPSA id 12E5A693B1; Fri, 16 Jan 2026 17:58:07 -0700 (MST) From: Simon Glass To: U-Boot Concept Date: Fri, 16 Jan 2026 17:56:50 -0700 Message-ID: <20260117005702.1684841-13-sjg@u-boot.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260117005702.1684841-1-sjg@u-boot.org> References: <20260117005702.1684841-1-sjg@u-boot.org> MIME-Version: 1.0 Message-ID-Hash: UY7NA4XGOPLFSFXP4VMGQFTNFK2XGT7Z X-Message-ID-Hash: UY7NA4XGOPLFSFXP4VMGQFTNFK2XGT7Z X-MailFrom: sjg@u-boot.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Simon Glass , "Claude Opus 4 . 5" X-Mailman-Version: 3.3.10 Precedence: list Subject: [Concept] [PATCH 12/18] video: truetype: Use consistent ctx/com pattern List-Id: Discussion and patches related to U-Boot Concept Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Simon Glass Update functions to use a consistent pattern for accessing vidconsole context: - Use vidconsole_ctx(dev) to get console_tt_ctx pointer - Get vidconsole_ctx via &ctx->com This removes usage of vidconsole_ctx_from_priv() and the intermediate vc_priv variable, simplifying the code. Co-developed-by: Claude Opus 4.5 Signed-off-by: Simon Glass --- drivers/video/console_truetype.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c index bafd35c2370..db9f89797bf 100644 --- a/drivers/video/console_truetype.c +++ b/drivers/video/console_truetype.c @@ -264,7 +264,8 @@ struct console_tt_store { static int console_truetype_set_row(struct udevice *dev, uint row, int clr) { struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent); - struct vidconsole_ctx *com = vidconsole_ctx(dev); + struct console_tt_ctx *ctx = vidconsole_ctx(dev); + struct vidconsole_ctx *com = &ctx->com; struct console_tt_priv *priv = dev_get_priv(dev); void *end, *line; int font_height; @@ -411,11 +412,10 @@ static void clear_from(struct udevice *dev, int index) static int console_truetype_putc_xy(struct udevice *dev, uint x, uint y, int cp) { - struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev); struct video_priv *vid_priv = dev_get_uclass_priv(dev->parent); - struct vidconsole_ctx *com = vidconsole_ctx_from_priv(vc_priv); - struct console_tt_priv *priv = dev_get_priv(dev); struct console_tt_ctx *ctx = vidconsole_ctx(dev); + struct vidconsole_ctx *com = &ctx->com; + struct console_tt_priv *priv = dev_get_priv(dev); struct console_tt_metrics *met = priv->cur_met; stbtt_fontinfo *font; int width, height, xoff, yoff; @@ -914,8 +914,8 @@ static struct console_tt_metrics *find_metrics(struct udevice *dev, static void set_bitmap_font(struct udevice *dev, struct video_fontdata *fontdata) { - struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev); - struct vidconsole_ctx *ctx = vidconsole_ctx_from_priv(vc_priv); + struct console_tt_ctx *ctx = vidconsole_ctx(dev); + struct vidconsole_ctx *com = &ctx->com; struct console_tt_priv *priv = dev_get_priv(dev); priv->cur_fontdata = fontdata; @@ -923,13 +923,13 @@ static void set_bitmap_font(struct udevice *dev, vidconsole_set_bitmap_font(dev, fontdata); - ctx->tab_width_frac = VID_TO_POS(fontdata->width) * 8 / 2; + com->tab_width_frac = VID_TO_POS(fontdata->width) * 8 / 2; } static void select_metrics(struct udevice *dev, struct console_tt_metrics *met) { - struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev); - struct vidconsole_ctx *com = vidconsole_ctx_from_priv(vc_priv); + struct console_tt_ctx *ctx = vidconsole_ctx(dev); + struct vidconsole_ctx *com = &ctx->com; struct console_tt_priv *priv = dev_get_priv(dev); struct udevice *vid_dev = dev_get_parent(dev); struct video_priv *vid_priv = dev_get_uclass_priv(vid_dev); @@ -1215,10 +1215,9 @@ static int truetype_entry_restore(struct udevice *dev, struct abuf *buf) static int truetype_get_cursor_info(struct udevice *dev) { - struct vidconsole_priv *vc_priv = dev_get_uclass_priv(dev); - struct vidconsole_ctx *com = vidconsole_ctx_from_priv(vc_priv); - struct console_tt_priv *priv = dev_get_priv(dev); struct console_tt_ctx *ctx = vidconsole_ctx(dev); + struct vidconsole_ctx *com = &ctx->com; + struct console_tt_priv *priv = dev_get_priv(dev); struct vidconsole_cursor *curs = &com->curs; int x, y, index; uint height;