From 131c0070a3b224e8ec2c817444f1ae4cf2419193 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 31 Jul 2009 11:38:59 +0000 Subject: [PATCH] * drop duplicate prototype for lib_get_sysinfo() * fix delay handling in tiny curses keyboard driver * fix off by one error in video driver Signed-off-by: Stefan Reinauer Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4473 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/curses/keyboard.c | 10 ++++++---- payloads/libpayload/drivers/video/video.c | 2 +- payloads/libpayload/include/sysinfo.h | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index 4370b280f1..92a96f8696 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -179,7 +179,7 @@ static int curses_getchar(int delay) break; if (delay > 0) { - mdelay(100); + mdelay(1); delay--; } @@ -195,15 +195,17 @@ int wgetch(WINDOW *win) { int delay = -1; - if (_halfdelay || win->_delay) - delay = win->_delay ? 0 : _halfdelay; + if (_halfdelay) + delay = _halfdelay; + else + delay = win->_delay; return curses_getchar(delay); } int nodelay(WINDOW *win, NCURSES_BOOL flag) { - win->_delay = flag ? 1 : 0; + win->_delay = flag ? 0 : -1; return 0; } diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c index 87b16b8a31..1eadce61cb 100644 --- a/payloads/libpayload/drivers/video/video.c +++ b/payloads/libpayload/drivers/video/video.c @@ -66,7 +66,7 @@ static void video_console_fixup_cursor(void) if (cursory < 0) cursory = 0; - if (cursorx > VIDEO_COLS) { + if (cursorx >= VIDEO_COLS) { cursorx = 0; cursory++; } diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index bcc3d5fbab..3b3a1563fd 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -54,7 +54,6 @@ struct sysinfo_t { }; extern struct sysinfo_t lib_sysinfo; -void lib_get_sysinfo(void); #endif