mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 15:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

ps2: use the new input subsystem

Browse Source 
Co-authored-by: Matheus <matheusuky@gmail.com>
This commit is contained in:
iretq
2026-04-27 00:11:28 -03:00
committed by Matheus
parent a1cfbe32bf
commit 21ddc29be7
3 changed files with 236 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/arch/x86-64/ps2mouse.c
+96 -23
View File
@@ -1,6 +1,6 @@
#include <arch/ps2.h>
#include <logging.h>
#include <kernel/mouse.h>
#include <kernel/input.h>
#define PS2_MOUSE_CMD_SAMPLERATE 0xF3
@@ -21,7 +21,7 @@ static void ps2_mouse_setrate(int port, uint8_t rate) {
}
}
static int datac;
static int datac;
static uint8_t data[4];
@@ -32,7 +32,13 @@ static inline bool enoughdata() {
return true;
}
static mouse_t *mouse;
static input_device_t *input_dev;
static bool last_left = false;
static bool last_right = false;
static bool last_middle = false;
static bool last_side = false;
static bool last_extra = false;
static void mouseisr() {
data[datac] = inb(PS2_PORT_DATA);
@@ -48,25 +54,67 @@ static void mouseisr() {
if (!enoughdata())
return;
mousepacket_t packet = {0};
datac = 0;
bool left = data[0] & 1;
bool right = data[0] & 2;
bool middle = data[0] & 4;
bool b4 = data[3] & 0x10;
bool b5 = data[3] & 0x20;
packet.x = data[1] - (data[0] & 0x10 ? 0x100 : 0);
packet.y = data[2] - (data[0] & 0x20 ? 0x100 : 0);
packet.z = (data[3] & 0x7) * (data[3] & 0x8 ? -1 : 1);
int x = data[1] - (data[0] & 0x10 ? 0x100 : 0);
int y = data[2] - (data[0] & 0x20 ? 0x100 : 0);
int z = 0;
packet.flags |= left ? MOUSE_FLAG_LB : 0;
packet.flags |= middle ? MOUSE_FLAG_MB : 0;
packet.flags |= right ? MOUSE_FLAG_RB : 0;
packet.flags |= b4 ? MOUSE_FLAG_B4 : 0;
packet.flags |= b5 ? MOUSE_FLAG_B5 : 0;
mouse_packet(mouse, &packet);
if (haswheel) {
if (fivebuttons)
z = (data[3] & 0x7) * (data[3] & 0x8 ? -1 : 1);
else
z = (int8_t)data[3];
}
bool left = (data[0] & 1) != 0;
bool right = (data[0] & 2) != 0;
bool middle = (data[0] & 4) != 0;
bool side = false, extra = false;
if (fivebuttons) {
side = (data[3] & 16) != 0;
extra = (data[3] & 32) != 0;
}
input_event_t events[8];
int eventcount = 0;
#define EMIT_EVENT(TYPE, CODE, VALUE) \
do { \
events[eventcount].type = (TYPE); \
events[eventcount].code = (CODE); \
events[eventcount].value = (VALUE); \
eventcount++; \
} while (0)
if (x != 0)
EMIT_EVENT(INPUT_EV_REL, INPUT_REL_X, x);
if (y != 0)
EMIT_EVENT(INPUT_EV_REL, INPUT_REL_Y, -y);
if (z != 0)
EMIT_EVENT(INPUT_EV_REL, INPUT_REL_WHEEL, z);
if (left != last_left)
EMIT_EVENT(INPUT_EV_KEY, INPUT_KEY_BTN_LEFT, left ? 1 : 0);
if (right != last_right)
EMIT_EVENT(INPUT_EV_KEY, INPUT_KEY_BTN_RIGHT, right ? 1 : 0);
if (middle != last_middle)
EMIT_EVENT(INPUT_EV_KEY, INPUT_KEY_BTN_MIDDLE, middle ? 1 : 0);
if (side != last_side)
EMIT_EVENT(INPUT_EV_KEY, INPUT_KEY_BTN_SIDE, side ? 1 : 0);
if (extra != last_extra)
EMIT_EVENT(INPUT_EV_KEY, INPUT_KEY_BTN_EXTRA, extra ? 1 : 0);
last_left = left;
last_right = right;
last_middle = middle;
last_side = side;
last_extra = extra;
#undef EMIT_EVENT
input_queue_packet(input_dev, events, eventcount);
}
#define DO_IDENTIFY_CHECK(step) \
@@ -92,7 +140,7 @@ void ps2mouse_init() {
ps2_mouse_setrate(2, 80);
DO_IDENTIFY_CHECK("has scroll");
if (identity[0] == PS2_MOUSE_Z) {
haswheel = true;
@@ -109,11 +157,36 @@ void ps2mouse_init() {
ps2_mouse_setrate(2, 60);
isr_t *isr = interrupt_allocate(mouseisr, arch_apic_eoi, IPL_MOUSE);
isr_t *isr = interrupt_allocate(mouseisr, arch_apic_eoi, IPL_INPUT);
__assert(isr);
arch_ioapic_setirq(PS2_MOUSEIRQ, isr->id & 0xff, current_cpu_id(), false);
mouse = mouse_new();
__assert(mouse);
input_dev = input_new();
__assert(input_dev);
input_dev->id_bus = INPUT_DEVICE_BUS_I8042;
snprintf(input_dev->name, sizeof(input_dev->name), "PS/2 Mouse");
input_dev->id_version = 1;
input_dev->ver_major = 1;
input_dev->ver_minor = 0;
input_dev->ver_patch = 0;
bitmap_set(&input_dev->ev_bits, INPUT_EV_KEY, 1);
bitmap_set(&input_dev->key_bits, INPUT_KEY_BTN_LEFT, 1);
bitmap_set(&input_dev->key_bits, INPUT_KEY_BTN_RIGHT, 1);
bitmap_set(&input_dev->key_bits, INPUT_KEY_BTN_MIDDLE, 1);
if (fivebuttons) {
bitmap_set(&input_dev->key_bits, INPUT_KEY_BTN_SIDE, 1);
bitmap_set(&input_dev->key_bits, INPUT_KEY_BTN_EXTRA, 1);
}
bitmap_set(&input_dev->ev_bits, INPUT_EV_REL, 1);
bitmap_set(&input_dev->rel_bits, INPUT_REL_X, 1);
bitmap_set(&input_dev->rel_bits, INPUT_REL_Y, 1);
if (haswheel)
bitmap_set(&input_dev->rel_bits, INPUT_REL_WHEEL, 1);
printf("ps2mouse: irq enabled with vector %u\n", isr->id & 0xff);
printf("ps2mouse: wheel: %d five buttons: %d\n", haswheel, fivebuttons);
}