aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f2
diff options
context:
space:
mode:
authorKen Sarkies2013-03-09 14:39:01 +1030
committerKen Sarkies2013-03-09 14:39:01 +1030
commit5b8953124e8c00cdf05169de6e304834cefacf63 (patch)
treed5e4fb881e3527bc19de848f841fdea69094b0af /lib/stm32/f2
parenta9a85f080bb8fc729125d3ad162058f063496e60 (diff)
This mainly moves the STM32 timers' code to the common area.
F2 and F4 have a common section to deal with the options register (TIM2 and TIM5 only) L1 has been made common with timer_common_all as its options register has very different settings to F2/F4. Code is in the L1/timer.c L1/timer.h files Note that F3 and F05 timers should fit into this scheme, with F3 having additional features. Bundled with this is L1/pwr.h to change a documentation setting Also all the Doxyfiles have added "ENABLE_PREPROCESSING = NO" to fix a problem introduced by commit 118.
Diffstat (limited to 'lib/stm32/f2')
-rw-r--r--lib/stm32/f2/Makefile16
-rw-r--r--lib/stm32/f2/timer.c40
2 files changed, 49 insertions, 7 deletions
diff --git a/lib/stm32/f2/Makefile b/lib/stm32/f2/Makefile
index 8d1c623..c9fa059 100644
--- a/lib/stm32/f2/Makefile
+++ b/lib/stm32/f2/Makefile
@@ -19,8 +19,8 @@
LIBNAME = libopencm3_stm32f2
-PREFIX ?= arm-none-eabi
-# PREFIX ?= arm-elf
+PREFIX ?= arm-none-eabi
+# PREFIX ?= arm-elf
CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar
CFLAGS = -Os -g \
@@ -32,11 +32,13 @@ CFLAGS = -Os -g \
-ffunction-sections -fdata-sections -MD -DSTM32F2
# ARFLAGS = rcsv
ARFLAGS = rcs
-OBJS = rcc.o gpio.o flash.o exti2.o timer.o \
- gpio_common_all.o gpio_common_f24.o dma_common_f24.o spi_common_all.o \
- dac_common_all.o usart_common_all.o iwdg_common_all.o i2c_common_all.o \
- crc_common_all.o \
- rtc_common_bcd.o
+
+OBJS = gpio.o exti2.o flash.o rcc.o
+
+OBJS += crc_common_all.o dac_common_all.o dma_common_f24.o \
+ gpio_common_all.o gpio_common_f24.o i2c_common_all.o \
+ iwdg_common_all.o rtc_common_bcd.o spi_common_all.o \
+ timer_common_all.o timer_common_f24.o usart_common_all.o
VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f2/timer.c b/lib/stm32/f2/timer.c
new file mode 100644
index 0000000..1495708
--- /dev/null
+++ b/lib/stm32/f2/timer.c
@@ -0,0 +1,40 @@
+/* This file is used for documentation purposes. It does not need
+to be compiled. All source code is in the common area.
+If there is any device specific code required it can be included here,
+in which case this file must be added to the compile list. */
+
+/** @defgroup timer_file Timers
+
+@ingroup STM32F2xx
+
+@brief <b>libopencm3 STM32F2xx Timers</b>
+
+@version 1.0.0
+
+@date 18 August 2012
+
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Edward Cheeseman <evbuilder@users.sourceforge.org>
+ * Copyright (C) 2011 Stephen Caudle <scaudle@doceme.com>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/timer.h>
+#include <libopencm3/stm32/common/timer_common_f24.h>
+