[v2] r4473 - in trunk/payloads/libpayload: curses drivers/video include

Author: stepan
Date: 2009-07-31 13:38:59 +0200 (Fri, 31 Jul 2009)
New Revision: 4473

Modified:
   trunk/payloads/libpayload/curses/keyboard.c
   trunk/payloads/libpayload/drivers/video/video.c
   trunk/payloads/libpayload/include/sysinfo.h
Log:
* 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

Modified: trunk/payloads/libpayload/curses/keyboard.c
===================================================================
--- trunk/payloads/libpayload/curses/keyboard.c	2009-07-28 01:23:32 UTC (rev 4472)
+++ trunk/payloads/libpayload/curses/keyboard.c	2009-07-31 11:38:59 UTC (rev 4473)
@@ -179,7 +179,7 @@
    		break;

if (delay > 0) {
-			mdelay(100);
+			mdelay(1);
    		delay--;
    	}

@@ -195,15 +195,17 @@
 {
    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;
 }

Modified: trunk/payloads/libpayload/drivers/video/video.c
===================================================================
--- trunk/payloads/libpayload/drivers/video/video.c	2009-07-28 01:23:32 UTC (rev 4472)
+++ trunk/payloads/libpayload/drivers/video/video.c	2009-07-31 11:38:59 UTC (rev 4473)
@@ -66,7 +66,7 @@
    if (cursory < 0)
    	cursory = 0;

-	if (cursorx > VIDEO_COLS) {
+	if (cursorx >= VIDEO_COLS) {
    	cursorx = 0;
    	cursory++;
    }

Modified: trunk/payloads/libpayload/include/sysinfo.h
===================================================================
--- trunk/payloads/libpayload/include/sysinfo.h	2009-07-28 01:23:32 UTC (rev 4472)
+++ trunk/payloads/libpayload/include/sysinfo.h	2009-07-31 11:38:59 UTC (rev 4473)
@@ -54,7 +54,6 @@
 };

extern struct sysinfo_t lib_sysinfo;
-void lib_get_sysinfo(void);

#endif