Changeset 0dc2fec in mainline for kernel/arch/ia32/include/arch/interrupt.h

Timestamp:

2016-05-22T19:19:43Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b272c67a

Parents:

153c7a29 (diff), af2254ec (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/ia32/include/arch/interrupt.h (modified) (2 diffs)

kernel/arch/ia32/include/arch/interrupt.h

@@ -50 +50 @@
 #define IVT_FREEBASE  (IVT_IRQBASE + IRQ_COUNT)
 
+#define EXC_DE 0
+#define EXC_NM 7
+#define EXC_SS 12
+#define EXC_GP 13
+#define EXC_PF 14
+#define EXC_XM 19
+
 #define IRQ_CLK       0
 #define IRQ_KBD       1
@@ -65 +72 @@
 #endif
 
-#define VECTOR_DEBUG              1
+#define VECTOR_DE                 (IVT_EXCBASE + EXC_DE)
+#define VECTOR_NM                 (IVT_EXCBASE + EXC_NM)
+#define VECTOR_SS                 (IVT_EXCBASE + EXC_SS)
+#define VECTOR_GP                 (IVT_EXCBASE + EXC_GP)
+#define VECTOR_PF                 (IVT_EXCBASE + EXC_PF)
+#define VECTOR_XM                 (IVT_EXCBASE + EXC_XM)
 #define VECTOR_CLK                (IVT_IRQBASE + IRQ_CLK)
 #define VECTOR_PIC_SPUR           (IVT_IRQBASE + IRQ_PIC_SPUR)