projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
video: Factor out vidconsole_put_string()
[oweals/u-boot.git]
/
common
/
console.c
diff --git
a/common/console.c
b/common/console.c
index 7aa58d0a63674c21df6ad3ac89445599e498b512..0b0dd76256c7c865668add13a2ae89eb1530cb3f 100644
(file)
--- a/
common/console.c
+++ b/
common/console.c
@@
-311,12
+311,12
@@
int serial_printf(const char *fmt, ...)
int fgetc(int file)
{
if (file < MAX_FILES) {
int fgetc(int file)
{
if (file < MAX_FILES) {
-#if CONFIG_IS_ENABLED(CONSOLE_MUX)
/*
* Effectively poll for input wherever it may be available.
*/
for (;;) {
WATCHDOG_RESET();
/*
* Effectively poll for input wherever it may be available.
*/
for (;;) {
WATCHDOG_RESET();
+#if CONFIG_IS_ENABLED(CONSOLE_MUX)
/*
* Upper layer may have already called tstc() so
* check for that first.
/*
* Upper layer may have already called tstc() so
* check for that first.
@@
-324,6
+324,10
@@
int fgetc(int file)
if (tstcdev != NULL)
return console_getc(file);
console_tstc(file);
if (tstcdev != NULL)
return console_getc(file);
console_tstc(file);
+#else
+ if (console_tstc(file))
+ return console_getc(file);
+#endif
#ifdef CONFIG_WATCHDOG
/*
* If the watchdog must be rate-limited then it should
#ifdef CONFIG_WATCHDOG
/*
* If the watchdog must be rate-limited then it should
@@
-332,9
+336,6
@@
int fgetc(int file)
udelay(1);
#endif
}
udelay(1);
#endif
}
-#else
- return console_getc(file);
-#endif
}
return -1;
}
return -1;
@@
-534,6
+535,13
@@
void putc(const char c)
void puts(const char *s)
{
void puts(const char *s)
{
+#ifdef CONFIG_SANDBOX
+ /* sandbox can send characters to stdout before it has a console */
+ if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
+ os_puts(s);
+ return;
+ }
+#endif
#ifdef CONFIG_DEBUG_UART
if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
while (*s) {
#ifdef CONFIG_DEBUG_UART
if (!gd || !(gd->flags & GD_FLG_SERIAL_READY)) {
while (*s) {