summaryrefslogtreecommitdiff
path: root/kernel/con.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/con.c')
-rw-r--r--kernel/con.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/con.c b/kernel/con.c
index c8be80b..2000fbc 100644
--- a/kernel/con.c
+++ b/kernel/con.c
@@ -1,7 +1,7 @@
/*
* con.c
*
- * Basic VGA text console. Implements printk() and puts().
+ * Basic VGA text console. Implements printk().
*/
#include <asm/io.h>
@@ -64,7 +64,7 @@ void con_init(void) {
}
/* write a zero-terminated string to console */
-static int puts(char *s) {
+static int con_puts(char *s) {
uint8_t *p = &vram[pos];
while(*s) {
@@ -100,6 +100,6 @@ int printk(char *fmt, ...) {
ret = vsprintf(buf, fmt, ap);
va_end(ap);
- puts(buf);
+ con_puts(buf);
return ret;
}