Atmel LCD driver GUARDTIME fix

[oweals/u-boot.git] / drivers / video / cfb_console.c

diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index 779aa4b53e49da3b7eea4814dce0feeef9d48f14..bcafb27a7a74859613737b4c2c0dc4d573cac6be 100644 (file)
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -1181,6 +1181,7 @@ static void *video_logo (void)
 {
        char info[128];
        extern char version_string;
+       int space, len, y_off = 0;
 
 #ifdef CONFIG_SPLASH_SCREEN
        char *s;
@@ -1198,7 +1199,19 @@ static void *video_logo (void)
        logo_plot (video_fb_address, VIDEO_COLS, 0, 0);
 
        sprintf (info, " %s", &version_string);
-       video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, (uchar *)info);
+
+       space = (VIDEO_LINE_LEN / 2 - VIDEO_INFO_X) / VIDEO_FONT_WIDTH;
+       len = strlen(info);
+
+       if (len > space) {
+               video_drawchars (VIDEO_INFO_X, VIDEO_INFO_Y,
+                                (uchar *)info, space);
+               video_drawchars (VIDEO_INFO_X + VIDEO_FONT_WIDTH,
+                                VIDEO_INFO_Y + VIDEO_FONT_HEIGHT,
+                                (uchar *)info + space, len - space);
+               y_off = 1;
+       } else
+               video_drawstring (VIDEO_INFO_X, VIDEO_INFO_Y, (uchar *)info);
 
 #ifdef CONFIG_CONSOLE_EXTRA_INFO
        {
@@ -1206,10 +1219,27 @@ static void *video_logo (void)
 
                for (i = 1; i < n; i++) {
                        video_get_info_str (i, info);
-                       if (*info)
+                       if (!*info)
+                               continue;
+
+                       len = strlen(info);
+                       if (len > space) {
+                               video_drawchars (VIDEO_INFO_X,
+                                                VIDEO_INFO_Y +
+                                                (i + y_off) * VIDEO_FONT_HEIGHT,
+                                                (uchar *)info, space);
+                               y_off++;
+                               video_drawchars (VIDEO_INFO_X + VIDEO_FONT_WIDTH,
+                                                VIDEO_INFO_Y +
+                                                (i + y_off) * VIDEO_FONT_HEIGHT,
+                                                (uchar *)info + space,
+                                                len - space);
+                       } else {
                                video_drawstring (VIDEO_INFO_X,
-                                                 VIDEO_INFO_Y + i * VIDEO_FONT_HEIGHT,
+                                                 VIDEO_INFO_Y +
+                                                 (i + y_off) * VIDEO_FONT_HEIGHT,
                                                  (uchar *)info);
+                       }
                }
        }
 #endif
@@ -1300,53 +1330,57 @@ static int video_init (void)
 
 /*****************************************************************************/
 
+/*
+ * Implement a weak default function for boards that optionally
+ * need to skip the video initialization.
+ */
+int __board_video_skip(void)
+{
+       /* As default, don't skip test */
+       return 0;
+}
+int board_video_skip(void) __attribute__((weak, alias("__board_video_skip")));
+
 int drv_video_init (void)
 {
        int skip_dev_init;
        device_t console_dev;
 
-       skip_dev_init = 0;
+       /* Check if video initialization should be skipped */
+       if (board_video_skip())
+               return 0;
 
        /* Init video chip - returns with framebuffer cleared */
-       if (video_init () == -1)
-               skip_dev_init = 1;
+       skip_dev_init = (video_init () == -1);
 
-#ifdef CONFIG_VGA_AS_SINGLE_DEVICE
-       /* Devices VGA and Keyboard will be assigned seperately */
-       /* Init vga device */
-       if (!skip_dev_init) {
-               memset (&console_dev, 0, sizeof (console_dev));
-               strcpy (console_dev.name, "vga");
-               console_dev.ext = DEV_EXT_VIDEO;        /* Video extensions */
-               console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM;
-               console_dev.putc = video_putc;  /* 'putc' function */
-               console_dev.puts = video_puts;  /* 'puts' function */
-               console_dev.tstc = NULL;        /* 'tstc' function */
-               console_dev.getc = NULL;        /* 'getc' function */
-
-               if (device_register (&console_dev) == 0)
-                       return 1;
-       }
-#else
+#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
        PRINTD ("KBD: Keyboard init ...\n");
-       if (VIDEO_KBD_INIT_FCT == -1)
-               skip_dev_init = 1;
-
-       /* Init console device */
-       if (!skip_dev_init) {
-               memset (&console_dev, 0, sizeof (console_dev));
-               strcpy (console_dev.name, "vga");
-               console_dev.ext = DEV_EXT_VIDEO;        /* Video extensions */
-               console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-               console_dev.putc = video_putc;  /* 'putc' function */
-               console_dev.puts = video_puts;  /* 'puts' function */
-               console_dev.tstc = VIDEO_TSTC_FCT;      /* 'tstc' function */
-               console_dev.getc = VIDEO_GETC_FCT;      /* 'getc' function */
-
-               if (device_register (&console_dev) == 0)
-                       return 1;
-       }
+       skip_dev_init |= (VIDEO_KBD_INIT_FCT == -1);
+#endif
+
+       if (skip_dev_init)
+               return 0;
+
+       /* Init vga device */
+       memset (&console_dev, 0, sizeof (console_dev));
+       strcpy (console_dev.name, "vga");
+       console_dev.ext = DEV_EXT_VIDEO;        /* Video extensions */
+       console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM;
+       console_dev.putc = video_putc;  /* 'putc' function */
+       console_dev.puts = video_puts;  /* 'puts' function */
+       console_dev.tstc = NULL;        /* 'tstc' function */
+       console_dev.getc = NULL;        /* 'getc' function */
+
+#if !defined(CONFIG_VGA_AS_SINGLE_DEVICE)
+       /* Also init console device */
+       console_dev.flags |= DEV_FLAGS_INPUT;
+       console_dev.tstc = VIDEO_TSTC_FCT;      /* 'tstc' function */
+       console_dev.getc = VIDEO_GETC_FCT;      /* 'getc' function */
 #endif /* CONFIG_VGA_AS_SINGLE_DEVICE */
-       /* No console dev available */
-       return 0;
+
+       if (device_register (&console_dev) != 0)
+               return 0;
+
+       /* Return success */
+       return 1;
 }