1 files changed, 9 insertions, 62 deletions

diff --git a/firmware/timer.c b/firmware/timer.c
index 044b871b3f..8cd165bd35 100644
--- a/firmware/timer.c
+++ b/firmware/timer.c
@@ -29,64 +29,22 @@
 static int timer_prio = -1;
 void SHAREDBSS_ATTR (*pfn_timer)(void) = NULL;      /* timer callback */
 void SHAREDBSS_ATTR (*pfn_unregister)(void) = NULL; /* unregister callback */
-#if defined CPU_PP
-static long SHAREDBSS_ATTR cycles_new = 0;
-#endif
 
 #ifndef __TIMER_SET
 /* Define these if not defined by target to make the #else cases compile
  * even if the target doesn't have them implemented. */
 #define __TIMER_SET(cycles, set) false
-#define __TIMER_START() false
-#define __TIMER_STOP(...)
+#if NUM_CORES > 1
+#define __TIMER_START(int_prio, core) false
+#else
+#define __TIMER_START(int_prio) false
+#endif
+#define __TIMER_STOP()
 #endif
-
-/* interrupt handler */
-#if defined(CPU_PP)
-void TIMER2(void)
-{
-    TIMER2_VAL; /* ACK interrupt */
-    if (cycles_new > 0)
-    {
-        TIMER2_CFG = 0xc0000000 | (cycles_new - 1);
-        cycles_new = 0;
-    }
-    if (pfn_timer != NULL)
-    {
-        cycles_new = -1;
-        /* "lock" the variable, in case timer_set_period()
-         * is called within pfn_timer() */
-        pfn_timer();
-        cycles_new = 0;
-    }
-}
-#endif /* CONFIG_CPU */
 
 static bool timer_set(long cycles, bool start)
 {
-#if defined(CPU_PP)
-    if (cycles > 0x20000000 || cycles < 2)
-        return false;
-
-    if (start)
-    {
-        if (pfn_unregister != NULL)
-        {
-            pfn_unregister();
-            pfn_unregister = NULL;
-        }
-        CPU_INT_DIS = TIMER2_MASK;
-        COP_INT_DIS = TIMER2_MASK;
-    }
-    if (start || (cycles_new == -1))  /* within isr, cycles_new is "locked" */
-        TIMER2_CFG = 0xc0000000 | (cycles - 1);    /* enable timer */
-    else
-        cycles_new = cycles;
-
-    return true;
-#else
     return __TIMER_SET(cycles, start);
-#endif /* CONFIG_CPU */
 }
 
 /* Register a user timer, called every <cycles> TIMER_FREQ cycles */
@@ -109,18 +67,12 @@ bool timer_register(int reg_prio, void (*unregister_callback)(void),
     pfn_unregister = unregister_callback;
     timer_prio = reg_prio;
 
-#if defined(CPU_PP)
-    /* unmask interrupt source */
 #if NUM_CORES > 1
-    if (core == COP)
-        COP_INT_EN = TIMER2_MASK;
-    else
-#endif
-        CPU_INT_EN = TIMER2_MASK;
-    return true;
+    return __TIMER_START(int_prio, core);
 #else
     return __TIMER_START(int_prio);
 #endif
+
     /* Cover for targets that don't use all these */
     (void)reg_prio;
     (void)unregister_callback;
@@ -137,13 +89,8 @@ bool timer_set_period(long cycles)
 
 void timer_unregister(void)
 {
-#if defined(CPU_PP)
-    TIMER2_CFG = 0;         /* stop timer 2 */
-    CPU_INT_DIS = TIMER2_MASK;
-    COP_INT_DIS = TIMER2_MASK;
-#else
     __TIMER_STOP();
-#endif
+
     pfn_timer = NULL;
     pfn_unregister = NULL;
     timer_prio = -1;