diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2012-04-09 16:38:01 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-04-11 16:56:57 -0400 |
commit | 08c56bb56a5ba4028ad761a8ff05ead0f54a549c (patch) | |
tree | e8d6b42d27e2a5912261c6cf2f2f77c5d2ac2933 /libmaple/include | |
parent | 378a766ec86694a6be0f8e38976473646c82702c (diff) | |
download | librambutan-08c56bb56a5ba4028ad761a8ff05ead0f54a549c.tar.gz librambutan-08c56bb56a5ba4028ad761a8ff05ead0f54a549c.zip |
STM32F1: Add support for timers 9 through 14.
This applies to XL-density STM32F1 devices.
In stm32f1/timer.c, add timer_dev's for the new timers, using the
timer_private API. These definitions are conditionally compiled based
on the target density to avoid wasting space on smaller MCUs. Also add
calls to the appropriate timer_private.h dispatch routines within the
IRQ handlers for these timers. We need to change the IRQ handler names
to reflect this eventually, but put that off for now, as it could
break backwards compatibility in some exotic situations where the user
refers to the libmaple IRQ handlers directly.
In stm32f1/timer.h, add register map base pointers and device
declarations for the new timers. timer_dev* declarations are compiled
in only when the target MCU supports them, in keeping with the above
stm32f1/timer.c changes.
In libmaple/timer.c, update the (static) IRQ enable routines to
account for the additional timers. This adds some code that's
unnecessary on smaller STM32F1s, but it's minimal (40 extra bytes on
my machine), so portability and readability win out.
Size change, using GCC version "(Sourcery G++ Lite 2011.03-42) 4.5.2":
Before:
text data bss dec hex filename
615 0 0 615 267 build/home/mbolivar/leaf/libmaple/libmaple/timer.o
After:
text data bss dec hex filename
655 0 0 655 28f build/home/mbolivar/leaf/libmaple/libmaple/timer.o
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'libmaple/include')
-rw-r--r-- | libmaple/include/libmaple/timer.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libmaple/include/libmaple/timer.h b/libmaple/include/libmaple/timer.h index e98759a..0a34066 100644 --- a/libmaple/include/libmaple/timer.h +++ b/libmaple/include/libmaple/timer.h @@ -37,18 +37,12 @@ extern "C"{ #endif +#include <series/timer.h> #include <libmaple/libmaple.h> #include <libmaple/rcc.h> #include <libmaple/nvic.h> #include <libmaple/bitband.h> -struct timer_adv_reg_map; -struct timer_gen_reg_map; -struct timer_bas_reg_map; -struct timer_dev; -/* Include the series header here, as it may need the above */ -#include <series/timer.h> - /* * Register maps */ |