mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-01 23:18:21 +00:00
ps2: use the new input subsystem
Co-authored-by: Matheus <matheusuky@gmail.com>
This commit is contained in:
Matheus
+139
-127
@@ -1,123 +1,124 @@
|
||||
#include <arch/ps2kbd.h>
|
||||
#include <stdbool.h>
|
||||
#include <arch/io.h>
|
||||
#include <arch/cpu.h>
|
||||
#include <kernel/interrupt.h>
|
||||
#include <arch/apic.h>
|
||||
#include <kernel/keyboard.h>
|
||||
#include <arch/cpu.h>
|
||||
#include <arch/io.h>
|
||||
#include <arch/ps2.h>
|
||||
#include <arch/ps2kbd.h>
|
||||
#include <kernel/input.h>
|
||||
#include <kernel/interrupt.h>
|
||||
#include <logging.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
static char codes[128] = {
|
||||
KEYCODE_RESERVED,
|
||||
KEYCODE_ESCAPE,
|
||||
KEYCODE_1,
|
||||
KEYCODE_2,
|
||||
KEYCODE_3,
|
||||
KEYCODE_4,
|
||||
KEYCODE_5,
|
||||
KEYCODE_6,
|
||||
KEYCODE_7,
|
||||
KEYCODE_8,
|
||||
KEYCODE_9,
|
||||
KEYCODE_0,
|
||||
KEYCODE_MINUS,
|
||||
KEYCODE_EQUAL,
|
||||
KEYCODE_BACKSPACE,
|
||||
KEYCODE_TAB,
|
||||
KEYCODE_Q,
|
||||
KEYCODE_W,
|
||||
KEYCODE_E,
|
||||
KEYCODE_R,
|
||||
KEYCODE_T,
|
||||
KEYCODE_Y,
|
||||
KEYCODE_U,
|
||||
KEYCODE_I,
|
||||
KEYCODE_O,
|
||||
KEYCODE_P,
|
||||
KEYCODE_LEFTBRACE,
|
||||
KEYCODE_RIGHTBRACE,
|
||||
KEYCODE_ENTER,
|
||||
KEYCODE_LEFTCTRL,
|
||||
KEYCODE_A,
|
||||
KEYCODE_S,
|
||||
KEYCODE_D,
|
||||
KEYCODE_F,
|
||||
KEYCODE_G,
|
||||
KEYCODE_H,
|
||||
KEYCODE_J,
|
||||
KEYCODE_K,
|
||||
KEYCODE_L,
|
||||
KEYCODE_SEMICOLON,
|
||||
KEYCODE_APOSTROPHE,
|
||||
KEYCODE_GRAVE,
|
||||
KEYCODE_LEFTSHIFT,
|
||||
KEYCODE_BACKSLASH,
|
||||
KEYCODE_Z,
|
||||
KEYCODE_X,
|
||||
KEYCODE_C,
|
||||
KEYCODE_V,
|
||||
KEYCODE_B,
|
||||
KEYCODE_N,
|
||||
KEYCODE_M,
|
||||
KEYCODE_COMMA,
|
||||
KEYCODE_DOT,
|
||||
KEYCODE_SLASH,
|
||||
KEYCODE_RIGHTSHIFT,
|
||||
KEYCODE_KEYPADASTERISK,
|
||||
KEYCODE_LEFTALT,
|
||||
KEYCODE_SPACE,
|
||||
KEYCODE_CAPSLOCK,
|
||||
KEYCODE_F1,
|
||||
KEYCODE_F2,
|
||||
KEYCODE_F3,
|
||||
KEYCODE_F4,
|
||||
KEYCODE_F5,
|
||||
KEYCODE_F6,
|
||||
KEYCODE_F7,
|
||||
KEYCODE_F8,
|
||||
KEYCODE_F9,
|
||||
KEYCODE_F10,
|
||||
KEYCODE_NUMLOCK,
|
||||
KEYCODE_SCROLLLOCK,
|
||||
KEYCODE_KEYPAD7,
|
||||
KEYCODE_KEYPAD8,
|
||||
KEYCODE_KEYPAD9,
|
||||
KEYCODE_KEYPADMINUS,
|
||||
KEYCODE_KEYPAD4,
|
||||
KEYCODE_KEYPAD5,
|
||||
KEYCODE_KEYPAD6,
|
||||
KEYCODE_KEYPADPLUS,
|
||||
KEYCODE_KEYPAD1,
|
||||
KEYCODE_KEYPAD2,
|
||||
KEYCODE_KEYPAD3,
|
||||
KEYCODE_KEYPAD0,
|
||||
KEYCODE_KEYPADDOT,
|
||||
static uint8_t codes[128] = {
|
||||
INPUT_KEY_RESERVED,
|
||||
INPUT_KEY_ESC,
|
||||
INPUT_KEY_1,
|
||||
INPUT_KEY_2,
|
||||
INPUT_KEY_3,
|
||||
INPUT_KEY_4,
|
||||
INPUT_KEY_5,
|
||||
INPUT_KEY_6,
|
||||
INPUT_KEY_7,
|
||||
INPUT_KEY_8,
|
||||
INPUT_KEY_9,
|
||||
INPUT_KEY_0,
|
||||
INPUT_KEY_MINUS,
|
||||
INPUT_KEY_EQUAL,
|
||||
INPUT_KEY_BACKSPACE,
|
||||
INPUT_KEY_TAB,
|
||||
INPUT_KEY_Q,
|
||||
INPUT_KEY_W,
|
||||
INPUT_KEY_E,
|
||||
INPUT_KEY_R,
|
||||
INPUT_KEY_T,
|
||||
INPUT_KEY_Y,
|
||||
INPUT_KEY_U,
|
||||
INPUT_KEY_I,
|
||||
INPUT_KEY_O,
|
||||
INPUT_KEY_P,
|
||||
INPUT_KEY_LEFTBRACE,
|
||||
INPUT_KEY_RIGHTBRACE,
|
||||
INPUT_KEY_ENTER,
|
||||
INPUT_KEY_LEFTCTRL,
|
||||
INPUT_KEY_A,
|
||||
INPUT_KEY_S,
|
||||
INPUT_KEY_D,
|
||||
INPUT_KEY_F,
|
||||
INPUT_KEY_G,
|
||||
INPUT_KEY_H,
|
||||
INPUT_KEY_J,
|
||||
INPUT_KEY_K,
|
||||
INPUT_KEY_L,
|
||||
INPUT_KEY_SEMICOLON,
|
||||
INPUT_KEY_APOSTROPHE,
|
||||
INPUT_KEY_GRAVE,
|
||||
INPUT_KEY_LEFTSHIFT,
|
||||
INPUT_KEY_BACKSLASH,
|
||||
INPUT_KEY_Z,
|
||||
INPUT_KEY_X,
|
||||
INPUT_KEY_C,
|
||||
INPUT_KEY_V,
|
||||
INPUT_KEY_B,
|
||||
INPUT_KEY_N,
|
||||
INPUT_KEY_M,
|
||||
INPUT_KEY_COMMA,
|
||||
INPUT_KEY_DOT,
|
||||
INPUT_KEY_SLASH,
|
||||
INPUT_KEY_RIGHTSHIFT,
|
||||
INPUT_KEY_KPASTERISK,
|
||||
INPUT_KEY_LEFTALT,
|
||||
INPUT_KEY_SPACE,
|
||||
INPUT_KEY_CAPSLOCK,
|
||||
INPUT_KEY_F1,
|
||||
INPUT_KEY_F2,
|
||||
INPUT_KEY_F3,
|
||||
INPUT_KEY_F4,
|
||||
INPUT_KEY_F5,
|
||||
INPUT_KEY_F6,
|
||||
INPUT_KEY_F7,
|
||||
INPUT_KEY_F8,
|
||||
INPUT_KEY_F9,
|
||||
INPUT_KEY_F10,
|
||||
INPUT_KEY_NUMLOCK,
|
||||
INPUT_KEY_SCROLLLOCK,
|
||||
INPUT_KEY_KP7,
|
||||
INPUT_KEY_KP8,
|
||||
INPUT_KEY_KP9,
|
||||
INPUT_KEY_KPMINUS,
|
||||
INPUT_KEY_KP4,
|
||||
INPUT_KEY_KP5,
|
||||
INPUT_KEY_KP6,
|
||||
INPUT_KEY_KPPLUS,
|
||||
INPUT_KEY_KP1,
|
||||
INPUT_KEY_KP2,
|
||||
INPUT_KEY_KP3,
|
||||
INPUT_KEY_KP0,
|
||||
INPUT_KEY_KPDOT,
|
||||
0, 0, 0,
|
||||
KEYCODE_F11,
|
||||
KEYCODE_F12
|
||||
INPUT_KEY_F11,
|
||||
INPUT_KEY_F12
|
||||
};
|
||||
|
||||
static char extendedcodes[128] = {
|
||||
[0x1C] = KEYCODE_KEYPADENTER,
|
||||
[0x1D] = KEYCODE_RIGHTCTRL,
|
||||
[0x35] = KEYCODE_KEYPADSLASH, // k/
|
||||
[0x38] = KEYCODE_RIGHTALT, // altgr
|
||||
[0x47] = KEYCODE_HOME, // home
|
||||
[0x48] = KEYCODE_UP, // up
|
||||
[0x49] = KEYCODE_PAGEUP, // page up
|
||||
[0x4B] = KEYCODE_LEFT, // left
|
||||
[0x4D] = KEYCODE_RIGHT, // right
|
||||
[0x4F] = KEYCODE_END, // end
|
||||
[0x50] = KEYCODE_DOWN, // down
|
||||
[0x51] = KEYCODE_PAGEDOWN, // page down
|
||||
[0x52] = KEYCODE_INSERT, // insert
|
||||
[0x53] = KEYCODE_DELETE // delete
|
||||
static uint8_t extendedcodes[128] = {
|
||||
[0x1C] = INPUT_KEY_KPENTER,
|
||||
[0x1D] = INPUT_KEY_RIGHTCTRL,
|
||||
[0x35] = INPUT_KEY_KPSLASH, // k/
|
||||
[0x38] = INPUT_KEY_RIGHTALT, // altgr
|
||||
[0x47] = INPUT_KEY_HOME, // home
|
||||
[0x48] = INPUT_KEY_UP, // up
|
||||
[0x49] = INPUT_KEY_PAGEUP, // page up
|
||||
[0x4B] = INPUT_KEY_LEFT, // left
|
||||
[0x4D] = INPUT_KEY_RIGHT, // right
|
||||
[0x4F] = INPUT_KEY_END, // end
|
||||
[0x50] = INPUT_KEY_DOWN, // down
|
||||
[0x51] = INPUT_KEY_PAGEDOWN, // page down
|
||||
[0x52] = INPUT_KEY_INSERT, // insert
|
||||
[0x53] = INPUT_KEY_DELETE // delete
|
||||
};
|
||||
|
||||
#define KEYBOARDIRQ 1
|
||||
|
||||
keyboard_t *kb;
|
||||
static input_device_t *input_dev;
|
||||
|
||||
static bool extended = false;
|
||||
|
||||
static void kbdisr(isr_t *isr, context_t *ctx) {
|
||||
@@ -127,35 +128,46 @@ static void kbdisr(isr_t *isr, context_t *ctx) {
|
||||
return;
|
||||
}
|
||||
|
||||
kbpacket_t packet;
|
||||
|
||||
packet.flags = 0;
|
||||
|
||||
if (scancode & 0x80) {
|
||||
packet.flags = KBPACKET_FLAGS_RELEASED;
|
||||
scancode &= 0x7F;
|
||||
}
|
||||
|
||||
char *tab = codes;
|
||||
|
||||
uint8_t *table = codes;
|
||||
if (extended) {
|
||||
tab = extendedcodes;
|
||||
table = extendedcodes;
|
||||
extended = false;
|
||||
}
|
||||
|
||||
packet.keycode = tab[scancode];
|
||||
bool released = (scancode & 0x80) != 0;
|
||||
scancode &= 0x7f;
|
||||
|
||||
if (!packet.keycode)
|
||||
input_event_t event;
|
||||
event.type = INPUT_EV_KEY;
|
||||
event.code = table[scancode];
|
||||
if (event.code == INPUT_KEY_RESERVED)
|
||||
return;
|
||||
|
||||
keyboard_sendpacket(kb, &packet);
|
||||
event.value = released ? 0 : 1;
|
||||
input_queue_packet(input_dev, &event, 1);
|
||||
}
|
||||
|
||||
void ps2kbd_init() {
|
||||
isr_t *isr = interrupt_allocate(kbdisr, arch_apic_eoi, IPL_KEYBOARD);
|
||||
isr_t *isr = interrupt_allocate(kbdisr, arch_apic_eoi, IPL_INPUT);
|
||||
__assert(isr);
|
||||
arch_ioapic_setirq(KEYBOARDIRQ, isr->id & 0xff, current_cpu_id(), false);
|
||||
kb = keyboard_new();
|
||||
__assert(kb);
|
||||
|
||||
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 Keyboard");
|
||||
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);
|
||||
for (int i = 0; i < 128; ++i) {
|
||||
if (codes[i] != INPUT_KEY_RESERVED)
|
||||
bitmap_set(&input_dev->key_bits, codes[i], 1);
|
||||
if (extendedcodes[i] != INPUT_KEY_RESERVED)
|
||||
bitmap_set(&input_dev->key_bits, extendedcodes[i], 1);
|
||||
}
|
||||
|
||||
printf("ps2kbd: irq enabled with vector %u\n", isr->id & 0xff);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user