summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/init.c4
-rw-r--r--kernel/io.c6
2 files changed, 4 insertions, 6 deletions
diff --git a/kernel/init.c b/kernel/init.c
index a7a71d6..195ce92 100644
--- a/kernel/init.c
+++ b/kernel/init.c
@@ -4,7 +4,5 @@
void kernel_main(void) {
tty_init();
- serial_init();
- serial_writestring("Hello world\n");
- printf("Hello world\n");
+ kprintf("Hello world\n");
}
diff --git a/kernel/io.c b/kernel/io.c
index e2bef20..71b01bd 100644
--- a/kernel/io.c
+++ b/kernel/io.c
@@ -18,7 +18,7 @@ char* convert(unsigned int num, int base) {
return ptr;
}
-int vprintf(const char *fmt, va_list args) {
+int vkprintf(const char *fmt, va_list args) {
char *s;
int i;
@@ -60,12 +60,12 @@ int vprintf(const char *fmt, va_list args) {
return 0;
}
-int printf(const char *fmt, ...) {
+int kprintf(const char *fmt, ...) {
va_list args;
int done;
va_start(args, fmt);
- done = vprintf(fmt, args);
+ done = vkprintf(fmt, args);
va_end(args);
return done;