From 2de1c550cab8a5812dc9965313fce00816a003eb Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@swtch.com>
Date: Sat, 11 Jul 2009 19:24:56 -0700
Subject: trap cleanup

IRQ_OFFSET -> T_IRQ0 (a trap number not an IRQ number)
T_SYSCALL 0x30 -> 0x40 (move out of IRQ range)
---
 ioapic.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ioapic.c')

diff --git a/ioapic.c b/ioapic.c
index bf5f793..d343611 100644
--- a/ioapic.c
+++ b/ioapic.c
@@ -62,7 +62,7 @@ ioapicinit(void)
   // Mark all interrupts edge-triggered, active high, disabled,
   // and not routed to any CPUs.
   for(i = 0; i <= maxintr; i++){
-    ioapicwrite(REG_TABLE+2*i, INT_DISABLED | (IRQ_OFFSET + i));
+    ioapicwrite(REG_TABLE+2*i, INT_DISABLED | (T_IRQ0 + i));
     ioapicwrite(REG_TABLE+2*i+1, 0);
   }
 }
@@ -76,6 +76,6 @@ ioapicenable(int irq, int cpunum)
   // Mark interrupt edge-triggered, active high,
   // enabled, and routed to the given cpunum,
   // which happens to be that cpu's APIC ID.
-  ioapicwrite(REG_TABLE+2*irq, IRQ_OFFSET + irq);
+  ioapicwrite(REG_TABLE+2*irq, T_IRQ0 + irq);
   ioapicwrite(REG_TABLE+2*irq+1, cpunum << 24);
 }
-- 
cgit v1.2.3