rename CFG_ macros to CONFIG_SYS

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

diff --git a/common/devices.c b/common/devices.c
index 615b2171c2208ddd274d749f59f67daed44e153c..ce3b7a00f904b0e394a2fe6388c21bfd779dd064 100644 (file)
--- a/common/devices.c
+++ b/common/devices.c
@@ -26,6 +26,7 @@
 #include <stdarg.h>
 #include <malloc.h>
 #include <devices.h>
+#include <serial.h>
 #ifdef CONFIG_LOGBUFFER
 #include <logbuff.h>
 #endif
@@ -33,30 +34,32 @@
 #include <i2c.h>
 #endif
 
-list_t devlist = 0;
+DECLARE_GLOBAL_DATA_PTR;
+
+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! */
+       /* nulldev is empty! */
 }
 
 void nulldev_puts(const char *s)
 {
-  /* nulldev is empty! */
+       /* nulldev is empty! */
 }
 
 int nulldev_input(void)
 {
-  /* nulldev is empty! */
-  return 0;
+       /* nulldev is empty! */
+       return 0;
 }
 #endif
 
@@ -73,7 +76,7 @@ static void drv_system_init (void)
 
        strcpy (dev.name, "serial");
        dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-#if CONFIG_SERIAL_SOFTWARE_FIFO
+#ifdef CONFIG_SERIAL_SOFTWARE_FIFO
        dev.putc = serial_buffered_putc;
        dev.puts = serial_buffered_puts;
        dev.getc = serial_buffered_getc;
@@ -87,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");
@@ -105,33 +108,72 @@ static void drv_system_init (void)
  * DEVICES
  **************************************************************************
  */
+struct list_head* device_get_list(void)
+{
+       return &(devs.list);
+}
+
+device_t* device_get_by_name(char* name)
+{
+       struct list_head *pos;
+       device_t *dev;
+
+       if(!name)
+               return NULL;
+
+       list_for_each(pos, &(devs.list)) {
+               dev = list_entry(pos, device_t, list);
+               if(strcmp(dev->name, name) == 0)
+                       return dev;
+       }
+
+       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)
 {
-       ListInsertItem (devlist, dev, LIST_END);
+       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 i,l,dev_index;
-       device_t *dev = NULL;
+       int l;
+       struct list_head *pos;
+       device_t *dev;
        char temp_names[3][8];
 
-       dev_index=-1;
-       for (i=1; i<=ListNumItems(devlist); i++) {
-               dev = ListGetPtrToItem (devlist, i);
-               if(strcmp(dev->name,devname)==0) {
-                       dev_index=i;
-                       break;
-               }
-       }
-       if(dev_index<0) /* device not found */
-               return 0;
+       dev = device_get_by_name(devname);
+
+       if(!dev) /* device not found */
+               return -1;
        /* get stdio devices (ListRemoveItem changes the dev list) */
        for (l=0 ; l< MAX_FILES; l++) {
                if (stdio_devices[l] == dev) {
@@ -142,42 +184,39 @@ int device_deregister(char *devname)
                        stdio_devices[l]->name,
                        sizeof(stdio_devices[l]->name));
        }
-       ListRemoveItem(devlist,NULL,dev_index);
+
+       list_del(&(dev->list));
+
        /* reassign Device list */
-       for (i=1; i<=ListNumItems(devlist); i++) {
-               dev = ListGetPtrToItem (devlist, i);
+       list_for_each(pos, &(devs.list)) {
+               dev = list_entry(pos, device_t, list);
                for (l=0 ; l< MAX_FILES; l++) {
-                       if(strcmp(dev->name,temp_names[l])==0) {
+                       if(strcmp(dev->name, temp_names[l]) == 0)
                                stdio_devices[l] = dev;
-                       }
                }
        }
        return 0;
 }
-#endif /* CFG_DEVICE_DEREGISTER */
+#endif /* CONFIG_SYS_DEVICE_DEREGISTER */
 
 int devices_init (void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       int i;
+#ifndef CONFIG_ARM     /* already relocated for current ARM implementation */
        ulong relocation_offset = gd->reloc_off;
+       int i;
 
        /* relocate device name pointers */
        for (i = 0; i < (sizeof (stdio_names) / sizeof (char *)); ++i) {
                stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
                                                relocation_offset);
        }
+#endif
 
        /* Initialize the list */
-       devlist = ListCreate (sizeof (device_t));
+       INIT_LIST_HEAD(&(devs.list));
 
-       if (devlist == NULL) {
-               eputs ("Cannot initialize the list of devices!\n");
-               return -1;
-       }
 #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 ();
@@ -185,22 +224,22 @@ int devices_init (void)
 #if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
        drv_video_init ();
 #endif
-#ifdef CONFIG_WL_4PPM_KEYBOARD
-       drv_wlkbd_init ();
+#ifdef CONFIG_KEYBOARD
+       drv_keyboard_init ();
 #endif
 #ifdef CONFIG_LOGBUFFER
        drv_logbuff_init ();
 #endif
        drv_system_init ();
-
-       gd-> flags |= GD_FLG_DEVINIT;   /* device initialization done */
+#ifdef CONFIG_SERIAL_MULTI
+       serial_devices_init ();
+#endif
+#ifdef CONFIG_USB_TTY
+       drv_usbtty_init ();
+#endif
+#ifdef CONFIG_NETCONSOLE
+       drv_nc_init ();
+#endif
 
        return (0);
 }
-
-int devices_done (void)
-{
-       ListDispose (devlist);
-
-       return 0;
-}