Merge pull request #3345 from bcostm/fix_suspend_tick

0xc0170 · web-flow · commit a2963668f7a2 · 2016-12-02T15:28:12.000+01:00
STM32 - Remove TIM_IT_UPDATE flag in HAL_Suspend/ResumeTick functions
diff --git a/targets/TARGET_STM/hal_tick_16b.c b/targets/TARGET_STM/hal_tick_16b.c
@@ -167,15 +167,13 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 void HAL_SuspendTick(void)
 {
     TimMasterHandle.Instance = TIM_MST;
-    // Disable HAL tick and us_ticker update interrupts (used for 32 bit counter)
-    __HAL_TIM_DISABLE_IT(&TimMasterHandle, (TIM_IT_CC2 | TIM_IT_UPDATE));
+    __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC2);
 }
 
 void HAL_ResumeTick(void)
 {
     TimMasterHandle.Instance = TIM_MST;
-    // Enable HAL tick and us_ticker update interrupts (used for 32 bit counter)
-    __HAL_TIM_ENABLE_IT(&TimMasterHandle, (TIM_IT_CC2 | TIM_IT_UPDATE));
+    __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);
 }
 
 #endif // TIM_MST_16BIT
diff --git a/targets/TARGET_STM/hal_tick_32b.c b/targets/TARGET_STM/hal_tick_32b.c
@@ -130,15 +130,13 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
 void HAL_SuspendTick(void)
 {
     TimMasterHandle.Instance = TIM_MST;
-    // Disable HAL tick and us_ticker update interrupts (used for 32 bit counter)
-    __HAL_TIM_DISABLE_IT(&TimMasterHandle, (TIM_IT_CC2 | TIM_IT_UPDATE));
+    __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC2);
 }
 
 void HAL_ResumeTick(void)
 {
     TimMasterHandle.Instance = TIM_MST;
-    // Enable HAL tick and us_ticker update interrupts (used for 32 bit counter)
-    __HAL_TIM_ENABLE_IT(&TimMasterHandle, (TIM_IT_CC2 | TIM_IT_UPDATE));
+    __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);
 }
 
 #endif // !TIM_MST_16BIT

Original file line number	Diff line number	Diff line change
`@@ -167,15 +167,13 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)`
`167`	`167`	`void HAL_SuspendTick(void)`
`168`	`168`	`{`
`169`	`169`	`TimMasterHandle.Instance = TIM_MST;`
`170`		`- // Disable HAL tick and us_ticker update interrupts (used for 32 bit counter)`
`171`		`- __HAL_TIM_DISABLE_IT(&TimMasterHandle, (TIM_IT_CC2 \| TIM_IT_UPDATE));`
	`170`	`+ __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC2);`
`172`	`171`	`}`
`173`	`172`
`174`	`173`	`void HAL_ResumeTick(void)`
`175`	`174`	`{`
`176`	`175`	`TimMasterHandle.Instance = TIM_MST;`
`177`		`- // Enable HAL tick and us_ticker update interrupts (used for 32 bit counter)`
`178`		`- __HAL_TIM_ENABLE_IT(&TimMasterHandle, (TIM_IT_CC2 \| TIM_IT_UPDATE));`
	`176`	`+ __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);`
`179`	`177`	`}`
`180`	`178`
`181`	`179`	`#endif // TIM_MST_16BIT`
Original file line number	Diff line number	Diff line change
`@@ -130,15 +130,13 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)`
`130`	`130`	`void HAL_SuspendTick(void)`
`131`	`131`	`{`
`132`	`132`	`TimMasterHandle.Instance = TIM_MST;`
`133`		`- // Disable HAL tick and us_ticker update interrupts (used for 32 bit counter)`
`134`		`- __HAL_TIM_DISABLE_IT(&TimMasterHandle, (TIM_IT_CC2 \| TIM_IT_UPDATE));`
	`133`	`+ __HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC2);`
`135`	`134`	`}`
`136`	`135`
`137`	`136`	`void HAL_ResumeTick(void)`
`138`	`137`	`{`
`139`	`138`	`TimMasterHandle.Instance = TIM_MST;`
`140`		`- // Enable HAL tick and us_ticker update interrupts (used for 32 bit counter)`
`141`		`- __HAL_TIM_ENABLE_IT(&TimMasterHandle, (TIM_IT_CC2 \| TIM_IT_UPDATE));`
	`139`	`+ __HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);`
`142`	`140`	`}`
`143`	`141`
`144`	`142`	`#endif // !TIM_MST_16BIT`