diff --git a/tools/console.c b/tools/console.c index b56fa7f..0631f29 100644 --- a/tools/console.c +++ b/tools/console.c @@ -9,8 +9,6 @@ #include #include "drivers/console.h" -#include "drivers/console/stdio.c" - /* private */ /* variables */ @@ -20,12 +18,17 @@ static char _console_buf[1024]; static size_t _console_buf_cnt = 0; +/* public */ +/* variables */ +extern ukConsole stdio_console; + + /* functions */ /* console_init */ ukConsole * console_init(ukBus * bus, char const * name) { ukConsole * drivers[] = { - &_stdio_console + &stdio_console }; size_t i; diff --git a/tools/project.conf b/tools/project.conf index 882304e..3bc3f5e 100644 --- a/tools/project.conf +++ b/tools/project.conf @@ -15,15 +15,15 @@ sources=start.S [uKernel] type=binary sources=bus.c,console.c,init.c,main.c -ldflags=$(OBJDIR)start.o $(OBJDIR)../src/lib/libuKernel.a `$(CC) -print-libgcc-file-name` -depends=$(OBJDIR)start.o,$(OBJDIR)../src/lib/libuKernel.a +ldflags=$(OBJDIR)start.o $(OBJDIR)../src/lib/libuKernel.a $(OBJDIR)../src/drivers/console/stdio.o `$(CC) -print-libgcc-file-name` +depends=$(OBJDIR)start.o,$(OBJDIR)../src/lib/libuKernel.a,$(OBJDIR)../src/drivers/console/stdio.o #sources [bus.c] depends=../src/drivers/bus.c,../src/drivers/bus/tty.c [console.c] -depends=../src/drivers/console.c,../src/drivers/console/stdio.h,../src/drivers/console/stdio.c +depends=../src/drivers/console.h [main.c] depends=../src/kernel/main.c