diff options
author | Alessandro Rubini <rubini@unipv.it> | 2009-10-10 11:51:26 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2009-10-18 23:10:43 +0200 |
commit | 8c0a92c8f4cf399e873c2611939f3617983785a9 (patch) | |
tree | d82e13a1847981ba9c357128383386d430d33edd /common/lcd.c | |
parent | e3ea948d4588e7efddbf0ee92147d93f827d7cea (diff) | |
download | u-boot-8c0a92c8f4cf399e873c2611939f3617983785a9.tar.gz |
lcd: remove '#if 0' 32-bit scroll, now memcpy does it
Signed-off-by: Alessandro Rubini <rubini@unipv.it>
Acked-by: Andrea Gallo <andrea.gallo@stericsson.com>
Diffstat (limited to 'common/lcd.c')
-rw-r--r-- | common/lcd.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/common/lcd.c b/common/lcd.c index dc8fea6694..4e316183db 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -99,32 +99,11 @@ static int lcd_getfgcolor (void); static void console_scrollup (void) { -#if 1 /* Copy up rows ignoring the first one */ memcpy (CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND, CONSOLE_SCROLL_SIZE); /* Clear the last one */ memset (CONSOLE_ROW_LAST, COLOR_MASK(lcd_color_bg), CONSOLE_ROW_SIZE); -#else - /* - * Poor attempt to optimize speed by moving "long"s. - * But the code is ugly, and not a bit faster :-( - */ - ulong *t = (ulong *)CONSOLE_ROW_FIRST; - ulong *s = (ulong *)CONSOLE_ROW_SECOND; - ulong l = CONSOLE_SCROLL_SIZE / sizeof(ulong); - uchar c = lcd_color_bg & 0xFF; - ulong val= (c<<24) | (c<<16) | (c<<8) | c; - - while (l--) - *t++ = *s++; - - t = (ulong *)CONSOLE_ROW_LAST; - l = CONSOLE_ROW_SIZE / sizeof(ulong); - - while (l-- > 0) - *t++ = val; -#endif } /*----------------------------------------------------------------------*/ |