Obtain the user-land console driver from its object

This commit is contained in:
Pierre Pronchery 2018-06-21 00:02:45 +02:00
parent 9948eb7a7a
commit beb0808f4e
2 changed files with 9 additions and 6 deletions

View File

@ -9,8 +9,6 @@
#include <errno.h>
#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;

View File

@ -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