From 6a00dde82ba2fdbbd40ff1f5638c4ed2cf21718a Mon Sep 17 00:00:00 2001
From: Laurent Vivier <Laurent@lvivier.info>
Date: Mon, 23 May 2005 17:09:48 +0000
Subject: [PATCH] replace console_put() by putchar() and console_print() by
 putstring()

---
 second/console.c | 12 +++++++-----
 second/console.h |  3 +--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/second/console.c b/second/console.c
index 6c9d066..5636893 100644
--- a/second/console.c
+++ b/second/console.c
@@ -4,6 +4,8 @@
  *
  */
 
+#include <stdio.h>
+
 #include "console.h"
 
 #include "vga.h"
@@ -23,17 +25,17 @@ console_init(emile_l2_header_t* info)
 		serial_init(info);
 }
 
-void
-console_put(char c)
+inline int putchar(int c)
 {
 	if (vga_enabled)
 		vga_put(c);
 	serial_put(c);
+
+	return c;
 }
 
-void
-console_print(const char *s)
+void putstring(const char *s)
 {
 	while(*s)
-		console_put(*(s++));
+                putchar(*(s++));
 }
diff --git a/second/console.h b/second/console.h
index b56a07c..f19f496 100644
--- a/second/console.h
+++ b/second/console.h
@@ -12,7 +12,6 @@
 
 extern void console_init(emile_l2_header_t* info);
 
-extern void console_put(char c);
-extern void console_print(const char *s);
+extern void putstring(const char *s);
 
 #endif