diff options
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/interrupts.asm | 1 | ||||
| -rw-r--r-- | src/drivers/interrupts.c | 6 | ||||
| -rw-r--r-- | src/drivers/keyboard.c | 2 | ||||
| -rw-r--r-- | src/drivers/serial.c | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/src/drivers/interrupts.asm b/src/drivers/interrupts.asm index 59c323c..fd5dbfa 100644 --- a/src/drivers/interrupts.asm +++ b/src/drivers/interrupts.asm @@ -109,7 +109,6 @@ ISR_NOERRCODE 28 ISR_NOERRCODE 29 ISR_NOERRCODE 30 ISR_NOERRCODE 31 -ISR_NOERRCODE 128 extern isr_handler isr_common_stub: diff --git a/src/drivers/interrupts.c b/src/drivers/interrupts.c index e3e8699..edf5837 100644 --- a/src/drivers/interrupts.c +++ b/src/drivers/interrupts.c @@ -71,7 +71,6 @@ void irq_remap() // Handle IRQ ISRs void irq_handler(struct regs *r) { - __asm__("cli"); void (*handler)(struct regs * r); // Execute custom handler if exists @@ -85,7 +84,6 @@ void irq_handler(struct regs *r) // Send EOI to master PIC outb(0x20, 0x20); - __asm__("sti"); } // Map ISRs to the correct entries in the IDT @@ -130,7 +128,6 @@ void isr_uninstall_handler(int isr) void isr_handler(struct regs *r) { - __asm__("cli"); void (*handler)(struct regs * r); // Execute fault handler if exists @@ -143,7 +140,6 @@ void isr_handler(struct regs *r) while (1) { }; } - __asm__("sti"); } void isr_install() @@ -183,8 +179,6 @@ void isr_install() idt_set_gate(29, (u32)isr29, 0x08, 0x8E); idt_set_gate(30, (u32)isr30, 0x08, 0x8E); idt_set_gate(31, (u32)isr31, 0x08, 0x8E); - - idt_set_gate(0x80, (u32)isr128, 0x08, 0x8E); } /** diff --git a/src/drivers/keyboard.c b/src/drivers/keyboard.c index 85b905e..3bef356 100644 --- a/src/drivers/keyboard.c +++ b/src/drivers/keyboard.c @@ -6,7 +6,7 @@ u8 scancode; -void keyboard_handler(struct regs *r) +void keyboard_handler() { scancode = inb(0x60); serial_print("KEY\n"); diff --git a/src/drivers/serial.c b/src/drivers/serial.c index 1ef424a..dcee4dd 100644 --- a/src/drivers/serial.c +++ b/src/drivers/serial.c @@ -1,6 +1,6 @@ #include <cpu.h> #include <def.h> -#include <string.h> +#include <str.h> void serial_install() { |