diff options
author | dzwdz | 2022-04-07 21:25:54 +0200 |
---|---|---|
committer | dzwdz | 2022-04-07 21:25:54 +0200 |
commit | 86623b76dce72bc611f470e0e9ecad963fd558b2 (patch) | |
tree | e9f1204a3761e4389e4b51276c7d359957f4fb86 /src/kernel/vfs | |
parent | da2bbef4e4f586ecf13cd5ffe9a62df3114a3483 (diff) |
kernel: remove the `/tty` device
Diffstat (limited to 'src/kernel/vfs')
-rw-r--r-- | src/kernel/vfs/root.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/src/kernel/vfs/root.c b/src/kernel/vfs/root.c index b8b41fc..f61096c 100644 --- a/src/kernel/vfs/root.c +++ b/src/kernel/vfs/root.c @@ -12,7 +12,6 @@ enum { HANDLE_ROOT, - HANDLE_TTY, HANDLE_VGA, HANDLE_COM1, HANDLE_PS2, @@ -60,9 +59,7 @@ int vfs_root_handler(struct vfs_request *req) { switch (req->type) { case VFSOP_OPEN: if (exacteq(req, "/")) return HANDLE_ROOT; - if (exacteq(req, "/tty")) return HANDLE_TTY; if (exacteq(req, "/vga")) return HANDLE_VGA; - if (exacteq(req, "/com1")) return HANDLE_COM1; if (exacteq(req, "/ps2")) return HANDLE_PS2; @@ -83,7 +80,6 @@ int vfs_root_handler(struct vfs_request *req) { case HANDLE_ROOT: { // TODO document directory read format const char src[] = - "tty\0" "vga\0" "com1\0" "ps2\0" @@ -93,14 +89,6 @@ int vfs_root_handler(struct vfs_request *req) { virt_cpy_to(req->caller->pages, req->output.buf, src, len); return len; } - case HANDLE_TTY: { - struct virt_iter iter; - virt_iter_new(&iter, req->output.buf, req->output.len, - req->caller->pages, true, false); - while (virt_iter_next(&iter)) - tty_read(iter.frag, iter.frag_len); - return iter.prior; - } case HANDLE_VGA: { char *vga = (void*)0xB8000; req_preprocess(req, 80*25*2); @@ -109,10 +97,12 @@ int vfs_root_handler(struct vfs_request *req) { return req->output.len; } case HANDLE_COM1: { - char buf[16]; - size_t len = serial_read(buf, sizeof buf); - virt_cpy_to(req->caller->pages, req->output.buf, buf, len); - return len; + struct virt_iter iter; + virt_iter_new(&iter, req->output.buf, req->output.len, + req->caller->pages, true, false); + while (virt_iter_next(&iter)) + serial_read(iter.frag, iter.frag_len); + return iter.prior; } case HANDLE_PS2: { uint8_t buf[16]; @@ -150,14 +140,6 @@ int vfs_root_handler(struct vfs_request *req) { case VFSOP_WRITE: switch (req->id) { case HANDLE_ROOT: return -1; - case HANDLE_TTY: { - struct virt_iter iter; - virt_iter_new(&iter, req->input.buf, req->input.len, - req->caller->pages, true, false); - while (virt_iter_next(&iter)) - tty_write(iter.frag, iter.frag_len); - return iter.prior; - } case HANDLE_VGA: { void *vga = (void*)0xB8000; req_preprocess(req, 80*25*2); |