cleanup and refactor lcd.c

Rename console_(row|col) to console_curr_(row|col) to make their meaning clearer and distinguish them from CONSOLE_(COLS|ROWS).

This is a preparatory step for extracting lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Simon Glass <[email protected]>

Cc Anatolij Gustschin <[email protected]>

---
Changes in V2:
- New patch.

Quoted 6 lines · Nikita Kiryanov

Replace CONSOLE_(ROWS|COLS) macros with variables, and assign the original macro values.

This is a preparatory step for extracting lcd console code into its own file.

Quoted 6 lines

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Anatolij Gustschin <[email protected]>

Cc Simon Glass <[email protected]>

---
Changes in V2:
- New patch.

Are you intended to want to support multiple displays, or just to change the resolution after start?

Acked-by Simon Glass <[email protected]>

Tested on pit, LCD works fine.

Tested-by Simon Glass <[email protected]>

Replace CONSOLE_(ROWS|COLS) macros with variables, and assign the original macro values.

This is a preparatory step for extracting lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Anatolij Gustschin <[email protected]>

Cc Simon Glass <[email protected]>

Introduce set_console_row(), set_console_col(), and lcd_init_console(). Use these functions in lcd functions: lcd_init(), lcd_clear(), lcd_logo().

This is a preparatory step for extracting lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Anatolij Gustschin <[email protected]>

Cc Simon Glass <[email protected]>

---
Changes in V2:
- New patch.

COLOR_MASK macro doesn't do anything; Remove it to reduce visual complexity.

This is a preparatory step for extracting lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Anatolij Gustschin <[email protected]>

Cc Simon Glass <[email protected]>

---
Changes in V2:
- New patch.

Introduce lcd_getbgcolor() and lcd_getfgcolor(), and use them where applicable.

This is a preparatory step for extracting lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

c: Anatolij Gustschin <[email protected]>
Cc: Simon Glass <[email protected]>
---
Changes in V2:
- New patch.

 common/lcd.c  | 20 +++++++++++++++-----
 include/lcd.h | 14 ++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

common/lcd.c +2 -2

index f98aaaf..a75c616 100644
@@ -186,7 +186,7 @@ static void console_scrollup(void)
        /* Clear the last rows */
 #if (LCD_BPP != LCD_COLOR32)
        memset(lcd_console_address + CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows,
-               lcd_color_bg,
+               lcd_getbgcolor(),
                CONSOLE_ROW_SIZE * rows);
 #else
        u32 *ppix = lcd_console_address +

@@ -195,7 +195,7 @@ static void console_scrollup(void)
        for (i = 0;
            i < (CONSOLE_ROW_SIZE * rows) / NBYTES(panel_info.vl_bpix);
            i++) {
-               *ppix++ = lcd_color_bg;
+               *ppix++ = lcd_getbgcolor();
        }
 #endif
        lcd_sync();

common/lcd.c +12 -2

                                bits <<= 1;
                        }
                }

@@ -460,7 +460,7 @@ void lcd_clear(void)
        /* set framebuffer to background color */
 #if (LCD_BPP != LCD_COLOR32)
        memset((char *)lcd_base,
-               lcd_color_bg,
+               lcd_getbgcolor(),
                lcd_line_length * panel_info.vl_row);
 #else
        u32 *ppix = lcd_base;

@@ -468,7 +468,7 @@ void lcd_clear(void)
        for (i = 0;
           i < (lcd_line_length * panel_info.vl_row)/NBYTES(panel_info.vl_bpix);
           i++) {
-               *ppix++ = lcd_color_bg;
+               *ppix++ = lcd_getbgcolor();
        }
 #endif
 #endif

@@ -575,6 +575,11 @@ static void lcd_setfgcolor(int color)
        lcd_color_fg = color;
 }
 
+int lcd_getfgcolor(void)
+{
+       return lcd_color_fg;
+}
+
 /*----------------------------------------------------------------------*/
 
 static void lcd_setbgcolor(int color)

@@ -582,6 +587,11 @@ static void lcd_setbgcolor(int color)
        lcd_color_bg = color;
 }
 
