summaryrefslogtreecommitdiff
path: root/trap.c
diff options
context:
space:
mode:
authorrsc <rsc>2009-03-08 22:07:13 +0000
committerrsc <rsc>2009-03-08 22:07:13 +0000
commit2157576107d6e81c643e14e134b60b8ae519c256 (patch)
tree88ff770d321b4b2ef1ef1fcc0e17508ede6001bf /trap.c
parentb7f653dc49dd4af29a3b7bdd66cd712bea166623 (diff)
downloadxv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.gz
xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.tar.bz2
xv6-labs-2157576107d6e81c643e14e134b60b8ae519c256.zip
be consistent: no underscores in function names
Diffstat (limited to 'trap.c')
-rw-r--r--trap.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/trap.c b/trap.c
index fd00071..f35f8de 100644
--- a/trap.c
+++ b/trap.c
@@ -52,20 +52,20 @@ trap(struct trapframe *tf)
wakeup(&ticks);
release(&tickslock);
}
- lapic_eoi();
+ lapiceoi();
break;
case IRQ_OFFSET + IRQ_IDE:
- ide_intr();
- lapic_eoi();
+ ideintr();
+ lapiceoi();
break;
case IRQ_OFFSET + IRQ_KBD:
- kbd_intr();
- lapic_eoi();
+ kbdintr();
+ lapiceoi();
break;
case IRQ_OFFSET + IRQ_SPURIOUS:
cprintf("cpu%d: spurious interrupt at %x:%x\n",
cpu(), tf->cs, tf->eip);
- lapic_eoi();
+ lapiceoi();
break;
default: