From: Simon Glass <simon.glass@canonical.com> Change cli_index_adjust() to take a struct vidconsole_ctx pointer instead of struct vidconsole_priv, since cli_index is now part of the context structure. Update all callers accordingly. Co-developed-by: Claude Opus 4.5 <noreply@anthropic.com> Signed-off-by: Simon Glass <simon.glass@canonical.com> --- drivers/video/vidconsole-uclass.c | 4 ++-- include/video_console.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index eda55fcf04e..ed9311bd05e 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -85,7 +85,7 @@ static int vidconsole_back(struct udevice *dev) ctx->ycur = 0; } assert(ctx->cli_index); - cli_index_adjust(priv, -1); + cli_index_adjust(ctx, -1); return video_sync(dev->parent, false); } @@ -478,7 +478,7 @@ static int vidconsole_output_glyph(struct udevice *dev, int ch) ctx->last_ch = ch; if (ctx->xcur_frac >= ctx->xsize_frac) vidconsole_newline(dev); - cli_index_adjust(priv, 1); + cli_index_adjust(ctx, 1); return 0; } diff --git a/include/video_console.h b/include/video_console.h index 43b894048ed..d3e8b3f3c9f 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -612,10 +612,10 @@ static inline void vidconsole_readline_end(void) } #endif /* CONFIG_CURSOR */ -static inline void cli_index_adjust(struct vidconsole_priv *priv, int by) +static inline void cli_index_adjust(struct vidconsole_ctx *ctx, int by) { if (CONFIG_IS_ENABLED(CURSOR)) - priv->ctx.cli_index += by; + ctx->cli_index += by; } /** -- 2.43.0