From f293407a9d722beb5c060e781b812adc6b22746d Mon Sep 17 00:00:00 2001
From: blckmn <blackman@xtra.com.au>
Date: Wed, 22 Jun 2016 21:12:38 +1000
Subject: [PATCH] Renamed pin on timerHardware_t to tag for clarity

---
 src/main/drivers/pwm_output.c | 2 +-
 src/main/drivers/pwm_rx.c     | 4 ++--
 src/main/drivers/timer.c      | 6 +++---
 src/main/drivers/timer.h      | 4 ++--
 src/main/io/serial_4way.c     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index 7fc326f4b..3aba0c097 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -95,7 +95,7 @@ static pwmOutputPort_t *pwmOutConfig(const timerHardware_t *timerHardware, uint8
     pwmOutputPort_t *p = &pwmOutputPorts[allocatedOutputPortCount++];
 
     configTimeBase(timerHardware->tim, period, mhz);
-    pwmGPIOConfig(timerHardware->pin, IOCFG_AF_PP);
+    pwmGPIOConfig(timerHardware->tag, IOCFG_AF_PP);
 
     pwmOCConfig(timerHardware->tim, timerHardware->channel, value, timerHardware->outputInverted);
 
diff --git a/src/main/drivers/pwm_rx.c b/src/main/drivers/pwm_rx.c
index 50a24e28e..9452a89ea 100644
--- a/src/main/drivers/pwm_rx.c
+++ b/src/main/drivers/pwm_rx.c
@@ -372,7 +372,7 @@ void pwmInConfig(const timerHardware_t *timerHardwarePtr, uint8_t channel)
     self->mode = INPUT_MODE_PWM;
     self->timerHardware = timerHardwarePtr;
 
-    pwmGPIOConfig(timerHardwarePtr->pin, timerHardwarePtr->ioMode);
+    pwmGPIOConfig(timerHardwarePtr->tag, timerHardwarePtr->ioMode);
     pwmICConfig(timerHardwarePtr->tim, timerHardwarePtr->channel, TIM_ICPolarity_Rising);
 
     timerConfigure(timerHardwarePtr, (uint16_t)PWM_TIMER_PERIOD, PWM_TIMER_MHZ);
@@ -401,7 +401,7 @@ void ppmInConfig(const timerHardware_t *timerHardwarePtr)
     self->mode = INPUT_MODE_PPM;
     self->timerHardware = timerHardwarePtr;
 
-    pwmGPIOConfig(timerHardwarePtr->pin, timerHardwarePtr->ioMode);
+    pwmGPIOConfig(timerHardwarePtr->tag, timerHardwarePtr->ioMode);
     pwmICConfig(timerHardwarePtr->tim, timerHardwarePtr->channel, TIM_ICPolarity_Rising);
 
     timerConfigure(timerHardwarePtr, (uint16_t)PPM_TIMER_PERIOD, PWM_TIMER_MHZ);
diff --git a/src/main/drivers/timer.c b/src/main/drivers/timer.c
index ba732d42f..673265f54 100755
--- a/src/main/drivers/timer.c
+++ b/src/main/drivers/timer.c
@@ -364,8 +364,8 @@ void timerChClearCCFlag(const timerHardware_t *timHw)
 // configure timer channel GPIO mode
 void timerChConfigGPIO(const timerHardware_t* timHw, ioConfig_t mode)
 {
-    IOInit(IOGetByTag(timHw->pin), OWNER_TIMER, RESOURCE_TIMER);
-    IOConfigGPIO(IOGetByTag(timHw->pin), mode);
+    IOInit(IOGetByTag(timHw->tag), OWNER_TIMER, RESOURCE_TIMER);
+    IOConfigGPIO(IOGetByTag(timHw->tag), mode);
 }
 
 // calculate input filter constant
@@ -657,7 +657,7 @@ void timerInit(void)
 #if defined(STM32F3) || defined(STM32F4)
     for (uint8_t timerIndex = 0; timerIndex < USABLE_TIMER_CHANNEL_COUNT; timerIndex++) {
         const timerHardware_t *timerHardwarePtr = &timerHardware[timerIndex];
-        IOConfigGPIOAF(IOGetByTag(timerHardwarePtr->pin), timerHardwarePtr->ioMode, timerHardwarePtr->alternateFunction);
+        IOConfigGPIOAF(IOGetByTag(timerHardwarePtr->tag), timerHardwarePtr->ioMode, timerHardwarePtr->alternateFunction);
     }
 #endif
     
diff --git a/src/main/drivers/timer.h b/src/main/drivers/timer.h
index f7ca6b445..ce09e1474 100644
--- a/src/main/drivers/timer.h
+++ b/src/main/drivers/timer.h
@@ -70,9 +70,9 @@ typedef struct timerDef_s {
     rccPeriphTag_t rcc;
 } timerDef_t;
 
-typedef struct {
+typedef struct timerHardware_s {
     TIM_TypeDef *tim;
-    ioTag_t pin;
+    ioTag_t tag;
     uint8_t channel;
     uint8_t irq;
     uint8_t outputEnable;
diff --git a/src/main/io/serial_4way.c b/src/main/io/serial_4way.c
index 4d83d5d8c..6d96a36ec 100644
--- a/src/main/io/serial_4way.c
+++ b/src/main/io/serial_4way.c
@@ -140,7 +140,7 @@ int esc4wayInit(void)
     for (volatile uint8_t i = 0; i < pwmOutputConfiguration->outputCount; i++) {
         if ((pwmOutputConfiguration->portConfigurations[i].flags & PWM_PF_MOTOR) == PWM_PF_MOTOR) {
             if(motor[pwmOutputConfiguration->portConfigurations[i].index] > 0) {
-                escHardware[escIdx].io = IOGetByTag(pwmOutputConfiguration->portConfigurations[i].timerHardware->pin);
+                escHardware[escIdx].io = IOGetByTag(pwmOutputConfiguration->portConfigurations[i].timerHardware->tag);
                 escIdx++;
             }
         }
-- 
2.11.4.GIT