Changeset 965dc18 in mainline for kernel/arch/sparc64/src/drivers/tick.c

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

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

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

@@ -46 +46 @@
 #define TICK_RESTART_TIME       50      /* Worst case estimate. */
 
-/** Initialize tick interrupt. */
+/** Initialize tick and stick interrupt. */
 void tick_init(void)
 {
+        /* initialize TICK interrupt */
         tick_compare_reg_t compare;
-        
+
         interrupt_register(14, "tick_int", tick_interrupt);
         compare.int_dis = false;
@@ -57 +58 @@
         tick_compare_write(compare.value);
         tick_write(0);
+
+#if defined (US3)
+        /* disable STICK interrupts and clear any pending ones */
+        tick_compare_reg_t stick_compare;
+        softint_reg_t clear;
+
+        stick_compare.value = stick_compare_read();
+        stick_compare.int_dis = true;
+        stick_compare.tick_cmpr = 0;
+        stick_compare_write(stick_compare.value);
+
+        clear.value = 0;
+        clear.stick_int = 1;
+        clear_softint_write(clear.value);
+#endif
 }
 
@@ -68 +84 @@
         softint_reg_t softint, clear;
         uint64_t drift;
-        
+
         softint.value = softint_read();