summaryrefslogtreecommitdiff
path: root/src/libs/mynewt-nimble/porting/npl
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/mynewt-nimble/porting/npl')
-rw-r--r--src/libs/mynewt-nimble/porting/npl/freertos/include/nimble/nimble_npl_os.h14
-rw-r--r--src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c2
2 files changed, 2 insertions, 14 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 3a3de40d..545be0f4 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
@@ -37,8 +37,6 @@ extern "C" {
#define BLE_NPL_TIME_FOREVER portMAX_DELAY
-extern volatile int ble_npl_in_critical;
-
/* This should be compatible with TickType_t */
typedef uint32_t ble_npl_time_t;
typedef int32_t ble_npl_stime_t;
@@ -284,22 +282,14 @@ static inline uint32_t
ble_npl_hw_enter_critical(void)
{
//vPortEnterCritical();
- ++ble_npl_in_critical;
- return npl_freertos_hw_enter_critical();
+ return npl_freertos_hw_enter_critical();
}
static inline void
ble_npl_hw_exit_critical(uint32_t ctx)
{
- --ble_npl_in_critical;
- npl_freertos_hw_exit_critical(ctx);
-}
+ npl_freertos_hw_exit_critical(ctx);
-static inline bool
-ble_npl_hw_is_in_critical(void)
-{
- // Do the same as RIOT and keep track of the critical state manually
- return (ble_npl_in_critical > 0);
}
#ifdef __cplusplus
diff --git a/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c b/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
index 667a751c..875521ab 100644
--- a/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
+++ b/src/libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
@@ -22,8 +22,6 @@
#include <string.h>
#include "nimble/nimble_npl.h"
-volatile int ble_npl_in_critical = 0;
-
static inline bool
in_isr(void)
{