+int lcd_getbgcolor(void)
+{
+       return lcd_color_bg;
+}
+
 /************************************************************************/
 /* ** Chipset depending Bitmap / Logo stuff...                          */
 /************************************************************************/

include/lcd.h +0 -0

index 01609ac..2235b9b 100644

include/lcd.h +11 -1

+ */
+int lcd_getbgcolor(void);
+
+/**
+ * Get the foreground color of the LCD
+ *
+ * @return foreground color value
+ */
+int lcd_getfgcolor(void);
+
+/**
  * Set the position of the text cursor
  *
  * @param col  Column to place cursor (0 = left side)
--

1.9.1

Hi Nikita,

Quoted 41 lines · Nikita Kiryanov

Introduce lcd_getbgcolor() and lcd_getfgcolor(), and use them where applicable.

This is a preparatory step for extracting lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

c: Anatolij Gustschin <[email protected]>
Cc: Simon Glass <[email protected]>
---
Changes in V2:
- New patch.

  common/lcd.c  | 20 +++++++++++++++-----
  include/lcd.h | 14 ++++++++++++++
  2 files changed, 29 insertions(+), 5 deletions(-)

common/lcd.c +2 -2

index f98aaaf..a75c616 100644
@@ -186,7 +186,7 @@ static void console_scrollup(void)
         /* Clear the last rows */
  #if (LCD_BPP != LCD_COLOR32)
         memset(lcd_console_address + CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows,
-               lcd_color_bg,
+               lcd_getbgcolor(),
                 CONSOLE_ROW_SIZE * rows);
  #else
         u32 *ppix = lcd_console_address +

@@ -195,7 +195,7 @@ static void console_scrollup(void)
         for (i = 0;
             i < (CONSOLE_ROW_SIZE * rows) / NBYTES(panel_info.vl_bpix);
             i++) {
-               *ppix++ = lcd_color_bg;
+               *ppix++ = lcd_getbgcolor();
         }
  #endif
         lcd_sync();

@@ -342,7 +342,7 @@ static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
 

common/lcd.c static void lcd_drawchars(ushort x, ushort y, uchar *str, int count) · line 345

Quoted 4 lines

common/lcd.c +1 -1

                         for (c = 0; c < 8; ++c) {
                                 *d++ = (bits & 0x80) ?
-                                               lcd_color_fg : lcd_color_bg;
+                                       lcd_getfgcolor() : lcd_getbgcolor();

Won't this slow things down slightly?

Quoted 53 lines

common/lcd.c +12 -2

                                 bits <<= 1;
                         }
                 }

@@ -460,7 +460,7 @@ void lcd_clear(void)
         /* set framebuffer to background color */
  #if (LCD_BPP != LCD_COLOR32)
         memset((char *)lcd_base,
-               lcd_color_bg,
+               lcd_getbgcolor(),
                 lcd_line_length * panel_info.vl_row);
  #else
         u32 *ppix = lcd_base;

@@ -468,7 +468,7 @@ void lcd_clear(void)
         for (i = 0;
            i < (lcd_line_length * panel_info.vl_row)/NBYTES(panel_info.vl_bpix);
            i++) {
-               *ppix++ = lcd_color_bg;
+               *ppix++ = lcd_getbgcolor();
         }
  #endif
  #endif

@@ -575,6 +575,11 @@ static void lcd_setfgcolor(int color)
         lcd_color_fg = color;
  }
 
+int lcd_getfgcolor(void)
+{
+       return lcd_color_fg;
+}
+
  /*----------------------------------------------------------------------*/
 
  static void lcd_setbgcolor(int color)

@@ -582,6 +587,11 @@ static void lcd_setbgcolor(int color)
         lcd_color_bg = color;
  }
 
+int lcd_getbgcolor(void)
+{
+       return lcd_color_bg;
+}
+
  /************************************************************************/
  /* ** Chipset depending Bitmap / Logo stuff...                          */
  /************************************************************************/

include/lcd.h +0 -0

index 01609ac..2235b9b 100644
@@ -291,6 +291,20 @@ int lcd_get_screen_rows(void);
  int lcd_get_screen_columns(void);
 

include/lcd.h int lcd_get_screen_rows(void); · line 296

Quoted 4 lines

