X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/714e732504021937171665407133851ad9f3e68b..90129c6876c9bac2e468ab82c8264352d1952b4d:/lunaix-os/kernel/lxconsole.c?ds=sidebyside diff --git a/lunaix-os/kernel/lxconsole.c b/lunaix-os/kernel/lxconsole.c index 88fd1f4..894a1b8 100644 --- a/lunaix-os/kernel/lxconsole.c +++ b/lunaix-os/kernel/lxconsole.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -7,7 +8,11 @@ static struct console lx_console; -volatile int can_flush = 0; +int +__tty_write(struct device* dev, + void* buf, + unsigned int offset, + unsigned int len); void lxconsole_init() @@ -30,6 +35,19 @@ lxconsole_init() memset(lx_console.buffer.data, 0, lx_console.buffer.size); lx_console.flush_timer = NULL; + + struct device* tty_dev = device_add(NULL, &lx_console, "tty"); + tty_dev->write = __tty_write; +} + +int +__tty_write(struct device* dev, + void* buf, + unsigned int offset, + unsigned int len) +{ + struct console* console = (struct console*)dev->underlay; + console_write(console, buf, len); } void @@ -82,7 +100,7 @@ console_view_down() } void -__flush_cb(void* arg) +console_flush() { if (mutex_on_hold(&lx_console.buffer.lock)) { return; @@ -111,7 +129,6 @@ console_write(struct console* console, uint8_t* data, size_t size) for (size_t i = 0; i < size; i++) { c = data[i]; buffer[(ptr + i) % console->buffer.size] = c; - // chars += (31 < c && c < 127); lines += (c == '\n'); } @@ -149,6 +166,6 @@ void console_start_flushing() { struct lx_timer* timer = - timer_run_ms(20, __flush_cb, NULL, TIMER_MODE_PERIODIC); + timer_run_ms(20, console_flush, NULL, TIMER_MODE_PERIODIC); lx_console.flush_timer = timer; } \ No newline at end of file