mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nrf: Return immediatly from mp_hal_delay_us if 0us is given 

After nrfx 1.0.0 a new macro was introduced to do a common
hardware timeout. The macro function triggers a counter of
retries or a timeout in us. However, in many cases, like in
nrfx_adc.c the timeout value is set to 0, leading to a infinite
loop in mp_hal_delay_us. This patch prevents this from happening.

Path of error:
nrfx_adc.c -> NRFX_WAIT_FOR -> NRFX_DELAY_US -> mp_hal_delay_us.
This commit is contained in:
Glenn Ruben Bakke 2018-04-12 23:14:10 +02:00 committed by Damien George
parent 63c748bfcc
commit 24258cf0b9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/nrf/mphalport.c
View File

@ -82,6 +82,10 @@ void mp_hal_stdout_tx_str(const char *str) {
void mp_hal_delay_us(mp_uint_t us) void mp_hal_delay_us(mp_uint_t us)
{ {
if (us == 0) {
return;
}
register uint32_t delay __ASM ("r0") = us; register uint32_t delay __ASM ("r0") = us;
__ASM volatile ( __ASM volatile (
#ifdef NRF51 #ifdef NRF51