From: Simon Glass <sjg@chromium.org> Now that both console drivers use the CLI index, we don't need the extra parameters for this. Drop them. Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/scene_textline.c | 3 +-- drivers/video/vidconsole-uclass.c | 4 ++-- include/video_console.h | 12 +++--------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/boot/scene_textline.c b/boot/scene_textline.c index 3d4269a8e05..7e01959c40d 100644 --- a/boot/scene_textline.c +++ b/boot/scene_textline.c @@ -214,8 +214,7 @@ int scene_textline_render_deps(struct scene *scn, if (ret) return log_msg_ret("sav", ret); - vidconsole_show_cursor(cons, txt->obj.bbox.x0, - txt->obj.bbox.y0, scn->cls.num); + vidconsole_show_cursor(cons); } return 0; diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index f62e34673db..15b62d160cd 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -712,7 +712,7 @@ int vidconsole_entry_restore(struct udevice *dev, struct abuf *buf) } #ifdef CONFIG_CURSOR -int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, uint index) +int vidconsole_show_cursor(struct udevice *dev) { struct vidconsole_priv *priv = dev_get_uclass_priv(dev); struct vidconsole_ops *ops = vidconsole_get_ops(dev); @@ -747,7 +747,7 @@ int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, uint index) curs->height); } - priv->curs.visible = true; + curs->visible = true; return 0; } diff --git a/include/video_console.h b/include/video_console.h index 669292c97d7..b40253b218d 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -451,17 +451,12 @@ int vidconsole_entry_restore(struct udevice *dev, struct abuf *buf); /** * vidconsole_show_cursor() - Show the cursor * - * Shows a cursor at the specified position. The position is passed in, but for - * the truetype console it is not actually used, since it tracks where the - * cursor must go. + * Shows a cursor at the current position. * * @dev: Console device to use - * @x: X position in pixels - * @y: Y position in pixels - * @index: Character position (0 = at start) * Return: 0 if OK, -ve on error */ -int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, uint index); +int vidconsole_show_cursor(struct udevice *dev); /** * vidconsole_readline_start() - Enable cursor for all video consoles @@ -481,8 +476,7 @@ void vidconsole_readline_start(bool indent); */ void vidconsole_readline_end(void); #else -static inline int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, - uint index) +static inline int vidconsole_show_cursor(struct udevice *dev) { return 0; } -- 2.43.0