From 7085867db675691371f6ef878c8afdf63ad903a8 Mon Sep 17 00:00:00 2001 From: Piotr Esden-Tempski Date: Thu, 4 Jul 2013 19:03:43 -0700 Subject: [PATCH] [STM32F3] Split timer common f24 into f234 and f24. --- lib/stm32/common/timer_common_f234.c | 58 ++++++++++++++++++++++++++++ lib/stm32/common/timer_common_f24.c | 29 -------------- lib/stm32/f2/Makefile | 7 ++-- lib/stm32/f3/Makefile | 2 +- lib/stm32/f4/Makefile | 6 +-- 5 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 lib/stm32/common/timer_common_f234.c diff --git a/lib/stm32/common/timer_common_f234.c b/lib/stm32/common/timer_common_f234.c new file mode 100644 index 00000000..e4e35745 --- /dev/null +++ b/lib/stm32/common/timer_common_f234.c @@ -0,0 +1,58 @@ +/** @addtogroup timer_file + +*/ + +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Edward Cheeseman + * Copyright (C) 2011 Stephen Caudle + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/**@{*/ + +#include + +/*---------------------------------------------------------------------------*/ +/** @brief Set Input Polarity + +The timer channel must be set to input capture mode. + +@param[in] timer_peripheral Unsigned int32. Timer register address base +@param[in] ic ::tim_ic_id. Input Capture channel designator. +@param[in] pol ::tim_ic_pol. Input Capture polarity control. +*/ + +void timer_ic_set_polarity(uint32_t timer_peripheral, enum tim_ic_id ic, + enum tim_ic_pol pol) +{ + /* Clear CCxP and CCxNP to zero. For both edge trigger both fields are + * set. Case 10 is invalid. + */ + TIM_CCER(timer_peripheral) &= ~(0x6 << (ic * 4)); + switch (pol) { + case TIM_IC_RISING: /* 00 */ + break; + case TIM_IC_BOTH: /* 11 */ + TIM_CCER(timer_peripheral) |= (0x6 << (ic * 4)); + break; + case TIM_IC_FALLING: /* 01 */ + TIM_CCER(timer_peripheral) |= (0x2 << (ic * 4)); + } +} +/**@}*/ + + diff --git a/lib/stm32/common/timer_common_f24.c b/lib/stm32/common/timer_common_f24.c index 7eb5abf9..ce1c1e38 100644 --- a/lib/stm32/common/timer_common_f24.c +++ b/lib/stm32/common/timer_common_f24.c @@ -37,7 +37,6 @@ and similarly for TIM5 for oscillator calibration purposes. @ref tim5_opt_trigger_remap. */ -#if !defined(STM32F3) void timer_set_option(uint32_t timer_peripheral, uint32_t option) { if (timer_peripheral == TIM2) { @@ -48,35 +47,7 @@ void timer_set_option(uint32_t timer_peripheral, uint32_t option) TIM_OR(timer_peripheral) |= option; } } -#endif -/*---------------------------------------------------------------------------*/ -/** @brief Set Input Polarity - -The timer channel must be set to input capture mode. - -@param[in] timer_peripheral Unsigned int32. Timer register address base -@param[in] ic ::tim_ic_id. Input Capture channel designator. -@param[in] pol ::tim_ic_pol. Input Capture polarity control. -*/ - -void timer_ic_set_polarity(uint32_t timer_peripheral, enum tim_ic_id ic, - enum tim_ic_pol pol) -{ - /* Clear CCxP and CCxNP to zero. For both edge trigger both fields are - * set. Case 10 is invalid. - */ - TIM_CCER(timer_peripheral) &= ~(0x6 << (ic * 4)); - switch (pol) { - case TIM_IC_RISING: /* 00 */ - break; - case TIM_IC_BOTH: /* 11 */ - TIM_CCER(timer_peripheral) |= (0x6 << (ic * 4)); - break; - case TIM_IC_FALLING: /* 01 */ - TIM_CCER(timer_peripheral) |= (0x2 << (ic * 4)); - } -} /**@}*/ diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile index 5e629e15..4593a097 100644 --- a/lib/stm32/f2/Makefile +++ b/lib/stm32/f2/Makefile @@ -38,9 +38,10 @@ OBJS = gpio.o exti.o rcc.o OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ gpio_common_all.o gpio_common_f234.o i2c_common_all.o \ iwdg_common_all.o rtc_common_bcd.o spi_common_all.o \ - spi_common_f124.o timer_common_all.o timer_common_f24.o \ - usart_common_all.o usart_common_f124.o flash_common_f234.o \ - flash_common_f24.o hash_common_f24.o crypto_common_f24.o + spi_common_f124.o timer_common_all.o timer_common_f234.o \ + timer_common_f24.o usart_common_all.o usart_common_f124.o \ + flash_common_f234.o flash_common_f24.o hash_common_f24.o \ + crypto_common_f24.o VPATH += ../../usb:../:../../cm3:../common diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile index 30b91192..0fe777da 100644 --- a/lib/stm32/f3/Makefile +++ b/lib/stm32/f3/Makefile @@ -39,7 +39,7 @@ OBJS = rcc.o gpio.o adc.o exti.o i2c.o spi.o usart.o OBJS += gpio_common_all.o gpio_common_f234.o \ dac_common_all.o usart_common_all.o crc_common_all.o\ iwdg_common_all.o spi_common_all.o dma_common_f13.o\ - timer_common_all.o timer_common_f24.o flash_common_f234.o \ + timer_common_all.o timer_common_f234.o flash_common_f234.o \ flash.o OBJS += usb.o usb_control.o usb_standard.o usb_f103.o diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile index a31f9e99..9cd78ff3 100644 --- a/lib/stm32/f4/Makefile +++ b/lib/stm32/f4/Makefile @@ -40,9 +40,9 @@ OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \ gpio_common_all.o gpio_common_f234.o i2c_common_all.o \ iwdg_common_all.o pwr_common_all.o rtc_common_bcd.o \ spi_common_all.o spi_common_f124.o timer_common_all.o \ - timer_common_f24.o usart_common_all.o usart_common_f124.o \ - flash_common_f234.o flash_common_f24.o hash_common_f24.o \ - crypto_common_f24.o + timer_common_f234.o timer_common_f24.o usart_common_all.o \ + usart_common_f124.o flash_common_f234.o flash_common_f24.o \ + hash_common_f24.o crypto_common_f24.o OBJS += usb.o usb_standard.o usb_control.o usb_fx07_common.o \ usb_f107.o usb_f207.o