From dc42353f53df0b5425377330f16e668829d8fd9a Mon Sep 17 00:00:00 2001 From: dzwdz Date: Thu, 5 May 2022 21:01:25 +0200 Subject: kernel: ps2 driver is now a separate backend --- src/kernel/arch/i386/driver/ps2.c | 40 +++++++++++++++++++++++++++++++++++++++ src/kernel/arch/i386/driver/ps2.h | 4 ++++ 2 files changed, 44 insertions(+) (limited to 'src/kernel/arch') diff --git a/src/kernel/arch/i386/driver/ps2.c b/src/kernel/arch/i386/driver/ps2.c index 4b7eae4..6ee24e2 100644 --- a/src/kernel/arch/i386/driver/ps2.c +++ b/src/kernel/arch/i386/driver/ps2.c @@ -1,20 +1,60 @@ #include #include +#include +#include #include #include + #define BACKLOG_CAPACITY 64 static volatile uint8_t backlog_buf[BACKLOG_CAPACITY]; static volatile ring_t backlog = {(void*)backlog_buf, BACKLOG_CAPACITY, 0, 0}; +static struct vfs_request *blocked_on = NULL; + bool ps2_ready(void) { return ring_size((void*)&backlog) > 0; } void ps2_recv(uint8_t s) { ring_put1b((void*)&backlog, s); + if (blocked_on) { + vfs_ps2_accept(blocked_on); + blocked_on = NULL; + } } size_t ps2_read(uint8_t *buf, size_t len) { return ring_get((void*)&backlog, buf, len); } + +int vfs_ps2_accept(struct vfs_request *req) { + static uint8_t buf[32]; // pretty damn stupid + int ret; + switch (req->type) { + case VFSOP_OPEN: + // allows opening /ps2/anything, TODO don't + return vfsreq_finish(req, 0); // fake file handle, whatever + case VFSOP_READ: + if (ps2_ready()) { + // TODO FUKKEN MESS + if (req->caller) { + // clamp between 0, sizeof buf + ret = req->output.len; + if (ret > sizeof buf) ret = sizeof buf; + if (ret < 0) ret = 0; + + ret = ps2_read(buf, ret); + virt_cpy_to(req->caller->pages, req->output.buf, buf, ret); + } else ret = -1; + return vfsreq_finish(req, ret); + } else { + blocked_on = req; + return -1; + } + default: + return vfsreq_finish(req, -1); + } +} + +bool vfs_ps2_ready(struct vfs_backend *self) { return blocked_on == NULL; } diff --git a/src/kernel/arch/i386/driver/ps2.h b/src/kernel/arch/i386/driver/ps2.h index 712b157..1bbc2f1 100644 --- a/src/kernel/arch/i386/driver/ps2.h +++ b/src/kernel/arch/i386/driver/ps2.h @@ -1,4 +1,5 @@ #pragma once +#include #include #include #include @@ -6,3 +7,6 @@ bool ps2_ready(void); void ps2_recv(uint8_t scancode); size_t ps2_read(uint8_t *buf, size_t max_len); + +int vfs_ps2_accept(struct vfs_request *); +bool vfs_ps2_ready(struct vfs_backend *); -- cgit v1.2.3