diff --git a/components/bt/bluedroid/btc/core/btc_dm.c b/components/bt/bluedroid/btc/core/btc_dm.c index 011d1ff93d..5b712dbf17 100644 --- a/components/bt/bluedroid/btc/core/btc_dm.c +++ b/components/bt/bluedroid/btc/core/btc_dm.c @@ -41,7 +41,7 @@ /****************************************************************************** ** Static variables ******************************************************************************/ -#if BTC_DYNAMIC_MENDRY == FALSE +#if BTC_DYNAMIC_MEMORY == FALSE btc_dm_cb_t btc_dm_cb = {0}; #else btc_dm_cb_t *btc_dm_cb_ptr; diff --git a/components/bt/bluedroid/btc/core/btc_manage.c b/components/bt/bluedroid/btc/core/btc_manage.c index 08afcb7543..5f394ee946 100644 --- a/components/bt/bluedroid/btc/core/btc_manage.c +++ b/components/bt/bluedroid/btc/core/btc_manage.c @@ -19,7 +19,7 @@ #include "esp_bt_defs.h" #include "esp_gatt_defs.h" -#if BTC_DYNAMIC_MENDRY == FALSE +#if BTC_DYNAMIC_MEMORY == FALSE void *btc_profile_cb_tab[BTC_PID_NUM] = {}; #else void **btc_profile_cb_tab; diff --git a/components/bt/bluedroid/btc/core/btc_task.c b/components/bt/bluedroid/btc/core/btc_task.c index edfc4a63f1..c0e57ee417 100644 --- a/components/bt/bluedroid/btc/core/btc_task.c +++ b/components/bt/bluedroid/btc/core/btc_task.c @@ -196,7 +196,7 @@ bt_status_t btc_transfer_context(btc_msg_t *msg, void *arg, int arg_len, btc_arg } -#if BTC_DYNAMIC_MENDRY +#if BTC_DYNAMIC_MEMORY static void btc_deinit_mem(void) { if (btc_dm_cb_ptr) { @@ -311,7 +311,7 @@ error_exit:; btc_deinit_mem(); return BT_STATUS_NOMEM; } -#endif ///BTC_DYNAMIC_MENDRY +#endif ///BTC_DYNAMIC_MEMORY int btc_init(void) { @@ -320,7 +320,7 @@ int btc_init(void) return BT_STATUS_NOMEM; } -#if BTC_DYNAMIC_MENDRY +#if BTC_DYNAMIC_MEMORY if (btc_init_mem() != BT_STATUS_SUCCESS){ return BT_STATUS_NOMEM; } @@ -339,7 +339,7 @@ int btc_init(void) void btc_deinit(void) { -#if BTC_DYNAMIC_MENDRY +#if BTC_DYNAMIC_MEMORY btc_deinit_mem(); #endif diff --git a/components/bt/bluedroid/btc/include/btc/btc_dm.h b/components/bt/bluedroid/btc/include/btc/btc_dm.h index 1accc3970b..4035969214 100644 --- a/components/bt/bluedroid/btc/include/btc/btc_dm.h +++ b/components/bt/bluedroid/btc/include/btc/btc_dm.h @@ -75,7 +75,7 @@ typedef struct #endif } btc_dm_cb_t; -#if BTC_DYNAMIC_MENDRY == FALSE +#if BTC_DYNAMIC_MEMORY == FALSE extern btc_dm_cb_t btc_dm_cb; #else extern btc_dm_cb_t *btc_dm_cb_ptr; diff --git a/components/bt/bluedroid/btc/include/btc/btc_manage.h b/components/bt/bluedroid/btc/include/btc/btc_manage.h index bd031a0e89..48ba1c5e10 100644 --- a/components/bt/bluedroid/btc/include/btc/btc_manage.h +++ b/components/bt/bluedroid/btc/include/btc/btc_manage.h @@ -19,7 +19,7 @@ #include "btc/btc_task.h" #include "esp_bt_defs.h" -#if BTC_DYNAMIC_MENDRY == FALSE +#if BTC_DYNAMIC_MEMORY == FALSE extern void *btc_profile_cb_tab[BTC_PID_NUM]; #else extern void **btc_profile_cb_tab; diff --git a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c index 3355a5924b..9f02cc26f5 100644 --- a/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c +++ b/components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c @@ -32,7 +32,7 @@ #include "esp_bt.h" #if (BLE_INCLUDED == TRUE) -#if BTC_DYNAMIC_MENDRY == FALSE +#if BTC_DYNAMIC_MEMORY == FALSE static tBTA_BLE_ADV_DATA gl_bta_adv_data; static tBTA_BLE_ADV_DATA gl_bta_scan_rsp_data; #else @@ -1373,4 +1373,4 @@ void btc_adv_list_unlock(void) osi_mutex_unlock(&adv_list_lock); } #endif -#endif ///BLE_INCLUDED == TRUE \ No newline at end of file +#endif ///BLE_INCLUDED == TRUE diff --git a/components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h b/components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h index b5e2effe7e..3af1559ff8 100644 --- a/components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h +++ b/components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h @@ -18,7 +18,7 @@ #include "esp_bt_defs.h" #include "esp_gap_ble_api.h" -#if BTC_DYNAMIC_MENDRY == TRUE +#if BTC_DYNAMIC_MEMORY == TRUE #include "bta/bta_api.h" extern tBTA_BLE_ADV_DATA *gl_bta_adv_data_ptr; extern tBTA_BLE_ADV_DATA *gl_bta_scan_rsp_data_ptr; diff --git a/components/bt/bluedroid/stack/include/stack/dyn_mem.h b/components/bt/bluedroid/stack/include/stack/dyn_mem.h index 1241c3a85a..c2679a318b 100644 --- a/components/bt/bluedroid/stack/include/stack/dyn_mem.h +++ b/components/bt/bluedroid/stack/include/stack/dyn_mem.h @@ -28,7 +28,7 @@ #define GATT_DYNAMIC_MEMORY TRUE #define SMP_DYNAMIC_MEMORY TRUE #define BTA_DYNAMIC_MEMORY TRUE -#define BTC_DYNAMIC_MENDRY TRUE +#define BTC_DYNAMIC_MEMORY TRUE #define SDP_DYNAMIC_MEMORY TRUE #define GAP_DYNAMIC_MEMORY TRUE #define RFC_DYNAMIC_MEMORY TRUE @@ -64,7 +64,7 @@ #define GATT_DYNAMIC_MEMORY FALSE #define SMP_DYNAMIC_MEMORY FALSE #define BTA_DYNAMIC_MEMORY FALSE -#define BTC_DYNAMIC_MENDRY FALSE +#define BTC_DYNAMIC_MEMORY FALSE #define SDP_DYNAMIC_MEMORY FALSE #define GAP_DYNAMIC_MEMORY FALSE #define RFC_DYNAMIC_MEMORY FALSE @@ -234,8 +234,8 @@ #define BTA_DYNAMIC_MEMORY FALSE #endif -#ifndef BTC_DYNAMIC_MENDRY -#define BTC_DYNAMIC_MENDRY FALSE +#ifndef BTC_DYNAMIC_MEMORY +#define BTC_DYNAMIC_MEMORY FALSE #endif #endif /* #ifdef DYN_MEM_H */