diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:49 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-05-10 18:15:49 +0200 |
| commit | 8e8412601f5534abe5a57c4b6d62ab9fb5550ea9 (patch) | |
| tree | 4f2285fdca21c2bcf11efd3c118aa3d84337b5c2 /include | |
| parent | f44e7eebd5e3022af5659baf81fcdbfe5ce44268 (diff) | |
| parent | 90df2a955e3c66fee2c59f67d9274e6a9addd9ce (diff) | |
| download | barebox-8e8412601f5534abe5a57c4b6d62ab9fb5550ea9.tar.gz barebox-8e8412601f5534abe5a57c4b6d62ab9fb5550ea9.tar.xz | |
Merge branch 'for-next/ctrlc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 4 | ||||
| -rw-r--r-- | include/console.h | 3 | ||||
| -rw-r--r-- | include/console_countdown.h | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/include/common.h b/include/common.h index 11d26cb3db..723b9c706c 100644 --- a/include/common.h +++ b/include/common.h @@ -68,7 +68,9 @@ int readline (const char *prompt, char *buf, int len); long get_ram_size (volatile long *, long); /* common/console.c */ -int ctrlc (void); +int ctrlc(void); +int arch_ctrlc(void); +void ctrlc_handled(void); #ifdef ARCH_HAS_STACK_DUMP void dump_stack(void); diff --git a/include/console.h b/include/console.h index 673921331d..4062e5abf6 100644 --- a/include/console.h +++ b/include/console.h @@ -207,4 +207,7 @@ static inline void pbl_set_putc(void (*putcf)(void *ctx, int c), void *ctx) {} bool console_allow_color(void); +void console_ctrlc_allow(void); +void console_ctrlc_forbid(void); + #endif diff --git a/include/console_countdown.h b/include/console_countdown.h index c6c2d5c00e..88cadf11ec 100644 --- a/include/console_countdown.h +++ b/include/console_countdown.h @@ -7,7 +7,7 @@ #define CONSOLE_COUNTDOWN_CTRLC (1 << 4) #define CONSOLE_COUNTDOWN_EXTERN (1 << 5) -int console_countdown(int timeout_s, unsigned flags, char *out_key); +int console_countdown(int timeout_s, unsigned flags, const char *keys, char *out_key); void console_countdown_abort(void); #endif /* __CONSOLE_COUNTDOWN_H */ |