diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 1 | ||||
| -rw-r--r-- | common/console_countdown.c | 67 | ||||
| -rw-r--r-- | common/env.c | 12 |
3 files changed, 75 insertions, 5 deletions
diff --git a/common/Makefile b/common/Makefile index eca1e3533c..2738238c67 100644 --- a/common/Makefile +++ b/common/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_CMD_MEMTEST) += memtest.o obj-$(CONFIG_COMMAND_SUPPORT) += command.o obj-$(CONFIG_CONSOLE_FULL) += console.o obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o +obj-y += console_countdown.o obj-$(CONFIG_DDR_SPD) += ddr_spd.o obj-$(CONFIG_ENV_HANDLING) += environment.o obj-$(CONFIG_ENVIRONMENT_VARIABLES) += env.o diff --git a/common/console_countdown.c b/common/console_countdown.c new file mode 100644 index 0000000000..ffbdb4fa2d --- /dev/null +++ b/common/console_countdown.c @@ -0,0 +1,67 @@ +/* + * console_countdown - contdown on the console - interruptible by a keypress + * + * Copyright (c) 2007 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <clock.h> +#include <command.h> +#include <errno.h> +#include <console_countdown.h> +#include <stdio.h> + +int console_countdown(int timeout_s, unsigned flags, char *out_key) +{ + uint64_t start, second; + int countdown, ret = -EINTR; + int key = 0; + + start = get_time_ns(); + second = start; + + countdown = timeout_s; + + if (!(flags & CONSOLE_COUNTDOWN_SILENT)) + printf("%2d", countdown--); + + do { + if (tstc()) { + key = getc(); + if (flags & CONSOLE_COUNTDOWN_ANYKEY) + goto out; + if (flags & CONSOLE_COUNTDOWN_RETURN && key == '\n') + goto out; + if (flags & CONSOLE_COUNTDOWN_CTRLC && key == 3) + goto out; + key = 0; + } + if (!(flags & CONSOLE_COUNTDOWN_SILENT) && + is_timeout(second, SECOND)) { + printf("\b\b%2d", countdown--); + second += SECOND; + } + } while (!is_timeout(start, timeout_s * SECOND)); + + ret = 0; + + out: + if (!(flags & CONSOLE_COUNTDOWN_SILENT)) + printf("\n"); + if (key && out_key) + *out_key = key; + + return ret; +} diff --git a/common/env.c b/common/env.c index 2e33eb3585..c98ed73f9b 100644 --- a/common/env.c +++ b/common/env.c @@ -218,16 +218,18 @@ int setenv(const char *_name, const char *value) *par++ = 0; dev = get_device_by_name(name); - if (dev) + if (dev) { ret = dev_set_param(dev, par, value); - else + if (ret) + eprintf("%s: set parameter %s: %s\n", + dev_name(dev), par, strerror(-ret)); + } else { ret = -ENODEV; + eprintf("set parameter: no such device %s\n", name); + } errno = -ret; - if (ret < 0) - perror("set parameter"); - goto out; } |