DeforaOS/uKernel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring the user-land console driver closer to uKernel

Browse Source
This commit is contained in:
Pierre Pronchery 2018-06-20 21:59:39 +02:00
parent 4ac899b883
commit ecb1d85402
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/console.c
View File

@ -24,23 +24,29 @@ static size_t _console_buf_cnt = 0;
/* console_init */ /* console_init */
ukConsole * console_init(ukBus * bus, char const * name) ukConsole * console_init(ukBus * bus, char const * name)
{ {
ukConsole * console = NULL; ukConsole * drivers[] = {
&_stdio_console
};
size_t i;
if(strcmp(name, "stdio") == 0) if(_console != NULL)
{ return _console;
printf("%s%s%s\n", name, (bus != NULL) ? " at " : "", for(i = 0; i < sizeof(drivers) / sizeof(*drivers); i++)
(bus != NULL) ? bus->name : ""); if(strncmp(drivers[i]->name, name,
console = _stdio_console_init(bus); strlen(drivers[i]->name)) == 0
} && drivers[i]->init != NULL)
else {
printf("%s%s%s\n", name, (bus != NULL) ? " at " : "",
(bus != NULL) ? bus->name : "");
_console = _stdio_console_init(bus);
}
if(_console == NULL)
{ {
errno = ENODEV; errno = ENODEV;
return NULL; return NULL;
} }
if(_console == NULL)
_console = console;
_console->print(_console, _console_buf, _console_buf_cnt); _console->print(_console, _console_buf, _console_buf_cnt);
return console; return _console;
} }
@ -49,6 +55,8 @@ ukConsole * console_init(ukBus * bus, char const * name)
/* console_get_default */ /* console_get_default */
ukConsole * console_get_default(void) ukConsole * console_get_default(void)
{ {
if(_console == NULL)
errno = ENODEV;
return _console; return _console;
} }
@ -57,8 +65,9 @@ ukConsole * console_get_default(void)
/* console_clear */ /* console_clear */
void console_clear(ukConsole * console) void console_clear(ukConsole * console)
{ {
if(console == NULL) if(console == NULL
console = console_get_default(); && (console = console_get_default()) == NULL)
return;
console->clear(console); console->clear(console);
} }