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

component/bt : use ESP_LOGx instead of printf

Browse Source
This commit is contained in:
Tian Hao
2016-11-29 17:42:04 +08:00
parent 9f33d8f5c0
commit 5a14e8addf
3 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
components/bt/Kconfig
View File

@@ -8,18 +8,6 @@ config BT_ENABLED
help help
This compiles in the low-level BT stack. This compiles in the low-level BT stack.
menu "BT UTILITY OPTION"
visible if BT_ENABLED
config BT_USE_ETS_PRINT
bool "BT use print which has nolock"
default y
depends on BT_ENABLED
help
This select use print or ets_print
endmenu #menu
config BTC_TASK_STACK_SIZE config BTC_TASK_STACK_SIZE
int "BT event (callback to application) task stack size" int "BT event (callback to application) task stack size"
default 2048 default 2048

8
components/bt/bluedroid/bta/sdp/bta_sdp_api.c
View File

@@ -59,7 +59,7 @@ tBTA_SDP_STATUS BTA_SdpEnable(tBTA_SDP_DM_CBACK *p_cback)
tBTA_SDP_STATUS status = BTA_SDP_FAILURE; tBTA_SDP_STATUS status = BTA_SDP_FAILURE;
tBTA_SDP_API_ENABLE *p_buf; tBTA_SDP_API_ENABLE *p_buf;
APPL_TRACE_API(__FUNCTION__); APPL_TRACE_API("%s\n", __FUNCTION__);
if (p_cback && FALSE == bta_sys_is_register(BTA_ID_SDP)) { if (p_cback && FALSE == bta_sys_is_register(BTA_ID_SDP)) {
memset(&bta_sdp_cb, 0, sizeof(tBTA_SDP_CB)); memset(&bta_sdp_cb, 0, sizeof(tBTA_SDP_CB));
@@ -95,7 +95,7 @@ tBTA_SDP_STATUS BTA_SdpSearch(BD_ADDR bd_addr, tSDP_UUID *uuid)
tBTA_SDP_STATUS ret = BTA_SDP_FAILURE; tBTA_SDP_STATUS ret = BTA_SDP_FAILURE;
tBTA_SDP_API_SEARCH *p_msg; tBTA_SDP_API_SEARCH *p_msg;
APPL_TRACE_API(__FUNCTION__); APPL_TRACE_API("%s\n", __FUNCTION__);
if ((p_msg = (tBTA_SDP_API_SEARCH *)GKI_getbuf(sizeof(tBTA_SDP_API_SEARCH))) != NULL) { if ((p_msg = (tBTA_SDP_API_SEARCH *)GKI_getbuf(sizeof(tBTA_SDP_API_SEARCH))) != NULL) {
p_msg->hdr.event = BTA_SDP_API_SEARCH_EVT; p_msg->hdr.event = BTA_SDP_API_SEARCH_EVT;
bdcpy(p_msg->bd_addr, bd_addr); bdcpy(p_msg->bd_addr, bd_addr);
@@ -125,7 +125,7 @@ tBTA_SDP_STATUS BTA_SdpCreateRecordByUser(void *user_data)
tBTA_SDP_STATUS ret = BTA_SDP_FAILURE; tBTA_SDP_STATUS ret = BTA_SDP_FAILURE;
tBTA_SDP_API_RECORD_USER *p_msg; tBTA_SDP_API_RECORD_USER *p_msg;
APPL_TRACE_API(__FUNCTION__); APPL_TRACE_API("%s\n", __FUNCTION__);
if ((p_msg = (tBTA_SDP_API_RECORD_USER *)GKI_getbuf(sizeof(tBTA_SDP_API_RECORD_USER))) != NULL) { if ((p_msg = (tBTA_SDP_API_RECORD_USER *)GKI_getbuf(sizeof(tBTA_SDP_API_RECORD_USER))) != NULL) {
p_msg->hdr.event = BTA_SDP_API_CREATE_RECORD_USER_EVT; p_msg->hdr.event = BTA_SDP_API_CREATE_RECORD_USER_EVT;
p_msg->user_data = user_data; p_msg->user_data = user_data;
@@ -153,7 +153,7 @@ tBTA_SDP_STATUS BTA_SdpRemoveRecordByUser(void *user_data)
tBTA_SDP_STATUS ret = BTA_SDP_FAILURE; tBTA_SDP_STATUS ret = BTA_SDP_FAILURE;
tBTA_SDP_API_RECORD_USER *p_msg; tBTA_SDP_API_RECORD_USER *p_msg;
APPL_TRACE_API(__FUNCTION__); APPL_TRACE_API("%s\n", __FUNCTION__);
if ((p_msg = (tBTA_SDP_API_RECORD_USER *)GKI_getbuf(sizeof(tBTA_SDP_API_RECORD_USER))) != NULL) { if ((p_msg = (tBTA_SDP_API_RECORD_USER *)GKI_getbuf(sizeof(tBTA_SDP_API_RECORD_USER))) != NULL) {
p_msg->hdr.event = BTA_SDP_API_REMOVE_RECORD_USER_EVT; p_msg->hdr.event = BTA_SDP_API_REMOVE_RECORD_USER_EVT;
p_msg->user_data = user_data; p_msg->user_data = user_data;

10
components/bt/bluedroid/include/bt_trace.h
View File

@@ -22,13 +22,11 @@
#include <stdio.h> #include <stdio.h>
#include "bt_types.h" #include "bt_types.h"
#include "rom/ets_sys.h" #include "esp_log.h"
#ifdef CONFIG_BT_USE_ETS_PRINT #define TAG "BT"
#define BT_PRINTF ets_printf
#else #define BT_PRINTF(fmt, ...) ESP_LOGE(TAG, fmt, ##__VA_ARGS__)
#define BT_PRINTF printf
#endif
#ifndef assert #ifndef assert
#define assert(x) do { if (!(x)) BT_PRINTF("bt host error %s %u\n", __FILE__, __LINE__); } while (0) #define assert(x) do { if (!(x)) BT_PRINTF("bt host error %s %u\n", __FILE__, __LINE__); } while (0)