@@ -61,47 +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
*/
@@ -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/%)
new file mode 100644
@@ -0,0 +1,84 @@
+/* Copyright 2015 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 <device.h>
+#include <console.h>
+#include <chip.h>
+#include <opal-api.h>
+#include <opal-internal.h>
+#include <time-utils.h>
+#include <time.h>
+
+#include "mambo.h"
+
+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);
+}
+
+/*
+ * mambo_console_read() will return -1 if there is no character to read. There's
+ * no explicit polling method so we "poll" by doing a read. If successful we
+ * stash the character until an actual read operation.
+ */
+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[count++] = mambo_char;
+ mambo_char = -1;
+ }
+
+ 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);
+}
@@ -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();
There's no need for this to be in the skiboot core console code. Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- core/console.c | 41 --------------------- platforms/mambo/Makefile.inc | 2 +- platforms/mambo/console.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ platforms/mambo/mambo.c | 10 ------ 4 files changed, 85 insertions(+), 52 deletions(-) create mode 100644 platforms/mambo/console.c