From: Alessandro Rubini Date: Sat, 10 Oct 2009 09:51:26 +0000 (+0200) Subject: lcd: remove '#if 0' 32-bit scroll, now memcpy does it X-Git-Tag: v2009.11-rc1~19 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8c0a92c8f4cf399e873c2611939f3617983785a9;p=u-boot lcd: remove '#if 0' 32-bit scroll, now memcpy does it Signed-off-by: Alessandro Rubini Acked-by: Andrea Gallo --- 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 } /*----------------------------------------------------------------------*/