From: Simon Glass <sjg@chromium.org> There is only one user of this function. Update it to use the new vidconsole_show_cursor() instead. Remove the now-unused vidconsole_set_cursor_visible() Signed-off-by: Simon Glass <sjg@chromium.org> --- boot/scene_textline.c | 4 ++-- drivers/video/vidconsole-uclass.c | 13 ------------- include/video_console.h | 24 +----------------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/boot/scene_textline.c b/boot/scene_textline.c index ba39cfb7cee..3d4269a8e05 100644 --- a/boot/scene_textline.c +++ b/boot/scene_textline.c @@ -214,8 +214,8 @@ int scene_textline_render_deps(struct scene *scn, if (ret) return log_msg_ret("sav", ret); - vidconsole_set_cursor_visible(cons, true, txt->obj.bbox.x0, - txt->obj.bbox.y0, scn->cls.num); + vidconsole_show_cursor(cons, txt->obj.bbox.x0, + txt->obj.bbox.y0, scn->cls.num); } return 0; diff --git a/drivers/video/vidconsole-uclass.c b/drivers/video/vidconsole-uclass.c index 9ab331af68a..65c912a4f6f 100644 --- a/drivers/video/vidconsole-uclass.c +++ b/drivers/video/vidconsole-uclass.c @@ -751,19 +751,6 @@ int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, uint index) return 0; } -int vidconsole_set_cursor_visible(struct udevice *dev, bool visible, - uint x, uint y, uint index) -{ - if (visible) { - int ret; - - ret = vidconsole_show_cursor(dev, x, y, index); - if (ret) - return ret; - } - - return 0; -} #endif /* CONFIG_CURSOR */ int vidconsole_mark_start(struct udevice *dev) diff --git a/include/video_console.h b/include/video_console.h index af2b8499bb4..0b8742c5ee9 100644 --- a/include/video_console.h +++ b/include/video_console.h @@ -466,21 +466,6 @@ int vidconsole_entry_restore(struct udevice *dev, struct abuf *buf); */ int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, uint index); -/** - * vidconsole_set_cursor_visible() - Show or hide the cursor - * - * Shows or hides a cursor at the current position - * - * @dev: Console device to use - * @visible: true to show the cursor, false to hide it - * @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_set_cursor_visible(struct udevice *dev, bool visible, - uint x, uint y, uint index); - /** * vidconsole_readline_start() - Enable cursor for all video consoles * @@ -505,13 +490,6 @@ static inline int vidconsole_show_cursor(struct udevice *dev, uint x, uint y, return 0; } -static inline int vidconsole_set_cursor_visible(struct udevice *dev, - bool visible, uint x, uint y, - uint index) -{ - return 0; -} - static inline void vidconsole_readline_start(bool indent) { } @@ -519,7 +497,6 @@ static inline void vidconsole_readline_start(bool indent) static inline void vidconsole_readline_end(void) { } - #endif /* CONFIG_CURSOR */ static inline void cli_index_adjust(struct vidconsole_priv *priv, int by) @@ -529,6 +506,7 @@ static inline void cli_index_adjust(struct vidconsole_priv *priv, int by) } /** + * vidconsole_push_colour() - Temporarily change the font colour * * @dev: Device to adjust -- 2.43.0