Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 20:58:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

video: Add a function to clear the display

Browse source 
Move the code from the 'cls' command into the console file, so it can
be called from elsewhere.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2023-10-01 19:15:23 -06:00 • committed by Tom Rini
parent c0e708eb9f
commit cde03fa23e
3 changed files with 44 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmd/cls.c
View file

@ -7,33 +7,14 @@
*/ */
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <console.h>
#include <dm.h> #include <dm.h>
#include <video_console.h>
#define CSI "\x1b["
static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc,
char *const argv[]) char *const argv[])
{ {
__maybe_unused struct udevice *dev; if (console_clear())
return CMD_RET_FAILURE;
/*
* Send clear screen and home
*
* FIXME(Heinrich Schuchardt <xypron.glpk@gmx.de>): This should go
* through an API and only be written to serial terminals, not video
* displays
*/
printf(CSI "2J" CSI "1;1H");
if (IS_ENABLED(CONFIG_VIDEO_ANSI))
return 0;
if (IS_ENABLED(CONFIG_VIDEO)) {
if (uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev))
return CMD_RET_FAILURE;
if (vidconsole_clear_and_reset(dev))
return CMD_RET_FAILURE;
}
return CMD_RET_SUCCESS; return CMD_RET_SUCCESS;
} }

31
common/console.c
View file

@ -19,12 +19,15 @@
#include <stdio_dev.h> #include <stdio_dev.h>
#include <exports.h> #include <exports.h>
#include <env_internal.h> #include <env_internal.h>
#include <video_console.h>
#include <watchdog.h> #include <watchdog.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <linux/delay.h> #include <linux/delay.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#define CSI "\x1b["
static int on_console(const char *name, const char *value, enum env_op op, static int on_console(const char *name, const char *value, enum env_op op,
int flags) int flags)
{ {
@ -1010,6 +1013,34 @@ int console_init_f(void)
return 0; return 0;
} }
int console_clear(void)
{
/*
* Send clear screen and home
*
* FIXME(Heinrich Schuchardt <xypron.glpk@gmx.de>): This should go
* through an API and only be written to serial terminals, not video
* displays
*/
printf(CSI "2J" CSI "1;1H");
if (IS_ENABLED(CONFIG_VIDEO_ANSI))
return 0;
if (IS_ENABLED(CONFIG_VIDEO)) {
struct udevice *dev;
int ret;
ret = uclass_first_device_err(UCLASS_VIDEO_CONSOLE, &dev);
if (ret)
return ret;
ret = vidconsole_clear_and_reset(dev);
if (ret)
return ret;
}
return 0;
}
static void stdio_print_current_devices(void) static void stdio_print_current_devices(void)
{ {
char *stdinname, *stdoutname, *stderrname; char *stdinname, *stdoutname, *stderrname;

10
include/console.h
View file

@ -156,6 +156,16 @@ int console_announce_r(void);
*/ */
void console_puts_select_stderr(bool serial_only, const char *s); void console_puts_select_stderr(bool serial_only, const char *s);
/**
* console_clear() - Clear the console
*
* Uses an ANSI sequence to clear the display, failing back to clearing the
* video display directly if !CONFIG_VIDEO_ANSI
*
* Return: 0 if OK, -ve on error
*/
int console_clear(void);
/* /*
* CONSOLE multiplexing. * CONSOLE multiplexing.
*/ */