From: Simon Glass <simon.glass@canonical.com> Add a ctx parameter to the internal vidconsole_output_glyph() function to allow passing in a specific vidconsole context. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- drivers/video/vidconsole-uclass.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index ec78068f734..cc244a3aad7 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -454,10 +454,9 @@ error: } /* Put that actual character on the screen (using the UTF-32 code points). */ -static int vidconsole_output_glyph(struct udevice *dev, int ch) +static int vidconsole_output_glyph(struct udevice *dev, + struct vidconsole_ctx *ctx, int ch) { - struct vidconsole_priv *priv = dev_get_uclass_priv(dev); - struct vidconsole_ctx *ctx = vidconsole_ctx_from_priv(priv); int ret; if (_DEBUG) { @@ -473,7 +472,8 @@ static int vidconsole_output_glyph(struct udevice *dev, int ch) ret = vidconsole_putc_xy(dev, ctx, ctx->xcur_frac, ctx->ycur, ch); if (ret == -EAGAIN) { vidconsole_newline(dev, ctx); - ret = vidconsole_putc_xy(dev, ctx, ctx->xcur_frac, ctx->ycur, ch); + ret = vidconsole_putc_xy(dev, ctx, ctx->xcur_frac, ctx->ycur, + ch); } if (ret < 0) return ret; @@ -535,7 +535,7 @@ int vidconsole_put_char(struct udevice *dev, char ch) } else { cp = ch; } - ret = vidconsole_output_glyph(dev, cp); + ret = vidconsole_output_glyph(dev, ctx, cp); if (ret < 0) return ret; break; -- 2.43.0