X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f6ab9c9ababa2cf6e5c723b83ffb9362094054e8..8b8f49b713d64065775fe538232f8639083601bd:/lunaix-os/kernel/tty/lxconsole.c diff --git a/lunaix-os/kernel/tty/lxconsole.c b/lunaix-os/kernel/tty/lxconsole.c index 8d0747d..5c18cbc 100644 --- a/lunaix-os/kernel/tty/lxconsole.c +++ b/lunaix-os/kernel/tty/lxconsole.c @@ -146,20 +146,6 @@ __tty_read_pg(struct device* dev, void* buf, size_t offset) return __tty_read(dev, buf, offset, PG_SIZE); } -void -lxconsole_spawn_ttydev() -{ - struct device* tty_dev = device_addseq(NULL, &lx_console, "tty"); - tty_dev->ops.write = __tty_write; - tty_dev->ops.write_page = __tty_write_pg; - tty_dev->ops.read = __tty_read; - tty_dev->ops.read_page = __tty_read_pg; - tty_dev->ops.exec_cmd = __tty_exec_cmd; - - waitq_init(&lx_reader); - input_add_listener(__lxconsole_listener); -} - int __tty_write(struct device* dev, void* buf, size_t offset, size_t len) { @@ -352,4 +338,29 @@ console_start_flushing() struct lx_timer* timer = timer_run_ms(20, console_flush, NULL, TIMER_MODE_PERIODIC); lx_console.flush_timer = timer; -} \ No newline at end of file +} + +static int +lxconsole_spawn_ttydev(struct device_def* devdef) +{ + struct device* tty_dev = device_allocseq(NULL, &lx_console); + tty_dev->ops.write = __tty_write; + tty_dev->ops.write_page = __tty_write_pg; + tty_dev->ops.read = __tty_read; + tty_dev->ops.read_page = __tty_read_pg; + tty_dev->ops.exec_cmd = __tty_exec_cmd; + + waitq_init(&lx_reader); + input_add_listener(__lxconsole_listener); + + device_register(tty_dev, &devdef->class, "tty"); + + return 0; +} + +static struct device_def lxconsole_def = { + .name = "Lunaix Virtual Console", + .class = DEVCLASSV(DEVIF_NON, DEVFN_TTY, DEV_BUILTIN, 12), + .init = lxconsole_spawn_ttydev +}; +EXPORT_DEVICE(lxconsole, &lxconsole_def, load_earlystage); \ No newline at end of file