diff options
| -rw-r--r-- | core/console.c | 42 | ||||
| -rw-r--r-- | include/console.h | 3 | ||||
| -rw-r--r-- | platforms/mambo/Makefile.inc | 2 | ||||
| -rw-r--r-- | platforms/mambo/console.c | 68 | ||||
| -rw-r--r-- | platforms/mambo/mambo.c | 10 |
5 files changed, 70 insertions, 55 deletions
diff --git a/core/console.c b/core/console.c index 3189c4f..05c86bb 100644 --- a/core/console.c +++ b/core/console.c @@ -61,48 +61,6 @@ void force_dummy_console(void) NULL, 0); } - -static int mambo_char = -1; - -static bool mambo_con_poll_read(void) -{ - if (mambo_char < 0) - mambo_char = mambo_console_read(); - return mambo_char >= 0; -} - -static size_t mambo_con_read(char *buf, size_t len) -{ - size_t count = 0; - - while(count < len) { - if (!mambo_con_poll_read()) - break; - *(buf++) = mambo_char; - mambo_char = -1; - count++; - } - return count; -} - -static size_t mambo_con_write(const char *buf, size_t len) -{ - mambo_console_write(buf, len); - return len; -} - -static struct con_ops mambo_con_driver = { - .poll_read = mambo_con_poll_read, - .read = mambo_con_read, - .write = mambo_con_write, -}; - -void enable_mambo_console(void) -{ - prlog(PR_NOTICE, "Enabling Mambo console\n"); - set_console(&mambo_con_driver); -} - /* * Helper function for adding /ibm,opal/consoles/serial@<xyz> nodes */ diff --git a/include/console.h b/include/console.h index 6a80bef..08d2961 100644 --- a/include/console.h +++ b/include/console.h @@ -61,8 +61,7 @@ extern void set_console(struct con_ops *driver); extern void console_complete_flush(void); -extern int mambo_console_read(void); -extern void mambo_console_write(const char *buf, size_t count); +extern size_t mambo_console_write(const char *buf, size_t count); extern void enable_mambo_console(void); ssize_t console_write(bool flush_to_drivers, const void *buf, size_t count); diff --git a/platforms/mambo/Makefile.inc b/platforms/mambo/Makefile.inc index 2cc8613..f3023ef 100644 --- a/platforms/mambo/Makefile.inc +++ b/platforms/mambo/Makefile.inc @@ -1,6 +1,6 @@ SUBDIRS += $(PLATDIR)/mambo -MAMBO_OBJS = mambo.o +MAMBO_OBJS = mambo.o console.o MAMBO = $(PLATDIR)/mambo/built-in.o $(MAMBO): $(MAMBO_OBJS:%=$(PLATDIR)/mambo/%) diff --git a/platforms/mambo/console.c b/platforms/mambo/console.c new file mode 100644 index 0000000..c7d7ab0 --- /dev/null +++ b/platforms/mambo/console.c @@ -0,0 +1,68 @@ +/* Copyright 2016 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <skiboot.h> +#include <console.h> + +#include "mambo.h" + +/* + * The SIM_READ_CONSOLE callout will return -1 if there is no character to read. + * There's no explicit poll callout so we "poll" by doing a read and stashing + * the result until we do an actual read. + */ +static int mambo_char = -1; + +static bool mambo_console_poll(void) +{ + if (mambo_char < 0) + mambo_char = callthru0(SIM_READ_CONSOLE_CODE); + + return mambo_char >= 0; +} + +static size_t mambo_console_read(char *buf, size_t len) +{ + size_t count = 0; + + while (count < len) { + if (!mambo_console_poll()) + break; + + buf[count++] = mambo_char; + mambo_char = -1; + } + + return count; +} + +size_t mambo_console_write(const char *buf, size_t len) +{ + callthru2(SIM_WRITE_CONSOLE_CODE, (unsigned long)buf, len); + return len; +} + +static struct con_ops mambo_con_driver = { + .poll_read = mambo_console_poll, + .read = mambo_console_read, + .write = mambo_console_write, +}; + +void enable_mambo_console(void) +{ + prlog(PR_NOTICE, "Enabling Mambo console\n"); + set_console(&mambo_con_driver); +} diff --git a/platforms/mambo/mambo.c b/platforms/mambo/mambo.c index 659d1ba..cc5cbf9 100644 --- a/platforms/mambo/mambo.c +++ b/platforms/mambo/mambo.c @@ -211,16 +211,6 @@ static void mambo_rtc_init(void) opal_register(OPAL_RTC_READ, mambo_rtc_read, 2); } -int mambo_console_read(void) -{ - return callthru0(SIM_READ_CONSOLE_CODE); -} - -void mambo_console_write(const char *buf, size_t count) -{ - callthru2(SIM_WRITE_CONSOLE_CODE, (unsigned long)buf, count); -} - static void mambo_platform_init(void) { force_dummy_console(); |