Merge pull request #9960 from marcuschangarm/fix-no-rtos-wait

0xc0170 · web-flow · commit 5be51a5b8685 · 2019-05-21T09:13:27.000+01:00
Use LP tickers for waiting in no RTOS builds when available
diff --git a/platform/mbed_wait_api_no_rtos.c b/platform/mbed_wait_api_no_rtos.c
@@ -23,16 +23,23 @@
 // if the RTOS is not present.
 #ifndef MBED_CONF_RTOS_PRESENT
 
+#include "hal/lp_ticker_api.h"
 #include "hal/us_ticker_api.h"
 
 void wait(float s)
 {
-    wait_us(s * 1000000.0f);
+    wait_ms(s * 1000.0f);
 }
 
 void wait_ms(int ms)
 {
+#if DEVICE_LPTICKER
+    const ticker_data_t *const ticker = get_lp_ticker_data();
+    uint32_t start = ticker_read(ticker);
+    while ((ticker_read(ticker) - start) < (uint32_t)(ms * 1000));
+#else
     wait_us(ms * 1000);
+#endif
 }
 
 void wait_us(int us)

Original file line number	Diff line number	Diff line change
`@@ -23,16 +23,23 @@`
`23`	`23`	`// if the RTOS is not present.`
`24`	`24`	`#ifndef MBED_CONF_RTOS_PRESENT`
`25`	`25`
	`26`	`+#include "hal/lp_ticker_api.h"`
`26`	`27`	`#include "hal/us_ticker_api.h"`
`27`	`28`
`28`	`29`	`void wait(float s)`
`29`	`30`	`{`
`30`		`- wait_us(s * 1000000.0f);`
	`31`	`+ wait_ms(s * 1000.0f);`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`void wait_ms(int ms)`
`34`	`35`	`{`
	`36`	`+#if DEVICE_LPTICKER`
	`37`	`+ const ticker_data_t *const ticker = get_lp_ticker_data();`
	`38`	`+ uint32_t start = ticker_read(ticker);`
	`39`	`+ while ((ticker_read(ticker) - start) < (uint32_t)(ms * 1000));`
	`40`	`+#else`
`35`	`41`	`wait_us(ms * 1000);`
	`42`	`+#endif`
`36`	`43`	`}`
`37`	`44`
`38`	`45`	`void wait_us(int us)`