libfdt: Rework fdt_next_node()

[karo-tx-uboot.git] / common / devices.c

diff --git a/common/devices.c b/common/devices.c
index 2977436420bc9d2a1fa5899994f271f33c494cb4..ba53c9bbec4cc1e627749b6f2ce9ad1efe01ab6c 100644 (file)
--- a/common/devices.c
+++ b/common/devices.c
@@ -40,12 +40,12 @@ static device_t devs;
 device_t *stdio_devices[] = { NULL, NULL, NULL };
 char *stdio_names[MAX_FILES] = { "stdin", "stdout", "stderr" };
 
-#if defined(CONFIG_SPLASH_SCREEN) && !defined(CFG_DEVICE_NULLDEV)
-#define        CFG_DEVICE_NULLDEV      1
+#if defined(CONFIG_SPLASH_SCREEN) && !defined(CONFIG_SYS_DEVICE_NULLDEV)
+#define        CONFIG_SYS_DEVICE_NULLDEV       1
 #endif
 
 
-#ifdef CFG_DEVICE_NULLDEV
+#ifdef CONFIG_SYS_DEVICE_NULLDEV
 void nulldev_putc(const char c)
 {
        /* nulldev is empty! */
@@ -90,7 +90,7 @@ static void drv_system_init (void)
 
        device_register (&dev);
 
-#ifdef CFG_DEVICE_NULLDEV
+#ifdef CONFIG_SYS_DEVICE_NULLDEV
        memset (&dev, 0, sizeof (dev));
 
        strcpy (dev.name, "nulldev");
@@ -130,17 +130,39 @@ device_t* device_get_by_name(char* name)
        return NULL;
 }
 
+device_t* device_clone(device_t *dev)
+{
+       device_t *_dev;
+
+       if(!dev)
+               return NULL;
+
+       _dev = calloc(1, sizeof(device_t));
+
+       if(!_dev)
+               return NULL;
+
+       memcpy(_dev, dev, sizeof(device_t));
+       strncpy(_dev->name, dev->name, 16);
+
+       return _dev;
+}
 
 int device_register (device_t * dev)
 {
-       list_add(&(dev->list), &(devs.list));
+       device_t *_dev;
+
+       _dev = device_clone(dev);
+       if(!_dev)
+               return -1;
+       list_add_tail(&(_dev->list), &(devs.list));
        return 0;
 }
 
 /* deregister the device "devname".
  * returns 0 if success, -1 if device is assigned and 1 if devname not found
  */
-#ifdef CFG_DEVICE_DEREGISTER
+#ifdef CONFIG_SYS_DEVICE_DEREGISTER
 int device_deregister(char *devname)
 {
        int l;
@@ -175,7 +197,7 @@ int device_deregister(char *devname)
        }
        return 0;
 }
-#endif /* CFG_DEVICE_DEREGISTER */
+#endif /* CONFIG_SYS_DEVICE_DEREGISTER */
 
 int devices_init (void)
 {
@@ -193,8 +215,11 @@ int devices_init (void)
        /* Initialize the list */
        INIT_LIST_HEAD(&(devs.list));
 
+#ifdef CONFIG_ARM_DCC_MULTI
+       drv_arm_dcc_init ();
+#endif
 #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C)
-       i2c_init (CFG_I2C_SPEED, CFG_I2C_SLAVE);
+       i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
 #endif
 #ifdef CONFIG_LCD
        drv_lcd_init ();
@@ -218,6 +243,9 @@ int devices_init (void)
 #ifdef CONFIG_NETCONSOLE
        drv_nc_init ();
 #endif
+#ifdef CONFIG_JTAG_CONSOLE
+       drv_jtag_console_init ();
+#endif
 
        return (0);
 }