diff options
| author | Simon Glass <sjg@chromium.org> | 2014-02-27 13:26:22 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-03-17 20:05:49 -0600 |
| commit | ffb87905cb3883c84598b87ca05384c17d59dee1 (patch) | |
| tree | 34a10775e3d35c5ebf5432222443094025cb14bb /arch/sandbox/cpu/os.c | |
| parent | 20f86a0aeaad5dfa0b4f50bf5d04dd7bf1f7c3e9 (diff) | |
| download | olio-uboot-2014.01-ffb87905cb3883c84598b87ca05384c17d59dee1.tar.xz olio-uboot-2014.01-ffb87905cb3883c84598b87ca05384c17d59dee1.zip | |
sandbox: Allow Ctrl-C to work in sandbox
It is useful for Cltl-C to be handled by U-Boot as it is on other boards.
But it is also useful to be able to terminate U-Boot with Ctrl-C.
Add an option to enable signals while in raw mode, and make this the
default. Add an option to leave the terminal cooked, which is useful for
redirecting output.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/sandbox/cpu/os.c')
| -rw-r--r-- | arch/sandbox/cpu/os.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 52e1096f3..9de71bb2b 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -104,21 +104,22 @@ void os_exit(int exit_code) /* Restore tty state when we exit */ static struct termios orig_term; +static bool term_setup; static void os_fd_restore(void) { - tcsetattr(0, TCSANOW, &orig_term); + if (term_setup) + tcsetattr(0, TCSANOW, &orig_term); } /* Put tty into raw mode so <tab> and <ctrl+c> work */ -void os_tty_raw(int fd) +void os_tty_raw(int fd, bool allow_sigs) { - static int setup = 0; struct termios term; - if (setup) + if (term_setup) return; - setup = 1; + term_setup = true; /* If not a tty, don't complain */ if (tcgetattr(fd, &orig_term)) @@ -128,7 +129,7 @@ void os_tty_raw(int fd) term.c_iflag = IGNBRK | IGNPAR; term.c_oflag = OPOST | ONLCR; term.c_cflag = CS8 | CREAD | CLOCAL; - term.c_lflag = 0; + term.c_lflag = allow_sigs ? ISIG : 0; if (tcsetattr(fd, TCSANOW, &term)) return; |