diff options
| author | Alex Auvolat <alex@adnab.me> | 2015-03-11 16:22:40 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2015-03-11 16:22:40 +0100 |
| commit | 9b9ef5a2c0ec8e66c7da24c4229d89a90a10e914 (patch) | |
| tree | 471cb88f003eb58ce84342f2e7ab7effda04ce2d /src/kernel/core/idt.c | |
| parent | a7ff74cdf2835625282491242ede57b05ceaa782 (diff) | |
| download | kogata-9b9ef5a2c0ec8e66c7da24c4229d89a90a10e914.tar.gz kogata-9b9ef5a2c0ec8e66c7da24c4229d89a90a10e914.zip | |
Bugfixing in progress. Strange bug: wait_on adds to waiters but later not in waiters.
Diffstat (limited to 'src/kernel/core/idt.c')
| -rw-r--r-- | src/kernel/core/idt.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/kernel/core/idt.c b/src/kernel/core/idt.c index f99460f..f3dd63b 100644 --- a/src/kernel/core/idt.c +++ b/src/kernel/core/idt.c @@ -91,6 +91,7 @@ static isr_handler_t ex_handlers[32] = {0}; /* Called in interrupt.s when an exception fires (interrupt 0 to 31) */ void idt_ex_handler(registers_t *regs) { + dbg_printf("Ex handler: %d\n", regs->int_no); if (ex_handlers[regs->int_no] != 0) { ex_handlers[regs->int_no](regs); } else { @@ -114,21 +115,21 @@ void idt_ex_handler(registers_t *regs) { void idt_irq_handler(registers_t *regs) { int st = enter_critical(CL_EXCL); // if someone tries to yield(), an assert will fail + dbg_printf("irq%d.", regs->err_code); + if (regs->err_code > 7) { outb(0xA0, 0x20); } outb(0x20, 0x20); - if (regs->err_code == 0) { - irq0_handler(regs, st); - } else { - /*dbg_printf("irq%d.", regs->err_code);*/ + if (irq_handlers[regs->err_code] != 0) { + irq_handlers[regs->err_code](regs); + } - if (irq_handlers[regs->err_code] != 0) { - irq_handlers[regs->err_code](regs); - } + exit_critical(st); - exit_critical(st); + if (regs->err_code == 0) { + threading_irq0_handler(); } // maybe exit |