diff --git a/src/kernel/core/console.c b/src/kernel/core/console.c index aaf88e0503..67f84ba05d 100644 --- a/src/kernel/core/console.c +++ b/src/kernel/core/console.c @@ -4,18 +4,16 @@ ** Copyright 2001-2002, Travis Geiselbrecht. All rights reserved. ** Distributed under the terms of the NewOS License. */ -#include -#include -#include -#include -#include + #include -#include -#include -#include +#include +#include +#include #include #include +#include + // from con.h enum { @@ -42,8 +40,8 @@ kprintf(const char *fmt, ...) va_start(args, fmt); ret = vsprintf(temp,fmt,args); va_end(args); - - _kern_write(console_fd, 0, temp, ret); + + write_pos(console_fd, 0, temp, ret); } } @@ -62,7 +60,7 @@ kprintf_xy(int x, int y, const char *fmt, ...) buf.x = x; buf.y = y; - _kern_ioctl(console_fd, CONSOLE_OP_WRITEXY, &buf, ret + sizeof(buf.x) + sizeof(buf.y)); + ioctl(console_fd, CONSOLE_OP_WRITEXY, &buf, ret + sizeof(buf.x) + sizeof(buf.y)); } } @@ -72,7 +70,7 @@ con_init(kernel_args *ka) { dprintf("con_init: entry\n"); - console_fd = _kern_open("/dev/console", 0); + console_fd = open("/dev/console", O_RDRW); dprintf("console_fd = %d\n", console_fd); return 0;