include/lcd.h +3 -0

  /**
+ * Get the background color of the LCD
+ *
+ * @return background color value

This is just the raw value of the pixel in the display I think.

Quoted 16 lines

include/lcd.h +11 -1

+ */
+int lcd_getbgcolor(void);
+
+/**
+ * Get the foreground color of the LCD
+ *
+ * @return foreground color value
+ */
+int lcd_getfgcolor(void);
+
+/**
   * Set the position of the text cursor
   *
   * @param col  Column to place cursor (0 = left side)
--

Quoted 2 lines

1.9.1

Regards,
Simon

CONSOLE_ROW_SECOND, CONSOLE_ROW_LAST, and
CONSOLE_SCROLL_SIZE are unused. Remove them.

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Anatolij Gustschin <[email protected]>

Cc Simon Glass <[email protected]>

---
Changes in V2:
- New patch.

common/lcd.c is a mix of code portions that do different but related things. To improve modularity, the various code portions should be split into their own modules. Separate lcd console code into its own file.

Signed-off-by Nikita Kiryanov <[email protected]>

Cc Anatolij Gustschin <[email protected]>

Cc Wolfgang Denk <[email protected]>

Cc Simon Glass <[email protected]>

---
NOTE: I'm resending this cover letter with a shorter Cc list because the original mail got held up. Sorry for the double post.

Changes in V2:
- New patch.

 common/Makefile       |   2 +-
 common/lcd.c          | 227 --------------------------------------------------
 common/lcd_console.c  | 212 ++++++++++++++++++++++++++++++++++++++++++++++
 include/lcd.h         |   1 +
 include/lcd_console.h |  85 +++++++++++++++++++
 5 files changed, 299 insertions(+), 228 deletions(-)
 create mode 100644 common/lcd_console.c
 create mode 100644 include/lcd_console.h

common/Makefile +1 -1

index 9c47e20..66584fc 100644
@@ -206,7 +206,7 @@ obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o
 obj-$(CONFIG_I2C_EDID) += edid.o
 obj-$(CONFIG_KALLSYMS) += kallsyms.o
 obj-y += splash.o
-obj-$(CONFIG_LCD) += lcd.o
+obj-$(CONFIG_LCD) += lcd.o lcd_console.o
 obj-$(CONFIG_LYNXKDI) += lynxkdi.o
 obj-$(CONFIG_MENU) += menu.o
 obj-$(CONFIG_MODEM_SUPPORT) += modem.o

common/lcd.c +0 -227

index b55dd4c..2d0380d 100644
@@ -73,22 +73,6 @@
 #define CONFIG_LCD_ALIGNMENT PAGE_SIZE
 #endif
 
-/* By default we scroll by a single line */
-#ifndef CONFIG_CONSOLE_SCROLL_LINES
-#define CONFIG_CONSOLE_SCROLL_LINES 1
-#endif
-
-/************************************************************************/
-/* ** CONSOLE DEFINITIONS & FUNCTIONS                                  */
-/************************************************************************/
-#define CONSOLE_ROW_SIZE       (VIDEO_FONT_HEIGHT * lcd_line_length)
-#define CONSOLE_ROW_FIRST      lcd_console_address
-#define CONSOLE_ROW_SECOND     (lcd_console_address + CONSOLE_ROW_SIZE)
-#define CONSOLE_ROW_LAST       (lcd_console_address + CONSOLE_SIZE \
-                                       - CONSOLE_ROW_SIZE)
-#define CONSOLE_SIZE           (CONSOLE_ROW_SIZE * console_rows)
-#define CONSOLE_SCROLL_SIZE    (CONSOLE_SIZE - CONSOLE_ROW_SIZE)
-
 #if (LCD_BPP != LCD_COLOR8) && (LCD_BPP != LCD_COLOR16) && \
        (LCD_BPP != LCD_COLOR32)
 # error Unsupported LCD BPP.

@@ -96,9 +80,6 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static void lcd_drawchars(ushort x, ushort y, uchar *str, int count);
-static inline void lcd_putc_xy(ushort x, ushort y, uchar  c);
-
 static int lcd_init(void *lcdbase);
 
 static void *lcd_logo(void);

