diff options
author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-19 16:50:14 -0400 |
---|---|---|
committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-05-19 18:45:46 -0400 |
commit | 1da733b80248c9d2a319d3ed0af6d743390489ee (patch) | |
tree | 43760601a5a97469a081904fbd7e71bae7bef51f /libmaple | |
parent | 7ff47e87734c9ca7dc0c3939a8dabc3e29035d53 (diff) | |
download | librambutan-1da733b80248c9d2a319d3ed0af6d743390489ee.tar.gz librambutan-1da733b80248c9d2a319d3ed0af6d743390489ee.zip |
timer.h: Naming tweaks.
Renamed timer_reg_map_union -> timer_reg_map.
Named the anonymous timer_type.
Diffstat (limited to 'libmaple')
-rw-r--r-- | libmaple/timer.h | 8 |
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[]; |