Merge pull request #3202 from geky/fix-rtos-wait-math

sg- · web-flow · commit 30e63a27b7fc · 2016-11-07T10:30:33.000-06:00
Fix arithmetic error in rtos-based wait
diff --git a/platform/mbed_wait_api_rtos.cpp b/platform/mbed_wait_api_rtos.cpp
@@ -37,13 +37,10 @@ void wait_us(int us) {
     int ms = us / 1000;
     if ((ms > 0) && core_util_are_interrupts_enabled()) {
         Thread::wait((uint32_t)ms);
-        us -= ms * 1000;
     }
     // Use busy waiting for sub-millisecond delays, or for the whole
     // interval if interrupts are not enabled
-    if (us > 0) {
-        while((us_ticker_read() - start) < (uint32_t)us);
-    }
+    while ((us_ticker_read() - start) < (uint32_t)us);
 }
 
 #endif // #if MBED_CONF_RTOS_PRESENT

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,10 @@ void wait_us(int us) {`
`37`	`37`	`int ms = us / 1000;`
`38`	`38`	`if ((ms > 0) && core_util_are_interrupts_enabled()) {`
`39`	`39`	`Thread::wait((uint32_t)ms);`
`40`		`- us -= ms * 1000;`
`41`	`40`	`}`
`42`	`41`	`// Use busy waiting for sub-millisecond delays, or for the whole`
`43`	`42`	`// interval if interrupts are not enabled`
`44`		`- if (us > 0) {`
`45`		`- while((us_ticker_read() - start) < (uint32_t)us);`
`46`		`- }`
	`43`	`+ while ((us_ticker_read() - start) < (uint32_t)us);`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`#endif // #if MBED_CONF_RTOS_PRESENT`