@@ -112,12 +93,6 @@ int lcd_line_length;
 
 char lcd_is_enabled = 0;
 
-static short console_curr_col;
-static short console_curr_row;
-static short console_cols;
-static short console_rows;
-
-static void *lcd_console_address;
 static void *lcd_base;                 /* Start of framebuffer memory  */
 
 static char lcd_flush_dcache;  /* 1 to flush dcache after each lcd update */

@@ -153,82 +128,6 @@ void lcd_set_flush_dcache(int flush)
        lcd_flush_dcache = (flush != 0);
 }
 
-void lcd_init_console(void *address, int rows, int cols)
-{
-       console_curr_col = 0;
-       console_curr_row = 0;
-       console_cols = cols;
-       console_rows = rows;
-       lcd_console_address = address;
-}
-
-void lcd_set_col(short col)
-{
-       console_curr_col = col;
-}
-
-void lcd_set_row(short row)
-{
-       console_curr_row = row;
-}
-
-/*----------------------------------------------------------------------*/
-
-static void console_scrollup(void)
-{
-       const int rows = CONFIG_CONSOLE_SCROLL_LINES;
-
-       /* Copy up rows ignoring those that will be overwritten */
-       memcpy(CONSOLE_ROW_FIRST,
-              lcd_console_address + CONSOLE_ROW_SIZE * rows,
-              CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows);
-
-       /* Clear the last rows */
-#if (LCD_BPP != LCD_COLOR32)
-       memset(lcd_console_address + CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows,
-               lcd_getbgcolor(),
-               CONSOLE_ROW_SIZE * rows);
-#else
-       u32 *ppix = lcd_console_address +
-                   CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows;
-       u32 i;
-       for (i = 0;
-           i < (CONSOLE_ROW_SIZE * rows) / NBYTES(panel_info.vl_bpix);
-           i++) {
-               *ppix++ = lcd_getbgcolor();
-       }
-#endif
-       lcd_sync();
-       console_curr_row -= rows;
-}
-
-/*----------------------------------------------------------------------*/
-
-static inline void console_back(void)
-{
-       if (--console_curr_col < 0) {
-               console_curr_col = console_cols - 1;
-               if (--console_curr_row < 0)
-                       console_curr_row = 0;
-       }
-
-       lcd_putc_xy(console_curr_col * VIDEO_FONT_WIDTH,
-                   console_curr_row * VIDEO_FONT_HEIGHT, ' ');
-}
-
-/*----------------------------------------------------------------------*/
-
-static inline void console_newline(void)
-{
-       console_curr_col = 0;
-
-       /* Check if we need to scroll the terminal */
-       if (++console_curr_row >= console_rows)
-               console_scrollup();
-       else
-               lcd_sync();
-}
-
 /*----------------------------------------------------------------------*/
 
 static void lcd_stub_putc(struct stdio_dev *dev, const char c)

@@ -236,121 +135,11 @@ static void lcd_stub_putc(struct stdio_dev *dev, const char c)
        lcd_putc(c);
 }
 
-void lcd_putc(const char c)
-{
-       if (!lcd_is_enabled) {
-               serial_putc(c);
-
-               return;
-       }
-
-       switch (c) {
-       case '\r':
-               console_curr_col = 0;
-
-               return;
-       case '\n':
-               console_newline();
-
-               return;
-       case '\t':      /* Tab (8 chars alignment) */
-               console_curr_col +=  8;
-               console_curr_col &= ~7;
-
-               if (console_curr_col >= console_cols)
-                       console_newline();
-
-               return;
-       case '\b':
-               console_back();
-
-               return;
-       default:
-               lcd_putc_xy(console_curr_col * VIDEO_FONT_WIDTH,
-                           console_curr_row * VIDEO_FONT_HEIGHT, c);
-               if (++console_curr_col >= console_cols)
-                       console_newline();
-       }
-}
-
-/*----------------------------------------------------------------------*/
-
 static void lcd_stub_puts(struct stdio_dev *dev, const char *s)
 {
        lcd_puts(s);
 }
 
