implement rumpuser_putchar() in common code

diff --git a/lib/librumprun_rumpuser/Makefile b/lib/librumprun_rumpuser/Makefile
index 0231f4e9349360a739819be17078387fff4bbb5e..1e1651b299f3061cec027726abdd376b23d03e89 100644 (file)
--- a/lib/librumprun_rumpuser/Makefile
+++ b/lib/librumprun_rumpuser/Makefile
@@ -3,7 +3,7 @@ LIBISPRIVATE=   # defined
 
 SRCS=          rumpuser_base.c
 SRCS+=         rumpuser_clock.c
-SRCS+=         rumpuser_dprintf.c
+SRCS+=         rumpuser_cons.c
 SRCS+=         rumpuser_mem.c
 SRCS+=         rumpuser_synch.c
 

diff --git a/lib/librumprun_rumpuser/rumpuser_cons.c b/lib/librumprun_rumpuser/rumpuser_cons.c
new file mode 100644 (file)
index 0000000..173c2af
--- /dev/null
+++ b/lib/librumprun_rumpuser/rumpuser_cons.c
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2015 Antti Kantee.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#define _BMK_PRINTF_VA
+
+#include <bmk-core/printf.h>
+
+#include <bmk-rumpuser/core_types.h>
+#include <bmk-rumpuser/rumpuser.h>
+
+void
+rumpuser_putchar(int c)
+{
+
+       bmk_printf("%c", c);
+}
+
+void
+rumpuser_dprintf(const char *fmt, ...)
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       bmk_vprintf(fmt, ap);
+       va_end(ap);
+}

diff --git a/lib/librumprun_rumpuser/rumpuser_dprintf.c b/lib/librumprun_rumpuser/rumpuser_dprintf.c
deleted file mode 100644 (file)
index 81bf495..0000000
--- a/lib/librumprun_rumpuser/rumpuser_dprintf.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * Copyright (c) 2015 Antti Kantee.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#define _BMK_PRINTF_VA
-
-#include <bmk-core/printf.h>
-
-#include <bmk-rumpuser/core_types.h>
-#include <bmk-rumpuser/rumpuser.h>
-
-void
-rumpuser_dprintf(const char *fmt, ...)
-{
-       va_list ap;
-
-       va_start(ap, fmt);
-       bmk_vprintf(fmt, ap);
-       va_end(ap);
-}

diff --git a/platform/baremetal/rumpuser.c b/platform/baremetal/rumpuser.c
index aab6b244f5ef0998afb48f4d70a8b1830d6447e0..4bd8975c41a39be7fef255ba5ef608bab759de74 100644 (file)
--- a/platform/baremetal/rumpuser.c
+++ b/platform/baremetal/rumpuser.c
@@ -46,13 +46,6 @@ rumprun_platform_rumpuser_init(void)
        return 0;
 }
 
-void
-rumpuser_putchar(int c)
-{
-
-       bmk_cons_putc(c);
-}
-
 /* reserve 1MB for bmk */
 #define BMK_MEMRESERVE (1024*1024)
 

diff --git a/platform/xen/rumphyper_base.c b/platform/xen/rumphyper_base.c
index 5006a8f09533581b8ddc914c81b3acdc4438295a..539a9ba7a7c3a269cf2118f04c661911ab645d99 100644 (file)
--- a/platform/xen/rumphyper_base.c
+++ b/platform/xen/rumphyper_base.c
@@ -36,14 +36,6 @@
 
 #include <bmk-rumpuser/rumpuser.h>
 
-void
-rumpuser_putchar(int ch)
-{
-       char c = (char)ch;
-
-       minios_console_print(NULL, &c, 1);
-}
-
 int
 rumpuser_getparam(const char *name, void *buf, size_t buflen)
 {