ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

NRF5 - Fix usage of volatile variable in nordic critical section implementations.

pull/2849/head
Vincent Coubard 2016-09-29 10:05:02 +01:00
parent 597f104685
commit dcf03310d0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_MCU_NRF51822/hal_patch/nordic_critical.c
View File

@ -21,12 +21,12 @@
#include "nrf_soc.h" #include "nrf_soc.h"
#include "nrf_sdm.h" #include "nrf_sdm.h"
static volatile union { static union {
uint32_t _PRIMASK_state; uint32_t _PRIMASK_state;
uint8_t _sd_state; uint8_t _sd_state;
} _state = { 0 } ; } _state = { 0 } ;
static volatile uint32_t _entry_count = 0; static volatile uint32_t _entry_count = 0;
static volatile bool _use_softdevice_routine = false; static bool _use_softdevice_routine = false;
void core_util_critical_section_enter() void core_util_critical_section_enter()
{ {

2
hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/nordic_critical.c
View File

@ -22,7 +22,7 @@
#include "nrf_sdm.h" #include "nrf_sdm.h"
#include "nrf_nvic.h" #include "nrf_nvic.h"
static volatile uint8_t _sd_state = 0; static uint8_t _sd_state = 0;
static volatile uint32_t _entry_count = 0; static volatile uint32_t _entry_count = 0;
void core_util_critical_section_enter() void core_util_critical_section_enter()