diff options
| author | JF <jf@codingfield.com> | 2020-05-02 17:48:59 +0200 |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-05-02 17:48:59 +0200 |
| commit | 66caada0d2da7731a0d08b0dadcf3ae05d2d41e5 (patch) | |
| tree | dbaaaf34d4ac8a52c2fbc8a621d56f2743698f2a /src/libs | |
| parent | 40e3ac61bd4256645ed40273f2762caea9e85b97 (diff) | |
| parent | ed168716b5055d3efec9b30b1b1a3c7ef6c5b17d (diff) | |
Merge branch 'nimble' into nimble-ota
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/mynewt-nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/mynewt-nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h b/src/libs/mynewt-nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h index f04145d3..d8810f35 100644 --- a/src/libs/mynewt-nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h +++ b/src/libs/mynewt-nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h @@ -282,8 +282,8 @@ static inline uint32_t ble_npl_hw_enter_critical(void) { //vPortEnterCritical(); - npl_freertos_hw_enter_critical(); - return 0; + + return npl_freertos_hw_enter_critical(); } static inline void |