projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make userspace actually work.
[pintos-anon]
/
src
/
devices
/
kbd.c
diff --git
a/src/devices/kbd.c
b/src/devices/kbd.c
index 21c98a5574a6b799bcf40238c21fbd0fb890fc00..ed52cfab82872ea9b05eaf0924f1a99a2ce3b8b0 100644
(file)
--- a/
src/devices/kbd.c
+++ b/
src/devices/kbd.c
@@
-5,7
+5,7
@@
#include "lib.h"
static void
#include "lib.h"
static void
-irq21_keyboard (struct intr_
args
*args UNUSED)
+irq21_keyboard (struct intr_
frame
*args UNUSED)
{
printk ("Keyboard!\n");
inb (0x60);
{
printk ("Keyboard!\n");
inb (0x60);
@@
-14,5
+14,5
@@
irq21_keyboard (struct intr_args *args UNUSED)
void
kbd_init (void)
{
void
kbd_init (void)
{
- intr_register (0x21, 0, IF_OFF, irq21_keyboard);
+ intr_register (0x21, 0, IF_OFF, irq21_keyboard
, "8042 Keyboard"
);
}
}