Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor keyboard module cleanup

Browse Source
This commit is contained in:
Kevin Lange 2015-02-03 15:19:09 -08:00
parent 91599e4c5a
commit f631283fb2
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/ps2kbd.c
View File

@ -18,24 +18,12 @@
#include <module.h>
#define KEY_DEVICE 0x60
#define KEY_PENDING 0x64
#define KEYBOARD_NOTICES 0
#define KEYBOARD_IRQ 1
#define KEY_DEVICE 0x60
#define KEY_PENDING 0x64
#define KEY_IRQ 1
static fs_node_t * keyboard_pipe;
/*
* Add a character to the device buffer.
*/
static void putch(unsigned char c) {
uint8_t buf[2];
buf[0] = c;
buf[1] = '\0';
write_fs(keyboard_pipe, 0, 1, buf);
}
/*
* Wait on the keyboard.
*/
@ -43,13 +31,16 @@ static void keyboard_wait(void) {
while(inportb(KEY_PENDING) & 2);
}
/*
* Keyboard interrupt callback
*/
static void keyboard_handler(struct regs *r) {
unsigned char scancode;
keyboard_wait();
scancode = inportb(KEY_DEVICE);
irq_ack(KEYBOARD_IRQ);
irq_ack(KEY_IRQ);
putch(scancode);
write_fs(keyboard_pipe, 0, 1, (uint8_t []){scancode});
}
/*
@ -68,7 +59,7 @@ static int keyboard_install(void) {
vfs_mount("/dev/kbd", keyboard_pipe);
/* Install the interrupt handler */
irq_install_handler(KEYBOARD_IRQ, keyboard_handler);
irq_install_handler(KEY_IRQ, keyboard_handler);
return 0;
}