Merge pull request #6287 from codeauroraforum/Update_usticker

cmonr · web-flow · commit 5523d53f83e0 · 2018-03-14T13:56:34.000-05:00
MCUXpresso_MCUS: Apply K64F us_ticker fix across all MCU's
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/us_ticker.c
@@ -83,10 +83,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/us_ticker.c
@@ -83,10 +83,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL27Z/us_ticker.c
@@ -90,9 +90,13 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     LPTMR_StopTimer(LPTMR0);
-    LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta);
+    LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta_us);
     LPTMR_EnableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);
     LPTMR_StartTimer(LPTMR0);
 }
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL43Z/us_ticker.c
@@ -90,9 +90,13 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     LPTMR_StopTimer(LPTMR0);
-    LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta);
+    LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta_us);
     LPTMR_EnableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);
     LPTMR_StartTimer(LPTMR0);
 }
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/us_ticker.c
@@ -83,10 +83,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW24D/us_ticker.c
@@ -83,10 +83,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KW41Z/us_ticker.c
@@ -30,7 +30,7 @@ static void lptmr_isr(void)
     us_ticker_irq_handler();
 }
 
-void us_ticker_init(void) 
+void us_ticker_init(void)
 {
     if (us_ticker_inited) {
         return;
@@ -69,7 +69,7 @@ void us_ticker_init(void)
 }
 
 
-uint32_t us_ticker_read() 
+uint32_t us_ticker_read()
 {
     if (!us_ticker_inited) {
         us_ticker_init();
@@ -78,21 +78,25 @@ uint32_t us_ticker_read()
     return ~(PIT_GetCurrentTimerCount(PIT, kPIT_Chnl_1));
 }
 
-void us_ticker_disable_interrupt(void) 
+void us_ticker_disable_interrupt(void)
 {
     LPTMR_DisableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);
 }
 
-void us_ticker_clear_interrupt(void) 
+void us_ticker_clear_interrupt(void)
 {
     LPTMR_ClearStatusFlags(LPTMR0, kLPTMR_TimerCompareFlag);
 }
 
-void us_ticker_set_interrupt(timestamp_t timestamp) 
+void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     LPTMR_StopTimer(LPTMR0);
-    LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta);
+    LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta_us);
     LPTMR_EnableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);
     LPTMR_StartTimer(LPTMR0);
 }
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K22F/us_ticker.c
@@ -83,10 +83,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K24F/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K24F/us_ticker.c
@@ -83,10 +83,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);
diff --git a/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/us_ticker.c b/targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/us_ticker.c
@@ -88,7 +88,6 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
     now_us = us_ticker_read();
     delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
 
-    uint32_t delta = timestamp - us_ticker_read();
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
     PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
diff --git a/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/us_ticker.c b/targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_IMX/us_ticker.c
@@ -87,10 +87,14 @@ void us_ticker_clear_interrupt(void)
 
 void us_ticker_set_interrupt(timestamp_t timestamp)
 {
-    uint32_t delta = timestamp - us_ticker_read();
+    uint32_t now_us, delta_us;
+
+    now_us = us_ticker_read();
+    delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);
+
     PIT_StopTimer(PIT, kPIT_Chnl_3);
     PIT_StopTimer(PIT, kPIT_Chnl_2);
-    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta);
+    PIT_SetTimerPeriod(PIT, kPIT_Chnl_3, (uint32_t)delta_us);
     PIT_EnableInterrupts(PIT, kPIT_Chnl_3, kPIT_TimerInterruptEnable);
     PIT_StartTimer(PIT, kPIT_Chnl_3);
     PIT_StartTimer(PIT, kPIT_Chnl_2);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ static void lptmr_isr(void)`
`30`	`30`	`us_ticker_irq_handler();`
`31`	`31`	`}`
`32`	`32`
`33`		`-void us_ticker_init(void)`
	`33`	`+void us_ticker_init(void)`
`34`	`34`	`{`
`35`	`35`	`if (us_ticker_inited) {`
`36`	`36`	`return;`
`@@ -69,7 +69,7 @@ void us_ticker_init(void)`
`69`	`69`	`}`
`70`	`70`
`71`	`71`
`72`		`-uint32_t us_ticker_read()`
	`72`	`+uint32_t us_ticker_read()`
`73`	`73`	`{`
`74`	`74`	`if (!us_ticker_inited) {`
`75`	`75`	`us_ticker_init();`
`@@ -78,21 +78,25 @@ uint32_t us_ticker_read()`
`78`	`78`	`return ~(PIT_GetCurrentTimerCount(PIT, kPIT_Chnl_1));`
`79`	`79`	`}`
`80`	`80`
`81`		`-void us_ticker_disable_interrupt(void)`
	`81`	`+void us_ticker_disable_interrupt(void)`
`82`	`82`	`{`
`83`	`83`	`LPTMR_DisableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);`
`84`	`84`	`}`
`85`	`85`
`86`		`-void us_ticker_clear_interrupt(void)`
	`86`	`+void us_ticker_clear_interrupt(void)`
`87`	`87`	`{`
`88`	`88`	`LPTMR_ClearStatusFlags(LPTMR0, kLPTMR_TimerCompareFlag);`
`89`	`89`	`}`
`90`	`90`
`91`		`-void us_ticker_set_interrupt(timestamp_t timestamp)`
	`91`	`+void us_ticker_set_interrupt(timestamp_t timestamp)`
`92`	`92`	`{`
`93`		`- uint32_t delta = timestamp - us_ticker_read();`
	`93`	`+ uint32_t now_us, delta_us;`
	`94`	`+`
	`95`	`+ now_us = us_ticker_read();`
	`96`	`+ delta_us = timestamp >= now_us ? timestamp - now_us : (uint32_t)((uint64_t)timestamp + 0xFFFFFFFF - now_us);`
	`97`	`+`
`94`	`98`	`LPTMR_StopTimer(LPTMR0);`
`95`		`- LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta);`
	`99`	`+ LPTMR_SetTimerPeriod(LPTMR0, (uint32_t)delta_us);`
`96`	`100`	`LPTMR_EnableInterrupts(LPTMR0, kLPTMR_TimerInterruptEnable);`
`97`	`101`	`LPTMR_StartTimer(LPTMR0);`
`98`	`102`	`}`