* 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 <stepan@coresystems.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4473 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c
index 4370b280f14696143ae4d8177993d9c0ac135332..92a96f869609a788095e91a735d656d784683d5e 100644 (file)
--- 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 87b16b8a31c502ac1858ac8cd2e1cda697394107..1eadce61cba88480676740558ff737b6fd172053 100644 (file)
--- 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 bcc3d5fbab5f1937c340a4b41a5affb8fe20d245..3b3a1563fd76fd23f79a186c83a3a1ac6bde5736 100644 (file)
--- 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