From: Simon Glass <simon.glass@canonical.com> Update console_set_font() to take a context parameter so it can set font properties for a specific context. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- drivers/video/console_core.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/video/console_core.c b/drivers/video/console_core.c index ff5d9f5964a..483639e65c4 100644 --- a/drivers/video/console_core.c +++ b/drivers/video/console_core.c @@ -18,14 +18,16 @@ * console_set_font() - prepare vidconsole for chosen font. * * @dev vidconsole device + * @ctx vidconsole context * @fontdata pointer to font data struct */ -static int console_set_font(struct udevice *dev, struct video_fontdata *fontdata) +static int console_set_font(struct udevice *dev, struct vidconsole_ctx *ctx, + struct video_fontdata *fontdata) { struct console_simple_priv *priv = dev_get_priv(dev); priv->fontdata = fontdata; - vidconsole_set_bitmap_font(dev, vidconsole_ctx(dev), fontdata); + vidconsole_set_bitmap_font(dev, ctx, fontdata); return 0; } @@ -304,7 +306,7 @@ int console_probe(struct udevice *dev) { int ret; - ret = console_set_font(dev, fonts); + ret = console_set_font(dev, vidconsole_ctx(dev), fonts); if (ret) return ret; @@ -373,13 +375,13 @@ int console_simple_select_font(struct udevice *dev, void *ctx, const char *name, if (!name) { if (fonts->name) - console_set_font(dev, fonts); + console_set_font(dev, ctx, fonts); return 0; } for (font = fonts; font->name; font++) { if (!strcmp(name, font->name)) { - console_set_font(dev, font); + console_set_font(dev, ctx, font); return 0; } }; -- 2.43.0