projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
common
/
stdio.c
diff --git
a/common/stdio.c
b/common/stdio.c
index
870ddfd
..
1bf9ba0
100644
(file)
--- a/
common/stdio.c
+++ b/
common/stdio.c
@@
-76,18
+76,10
@@
static void drv_system_init (void)
strcpy (dev.name, "serial");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
strcpy (dev.name, "serial");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
-#ifdef CONFIG_SERIAL_SOFTWARE_FIFO
- dev.putc = serial_buffered_putc;
- dev.puts = serial_buffered_puts;
- dev.getc = serial_buffered_getc;
- dev.tstc = serial_buffered_tstc;
-#else
dev.putc = serial_putc;
dev.puts = serial_puts;
dev.getc = serial_getc;
dev.tstc = serial_tstc;
dev.putc = serial_putc;
dev.puts = serial_puts;
dev.getc = serial_getc;
dev.tstc = serial_tstc;
-#endif
-
stdio_register (&dev);
#ifdef CONFIG_SYS_DEVICE_NULLDEV
stdio_register (&dev);
#ifdef CONFIG_SYS_DEVICE_NULLDEV
@@
-113,7
+105,7
@@
struct list_head* stdio_get_list(void)
return &(devs.list);
}
return &(devs.list);
}
-struct stdio_dev* stdio_get_by_name(c
har*
name)
+struct stdio_dev* stdio_get_by_name(c
onst char *
name)
{
struct list_head *pos;
struct stdio_dev *dev;
{
struct list_head *pos;
struct stdio_dev *dev;
@@
-163,12
+155,12
@@
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
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
#ifdef CONFIG_SYS_STDIO_DEREGISTER
-int stdio_deregister(char *devname)
+int stdio_deregister(c
onst c
har *devname)
{
int l;
struct list_head *pos;
struct stdio_dev *dev;
{
int l;
struct list_head *pos;
struct stdio_dev *dev;
- char temp_names[3][
8
];
+ char temp_names[3][
16
];
dev = stdio_get_by_name(devname);
dev = stdio_get_by_name(devname);
@@
-182,7
+174,7
@@
int stdio_deregister(char *devname)
}
memcpy (&temp_names[l][0],
stdio_devices[l]->name,
}
memcpy (&temp_names[l][0],
stdio_devices[l]->name,
- sizeof(
stdio_devices[l]->name
));
+ sizeof(
temp_names[l]
));
}
list_del(&(dev->list));
}
list_del(&(dev->list));
@@
-201,7
+193,7
@@
int stdio_deregister(char *devname)
int stdio_init (void)
{
int stdio_init (void)
{
-#if
!defined(CONFIG_RELOC_FIXUP_WORKS
)
+#if
defined(CONFIG_NEEDS_MANUAL_RELOC
)
/* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off;
int i;
/* already relocated for current ARM implementation */
ulong relocation_offset = gd->reloc_off;
int i;
@@
-211,7
+203,7
@@
int stdio_init (void)
stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
relocation_offset);
}
stdio_names[i] = (char *) (((ulong) stdio_names[i]) +
relocation_offset);
}
-#endif /*
!CONFIG_RELOC_FIXUP_WORKS
*/
+#endif /*
CONFIG_NEEDS_MANUAL_RELOC
*/
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));
/* Initialize the list */
INIT_LIST_HEAD(&(devs.list));