squash PIT combined

RIOT-OS · Jun 5, 2017 · 6c9f0e8 · 6c9f0e8
1 parent 9c15627
commit 6c9f0e8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/boards/frdm-kw41z/include/periph_conf.h b/boards/frdm-kw41z/include/periph_conf.h
@@ -65,7 +65,6 @@ extern "C"
 #define TIMER_NUMOF             ((PIT_NUMOF) + (LPTMR_NUMOF))
 
 #define PIT_BASECLOCK           (CLOCK_BUSCLOCK)
-#define PIT_ISR_0               isr_pit
 #define LPTMR_ISR_0             isr_lptmr0
 
 /** @} */

diff --git a/cpu/kinetis_common/isr_kinetis.c b/cpu/kinetis_common/isr_kinetis.c
@@ -111,6 +111,7 @@ WEAK_DEFAULT void isr_ltc(void);
 WEAK_DEFAULT void isr_mcg(void);
 WEAK_DEFAULT void isr_mcm(void);
 WEAK_DEFAULT void isr_pdb0(void);
+WEAK_DEFAULT void isr_pit(void);
 WEAK_DEFAULT void isr_pit0(void);
 WEAK_DEFAULT void isr_pit1(void);
 WEAK_DEFAULT void isr_pit2(void);

diff --git a/cpu/kinetis_common/periph/timer.c b/cpu/kinetis_common/periph/timer.c
@@ -724,6 +724,22 @@ void timer_stop(tim_t dev)
 
 /* ****** ISR instances ****** */
 
+void isr_pit(void)
+{
+    /* Some of the lower end Kinetis CPUs combine the individual PIT interrupt
+     * flags into a single NVIC IRQ signal. This means that software needs to
+     * test which timer(s) went off when an IRQ occurs. */
+    for (size_t i = 0; i < PIT_NUMOF; ++i) {
+        if (PIT->CHANNEL[pit_config[i].count_ch].TCTRL & PIT_TCTRL_TIE_MASK) {
+            /* Interrupt is enabled */
+            if (PIT->CHANNEL[pit_config[i].count_ch].TFLG) {
+                /* Timer interrupt flag is set */
+                pit_irq_handler(_pit_tim_t(i));
+            }
+        }
+    }
+}
+
 #ifdef PIT_ISR_0
 void PIT_ISR_0(void)
 {