-void lcd_puts(const char *s)
-{
-       if (!lcd_is_enabled) {
-               serial_puts(s);
-
-               return;
-       }
-
-       while (*s)
-               lcd_putc(*s++);
-
-       lcd_sync();
-}
-
-/*----------------------------------------------------------------------*/
-
-void lcd_printf(const char *fmt, ...)
-{
-       va_list args;
-       char buf[CONFIG_SYS_PBSIZE];
-
-       va_start(args, fmt);
-       vsprintf(buf, fmt, args);
-       va_end(args);
-
-       lcd_puts(buf);
-}
-
-/************************************************************************/
-/* ** Low-Level Graphics Routines                                      */
-/************************************************************************/
-
-static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
-{
-       uchar *dest;
-       ushort row;
-
-       dest = (uchar *)(lcd_console_address +
-                       y * lcd_line_length + x * NBITS(LCD_BPP) / 8);
-
-       for (row = 0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
-               uchar *s = str;
-               int i;
-#if LCD_BPP == LCD_COLOR16
-               ushort *d = (ushort *)dest;
-#elif LCD_BPP == LCD_COLOR32
-               u32 *d = (u32 *)dest;
-#else
-               uchar *d = dest;
-#endif
-
-               for (i = 0; i < count; ++i) {
-                       uchar c, bits;
-
-                       c = *s++;
-                       bits = video_fontdata[c * VIDEO_FONT_HEIGHT + row];
-
-                       for (c = 0; c < 8; ++c) {
-                               *d++ = (bits & 0x80) ?
-                                       lcd_getfgcolor() : lcd_getbgcolor();
-                               bits <<= 1;
-                       }
-               }
-       }
-}
-
-static inline void lcd_putc_xy(ushort x, ushort y, uchar c)
-{
-       lcd_drawchars(x, y, &c, 1);
-}
-
 /************************************************************************/
 /**  Small utility to check that you got the colours right             */
 /************************************************************************/

