diff options
| author | Simon Glass <sjg@chromium.org> | 2014-07-23 06:55:05 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-07-23 14:07:24 +0100 |
| commit | d97143a67c696101b68eaaa3deb57ab36e288b77 (patch) | |
| tree | 44a7cfa571285634c77e12fe5486933f404fca0a /common/stdio.c | |
| parent | ab7cd62790c4f7831b91eab8a2ec81742d01bb54 (diff) | |
| download | blackbird-obmc-uboot-d97143a67c696101b68eaaa3deb57ab36e288b77.tar.gz blackbird-obmc-uboot-d97143a67c696101b68eaaa3deb57ab36e288b77.zip | |
stdio: Provide functions to add/remove devices using stdio_dev
The current functions for adding and removing devices require a device name.
This is not convenient for driver model, which wants to store a pointer to
the relevant device. Add new functions which provide this feature and adjust
the old ones to call these.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/stdio.c')
| -rw-r--r-- | common/stdio.c | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/common/stdio.c b/common/stdio.c index dd402cc23d..692ca7f1cd 100644 --- a/common/stdio.c +++ b/common/stdio.c @@ -11,6 +11,7 @@ #include <config.h> #include <common.h> +#include <errno.h> #include <stdarg.h> #include <malloc.h> #include <stdio_dev.h> @@ -148,32 +149,35 @@ struct stdio_dev* stdio_clone(struct stdio_dev *dev) return _dev; } -int stdio_register (struct stdio_dev * dev) +int stdio_register_dev(struct stdio_dev *dev, struct stdio_dev **devp) { struct stdio_dev *_dev; _dev = stdio_clone(dev); if(!_dev) - return -1; + return -ENODEV; list_add_tail(&(_dev->list), &(devs.list)); + if (devp) + *devp = _dev; + return 0; } +int stdio_register(struct stdio_dev *dev) +{ + return stdio_register_dev(dev, NULL); +} + /* deregister the device "devname". * returns 0 if success, -1 if device is assigned and 1 if devname not found */ #ifdef CONFIG_SYS_STDIO_DEREGISTER -int stdio_deregister(const char *devname) +int stdio_deregister_dev(struct stdio_dev *dev) { int l; struct list_head *pos; - struct stdio_dev *dev; char temp_names[3][16]; - dev = stdio_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) { @@ -197,6 +201,18 @@ int stdio_deregister(const char *devname) } return 0; } + +int stdio_deregister(const char *devname) +{ + struct stdio_dev *dev; + + dev = stdio_get_by_name(devname); + + if (!dev) /* device not found */ + return -ENODEV; + + return stdio_deregister_dev(dev); +} #endif /* CONFIG_SYS_STDIO_DEREGISTER */ int stdio_init (void) |
