feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/bt_typo' into 'master'

Browse Source 
Fix typo from the commit "Reduce the size of DRAM"

See merge request idf/esp-idf!5347
This commit is contained in:
Jiang Jiang Jian
2019-06-27 10:48:47 +08:00
parent 6ad2a948cc 917589e784
commit bbafd50662
8 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/bluedroid/btc/core/btc_dm.c
View File

@@ -41,7 +41,7 @@
/****************************************************************************** /******************************************************************************
** Static variables ** Static variables
******************************************************************************/ ******************************************************************************/
#if BTC_DYNAMIC_MENDRY == FALSE #if BTC_DYNAMIC_MEMORY == FALSE
btc_dm_cb_t btc_dm_cb = {0}; btc_dm_cb_t btc_dm_cb = {0};
#else #else
btc_dm_cb_t *btc_dm_cb_ptr; btc_dm_cb_t *btc_dm_cb_ptr;

2
components/bt/bluedroid/btc/core/btc_manage.c
View File

@@ -19,7 +19,7 @@
#include "esp_bt_defs.h" #include "esp_bt_defs.h"
#include "esp_gatt_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] = {}; void *btc_profile_cb_tab[BTC_PID_NUM] = {};
#else #else
void **btc_profile_cb_tab; void **btc_profile_cb_tab;

8
components/bt/bluedroid/btc/core/btc_task.c
View File

@@ -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) { static void btc_deinit_mem(void) {
if (btc_dm_cb_ptr) { if (btc_dm_cb_ptr) {
@@ -311,7 +311,7 @@ error_exit:;
btc_deinit_mem(); btc_deinit_mem();
return BT_STATUS_NOMEM; return BT_STATUS_NOMEM;
} }
#endif ///BTC_DYNAMIC_MENDRY #endif ///BTC_DYNAMIC_MEMORY
int btc_init(void) int btc_init(void)
{ {
@@ -320,7 +320,7 @@ int btc_init(void)
return BT_STATUS_NOMEM; return BT_STATUS_NOMEM;
} }
#if BTC_DYNAMIC_MENDRY #if BTC_DYNAMIC_MEMORY
if (btc_init_mem() != BT_STATUS_SUCCESS){ if (btc_init_mem() != BT_STATUS_SUCCESS){
return BT_STATUS_NOMEM; return BT_STATUS_NOMEM;
} }
@@ -339,7 +339,7 @@ int btc_init(void)
void btc_deinit(void) void btc_deinit(void)
{ {
#if BTC_DYNAMIC_MENDRY #if BTC_DYNAMIC_MEMORY
btc_deinit_mem(); btc_deinit_mem();
#endif #endif

2
components/bt/bluedroid/btc/include/btc/btc_dm.h
View File

@@ -75,7 +75,7 @@ typedef struct
#endif #endif
} btc_dm_cb_t; } btc_dm_cb_t;
#if BTC_DYNAMIC_MENDRY == FALSE #if BTC_DYNAMIC_MEMORY == FALSE
extern btc_dm_cb_t btc_dm_cb; extern btc_dm_cb_t btc_dm_cb;
#else #else
extern btc_dm_cb_t *btc_dm_cb_ptr; extern btc_dm_cb_t *btc_dm_cb_ptr;

2
components/bt/bluedroid/btc/include/btc/btc_manage.h
View File

@@ -19,7 +19,7 @@
#include "btc/btc_task.h" #include "btc/btc_task.h"
#include "esp_bt_defs.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]; extern void *btc_profile_cb_tab[BTC_PID_NUM];
#else #else
extern void **btc_profile_cb_tab; extern void **btc_profile_cb_tab;

4
components/bt/bluedroid/btc/profile/std/gap/btc_gap_ble.c
View File

@@ -32,7 +32,7 @@
#include "esp_bt.h" #include "esp_bt.h"
#if (BLE_INCLUDED == TRUE) #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_adv_data;
static tBTA_BLE_ADV_DATA gl_bta_scan_rsp_data; static tBTA_BLE_ADV_DATA gl_bta_scan_rsp_data;
#else #else
@@ -1373,4 +1373,4 @@ void btc_adv_list_unlock(void)
osi_mutex_unlock(&adv_list_lock); osi_mutex_unlock(&adv_list_lock);
} }
#endif #endif
#endif ///BLE_INCLUDED == TRUE #endif ///BLE_INCLUDED == TRUE

2
components/bt/bluedroid/btc/profile/std/include/btc_gap_ble.h
View File

@@ -18,7 +18,7 @@
#include "esp_bt_defs.h" #include "esp_bt_defs.h"
#include "esp_gap_ble_api.h" #include "esp_gap_ble_api.h"
#if BTC_DYNAMIC_MENDRY == TRUE #if BTC_DYNAMIC_MEMORY == TRUE
#include "bta/bta_api.h" #include "bta/bta_api.h"
extern tBTA_BLE_ADV_DATA *gl_bta_adv_data_ptr; extern tBTA_BLE_ADV_DATA *gl_bta_adv_data_ptr;
extern tBTA_BLE_ADV_DATA *gl_bta_scan_rsp_data_ptr; extern tBTA_BLE_ADV_DATA *gl_bta_scan_rsp_data_ptr;

8
components/bt/bluedroid/stack/include/stack/dyn_mem.h
View File

@@ -28,7 +28,7 @@
#define GATT_DYNAMIC_MEMORY TRUE #define GATT_DYNAMIC_MEMORY TRUE
#define SMP_DYNAMIC_MEMORY TRUE #define SMP_DYNAMIC_MEMORY TRUE
#define BTA_DYNAMIC_MEMORY TRUE #define BTA_DYNAMIC_MEMORY TRUE
#define BTC_DYNAMIC_MENDRY TRUE #define BTC_DYNAMIC_MEMORY TRUE
#define SDP_DYNAMIC_MEMORY TRUE #define SDP_DYNAMIC_MEMORY TRUE
#define GAP_DYNAMIC_MEMORY TRUE #define GAP_DYNAMIC_MEMORY TRUE
#define RFC_DYNAMIC_MEMORY TRUE #define RFC_DYNAMIC_MEMORY TRUE
@@ -64,7 +64,7 @@
#define GATT_DYNAMIC_MEMORY FALSE #define GATT_DYNAMIC_MEMORY FALSE
#define SMP_DYNAMIC_MEMORY FALSE #define SMP_DYNAMIC_MEMORY FALSE
#define BTA_DYNAMIC_MEMORY FALSE #define BTA_DYNAMIC_MEMORY FALSE
#define BTC_DYNAMIC_MENDRY FALSE #define BTC_DYNAMIC_MEMORY FALSE
#define SDP_DYNAMIC_MEMORY FALSE #define SDP_DYNAMIC_MEMORY FALSE
#define GAP_DYNAMIC_MEMORY FALSE #define GAP_DYNAMIC_MEMORY FALSE
#define RFC_DYNAMIC_MEMORY FALSE #define RFC_DYNAMIC_MEMORY FALSE
@@ -234,8 +234,8 @@
#define BTA_DYNAMIC_MEMORY FALSE #define BTA_DYNAMIC_MEMORY FALSE
#endif #endif
#ifndef BTC_DYNAMIC_MENDRY #ifndef BTC_DYNAMIC_MEMORY
#define BTC_DYNAMIC_MENDRY FALSE #define BTC_DYNAMIC_MEMORY FALSE
#endif #endif
#endif /* #ifdef DYN_MEM_H */ #endif /* #ifdef DYN_MEM_H */