[sys] Rearrange some things

This commit is contained in:
Kevin Lange 2011-05-07 01:55:49 -05:00
parent 4a1b2bceaa
commit 855eecbb41
3 changed files with 11 additions and 10 deletions

View File

@ -57,12 +57,8 @@ irq_remap() {
outportb(0xA1, 0x0);
}
/*
* Set up interrupt handler for hardware devices.
*/
void
irq_install() {
irq_remap();
irq_gates() {
idt_set_gate(32, (unsigned)_irq0, 0x08, 0x8E);
idt_set_gate(33, (unsigned)_irq1, 0x08, 0x8E);
idt_set_gate(34, (unsigned)_irq2, 0x08, 0x8E);
@ -79,6 +75,15 @@ irq_install() {
idt_set_gate(45, (unsigned)_irq13, 0x08, 0x8E);
idt_set_gate(46, (unsigned)_irq14, 0x08, 0x8E);
idt_set_gate(47, (unsigned)_irq15, 0x08, 0x8E);
}
/*
* Set up interrupt handler for hardware devices.
*/
void
irq_install() {
irq_remap();
irq_gates();
__asm__ __volatile__("sti");
}

View File

@ -18,11 +18,6 @@ timer_handler(
struct regs *r
) {
++timer_ticks;
#if 0
if (timer_ticks % 18 == 0) {
++ticker;
}
#endif
switch_task();
}

View File

@ -92,6 +92,7 @@ extern void isrs_uninstall_handler(int isrs);
extern void irq_install();
extern void irq_install_handler(int irq, irq_handler_t);
extern void irq_uninstall_handler(int irq);
extern void irq_gates();
/* Timer */
extern void timer_install();