Browse Source

Fixed all warnings in stm32l1 lib.

pull/105/merge
Piotr Esden-Tempski 12 years ago
parent
commit
ea67d6a36a
  1. 4
      include/libopencm3/stm32/l1/rcc.h
  2. 53
      lib/stm32/timer.c

4
include/libopencm3/stm32/l1/rcc.h

@ -425,6 +425,7 @@ int rcc_osc_ready_int_flag(osc_t osc);
void rcc_css_int_clear(void);
int rcc_css_int_flag(void);
void rcc_wait_for_osc_ready(osc_t osc);
void rcc_wait_for_sysclk_status(osc_t osc);
void rcc_osc_on(osc_t osc);
void rcc_osc_off(osc_t osc);
void rcc_css_enable(void);
@ -443,7 +444,8 @@ void rcc_set_ppre2(u32 ppre2);
void rcc_set_ppre1(u32 ppre1);
void rcc_set_hpre(u32 hpre);
void rcc_set_usbpre(u32 usbpre);
u32 rcc_get_system_clock_source(int i);
void rcc_set_rtcpre(u32 rtcpre);
u32 rcc_system_clock_source(void);
void rcc_rtc_select_clock(u32 clock);
void rcc_clock_setup_msi(const clock_scale_t *clock);
void rcc_clock_setup_hsi(const clock_scale_t *clock);

53
lib/stm32/timer.c

@ -520,6 +520,9 @@ void timer_set_output_idle_state(u32 timer_peripheral, u32 outputs)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_CR2(timer_peripheral) |= outputs & TIM_CR2_OIS_MASK;
#else
(void)timer_peripheral;
(void)outputs;
#endif
}
@ -541,6 +544,9 @@ void timer_reset_output_idle_state(u32 timer_peripheral, u32 outputs)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_CR2(timer_peripheral) &= ~(outputs & TIM_CR2_OIS_MASK);
#else
(void)timer_peripheral;
(void)outputs;
#endif
}
@ -631,6 +637,8 @@ void timer_enable_compare_control_update_on_trigger(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_CR2(timer_peripheral) |= TIM_CR2_CCUS;
#else
(void)timer_peripheral;
#endif
}
@ -652,6 +660,8 @@ void timer_disable_compare_control_update_on_trigger(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_CR2(timer_peripheral) &= ~TIM_CR2_CCUS;
#else
(void)timer_peripheral;
#endif
}
@ -672,6 +682,8 @@ void timer_enable_preload_complementry_enable_bits(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_CR2(timer_peripheral) |= TIM_CR2_CCPC;
#else
(void)timer_peripheral;
#endif
}
@ -691,6 +703,8 @@ void timer_disable_preload_complementry_enable_bits(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_CR2(timer_peripheral) &= ~TIM_CR2_CCPC;
#else
(void)timer_peripheral;
#endif
}
@ -725,6 +739,9 @@ void timer_set_repetition_counter(u32 timer_peripheral, u32 value)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_RCR(timer_peripheral) = value;
#else
(void)timer_peripheral;
(void)value;
#endif
}
@ -1383,6 +1400,9 @@ void timer_set_oc_idle_state_set(u32 timer_peripheral, enum tim_oc_id oc_id)
TIM_CR2(timer_peripheral) |= TIM_CR2_OIS4;
break;
}
#else
(void)timer_peripheral;
(void)oc_id;
#endif
}
@ -1429,6 +1449,9 @@ void timer_set_oc_idle_state_unset(u32 timer_peripheral, enum tim_oc_id oc_id)
TIM_CR2(timer_peripheral) &= ~TIM_CR2_OIS4;
break;
}
#else
(void)timer_peripheral;
(void)oc_id;
#endif
}
@ -1488,6 +1511,8 @@ void timer_enable_break_main_output(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= TIM_BDTR_MOE;
#else
(void)timer_peripheral;
#endif
}
@ -1507,6 +1532,8 @@ void timer_disable_break_main_output(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) &= ~TIM_BDTR_MOE;
#else
(void)timer_peripheral;
#endif
}
@ -1527,6 +1554,8 @@ void timer_enable_break_automatic_output(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= TIM_BDTR_AOE;
#else
(void)timer_peripheral;
#endif
}
@ -1547,6 +1576,8 @@ void timer_disable_break_automatic_output(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) &= ~TIM_BDTR_AOE;
#else
(void)timer_peripheral;
#endif
}
@ -1565,6 +1596,8 @@ void timer_set_break_polarity_high(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= TIM_BDTR_BKP;
#else
(void)timer_peripheral;
#endif
}
@ -1583,6 +1616,8 @@ void timer_set_break_polarity_low(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) &= ~TIM_BDTR_BKP;
#else
(void)timer_peripheral;
#endif
}
@ -1601,6 +1636,8 @@ void timer_enable_break(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= TIM_BDTR_BKE;
#else
(void)timer_peripheral;
#endif
}
@ -1619,6 +1656,8 @@ void timer_disable_break(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) &= ~TIM_BDTR_BKE;
#else
(void)timer_peripheral;
#endif
}
@ -1641,6 +1680,8 @@ void timer_set_enabled_off_state_in_run_mode(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= TIM_BDTR_OSSR;
#else
(void)timer_peripheral;
#endif
}
@ -1662,6 +1703,8 @@ void timer_set_disabled_off_state_in_run_mode(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) &= ~TIM_BDTR_OSSR;
#else
(void)timer_peripheral;
#endif
}
@ -1682,6 +1725,8 @@ void timer_set_enabled_off_state_in_idle_mode(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= TIM_BDTR_OSSI;
#else
(void)timer_peripheral;
#endif
}
@ -1701,6 +1746,8 @@ void timer_set_disabled_off_state_in_idle_mode(u32 timer_peripheral)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) &= ~TIM_BDTR_OSSI;
#else
(void)timer_peripheral;
#endif
}
@ -1722,6 +1769,9 @@ void timer_set_break_lock(u32 timer_peripheral, u32 lock)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= lock;
#else
(void)timer_peripheral;
(void)lock;
#endif
}
@ -1748,6 +1798,9 @@ void timer_set_deadtime(u32 timer_peripheral, u32 deadtime)
#if (defined(ADVANCED_TIMERS) && (ADVANCED_TIMERS))
if ((timer_peripheral == TIM1) || (timer_peripheral == TIM8))
TIM_BDTR(timer_peripheral) |= deadtime;
#else
(void)timer_peripheral;
(void)deadtime;
#endif
}

Loading…
Cancel
Save