X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/b3b42765712afed5a35c9be5c832f4a06bd85e7a..c4510182f3c02e390184bee518940e325f064b20:/lunaix-os/kernel/lxconsole.c?ds=inline

diff --git a/lunaix-os/kernel/lxconsole.c b/lunaix-os/kernel/lxconsole.c
deleted file mode 100644
index 77949c8..0000000
--- a/lunaix-os/kernel/lxconsole.c
+++ /dev/null
@@ -1,225 +0,0 @@
-#include <klibc/string.h>
-#include <lunaix/device.h>
-#include <lunaix/input.h>
-#include <lunaix/keyboard.h>
-#include <lunaix/lxconsole.h>
-#include <lunaix/mm/pmm.h>
-#include <lunaix/mm/valloc.h>
-#include <lunaix/mm/vmm.h>
-#include <lunaix/sched.h>
-#include <lunaix/tty/console.h>
-#include <lunaix/tty/tty.h>
-
-static struct console lx_console;
-
-int
-__tty_write(struct device* dev, void* buf, size_t offset, size_t len);
-
-int
-__tty_read(struct device* dev, void* buf, size_t offset, size_t len);
-
-static waitq_t lx_reader;
-static volatile char key;
-
-int
-__lxconsole_listener(struct input_device* dev)
-{
-    uint32_t keycode = dev->current_pkt.sys_code;
-    uint32_t type = dev->current_pkt.pkt_type;
-    if (type == PKT_PRESS) {
-        if (keycode == KEY_UP) {
-            console_view_up();
-        } else if (keycode == KEY_DOWN) {
-            console_view_down();
-        }
-        goto done;
-    }
-    if ((keycode & 0xff00) > KEYPAD) {
-        goto done;
-    }
-
-    key = (char)(keycode & 0x00ff);
-
-    pwake_all(&lx_reader);
-
-done:
-    return INPUT_EVT_NEXT;
-}
-
-void
-lxconsole_init()
-{
-    memset(&lx_console, 0, sizeof(lx_console));
-    fifo_init(&lx_console.output, vzalloc(8192), 8192, 0);
-    fifo_init(&lx_console.input, valloc(4096), 4096, 0);
-
-    lx_console.flush_timer = NULL;
-
-    struct device* tty_dev = device_addseq(NULL, &lx_console, "tty");
-    tty_dev->write = __tty_write;
-    tty_dev->read = __tty_read;
-
-    waitq_init(&lx_reader);
-    input_add_listener(__lxconsole_listener);
-}
-
-int
-__tty_write(struct device* dev, void* buf, size_t offset, size_t len)
-{
-    struct console* console = (struct console*)dev->underlay;
-    console_write(console, buf, len);
-}
-
-int
-__tty_read(struct device* dev, void* buf, size_t offset, size_t len)
-{
-    struct console* console = (struct console*)dev->underlay;
-
-    size_t count = fifo_read(&console->input, buf, len);
-    if (count > 0 && ((char*)buf)[count - 1] == '\n') {
-        return count;
-    }
-
-    while (count < len) {
-        pwait(&lx_reader);
-
-        if (key == 0x08) {
-            if (fifo_backone(&console->input)) {
-                console_write_char(key);
-            }
-            continue;
-        }
-        console_write_char(key);
-        if (!fifo_putone(&console->input, key) || key == '\n') {
-            break;
-        }
-    }
-    return count + fifo_read(&console->input, buf + count, len - count);
-}
-
-void
-console_schedule_flush()
-{
-    // TODO make the flush on-demand rather than periodic
-}
-
-void
-console_view_up()
-{
-    struct fifo_buf* buffer = &lx_console.output;
-    mutex_lock(&buffer->lock);
-    size_t p = lx_console.erd_pos - 2;
-    while (p < lx_console.erd_pos && p != buffer->wr_pos &&
-           ((char*)buffer->data)[p] != '\n') {
-        p--;
-    }
-    p++;
-
-    if (p > lx_console.erd_pos) {
-        p = 0;
-    }
-
-    buffer->flags |= FIFO_DIRTY;
-    lx_console.erd_pos = p;
-    mutex_unlock(&buffer->lock);
-}
-
-size_t
-__find_next_line(size_t start)
-{
-    size_t p = start;
-    while (p != lx_console.output.wr_pos &&
-           ((char*)lx_console.output.data)[p] != '\n') {
-        p = (p + 1) % lx_console.output.size;
-    }
-    return p + 1;
-}
-
-void
-console_view_down()
-{
-    struct fifo_buf* buffer = &lx_console.output;
-    mutex_lock(&buffer->lock);
-
-    lx_console.erd_pos = __find_next_line(lx_console.erd_pos);
-    buffer->flags |= FIFO_DIRTY;
-    mutex_unlock(&buffer->lock);
-}
-
-void
-console_flush()
-{
-    if (mutex_on_hold(&lx_console.output.lock)) {
-        return;
-    }
-    if (!(lx_console.output.flags & FIFO_DIRTY)) {
-        return;
-    }
-
-    tty_flush_buffer(lx_console.output.data,
-                     lx_console.erd_pos,
-                     lx_console.output.wr_pos,
-                     lx_console.output.size);
-    lx_console.output.flags &= ~FIFO_DIRTY;
-}
-
-void
-console_write(struct console* console, uint8_t* data, size_t size)
-{
-    mutex_lock(&console->output.lock);
-    uint8_t* buffer = console->output.data;
-    uintptr_t ptr = console->output.wr_pos;
-    uintptr_t rd_ptr = console->output.rd_pos;
-
-    char c;
-    int lines = 0;
-    int j = 0;
-    for (size_t i = 0; i < size; i++) {
-        c = data[i];
-        if (!c) {
-            continue;
-        }
-        buffer[(ptr + j) % console->output.size] = c;
-        lines += (c == '\n');
-        j++;
-    }
-
-    size = j;
-
-    uintptr_t new_ptr = (ptr + size) % console->output.size;
-    console->output.wr_pos = new_ptr;
-
-    if (console->lines > TTY_HEIGHT && lines > 0) {
-        console->output.rd_pos =
-          __find_next_line((size + rd_ptr) % console->output.size);
-    }
-
-    if (new_ptr < ptr + size && new_ptr > rd_ptr) {
-        console->output.rd_pos = new_ptr;
-    }
-
-    console->lines += lines;
-    console->erd_pos = console->output.rd_pos;
-    console->output.flags |= FIFO_DIRTY;
-    mutex_unlock(&console->output.lock);
-}
-
-void
-console_write_str(char* str)
-{
-    console_write(&lx_console, str, strlen(str));
-}
-
-void
-console_write_char(char str)
-{
-    console_write(&lx_console, &str, 1);
-}
-
-void
-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