add disable interrupt function in us_ticker_free()

Qinghao Shi · Qinghao Shi · commit 0c8527f5c140 · 2018-06-11T12:01:49.000+01:00
diff --git a/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c b/targets/TARGET_ARM_FM/TARGET_FVP_MPS2/us_ticker.c
@@ -62,12 +62,9 @@ void us_ticker_init(void)
 
 void us_ticker_free(void)
 {
-    if (!us_ticker_inited) {
-        return;
-    }
-
     US_TICKER_TIMER1->TimerControl  &= ~CMSDK_DUALTIMER1_CTRL_EN_Msk; // disable TIMER1
     US_TICKER_TIMER2->TimerControl  &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2
+    us_ticker_disable_interrupt();
     us_ticker_inited = 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -62,12 +62,9 @@ void us_ticker_init(void)`
`62`	`62`
`63`	`63`	`void us_ticker_free(void)`
`64`	`64`	`{`
`65`		`- if (!us_ticker_inited) {`
`66`		`- return;`
`67`		`- }`
`68`		`-`
`69`	`65`	`US_TICKER_TIMER1->TimerControl &= ~CMSDK_DUALTIMER1_CTRL_EN_Msk; // disable TIMER1`
`70`	`66`	`US_TICKER_TIMER2->TimerControl &= ~CMSDK_DUALTIMER2_CTRL_EN_Msk; // disable TIMER2`
	`67`	`+ us_ticker_disable_interrupt();`
`71`	`68`	`us_ticker_inited = 0;`
`72`	`69`	`}`
`73`	`70`