Changeset 2f08ff55 in mainline

Timestamp:

2008-12-31T13:16:22Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

d8c0dc5

Parents:

ef5de6d

Message:

Legacy vs. lagacy.

Location:

kernel/arch/ia64

Files:

• include/interrupt.h (modified) (1 diff)
• src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/include/interrupt.h

@@ -54 +54 @@
 #define VECTOR_TLB_SHOOTDOWN_IPI 0xf0
 #define INTERRUPT_TIMER         255
-#define IRQ_KBD                 (0x01+LAGACY_INTERRUPT_BASE)
-#define IRQ_MOUSE               (0x0c+LAGACY_INTERRUPT_BASE)
+#define IRQ_KBD                 (0x01+LEGACY_INTERRUPT_BASE)
+#define IRQ_MOUSE               (0x0c+LEGACY_INTERRUPT_BASE)
 #define INTERRUPT_SPURIOUS      15
-#define LAGACY_INTERRUPT_BASE   0x20
+#define LEGACY_INTERRUPT_BASE   0x20
 
 /** General Exception codes. */

kernel/arch/ia64/src/ia64.c

@@ -64 +64 @@
 
 /*NS16550 as a COM 1*/
-#define NS16550_IRQ (4+LAGACY_INTERRUPT_BASE)
+#define NS16550_IRQ (4+LEGACY_INTERRUPT_BASE)
 #define NS16550_PORT 0x3f8
 
@@ -110 +110 @@
                 ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i;
                 srlz_d();
-                ((uint32_t*)(IOSAPIC+0x10))[0]=LAGACY_INTERRUPT_BASE+i;
+                ((uint32_t*)(IOSAPIC+0x10))[0]=LEGACY_INTERRUPT_BASE+i;
                 srlz_d();
                 ((uint32_t*)(IOSAPIC+0x00))[0]=0x10+2*i+1;