Changeset 58775d30 in mainline for kernel/arch/sparc64/src/drivers/tick.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2003739

Parents:

6069061 (diff), 795e2bf (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:

Mainline changes

File:

• kernel/arch/sparc64/src/drivers/tick.c (modified) (4 diffs)

kernel/arch/sparc64/src/drivers/tick.c

@@ -35 +35 @@
 #include <arch/drivers/tick.h>
 #include <arch/interrupt.h>
+#include <arch/trap/interrupt.h>
 #include <arch/sparc64.h>
 #include <arch/asm.h>
@@ -51 +52 @@
         softint_reg_t clear;
 
-        interrupt_register(14, "tick_int", tick_interrupt);
         compare.int_dis = false;
         compare.tick_cmpr = tick_counter_read() +
@@ -79 +79 @@
 /** Process tick interrupt.
  *
- * @param n      Interrupt Level (14, can be ignored)
+ * @param n      Trap type (0x4e, can be ignored)
  * @param istate Interrupted state.
  *
@@ -93 +93 @@
          * Make sure we are servicing interrupt_level_14
          */
-        ASSERT(n == 14);
+        ASSERT(n == TT_INTERRUPT_LEVEL_14);
         
         /*