From 36ae96d649785f198b485021d6f9ec30e896adef Mon Sep 17 00:00:00 2001 From: okuji Date: Fri, 13 Sep 2002 11:27:41 +0000 Subject: [PATCH] 2002-09-13 Yoshinori K. Okuji * stage2/serial.c (fill_input_buf): Take a new argument NOWAIT. If NOWAIT is true, don't loop. All callers are changed. --- ChangeLog | 6 ++++++ stage2/serial.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b15af8d04..5aa74a3f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-09-13 Yoshinori K. Okuji + + * stage2/serial.c (fill_input_buf): Take a new argument NOWAIT. + If NOWAIT is true, don't loop. + All callers are changed. + 2002-09-08 Yoshinori K. Okuji * configure.in (--disable-serial): Fix a typo in the diff --git a/stage2/serial.c b/stage2/serial.c index 8cc244ef6..32ad20be3 100644 --- a/stage2/serial.c +++ b/stage2/serial.c @@ -260,7 +260,7 @@ serial_translate_key_sequence (void) } static -int fill_input_buf (void) +int fill_input_buf (int nowait) { int i; @@ -276,6 +276,9 @@ int fill_input_buf (void) /* Reset the counter to zero, to wait for the same interval. */ i = 0; } + + if (nowait) + break; } /* Translate some key sequences. */ @@ -290,7 +293,7 @@ serial_getkey (void) { int c; - while (! fill_input_buf ()) + while (! fill_input_buf (0)) ; c = input_buf[0]; @@ -304,7 +307,7 @@ serial_getkey (void) int serial_checkkey (void) { - if (fill_input_buf ()) + if (fill_input_buf (1)) return input_buf[0]; return -1;