1 files changed, 7 insertions, 11 deletions

diff --git a/libmaple/timers.c b/libmaple/timers.c
index 29aeeba..c561d39 100644
--- a/libmaple/timers.c
+++ b/libmaple/timers.c
@@ -55,7 +55,7 @@ struct timer_dev timer_dev_table[] = {
         .rcc_dev_num = RCC_TIMER4,
         .nvic_dev_num = NVIC_TIMER4
     },
-#if NR_TIMERS >= 8
+#ifdef STM32_HIGH_DENSITY
     /* High density devices only (eg, Maple Native) */
     [TIMER5] = {
         .base = (timer_port*)TIMER5_BASE,
@@ -82,7 +82,7 @@ void timer_init(timer_dev_num timer_num, uint16 prescale) {
     if (timer_num == TIMER1) {
         is_advanced = 1;
     }
-#if NR_TIMERS >= 8
+#ifdef STM32_HIGH_DENSITY
     if (timer_num == TIMER8) {
         is_advanced = 1;
     }
@@ -193,12 +193,8 @@ void timer_set_reload(timer_dev_num timer_num, uint16 max_reload) {
  * or similar to prevent interrupts and PWM output without 16 seperate function
  * calls to timer_set_mode */
 void timer_disable_all(void) {
-    // TODO: refactor
-
-    /* Note: this must be very robust because it gets called from,
-       e.g., ASSERT */
     timer_port *timer;
-#if NR_TIMERS >= 8
+#ifdef STM32_HIGH_DENSITY
     timer_port *timers[6] = { (timer_port*)TIMER1_BASE,
                               (timer_port*)TIMER2_BASE,
                               (timer_port*)TIMER3_BASE,
@@ -386,7 +382,7 @@ void timer_generate_update(timer_dev_num timer_num) {
  * registers /or/ has overflowed.
  *
  * This is a rather long implementation... */
-void TIM1_CC_IRQHandler(void) {
+void __irq_tim1_cc(void) {
     timer_port *timer = (timer_port*)TIMER1_BASE;
     uint16 sr_buffer;
     sr_buffer = timer->SR;
@@ -422,7 +418,7 @@ void TIM1_CC_IRQHandler(void) {
         //timer->EGR  = 1;
     }
 }
-void TIM2_IRQHandler(void) {
+void __irq_tim2(void) {
     /* This is a rather long implementation... */
     timer_port *timer = (timer_port*)TIMER2_BASE;
     uint16 sr_buffer;
@@ -457,7 +453,7 @@ void TIM2_IRQHandler(void) {
         //timer->EGR  = 1;
     }
 }
-void TIM3_IRQHandler(void) {
+void __irq_tim3(void) {
     /* This is a rather long implementation... */
     timer_port *timer = (timer_port*)TIMER3_BASE;
     uint16 sr_buffer;
@@ -493,7 +489,7 @@ void TIM3_IRQHandler(void) {
     }
 }
 
-void TIM4_IRQHandler(void) {
+void __irq_tim4(void) {
     /* This is a rather long implementation... */
     timer_port*timer = (timer_port*)TIMER4_BASE;
     uint16 sr_buffer;