aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-05-19 16:50:14 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-05-19 18:45:46 -0400
commit60e5eccf9e097ca9242d427711c4a0da5ae3e4fd (patch)
treeb4a750f13c0e8821a81571560a69831c4168334e
parent36ad4669e9cee709a4bc93a23a54c1515ba4b67e (diff)
timer.h: Naming tweaks.
Renamed timer_reg_map_union -> timer_reg_map. Named the anonymous timer_type.
-rw-r--r--libmaple/timer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmaple/timer.h b/libmaple/timer.h
index befc026..cd8f83e 100644
--- a/libmaple/timer.h
+++ b/libmaple/timer.h
@@ -135,13 +135,13 @@ typedef struct timer_bas_reg_map {
* Timer devices
*/
-typedef union {
+typedef union timer_reg_map {
timer_adv_reg_map *adv;
timer_gen_reg_map *gen;
timer_bas_reg_map *bas;
-} timer_reg_map_union;
+} timer_reg_map;
-typedef enum {
+typedef enum timer_type {
TIMER_ADVANCED,
TIMER_GENERAL,
TIMER_BASIC
@@ -149,7 +149,7 @@ typedef enum {
/** Timer device type */
typedef struct timer_dev {
- timer_reg_map_union regs;
+ timer_reg_map regs;
rcc_clk_id clk_id;
timer_type type;
voidFuncPtr handlers[];