@@ -1121,12 +910,6 @@ static int on_splashimage(const char *name, const char *value, enum env_op op,
 U_BOOT_ENV_CALLBACK(splashimage, on_splashimage);
 #endif
 
-void lcd_position_cursor(unsigned col, unsigned row)
-{
-       console_curr_col = min_t(short, col, console_cols - 1);
-       console_curr_row = min_t(short, row, console_rows - 1);
-}
-
 int lcd_get_pixel_width(void)
 {
        return panel_info.vl_col;

@@ -1137,16 +920,6 @@ int lcd_get_pixel_height(void)
        return panel_info.vl_row;
 }
 
-int lcd_get_screen_rows(void)
-{
-       return console_rows;
-}
-
-int lcd_get_screen_columns(void)
-{
-       return console_cols;
-}
-
 #if defined(CONFIG_LCD_DT_SIMPLEFB)
 static int lcd_dt_simplefb_configure_node(void *blob, int off)
 {

common/lcd_console.c new file +212 -0

new file mode 100644
index 0000000..223c9e8
@@ -0,0 +1,212 @@
+/*
+ * (C) Copyright 2001-2014
+ * DENX Software Engineering -- wd at denx.de
+ * Compulab Ltd - http://compulab.co.il/
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <lcd.h>
+#include <video_font.h>                /* Get font data, width and height */
+
+#define CONSOLE_ROW_SIZE       (VIDEO_FONT_HEIGHT * lcd_line_length)
+#define CONSOLE_ROW_FIRST      lcd_console_address
+#define CONSOLE_ROW_SECOND     (lcd_console_address + CONSOLE_ROW_SIZE)
+#define CONSOLE_ROW_LAST       (lcd_console_address + CONSOLE_SIZE \
+                                       - CONSOLE_ROW_SIZE)
+#define CONSOLE_SIZE           (CONSOLE_ROW_SIZE * console_rows)
+#define CONSOLE_SCROLL_SIZE    (CONSOLE_SIZE - CONSOLE_ROW_SIZE)
+
+static short console_curr_col;
+static short console_curr_row;
+static short console_cols;
+static short console_rows;
+static void *lcd_console_address;
+
+void lcd_init_console(void *address, int rows, int cols)
+{
+       console_curr_col = 0;
+       console_curr_row = 0;
+       console_cols = cols;
+       console_rows = rows;
+       lcd_console_address = address;
+}
+
+void lcd_set_col(short col)
+{
+       console_curr_col = col;
+}
+
+void lcd_set_row(short row)
+{
+       console_curr_row = row;
+}
+
+void lcd_position_cursor(unsigned col, unsigned row)
+{
+       console_curr_col = min_t(short, col, console_cols - 1);
+       console_curr_row = min_t(short, row, console_rows - 1);
+}
+
+int lcd_get_screen_rows(void)
+{
+       return console_rows;
+}
+
+int lcd_get_screen_columns(void)
+{
+       return console_cols;
+}
+
+static void lcd_drawchars(ushort x, ushort y, uchar *str, int count)
+{
+       uchar *dest;
+       ushort row;
+
+       dest = (uchar *)(lcd_console_address +
+                        y * lcd_line_length + x * NBITS(LCD_BPP) / 8);
+
+       for (row = 0; row < VIDEO_FONT_HEIGHT; ++row, dest += lcd_line_length) {
+               uchar *s = str;
+               int i;
+#if LCD_BPP == LCD_COLOR16
+               ushort *d = (ushort *)dest;
+#elif LCD_BPP == LCD_COLOR32
+               u32 *d = (u32 *)dest;
+#else
+               uchar *d = dest;
+#endif
+
+               for (i = 0; i < count; ++i) {
+                       uchar c, bits;
+
+                       c = *s++;
+                       bits = video_fontdata[c * VIDEO_FONT_HEIGHT + row];
+
+                       for (c = 0; c < 8; ++c) {
+                               *d++ = (bits & 0x80) ?
+                                       lcd_getfgcolor() : lcd_getbgcolor();
+                               bits <<= 1;
+                       }
+               }
+       }
+}
+
+static inline void lcd_putc_xy(ushort x, ushort y, uchar c)
+{
+       lcd_drawchars(x, y, &c, 1);
+}
+
+static void console_scrollup(void)
+{
+       const int rows = CONFIG_CONSOLE_SCROLL_LINES;
+
+       /* Copy up rows ignoring those that will be overwritten */
+       memcpy(CONSOLE_ROW_FIRST,
+              lcd_console_address + CONSOLE_ROW_SIZE * rows,
+              CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows);
+
+       /* Clear the last rows */
+#if (LCD_BPP != LCD_COLOR32)
+       memset(lcd_console_address + CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows,
+              lcd_getbgcolor(), CONSOLE_ROW_SIZE * rows);
+#else
+       u32 *ppix = lcd_console_address +
+                   CONSOLE_SIZE - CONSOLE_ROW_SIZE * rows;
+       u32 i;
+       for (i = 0;
+           i < (CONSOLE_ROW_SIZE * rows) / NBYTES(panel_info.vl_bpix);
+           i++) {
+               *ppix++ = lcd_getbgcolor();
+       }
+#endif
+       lcd_sync();
+       console_curr_row -= rows;
+}
+
+static inline void console_back(void)
+{
+       if (--console_curr_col < 0) {
+               console_curr_col = console_cols - 1;
+               if (--console_curr_row < 0)
+                       console_curr_row = 0;
+       }
+
+       lcd_putc_xy(console_curr_col * VIDEO_FONT_WIDTH,
+                   console_curr_row * VIDEO_FONT_HEIGHT, ' ');
+}
+
+static inline void console_newline(void)
+{
+       console_curr_col = 0;
+
+       /* Check if we need to scroll the terminal */
+       if (++console_curr_row >= console_rows)
+               console_scrollup();
+       else
+               lcd_sync();
+}
+
+void lcd_putc(const char c)
+{
+       if (!lcd_is_enabled) {
+               serial_putc(c);
+
+               return;
+       }
+
+       switch (c) {
+       case '\r':
+               console_curr_col = 0;
+
+               return;
+       case '\n':
+               console_newline();
+
+               return;
+       case '\t':      /* Tab (8 chars alignment) */
+               console_curr_col +=  8;
+               console_curr_col &= ~7;
+
+               if (console_curr_col >= console_cols)
+                       console_newline();
+
+               return;
+       case '\b':
+               console_back();
+
+               return;
+       default:
+               lcd_putc_xy(console_curr_col * VIDEO_FONT_WIDTH,
+                           console_curr_row * VIDEO_FONT_HEIGHT, c);
+               if (++console_curr_col >= console_cols)
+                       console_newline();
+       }
+}
+
+void lcd_puts(const char *s)
+{
+       if (!lcd_is_enabled) {
+               serial_puts(s);
+
+               return;
+       }
+
+       while (*s)
+               lcd_putc(*s++);
+
+       lcd_sync();
+}
+
+void lcd_printf(const char *fmt, ...)
+{
+       va_list args;
+       char buf[CONFIG_SYS_PBSIZE];
+
+       va_start(args, fmt);
+       vsprintf(buf, fmt, args);
+       va_end(args);
+
+       lcd_puts(buf);
+}

include/lcd.h +1 -0

index 2235b9b..160f940 100644
@@ -12,6 +12,7 @@
 
 #ifndef _LCD_H_
 #define _LCD_H_
+#include <lcd_console.h>
 
 extern char lcd_is_enabled;
 

include/lcd_console.h new file +73 -0

new file mode 100644
index 0000000..3bc6bb6
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2014, Compulab Ltd - http://compulab.co.il/
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+/* By default we scroll by a single line */
+#ifndef CONFIG_CONSOLE_SCROLL_LINES
+#define CONFIG_CONSOLE_SCROLL_LINES 1
+#endif
+
+/**
+ * lcd_init_console() - Initialize lcd console parameters
+ *
+ * Setup the address of console base, and the number of rows and columns the
+ * console has.
+ *
+ * @address: Console base address
+ * @rows: Number of rows in the console
+ * @cols: Number of columns in the console
+ */
+void lcd_init_console(void *address, int rows, int cols);
+
+/**
+ * lcd_set_col() - Set the number of the current lcd console column
+ *
+ * Set the number of the console column where the cursor is.
+ *
+ * @col: Column number
+ */
+void lcd_set_col(short col);
+
+/**
+ * lcd_set_row() - Set the number of the current lcd console row
+ *
+ * Set the number of the console row where the cursor is.
+ *
+ * @row: Row number
+ */
+void lcd_set_row(short row);
+
+/**
+ * lcd_position_cursor() - Position the cursor on the screen
+ *
+ * Position the cursor at the given coordinates on the screen.
+ *
+ * @col: Column number
+ * @row: Row number
+ */
+void lcd_position_cursor(unsigned col, unsigned row);
+
+/**
+ * lcd_get_screen_rows() - Get the total number of screen rows
+ *
+ * @return: Number of screen rows
+ */
+int lcd_get_screen_rows(void);
+
+/**
+ * lcd_get_screen_columns() - Get the total number of screen columns
+ *
+ * @return: Number of screen columns
+ */
+int lcd_get_screen_columns(void);
+
+/**
+ * lcd_putc() - Print to screen a single character at the location of the cursor
+ *
+ * @c: The character to print
+ */
+void lcd_putc(const char c);
+
+/**

include/lcd_console.h new file +2 -1

+ */
+void lcd_printf(const char *fmt, ...);
--

1.9.1

This series is a first step towards an end goal of merging all CONFIG_LCD related functionality into CONFIG_VIDEO code. My plan is to start by refactoring lcd.c into something cleaner (less ifdefs) and more modular (split code into multiple files), then possibly refactor CONFIG_VIDEO code if needed, and then
finally: move CONFIG_LCD related functionality over to CONFIG_VIDEO code, replacing as much CONFIG_LCD related code with CONFIG_VIDEO related code as possible.

This specific step eliminates some unused code and refactors lcd console stuff into its own file.

In V2 I broke the last patch of the original series ("lcd: refactor lcd console stuff into its own file") into multiple patches to make it clear what changes had to be done in order to refactor the lcd console code into its own file. These preparatory patches ("lcd: rename console_(row|col)" to "lcd: make lcd_drawchars() independant of lcd_base") are meant to illustrate exactly what changed and where in the transition from lcd.c to lcd_console.c, and are not necesserily code improvements when viewed out of context.

Additional changes in V2:
- Added documentation for the new functions.

The whole series was rebased over current mainline, and compile tested for arm and powerpc.