sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

svn_rev_398 

remove disable_ctrlc(), had_ctrlc() and clear_ctrlc()
This commit is contained in:
Sascha Hauer 2007-07-05 18:01:50 +02:00 committed by Sascha Hauer
parent d402b885ce
commit 32f3bba54f
1 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
common/console.c
View File

@ -54,11 +54,10 @@ int console_register(struct console_device *newcdev)
int getc (void)
{
struct console_device *cdev = NULL;
while (1) {
if (!cdev)
cdev = first_console;
if (cdev->flags & CONSOLE_STDIN && !cdev->tstc(cdev))
if (cdev->flags & CONSOLE_STDIN && cdev->tstc(cdev))
return cdev->getc(cdev);
cdev = cdev->next;
}
@ -73,7 +72,7 @@ int fgetc(int fd)
return read(fd, &c, 1);
}
int tstc (void)
int tstc(void)
{
struct console_device *cdev = first_console;
@ -169,42 +168,10 @@ void vprintf (const char *fmt, va_list args)
}
/* test if ctrl-c was pressed */
static int ctrlc_disabled = 0; /* see disable_ctrl() */
static int ctrlc_was_pressed = 0;
int ctrlc (void)
{
if (!ctrlc_disabled) {
if (tstc ()) {
switch (getc ()) {
case 0x03: /* ^C - Control C */
ctrlc_was_pressed = 1;
return 1;
default:
break;
}
}
}
if (tstc() && getc() == 3)
return 1;
return 0;
}
/* pass 1 to disable ctrlc() checking, 0 to enable.
* returns previous state
*/
int disable_ctrlc (int disable)
{
int prev = ctrlc_disabled; /* save previous state */
ctrlc_disabled = disable;
return prev;
}
int had_ctrlc (void)
{
return ctrlc_was_pressed;
}
void clear_ctrlc (void)
{
ctrlc_was_pressed = 0;
}