From 5b8953124e8c00cdf05169de6e304834cefacf63 Mon Sep 17 00:00:00 2001 From: Ken Sarkies Date: Sat, 9 Mar 2013 14:39:01 +1030 Subject: 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. --- doc/efm32g/Doxyfile | 3 +++ doc/efm32gg/Doxyfile | 3 +++ doc/efm32lg/Doxyfile | 3 +++ doc/efm32tg/Doxyfile | 3 +++ doc/lm3s/Doxyfile | 3 +++ doc/lm4f/Doxyfile | 3 +++ doc/lpc13xx/Doxyfile | 3 +++ doc/lpc17xx/Doxyfile | 3 +++ doc/lpc43xx/Doxyfile | 3 +++ doc/stm32f1/Doxyfile | 11 +++++++---- doc/stm32f2/Doxyfile | 3 +++ doc/stm32f4/Doxyfile | 3 +++ doc/stm32l1/Doxyfile | 9 +++++++-- 13 files changed, 47 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/efm32g/Doxyfile b/doc/efm32g/Doxyfile index c80eaa2..c163b89 100644 --- a/doc/efm32g/Doxyfile +++ b/doc/efm32g/Doxyfile @@ -27,3 +27,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html \ GENERATE_TAGFILE = efm32g.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/efm32gg/Doxyfile b/doc/efm32gg/Doxyfile index 210d75d..8b063b9 100644 --- a/doc/efm32gg/Doxyfile +++ b/doc/efm32gg/Doxyfile @@ -27,3 +27,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html \ GENERATE_TAGFILE = efm32gg.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/efm32lg/Doxyfile b/doc/efm32lg/Doxyfile index 60b5e0c..30a594a 100644 --- a/doc/efm32lg/Doxyfile +++ b/doc/efm32lg/Doxyfile @@ -27,3 +27,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html \ GENERATE_TAGFILE = efm32lg.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/efm32tg/Doxyfile b/doc/efm32tg/Doxyfile index dd7191c..d104ff7 100644 --- a/doc/efm32tg/Doxyfile +++ b/doc/efm32tg/Doxyfile @@ -27,3 +27,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html \ GENERATE_TAGFILE = efm32tg.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/lm3s/Doxyfile b/doc/lm3s/Doxyfile index 9f5262c..56100e2 100644 --- a/doc/lm3s/Doxyfile +++ b/doc/lm3s/Doxyfile @@ -25,3 +25,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = lm3s.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/lm4f/Doxyfile b/doc/lm4f/Doxyfile index 183338c..b0c1b6d 100644 --- a/doc/lm4f/Doxyfile +++ b/doc/lm4f/Doxyfile @@ -25,3 +25,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = lm4f.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/lpc13xx/Doxyfile b/doc/lpc13xx/Doxyfile index 816c592..d231b1a 100644 --- a/doc/lpc13xx/Doxyfile +++ b/doc/lpc13xx/Doxyfile @@ -25,3 +25,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = lpc13xx.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/lpc17xx/Doxyfile b/doc/lpc17xx/Doxyfile index f7f0fbb..d9ee1f2 100644 --- a/doc/lpc17xx/Doxyfile +++ b/doc/lpc17xx/Doxyfile @@ -25,3 +25,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = lpc17xx.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/lpc43xx/Doxyfile b/doc/lpc43xx/Doxyfile index 02bf524..582d804 100644 --- a/doc/lpc43xx/Doxyfile +++ b/doc/lpc43xx/Doxyfile @@ -25,3 +25,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = lpc43xx.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/stm32f1/Doxyfile b/doc/stm32f1/Doxyfile index 914db66..3aa5c9f 100644 --- a/doc/stm32f1/Doxyfile +++ b/doc/stm32f1/Doxyfile @@ -16,14 +16,14 @@ WARN_LOGFILE = doxygen_stm32f1.log INPUT = ../../include/libopencm3/license.dox \ - ../../include/libopencm3/stm32/f1 \ - ../../include/libopencm3/stm32/common + ../../include/libopencm3/stm32/f1 \ + ../../include/libopencm3/stm32/common INPUT += ../../lib/stm32/f1 \ - ../../lib/stm32/common + ../../lib/stm32/common EXCLUDE = ../../include/libopencm3/stm32/f1/usb.h \ - ../../include/libopencm3/stm32/f1/usb_desc.h + ../../include/libopencm3/stm32/f1/usb_desc.h EXCLUDE_PATTERNS = *_common_f24.h *_common_f24.c @@ -33,3 +33,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = stm32f1.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/stm32f2/Doxyfile b/doc/stm32f2/Doxyfile index cfe5dd5..5753539 100644 --- a/doc/stm32f2/Doxyfile +++ b/doc/stm32f2/Doxyfile @@ -32,3 +32,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = stm32f2.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/stm32f4/Doxyfile b/doc/stm32f4/Doxyfile index c5016f4..ba4427d 100644 --- a/doc/stm32f4/Doxyfile +++ b/doc/stm32f4/Doxyfile @@ -32,3 +32,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = stm32f4.tag +ENABLE_PREPROCESSING = NO + + diff --git a/doc/stm32l1/Doxyfile b/doc/stm32l1/Doxyfile index 566bb01..5532f10 100644 --- a/doc/stm32l1/Doxyfile +++ b/doc/stm32l1/Doxyfile @@ -22,9 +22,11 @@ INPUT = ../../include/libopencm3/license.dox \ INPUT += ../../lib/stm32/l1 \ ../../lib/stm32/common -EXCLUDE = ../../include/libopencm3/stm32/common/gpio_common_f24.h +EXCLUDE = ../../include/libopencm3/stm32/common/gpio_common_f24.h \ + ../../include/libopencm3/stm32/common/timer_common_f24.h -EXCLUDE += ../../lib/stm32/common/gpio_common_f24.c +EXCLUDE += ../../lib/stm32/common/gpio_common_f24.c \ + ../../lib/stm32/common/timer_common_f24.c EXCLUDE_PATTERNS = @@ -34,3 +36,6 @@ TAGFILES = ../cm3/cm3.tag=../../cm3/html GENERATE_TAGFILE = stm32l1.tag +ENABLE_PREPROCESSING = NO + + -- cgit v1.2.3