malloc: work around some memalign fragmentation issues

[people/ms/u-boot.git] / common / stdio.c

diff --git a/common/stdio.c b/common/stdio.c
index c878103a4826b6d9f72b669125523a9b613d6bb3..f99cfe7f4f0db6cf560dd0766cba3ab5224322da 100644 (file)
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -11,6 +11,7 @@
 
 #include <config.h>
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <malloc.h>
@@ -24,6 +25,8 @@
 #include <i2c.h>
 #endif
 
+#include <dm/device-internal.h>
+
 DECLARE_GLOBAL_DATA_PTR;
 
 static struct stdio_dev devs;
@@ -34,41 +37,44 @@ char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
 #define        CONFIG_SYS_DEVICE_NULLDEV       1
 #endif
 
+#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#define        CONFIG_SYS_DEVICE_NULLDEV       1
+#endif
 
 #ifdef CONFIG_SYS_DEVICE_NULLDEV
-void nulldev_putc(struct stdio_dev *dev, const char c)
+static void nulldev_putc(struct stdio_dev *dev, const char c)
 {
        /* nulldev is empty! */
 }
 
-void nulldev_puts(struct stdio_dev *dev, const char *s)
+static void nulldev_puts(struct stdio_dev *dev, const char *s)
 {
        /* nulldev is empty! */
 }
 
-int nulldev_input(struct stdio_dev *dev)
+static int nulldev_input(struct stdio_dev *dev)
 {
        /* nulldev is empty! */
        return 0;
 }
 #endif
 
-void stdio_serial_putc(struct stdio_dev *dev, const char c)
+static void stdio_serial_putc(struct stdio_dev *dev, const char c)
 {
        serial_putc(c);
 }
 
-void stdio_serial_puts(struct stdio_dev *dev, const char *s)
+static void stdio_serial_puts(struct stdio_dev *dev, const char *s)
 {
        serial_puts(s);
 }
 
-int stdio_serial_getc(struct stdio_dev *dev)
+static int stdio_serial_getc(struct stdio_dev *dev)
 {
        return serial_getc();
 }
 
-int stdio_serial_tstc(struct stdio_dev *dev)
+static int stdio_serial_tstc(struct stdio_dev *dev)
 {
        return serial_tstc();
 }
@@ -85,7 +91,7 @@ static void drv_system_init (void)
        memset (&dev, 0, sizeof (dev));
 
        strcpy (dev.name, "serial");
-       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
        dev.putc = stdio_serial_putc;
        dev.puts = stdio_serial_puts;
        dev.getc = stdio_serial_getc;
@@ -96,7 +102,7 @@ static void drv_system_init (void)
        memset (&dev, 0, sizeof (dev));
 
        strcpy (dev.name, "nulldev");
-       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+       dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
        dev.putc = nulldev_putc;
        dev.puts = nulldev_puts;
        dev.getc = nulldev_input;
@@ -172,7 +178,7 @@ int stdio_register(struct stdio_dev *dev)
  * returns 0 if success, -1 if device is assigned and 1 if devname not found
  */
 #ifdef CONFIG_SYS_STDIO_DEREGISTER
-int stdio_deregister_dev(struct stdio_dev *dev)
+int stdio_deregister_dev(struct stdio_dev *dev, int force)
 {
        int l;
        struct list_head *pos;
@@ -181,6 +187,10 @@ int stdio_deregister_dev(struct stdio_dev *dev)
        /* get stdio devices (ListRemoveItem changes the dev list) */
        for (l=0 ; l< MAX_FILES; l++) {
                if (stdio_devices[l] == dev) {
+                       if (force) {
+                               strcpy(temp_names[l], "nulldev");
+                               continue;
+                       }
                        /* Device is assigned -> report error */
                        return -1;
                }
@@ -190,6 +200,7 @@ int stdio_deregister_dev(struct stdio_dev *dev)
        }
 
        list_del(&(dev->list));
+       free(dev);
 
        /* reassign Device list */
        list_for_each(pos, &(devs.list)) {
@@ -202,7 +213,7 @@ int stdio_deregister_dev(struct stdio_dev *dev)
        return 0;
 }
 
-int stdio_deregister(const char *devname)
+int stdio_deregister(const char *devname, int force)
 {
        struct stdio_dev *dev;
 
@@ -211,7 +222,7 @@ int stdio_deregister(const char *devname)
        if (!dev) /* device not found */
                return -ENODEV;
 
-       return stdio_deregister_dev(dev);
+       return stdio_deregister_dev(dev, force);
 }
 #endif /* CONFIG_SYS_STDIO_DEREGISTER */
 
@@ -237,6 +248,32 @@ int stdio_init_tables(void)
 
 int stdio_add_devices(void)
 {
+#ifdef CONFIG_DM_KEYBOARD
+       struct udevice *dev;
+       struct uclass *uc;
+       int ret;
+
+       /*
+        * For now we probe all the devices here. At some point this should be
+        * done only when the devices are required - e.g. we have a list of
+        * input devices to start up in the stdin environment variable. That
+        * work probably makes more sense when stdio itself is converted to
+        * driver model.
+        *
+        * TODO(sjg@chromium.org): Convert changing uclass_first_device() etc.
+        * to return the device even on error. Then we could use that here.
+        */
+       ret = uclass_get(UCLASS_KEYBOARD, &uc);
+       if (ret)
+               return ret;
+
+       /* Don't report errors to the caller - assume that they are non-fatal */
+       uclass_foreach_dev(dev, uc) {
+               ret = device_probe(dev);
+               if (ret)
+                       printf("Failed to probe keyboard '%s'\n", dev->name);
+       }
+#endif
 #ifdef CONFIG_SYS_I2C
        i2c_init_all();
 #else
@@ -244,13 +281,27 @@ int stdio_add_devices(void)
        i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 #endif
 #endif
-#ifdef CONFIG_LCD
+#ifdef CONFIG_DM_VIDEO
+       struct udevice *vdev;
+# ifndef CONFIG_DM_KEYBOARD
+       int ret;
+# endif
+
+       for (ret = uclass_first_device(UCLASS_VIDEO, &vdev);
+            vdev;
+            ret = uclass_next_device(&vdev))
+               ;
+       if (ret)
+               printf("%s: Video device failed (ret=%d)\n", __func__, ret);
+#else
+# if defined(CONFIG_LCD)
        drv_lcd_init ();
-#endif
-#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
+# endif
+# if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
        drv_video_init ();
-#endif
-#ifdef CONFIG_KEYBOARD
+# endif
+#endif /* CONFIG_DM_VIDEO */
+#if defined(CONFIG_KEYBOARD) && !defined(CONFIG_DM_KEYBOARD)
        drv_keyboard_init ();
 #endif
 #ifdef CONFIG_LOGBUFFER