diff mbox

[U-Boot,2/3] common/lcd.c: reduce some CONFIG_LCD_*_LOGO ifdefs

Message ID 1335537676-4927-1-git-send-email-agust@denx.de
State Accepted
Commit 0f999c49e5647ede23cfb1ee2b83da8d8a76297b
Delegated to: Anatolij Gustschin
Headers show

Commit Message

Anatolij Gustschin April 27, 2012, 2:41 p.m. UTC 
Move CONFIG_LCD_LOGO && !CONFIG_LCD_INFO_BELOW_LOGO ifdefs
to lcd_drawchars() func.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
---
 common/lcd.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

Comments

Anatolij Gustschin May 24, 2012, 8:59 p.m. UTC | #1 
On Fri, 27 Apr 2012 16:41:16 +0200
Anatolij Gustschin <agust@denx.de> wrote:

> Move CONFIG_LCD_LOGO && !CONFIG_LCD_INFO_BELOW_LOGO ifdefs
> to lcd_drawchars() func.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> ---
>  common/lcd.c |   16 ++++++----------
>  1 files changed, 6 insertions(+), 10 deletions(-)

Appied to u-boot-video/master.
diff mbox

Patch

diff --git a/common/lcd.c b/common/lcd.c
index 0ea45d0..ab78525 100644
--- a/common/lcd.c
+++ b/common/lcd.c
@@ -216,6 +216,10 @@  static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
 	uchar *dest;
 	ushort row;
 
+#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
+	y += BMP_LOGO_HEIGHT;
+#endif
+
 #if LCD_BPP == LCD_MONOCHROME
 	ushort off  = x * (1 << LCD_BPP) % 8;
 #endif
@@ -271,22 +275,14 @@  static void lcd_drawchars (ushort x, ushort y, uchar *str, int count)
 
 static inline void lcd_puts_xy (ushort x, ushort y, uchar *s)
 {
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
-	lcd_drawchars (x, y+BMP_LOGO_HEIGHT, s, strlen ((char *)s));
-#else
-	lcd_drawchars (x, y, s, strlen ((char *)s));
-#endif
+	lcd_drawchars(x, y, s, strlen((char *)s));
 }
 
 /*----------------------------------------------------------------------*/
 
 static inline void lcd_putc_xy (ushort x, ushort y, uchar c)
 {
-#if defined(CONFIG_LCD_LOGO) && !defined(CONFIG_LCD_INFO_BELOW_LOGO)
-	lcd_drawchars (x, y+BMP_LOGO_HEIGHT, &c, 1);
-#else
-	lcd_drawchars (x, y, &c, 1);
-#endif
+	lcd_drawchars(x, y, &c, 1);
 }
 
 /************************************************************************/