dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

console: Remember if ctrlc is disabled in console_tstc()

Browse Source 
We don't necessarily want to re-enable ctrl-c if it was already disabled
when calling tstc().

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Joe Hershberger
2018-07-02 20:06:48 -05:00
parent 08fcdd332f
commit b2f58d8ee0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/console.c
View File

@@ -196,20 +196,21 @@ static int console_tstc(int file)
{ {
int i, ret; int i, ret;
struct stdio_dev *dev; struct stdio_dev *dev;
int prev;
disable_ctrlc(1); prev = disable_ctrlc(1);
for (i = 0; i < cd_count[file]; i++) { for (i = 0; i < cd_count[file]; i++) {
dev = console_devices[file][i]; dev = console_devices[file][i];
if (dev->tstc != NULL) { if (dev->tstc != NULL) {
ret = dev->tstc(dev); ret = dev->tstc(dev);
if (ret > 0) { if (ret > 0) {
tstcdev = dev; tstcdev = dev;
disable_ctrlc(0); disable_ctrlc(prev);
return ret; return ret;
} }
} }
} }
disable_ctrlc(0); disable_ctrlc(prev);
return 0; return 0;
} }