Merge branch 'nimble' into nimble-ota

2020-05-02 17:48:59 +02:00
parent 40e3ac61bd ed168716b5
commit 66caada0d2
4 changed files with 22 additions and 14 deletions
--- 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