From 60cb126055ee082474969c56ff36f0778ba28c3e Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Mon, 20 Jun 2022 17:21:10 +0530 Subject: [PATCH] Revert "Fix crash due to less co count" This reverts commit db24d7c82fcf634a624e7e79bc1f01996e4a717f. co value should be correctly calculated rather than configured. --- porting/npl/freertos/src/npl_os_freertos.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/porting/npl/freertos/src/npl_os_freertos.c b/porting/npl/freertos/src/npl_os_freertos.c index 4b3d5b76b..7ba4914b6 100644 --- a/porting/npl/freertos/src/npl_os_freertos.c +++ b/porting/npl/freertos/src/npl_os_freertos.c @@ -98,6 +98,8 @@ static const char *TAG = "Timer"; #define BLE_TOTAL_EVQ_COUNT (10) +#define BLE_TOTAL_CO_COUNT (20) + #define BLE_TOTAL_SEM_COUNT (10) #define BLE_TOTAL_MUTEX_COUNT (10) @@ -133,7 +135,7 @@ static os_membuf_t ble_freertos_evq_buf[ struct os_mempool ble_freertos_co_pool; static os_membuf_t ble_freertos_co_buf[ - OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_TOTAL_CO_COUNT), sizeof (struct ble_npl_callout_freertos)) + OS_MEMPOOL_SIZE(BLE_TOTAL_CO_COUNT, sizeof (struct ble_npl_callout_freertos)) ]; struct os_mempool ble_freertos_sem_pool; @@ -1097,7 +1099,7 @@ int npl_freertos_mempool_init(void) if(!ble_freertos_evq_buf) { goto _error; } - ble_freertos_co_buf = malloc(OS_MEMPOOL_SIZE(MYNEWT_VAL(BLE_TOTAL_CO_COUNT), sizeof (struct ble_npl_callout_freertos)) * sizeof(os_membuf_t)); + ble_freertos_co_buf = malloc(OS_MEMPOOL_SIZE(BLE_TOTAL_CO_COUNT, sizeof (struct ble_npl_callout_freertos)) * sizeof(os_membuf_t)); if(!ble_freertos_co_buf) { goto _error; } @@ -1126,7 +1128,7 @@ int npl_freertos_mempool_init(void) goto _error; } - rc = os_mempool_init(&ble_freertos_co_pool, MYNEWT_VAL(BLE_TOTAL_CO_COUNT), + rc = os_mempool_init(&ble_freertos_co_pool, BLE_TOTAL_CO_COUNT, sizeof (struct ble_npl_callout_freertos), ble_freertos_co_buf, "ble_freertos_co_pool"); if(rc != 0) {