kernel: drop old keyboard and mouse subsystems

This commit is contained in:
2026-04-27 00:12:36 -03:00
committed by Matheus
parent 21ddc29be7
commit f48b80e6c2
4 changed files with 0 additions and 616 deletions
-145
View File
@@ -1,145 +0,0 @@
#ifndef _KEYBOARD_H
#define _KEYBOARD_H
#define KBPACKET_FLAGS_RELEASED 1
#define KBPACKET_FLAGS_LEFTCTRL 2
#define KBPACKET_FLAGS_CAPSLOCK 4
#define KBPACKET_FLAGS_LEFTALT 8
#define KBPACKET_FLAGS_RIGHTALT 16
#define KBPACKET_FLAGS_LEFTSHIFT 32
#define KBPACKET_FLAGS_RIGHTCTRL 64
#define KBPACKET_FLAGS_RIGHTSHIFT 128
#define KEYCODE_RESERVED 0
#define KEYCODE_ESCAPE 1
#define KEYCODE_1 2
#define KEYCODE_2 3
#define KEYCODE_3 4
#define KEYCODE_4 5
#define KEYCODE_5 6
#define KEYCODE_6 7
#define KEYCODE_7 8
#define KEYCODE_8 9
#define KEYCODE_9 10
#define KEYCODE_0 11
#define KEYCODE_MINUS 12
#define KEYCODE_EQUAL 13
#define KEYCODE_BACKSPACE 14
#define KEYCODE_TAB 15
#define KEYCODE_Q 16
#define KEYCODE_W 17
#define KEYCODE_E 18
#define KEYCODE_R 19
#define KEYCODE_T 20
#define KEYCODE_Y 21
#define KEYCODE_U 22
#define KEYCODE_I 23
#define KEYCODE_O 24
#define KEYCODE_P 25
#define KEYCODE_LEFTBRACE 26
#define KEYCODE_RIGHTBRACE 27
#define KEYCODE_ENTER 28
#define KEYCODE_LEFTCTRL 29
#define KEYCODE_A 30
#define KEYCODE_S 31
#define KEYCODE_D 32
#define KEYCODE_F 33
#define KEYCODE_G 34
#define KEYCODE_H 35
#define KEYCODE_J 36
#define KEYCODE_K 37
#define KEYCODE_L 38
#define KEYCODE_SEMICOLON 39
#define KEYCODE_APOSTROPHE 40
#define KEYCODE_GRAVE 41
#define KEYCODE_LEFTSHIFT 42
#define KEYCODE_BACKSLASH 43
#define KEYCODE_Z 44
#define KEYCODE_X 45
#define KEYCODE_C 46
#define KEYCODE_V 47
#define KEYCODE_B 48
#define KEYCODE_N 49
#define KEYCODE_M 50
#define KEYCODE_COMMA 51
#define KEYCODE_DOT 52
#define KEYCODE_SLASH 53
#define KEYCODE_RIGHTSHIFT 54
#define KEYCODE_KEYPADASTERISK 55
#define KEYCODE_LEFTALT 56
#define KEYCODE_SPACE 57
#define KEYCODE_CAPSLOCK 58
#define KEYCODE_F1 59
#define KEYCODE_F2 60
#define KEYCODE_F3 61
#define KEYCODE_F4 62
#define KEYCODE_F5 63
#define KEYCODE_F6 64
#define KEYCODE_F7 65
#define KEYCODE_F8 66
#define KEYCODE_F9 67
#define KEYCODE_F10 68
#define KEYCODE_NUMLOCK 69
#define KEYCODE_SCROLLLOCK 70
#define KEYCODE_KEYPAD7 71
#define KEYCODE_KEYPAD8 72
#define KEYCODE_KEYPAD9 73
#define KEYCODE_KEYPADMINUS 74
#define KEYCODE_KEYPAD4 75
#define KEYCODE_KEYPAD5 76
#define KEYCODE_KEYPAD6 77
#define KEYCODE_KEYPADPLUS 78
#define KEYCODE_KEYPAD1 79
#define KEYCODE_KEYPAD2 80
#define KEYCODE_KEYPAD3 81
#define KEYCODE_KEYPAD0 82
#define KEYCODE_KEYPADDOT 83
#define KEYCODE_F11 87
#define KEYCODE_F12 88
#define KEYCODE_KEYPADENTER 96
#define KEYCODE_RIGHTCTRL 97
#define KEYCODE_KEYPADSLASH 98
#define KEYCODE_SYSREQ 99
#define KEYCODE_RIGHTALT 100
#define KEYCODE_LINEFEED 101
#define KEYCODE_HOME 102
#define KEYCODE_UP 103
#define KEYCODE_PAGEUP 104
#define KEYCODE_LEFT 105
#define KEYCODE_RIGHT 106
#define KEYCODE_END 107
#define KEYCODE_DOWN 108
#define KEYCODE_PAGEDOWN 109
#define KEYCODE_INSERT 110
#define KEYCODE_DELETE 111
#include <spinlock.h>
#include <semaphore.h>
#include <ringbuffer.h>
#include <kernel/poll.h>
typedef uintmax_t keycode_t;
typedef struct {
ringbuffer_t packetbuffer;
semaphore_t semaphore;
spinlock_t lock;
int flags;
pollheader_t pollheader;
} keyboard_t;
typedef struct {
char ascii;
keycode_t keycode;
int flags;
} kbpacket_t;
extern keyboard_t *keyboard_console;
void keyboard_init();
keyboard_t *keyboard_new();
void keyboard_sendpacket(keyboard_t *keyboard, kbpacket_t *packet);
bool keyboard_get(keyboard_t *keyboard, kbpacket_t *packet);
int keyboard_wait(keyboard_t *keyboard, kbpacket_t *packet);
#endif
-31
View File
@@ -1,31 +0,0 @@
#ifndef _MOUSE_H
#define _MOUSE_H
#include <ringbuffer.h>
#include <kernel/poll.h>
#include <mutex.h>
#define MOUSE_FLAG_RB 1
#define MOUSE_FLAG_MB 2
#define MOUSE_FLAG_LB 4
#define MOUSE_FLAG_B4 8
#define MOUSE_FLAG_B5 16
typedef struct {
int flags;
int x,y,z;
} mousepacket_t;
typedef struct {
ringbuffer_t packetbuffer;
spinlock_t lock;
pollheader_t pollheader;
int flags;
mutex_t readmutex;
} mouse_t;
void mouse_init();
mouse_t *mouse_new();
void mouse_packet(mouse_t *mouse, mousepacket_t *packet);
#endif
-257
View File
@@ -1,257 +0,0 @@
#include <kernel/keyboard.h>
#include <kernel/alloc.h>
#include <logging.h>
#include <errno.h>
#include <kernel/devfs.h>
#include <hashtable.h>
#include <kernel/poll.h>
#include <kernel/usercopy.h>
#include <kernel/init.h>
#define BUFFER_PACKET_CAPACITY 100
#define BUFFER_SIZE (BUFFER_PACKET_CAPACITY * sizeof(kbpacket_t))
static char asciitable[] = {
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', '\b', '\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\r', 0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, '\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, ' ', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\r', 0, '/', 0, 0, '\r', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
static char asciitableupper[] = {
0, '\033', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '\b', '\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\r', 0, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '\"', '~', 0, '|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 0, '*', 0, ' ', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '\r', 0, '/', 0, 0, '\r', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
static int currentkbnum;
keyboard_t *keyboard_console;
static keyboard_t *newkb() {
keyboard_t *kb = alloc(sizeof(keyboard_t));
if (kb == NULL)
return NULL;
if (ringbuffer_init(&kb->packetbuffer, BUFFER_SIZE)) {
free(kb);
return NULL;
}
SEMAPHORE_INIT(&kb->semaphore, 0);
return kb;
}
static void destroykb(keyboard_t *kb) {
ringbuffer_destroy(&kb->packetbuffer);
free(kb);
}
void keyboard_sendpacket(keyboard_t *kb, kbpacket_t *packet) {
long ipl = interrupt_raiseipl(IPL_KEYBOARD);
switch (packet->keycode) {
case KEYCODE_LEFTCTRL:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_LEFTCTRL;
else
kb->flags |= KBPACKET_FLAGS_LEFTCTRL;
break;
case KEYCODE_RIGHTCTRL:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_RIGHTCTRL;
else
kb->flags |= KBPACKET_FLAGS_RIGHTCTRL;
break;
case KEYCODE_CAPSLOCK:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_CAPSLOCK;
else
kb->flags |= KBPACKET_FLAGS_CAPSLOCK;
break;
case KEYCODE_LEFTALT:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_LEFTALT;
else
kb->flags |= KBPACKET_FLAGS_LEFTALT;
break;
case KEYCODE_RIGHTALT:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_RIGHTALT;
else
kb->flags |= KBPACKET_FLAGS_RIGHTALT;
break;
case KEYCODE_LEFTSHIFT:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_LEFTSHIFT;
else
kb->flags |= KBPACKET_FLAGS_LEFTSHIFT;
break;
case KEYCODE_RIGHTSHIFT:
if (packet->flags & KBPACKET_FLAGS_RELEASED)
kb->flags &= ~KBPACKET_FLAGS_RIGHTSHIFT;
else
kb->flags |= KBPACKET_FLAGS_RIGHTSHIFT;
break;
}
packet->flags |= kb->flags;
char* table = asciitable;
if ((packet->flags & KBPACKET_FLAGS_LEFTSHIFT) || (packet->flags & KBPACKET_FLAGS_RIGHTSHIFT))
table = asciitableupper;
packet->ascii = table[packet->keycode];
spinlock_acquire(&kb->lock);
if (ringbuffer_write(&kb->packetbuffer, packet, sizeof(kbpacket_t)) != 0) {
semaphore_signal(&kb->semaphore);
poll_event(&kb->pollheader, POLLIN);
}
spinlock_release(&kb->lock);
spinlock_acquire(&keyboard_console->lock);
if (ringbuffer_write(&keyboard_console->packetbuffer, packet, sizeof(kbpacket_t)) != 0) {
semaphore_signal(&keyboard_console->semaphore);
poll_event(&keyboard_console->pollheader, POLLIN);
}
spinlock_release(&keyboard_console->lock);
interrupt_loweripl(ipl);
}
int keyboard_wait(keyboard_t *kb, kbpacket_t *packet) {
int e = semaphore_wait(&kb->semaphore, true);
if (e == SCHED_WAKEUP_REASON_INTERRUPTED)
return e;
long ipl = interrupt_raiseipl(IPL_KEYBOARD);
spinlock_acquire(&kb->lock);
__assert(ringbuffer_read(&kb->packetbuffer, packet, sizeof(kbpacket_t)) == sizeof(kbpacket_t));
spinlock_release(&kb->lock);
interrupt_loweripl(ipl);
return 0;
}
bool keyboard_get(keyboard_t *kb, kbpacket_t *packet) {
if (semaphore_test(&kb->semaphore) == false)
return false;
long ipl = interrupt_raiseipl(IPL_KEYBOARD);
spinlock_acquire(&kb->lock);
bool ok = ringbuffer_read(&kb->packetbuffer, packet, sizeof(kbpacket_t)) == sizeof(kbpacket_t);
spinlock_release(&kb->lock);
interrupt_loweripl(ipl);
return ok;
}
static hashtable_t kbtable;
static mutex_t tablelock;
static keyboard_t* getkb(int kb) {
void *kbp = NULL;
MUTEX_ACQUIRE(&tablelock);
hashtable_get(&kbtable, &kbp, &kb, sizeof(kb));
MUTEX_RELEASE(&tablelock);
return kbp;
}
static int read(int minor, iovec_iterator_t *iovec_iterator, size_t size, uintmax_t offset, int flags, size_t *readc) {
keyboard_t *kb = getkb(minor);
if (kb == NULL)
return ENODEV;
*readc = 0;
size_t count = size / sizeof(kbpacket_t);
if (count == 0)
return 0;
for (int i = 0; i < count; ++i) {
kbpacket_t packet;
bool ok = keyboard_get(kb, &packet);
if (ok == false) {
if (i == 0 && (flags & V_FFLAGS_NONBLOCKING) == 0) {
int error = keyboard_wait(kb, &packet);
if (error)
return error;
error = iovec_iterator_copy_from_buffer(iovec_iterator, &packet, sizeof(kbpacket_t));
*readc += error ? 0 : sizeof(kbpacket_t);
return error;
}
break;
}
int error = iovec_iterator_copy_from_buffer(iovec_iterator, &packet, sizeof(kbpacket_t));
if (error)
return error;
*readc += sizeof(kbpacket_t);
}
return 0;
}
static int poll(int minor, polldata_t *data, int events) {
int revents = 0;
keyboard_t *kb = getkb(minor);
if (kb == NULL)
return POLLERR;
long ipl = interrupt_raiseipl(IPL_KEYBOARD);
spinlock_acquire(&kb->lock);
if (events & POLLIN) {
size_t dataleft = RINGBUFFER_DATACOUNT(&kb->packetbuffer);
if (dataleft)
revents |= POLLIN;
}
if (revents == 0 && data)
poll_add(&kb->pollheader, data, events);
spinlock_release(&kb->lock);
interrupt_loweripl(ipl);
return revents;
}
static devops_t devops = {
.read = read,
.poll = poll
};
keyboard_t *keyboard_new() {
keyboard_t *kb = newkb();
if (kb == NULL)
return NULL;
MUTEX_ACQUIRE(&tablelock);
if (hashtable_set(&kbtable, kb, &currentkbnum, sizeof(currentkbnum), true)) {
MUTEX_RELEASE(&tablelock);
destroykb(kb);
return NULL;
}
MUTEX_RELEASE(&tablelock);
char name[12];
snprintf(name, 12, "keyboard%d", currentkbnum);
__assert(devfs_register(&devops, name, V_TYPE_CHDEV, DEV_MAJOR_KEYBOARD, currentkbnum, 0666, NULL) == 0);
POLL_INITHEADER(&kb->pollheader);
++currentkbnum;
return kb;
}
void keyboard_init() {
MUTEX_INIT(&tablelock);
keyboard_console = newkb();
__assert(keyboard_console);
__assert(hashtable_init(&kbtable, 20) == 0);
}
INIT_ROUTINE_DEFINE(keyboard, INIT_ROUTINE_FLAGS_NONE, keyboard_init, bsp_early);
-183
View File
@@ -1,183 +0,0 @@
#include <kernel/mouse.h>
#include <kernel/alloc.h>
#include <logging.h>
#include <errno.h>
#include <kernel/devfs.h>
#include <hashtable.h>
#include <kernel/poll.h>
#define BUFFER_PACKET_CAPACITY 100
#define BUFFER_SIZE (BUFFER_PACKET_CAPACITY * sizeof(mousepacket_t))
static int currentnum;
static mouse_t *newmouse() {
mouse_t *mouse = alloc(sizeof(mouse_t));
if (mouse == NULL)
return NULL;
if (ringbuffer_init(&mouse->packetbuffer, BUFFER_SIZE)) {
free(mouse);
return NULL;
}
POLL_INITHEADER(&mouse->pollheader);
SPINLOCK_INIT(mouse->lock);
MUTEX_INIT(&mouse->readmutex);
return mouse;
}
static void destroymouse(mouse_t *mouse) {
ringbuffer_destroy(&mouse->packetbuffer);
free(mouse);
}
void mouse_packet(mouse_t *mouse, mousepacket_t *packet) {
int oldipl = interrupt_raiseipl(IPL_MOUSE);
spinlock_acquire(&mouse->lock);
ringbuffer_write(&mouse->packetbuffer, packet, sizeof(mousepacket_t));
poll_event(&mouse->pollheader, POLLIN);
spinlock_release(&mouse->lock);
interrupt_loweripl(oldipl);
}
HASHTABLE_DEFINE_STATIC(mousetable, 10);
static MUTEX_DEFINE(tablelock);
static mouse_t* getmouse(int mouse) {
void *mousep = NULL;
MUTEX_ACQUIRE(&tablelock);
hashtable_get(&mousetable, &mousep, &mouse, sizeof(mouse));
MUTEX_RELEASE(&tablelock);
return mousep;
}
static int internalpoll(mouse_t *mouse, polldata_t *data, int events) {
int revents = 0;
if ((events & POLLIN) && RINGBUFFER_DATACOUNT(&mouse->packetbuffer))
revents |= POLLIN;
if (revents == 0 && data)
poll_add(&mouse->pollheader, data, events);
return revents;
}
static int read(int minor, iovec_iterator_t *iovec_iterator, size_t size, uintmax_t offset, int flags, size_t *readc) {
mouse_t *mouse = getmouse(minor);
if (mouse == NULL)
return ENODEV;
int error = 0;
*readc = 0;
size_t packetcount = size / sizeof(mousepacket_t);
if (packetcount == 0)
return error;
MUTEX_ACQUIRE(&mouse->readmutex);
// wait until there is data to read or return if nonblock
for (;;) {
polldesc_t desc = {0};
error = poll_initdesc(&desc, 1);
if (error)
goto leave;
// disable interrupts here as to not lose any interrupts
// and because we cannot sleep with a raised ipl
bool oldintstatus = interrupt_set(false);
spinlock_acquire(&mouse->lock);
int revents = internalpoll(mouse, &desc.data[0], POLLIN);
if (revents) {
spinlock_release(&mouse->lock);
interrupt_set(oldintstatus);
poll_leave(&desc);
poll_destroydesc(&desc);
break;
}
if (revents == 0 && flags & V_FFLAGS_NONBLOCKING) {
spinlock_release(&mouse->lock);
interrupt_set(oldintstatus);
poll_leave(&desc);
poll_destroydesc(&desc);
error = EAGAIN;
goto leave;
}
spinlock_release(&mouse->lock);
error = poll_dowait(&desc, 0);
interrupt_set(oldintstatus);
poll_leave(&desc);
poll_destroydesc(&desc);
if (error)
goto leave;
}
*readc = iovec_iterator_read_from_ringbuffer(iovec_iterator, &mouse->packetbuffer, sizeof(mousepacket_t) * packetcount);
if (*readc == RINGBUFFER_USER_COPY_FAILED) {
error = EFAULT;
goto leave;
}
__assert(*readc);
leave:
MUTEX_RELEASE(&mouse->readmutex);
return error;
}
static int poll(int minor, polldata_t *data, int events) {
mouse_t *mouse = getmouse(minor);
if (mouse == NULL)
return POLLERR;
MUTEX_ACQUIRE(&mouse->readmutex);
long ipl = interrupt_raiseipl(IPL_MOUSE);
spinlock_acquire(&mouse->lock);
int revents = internalpoll(mouse, data, events);
spinlock_release(&mouse->lock);
interrupt_loweripl(ipl);
MUTEX_RELEASE(&mouse->readmutex);
return revents;
}
static devops_t devops = {
.read = read,
.poll = poll
};
mouse_t *mouse_new() {
mouse_t *mouse = newmouse();
if (mouse == NULL)
return NULL;
MUTEX_ACQUIRE(&tablelock);
if (hashtable_set(&mousetable, mouse, &currentnum, sizeof(currentnum), true)) {
MUTEX_RELEASE(&tablelock);
destroymouse(mouse);
return NULL;
}
MUTEX_RELEASE(&tablelock);
char name[12];
snprintf(name, 12, "mouse%d", currentnum);
__assert(devfs_register(&devops, name, V_TYPE_CHDEV, DEV_MAJOR_MOUSE, currentnum, 0666, NULL) == 0);
++currentnum;
return mouse;
}