Merge branch 'bugfix/btdm_config_bluedroid_mem_debug_github_#12631' into 'master'

component/bt: Change the osi_mem_dbg_init to the esp_bluedroid_init function.

See merge request !860
This commit is contained in:
Jiang Jiang Jian 2017-06-14 11:18:34 +08:00
commit 06fa08b022
4 changed files with 6 additions and 5 deletions

View File

@ -127,6 +127,10 @@ esp_err_t esp_bluedroid_init(void)
return ESP_ERR_INVALID_STATE;
}
#ifdef CONFIG_BLUEDROID_MEM_DEBUG
osi_mem_dbg_init();
#endif
future_p = btc_main_get_future_p(BTC_MAIN_INIT_FUTURE);
*future_p = future_new();
if (*future_p == NULL) {

View File

@ -117,10 +117,6 @@ extern void osi_mem_dbg_init(void);
******************************************************************************/
int bte_main_boot_entry(bluedroid_init_done_cb_t cb)
{
#ifdef CONFIG_BLUEDROID_MEM_DEBUG
osi_mem_dbg_init();
#endif
if (gki_init()) {
LOG_ERROR("%s: Init GKI Module Failure.\n", __func__);
return -1;

View File

@ -118,7 +118,7 @@ void osi_mem_dbg_show(void)
char *osi_strdup(const char *str)
{
size_t size = strlen(str) + 1; // + 1 for the null terminator
char *new_string = (char *)calloc(1, size);
char *new_string = (char *)osi_calloc(size);
if (!new_string) {
return NULL;

View File

@ -21,6 +21,7 @@
#include <stddef.h>
//#include <stdlib.h>
#include "sdkconfig.h"
typedef void *(*alloc_fn)(size_t size);
typedef void (*free_fn)(void *ptr);