From 4b0cf97de21556de4558a72c2f2297f9d252b8ab Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 6 Jan 2012 21:25:27 +0000
Subject: [PATCH] Make STM32 F4 TIM pin naming consistent with F1

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4272 42af7a65-404d-4744-a932-0658087f49c3
---
 configs/stm3240g-eval/README.txt              | 2 +-
 configs/stm3240g-eval/include/board.h         | 4 ++--
 configs/stm3240g-eval/src/stm3240g-internal.h | 2 +-
 configs/stm3240g-eval/src/up_pwm.c            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configs/stm3240g-eval/README.txt b/configs/stm3240g-eval/README.txt
index 7e4046be94..4ce507244c 100755
--- a/configs/stm3240g-eval/README.txt
+++ b/configs/stm3240g-eval/README.txt
@@ -213,7 +213,7 @@ configured to output a pulse train using TIM4 CH2.  This pin is used by
 FSMC is but is also connected to the Motor Control Connector (CN5) just
 for this purpose:
 
-  PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB)
+  PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
 
 FSMC must be disabled in this case!  PD13 is available at:
 
diff --git a/configs/stm3240g-eval/include/board.h b/configs/stm3240g-eval/include/board.h
index 80ac9a8097..6ad4736d73 100755
--- a/configs/stm3240g-eval/include/board.h
+++ b/configs/stm3240g-eval/include/board.h
@@ -311,7 +311,7 @@
  * but is also connected to the Motor Control Connector (CN5) just for this
  * purpose:
  *
- *   PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB)
+ *   PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
  * FSMC must be disabled in this case!  PD13 is available at:
  *
@@ -320,7 +320,7 @@
  *   Motor Control Connector CN15, pin 33 -- not available unless you bridge SB14.
  */
 
-#define GPIO_TIM4_CH2 GPIO_TIM4_CH2_2
+#define GPIO_TIM4_CH2OUT GPIO_TIM4_CH2OUT_2
 
 /* CAN
  *
diff --git a/configs/stm3240g-eval/src/stm3240g-internal.h b/configs/stm3240g-eval/src/stm3240g-internal.h
index 679951314f..2f23d252ca 100644
--- a/configs/stm3240g-eval/src/stm3240g-internal.h
+++ b/configs/stm3240g-eval/src/stm3240g-internal.h
@@ -117,7 +117,7 @@
  * but is also connected to the Motor Control Connector (CN5) just for this
  * purpose:
  *
- *   PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB)
+ *   PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
  * FSMC must be disabled in this case!  PD13 is available at:
  *
diff --git a/configs/stm3240g-eval/src/up_pwm.c b/configs/stm3240g-eval/src/up_pwm.c
index d0701b2b29..f2932cc4d1 100644
--- a/configs/stm3240g-eval/src/up_pwm.c
+++ b/configs/stm3240g-eval/src/up_pwm.c
@@ -61,7 +61,7 @@
  * a pulse train using TIM4 CH2.  This pin is used by FSMC is connect to CN5 just for this
  * purpose:
  *
- * PD13 FSMC_A18 / MC_TIM4_CH2 pin 33 (EnB)
+ * PD13 FSMC_A18 / MC_TIM4_CH2OUT pin 33 (EnB)
  *
  * FSMC must be disabled in this case!
  */