From 093bc34cf1348d5200606574247d078b9a9fdfc3 Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Sun, 19 Apr 2015 16:05:58 +0000
Subject: [PATCH] implement rumpuser_putchar() in common code

---
 lib/librumprun_rumpuser/Makefile                          | 2 +-
 .../{rumpuser_dprintf.c => rumpuser_cons.c}               | 7 +++++++
 platform/baremetal/rumpuser.c                             | 7 -------
 platform/xen/rumphyper_base.c                             | 8 --------
 4 files changed, 8 insertions(+), 16 deletions(-)
 rename lib/librumprun_rumpuser/{rumpuser_dprintf.c => rumpuser_cons.c} (96%)

diff --git a/lib/librumprun_rumpuser/Makefile b/lib/librumprun_rumpuser/Makefile
index 0231f4e..1e1651b 100644
--- 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_dprintf.c b/lib/librumprun_rumpuser/rumpuser_cons.c
similarity index 96%
rename from lib/librumprun_rumpuser/rumpuser_dprintf.c
rename to lib/librumprun_rumpuser/rumpuser_cons.c
index 81bf495..173c2af 100644
--- a/lib/librumprun_rumpuser/rumpuser_dprintf.c
+++ b/lib/librumprun_rumpuser/rumpuser_cons.c
@@ -30,6 +30,13 @@
 #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, ...)
 {
diff --git a/platform/baremetal/rumpuser.c b/platform/baremetal/rumpuser.c
index aab6b24..4bd8975 100644
--- 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 5006a8f..539a9ba 100644
--- 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)
 {
-- 
2.39.5