From 1da733b80248c9d2a319d3ed0af6d743390489ee Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Thu, 19 May 2011 16:50:14 -0400
Subject: timer.h: Naming tweaks.

Renamed timer_reg_map_union -> timer_reg_map.

Named the anonymous timer_type.
---
 libmaple/timer.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libmaple')

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[];
-- 
cgit v1.2.3