Merge branch 'bugfix/fix_osi_men_dbg_xxx_not_defined_when_enable_mem_dbg' into 'master'

bugfix/fix the issue of functions not defined when enable memory debug

Closes IDFGH-9248

See merge request espressif/esp-idf!18802
This commit is contained in:
Wang Meng Yang
2022-07-11 15:36:46 +08:00
2 changed files with 6 additions and 6 deletions

View File

@@ -54,6 +54,12 @@
#define BTC_DYNAMIC_MEMORY FALSE #define BTC_DYNAMIC_MEMORY FALSE
#endif #endif
#if UC_BT_BLUEDROID_MEM_DEBUG
#define HEAP_MEMORY_DEBUG TRUE
#else
#define HEAP_MEMORY_DEBUG FALSE
#endif
#ifndef BT_BLE_DYNAMIC_ENV_MEMORY #ifndef BT_BLE_DYNAMIC_ENV_MEMORY
#define BT_BLE_DYNAMIC_ENV_MEMORY FALSE #define BT_BLE_DYNAMIC_ENV_MEMORY FALSE
#endif #endif

View File

@@ -2252,12 +2252,6 @@ The maximum number of payload octets that the local device can receive in a sing
#define BTSNOOP_MEM FALSE #define BTSNOOP_MEM FALSE
#endif #endif
#if UC_BT_BLUEDROID_MEM_DEBUG
#define HEAP_MEMORY_DEBUG TRUE
#else
#define HEAP_MEMORY_DEBUG FALSE
#endif
#if UC_HEAP_ALLOCATION_FROM_SPIRAM_FIRST #if UC_HEAP_ALLOCATION_FROM_SPIRAM_FIRST
#define HEAP_ALLOCATION_FROM_SPIRAM_FIRST TRUE #define HEAP_ALLOCATION_FROM_SPIRAM_FIRST TRUE
#else #else