Cleanup of makefiles. Cleanup of merge.

[arc.git] / arch / arm / arm_cm3 / drivers / Gpt.c

diff --git a/arch/arm/arm_cm3/drivers/Gpt.c b/arch/arm/arm_cm3/drivers/Gpt.c
index 793c33e916bd084af9fc588b484b060a3f023b3c..f25c4856134d7bf0adc90de8110b26a5aa44895b 100644 (file)
--- a/arch/arm/arm_cm3/drivers/Gpt.c
+++ b/arch/arm/arm_cm3/drivers/Gpt.c
@@ -67,7 +67,7 @@
 \r
 // Implementation specific\r
 /* STM32 helper arrays\r
- *
+ *\r
  */\r
 TIM_TypeDef * const TimAddr[] =\r
 {\r
@@ -318,13 +318,13 @@ void Gpt_StartTimer(Gpt_ChannelType channel, Gpt_ValueType period_ticks)
                TimAddr[channel]->CR1 |= (TIM_CR1_CEN | TIM_CR1_URS | TIM_CR1_DIR);\r
                TimAddr[channel]->CR1 &= ~TIM_CR1_UDIS;\r
        }\r
-\r
+       #if ( GPT_ENABLE_DISABLE_NOTIFICATION_API == STD_ON )\r
        if( Gpt_Global.config[confCh].GptNotification != NULL )\r
        {\r
                // GPT275\r
                Gpt_EnableNotification(channel);\r
        }\r
-\r
+       #endif\r
        Gpt_Unit[channel].state = GPT_STATE_STARTED;\r
 }\r
 \r
@@ -339,8 +339,9 @@ void Gpt_StopTimer(Gpt_ChannelType channel)
                // Disable timer\r
                TimAddr[channel]->CR1 &= ~TIM_CR1_CEN;\r
        }\r
-\r
+       #if ( GPT_ENABLE_DISABLE_NOTIFICATION_API == STD_ON )\r
        Gpt_DisableNotification(channel);\r
+       #endif\r
        Gpt_Unit[channel].state = GPT_STATE_STOPPED;\r
 }\r
 \r