Skip to content

Commit d73e172

Browse files
Isl2017Isl2017
committed
Merge branch 'feat/ble_log_spi_out_dev_phase_4' into 'master'
BLE Log SPI Out Dev Phase 4 Closes BLERP-2033, BLERP-2032, BLERP-2014, BLERP-2019, BLERP-2016, and BLERP-2015 See merge request espressif/esp-idf!40190
2 parents 29ea09f + 5f3ac91 commit d73e172

File tree

9 files changed

+657
-324
lines changed

9 files changed

+657
-324
lines changed

‎components/bt/common/Kconfig.in‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,21 @@ config BT_BLE_LOG_SPI_OUT_HCI_ENABLED
2727
help
2828
Enable logging of HCI packets to the SPI bus when BLE SPI log output is enabled.
2929

30+
config BT_BLE_LOG_SPI_OUT_HCI_BUF_SIZE
31+
int "SPI transaction buffer size for HCI logs"
32+
depends on BT_BLE_LOG_SPI_OUT_HCI_ENABLED
33+
default 1024
34+
help
35+
SPI transaction buffer size for HCI logs.
36+
There will be 2 SPI DMA buffers with the same size.
37+
38+
config BT_BLE_LOG_SPI_OUT_HCI_TASK_CNT
39+
int "HCI task count"
40+
depends on BT_BLE_LOG_SPI_OUT_HCI_ENABLED
41+
default 1
42+
help
43+
HCI task count
44+
3045
config BT_BLE_LOG_SPI_OUT_HOST_ENABLED
3146
bool "Enable Host log output to SPI"
3247
depends on BT_BLE_LOG_SPI_OUT_ENABLED
@@ -35,6 +50,21 @@ config BT_BLE_LOG_SPI_OUT_HOST_ENABLED
3550
This configuration applies to the logs of both Bluedroid Host and NimBLE Host.
3651
When BLE SPI log output is enabled, this option allows host logs to be transmitted via SPI.
3752

53+
config BT_BLE_LOG_SPI_OUT_HOST_BUF_SIZE
54+
int "SPI transaction buffer size for host logs"
55+
depends on BT_BLE_LOG_SPI_OUT_HOST_ENABLED
56+
default 1024
57+
help
58+
SPI transaction buffer size for host logs.
59+
There will be 2 SPI DMA buffers with the same size.
60+
61+
config BT_BLE_LOG_SPI_OUT_HOST_TASK_CNT
62+
int "Host task count"
63+
depends on BT_BLE_LOG_SPI_OUT_HOST_ENABLED
64+
default 2
65+
help
66+
Host task count.
67+
3868
config BT_BLE_LOG_SPI_OUT_LL_ENABLED
3969
bool "Enable Controller log output to SPI"
4070
depends on BT_BLE_LOG_SPI_OUT_ENABLED
@@ -105,7 +135,7 @@ config BT_BLE_LOG_SPI_OUT_SYNC_IO_NUM
105135
config BT_BLE_LOG_SPI_OUT_TS_SYNC_SLEEP_SUPPORT
106136
bool "Enable ble log & logic analyzer log time sync sleep support"
107137
depends on BT_BLE_LOG_SPI_OUT_LL_ENABLED
108-
default n
138+
default y
109139
help
110140
Enable ble log & logic analyzer log time sync sleep support
111141

@@ -138,3 +168,32 @@ config BT_BLE_LOG_SPI_OUT_LE_AUDIO_BUF_SIZE
138168
help
139169
SPI transaction buffer size for LE Audio logs.
140170
There will be 2 SPI DMA buffers with the same size.
171+
172+
config BT_BLE_LOG_SPI_OUT_LE_AUDIO_TASK_CNT
173+
int "LE audio task count"
174+
depends on BT_BLE_LOG_SPI_OUT_LE_AUDIO_ENABLED
175+
default 1
176+
help
177+
LE audio task count
178+
179+
config BT_BLE_LOG_SPI_OUT_MESH_ENABLED
180+
bool "Enable BLE mesh log output to SPI"
181+
depends on BT_BLE_LOG_SPI_OUT_ENABLED
182+
default n
183+
help
184+
Enable BLE mesh log output to SPI
185+
186+
config BT_BLE_LOG_SPI_OUT_MESH_BUF_SIZE
187+
int "SPI transaction buffer size for BLE mesh logs"
188+
depends on BT_BLE_LOG_SPI_OUT_MESH_ENABLED
189+
default 1024
190+
help
191+
SPI transaction buffer size for BLE mesh logs.
192+
There will be 2 SPI DMA buffers with the same size.
193+
194+
config BT_BLE_LOG_SPI_OUT_MESH_TASK_CNT
195+
int "Mesh task count"
196+
depends on BT_BLE_LOG_SPI_OUT_MESH_ENABLED
197+
default 3
198+
help
199+
Mesh task count

‎components/bt/common/ble_log/ble_log_spi_out.c‎

Lines changed: 529 additions & 291 deletions
Large diffs are not rendered by default.

‎components/bt/common/ble_log/include/ble_log/ble_log_spi_out.h‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "driver/spi_master.h"
1212
#include "driver/gpio.h"
1313
#include "esp_timer.h"
14-
#include "esp_log.h"
1514
#include "freertos/semphr.h"
1615
#include "esp_heap_caps.h"
1716

@@ -27,21 +26,22 @@ enum {
2726
BLE_LOG_SPI_OUT_SOURCE_ESP_LEGACY_ISR,
2827
BLE_LOG_SPI_OUT_SOURCE_LL_HCI,
2928
BLE_LOG_SPI_OUT_SOURCE_LE_AUDIO,
29+
BLE_LOG_SPI_OUT_SOURCE_MESH,
3030
BLE_LOG_SPI_OUT_SOURCE_USER = 0x10,
3131
BLE_LOG_SPI_OUT_SOURCE_SSC = 0xFD,
3232
BLE_LOG_SPI_OUT_SOURCE_SYNC,
3333
BLE_LOG_SPI_OUT_SOURCE_LOSS,
3434
};
3535

36-
enum {
37-
BLE_LOG_SPI_OUT_LEVEL_NONE = 0,
38-
BLE_LOG_SPI_OUT_LEVEL_ERROR,
39-
BLE_LOG_SPI_OUT_LEVEL_WARN,
40-
BLE_LOG_SPI_OUT_LEVEL_INFO,
41-
BLE_LOG_SPI_OUT_LEVEL_DEBUG,
42-
BLE_LOG_SPI_OUT_LEVEL_VERBOSE,
43-
BLE_LOG_SPI_OUT_LEVEL_MAX,
44-
};
36+
#define BLE_LOG_SPI_OUT_LEVEL_NONE 0
37+
#define BLE_LOG_SPI_OUT_LEVEL_ERROR 1
38+
#define BLE_LOG_SPI_OUT_LEVEL_WARN 2
39+
#define BLE_LOG_SPI_OUT_LEVEL_INFO 3
40+
#define BLE_LOG_SPI_OUT_LEVEL_DEBUG 4
41+
#define BLE_LOG_SPI_OUT_LEVEL_VERBOSE 5
42+
#define BLE_LOG_SPI_OUT_STR(x) #x
43+
#define BLE_LOG_SPI_OUT_XSTR(x) BLE_LOG_SPI_OUT_STR(x)
44+
#define BLE_LOG_SPI_OUT_BUILD_PREFIX(LEVEL, TAG) "[" BLE_LOG_SPI_OUT_XSTR(LEVEL) "][" TAG "]"
4545

4646
// Public functions
4747
int ble_log_spi_out_init(void);
@@ -53,12 +53,12 @@ void ble_log_spi_out_ll_write(uint32_t len, const uint8_t *addr, uint32_t len_ap
5353
void ble_log_spi_out_ll_log_ev_proc(void);
5454
void ble_log_spi_out_ts_sync_start(void);
5555
void ble_log_spi_out_ts_sync_stop(void);
56-
int ble_log_spi_out_printf(uint8_t source, const char *format, ...);
57-
int ble_log_spi_out_printf_enh(uint8_t source, uint8_t level, const char *tag, const char *format, ...);
58-
int ble_log_spi_out_write_with_ts(uint8_t source, const uint8_t *addr, uint16_t len);
5956
void ble_log_spi_out_dump_all(void);
6057
void ble_log_spi_out_enable(bool enable);
6158
void ble_log_spi_out_flush(void);
6259
void ble_log_spi_out_le_audio_write(const uint8_t *addr, uint16_t len);
60+
int ble_log_spi_out_host_write(uint8_t source, const char *prefix, const char *format, ...);
61+
int ble_log_spi_out_hci_write(uint8_t source, const uint8_t *addr, uint16_t len);
62+
int ble_log_spi_out_mesh_write(const char *prefix, const char *format, ...);
6363

6464
#endif // __BT_SPI_OUT_H__

‎components/bt/controller/esp32c3/Kconfig.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@ menu "Controller debug log Options (Experimental)"
599599
depends on BT_CTRL_LE_LOG_EN
600600
depends on !BT_CTRL_LE_LOG_DUMP_ONLY
601601
select BT_BLE_LOG_SPI_OUT_ENABLED
602+
select BT_BLE_LOG_SPI_OUT_LL_ENABLED
602603
default n
603604
help
604605
Output ble controller logs to SPI bus

‎components/bt/controller/esp32c3/bt.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ static void esp_bt_controller_log_interface(uint32_t len, const uint8_t *addr, b
551551
#if CONFIG_BT_CTRL_LE_LOG_SPI_OUT_EN
552552
static IRAM_ATTR void esp_bt_controller_spi_log_interface(uint32_t len, const uint8_t *addr, bool end)
553553
{
554-
ble_log_spi_out_write(BLE_LOG_SPI_OUT_SOURCE_ESP_LEGACY, addr, len);
554+
ble_log_spi_out_ll_write(len, addr, 0, NULL, 0);
555555
}
556556
#endif // CONFIG_BT_CTRL_LE_LOG_SPI_OUT_EN
557557

@@ -1809,6 +1809,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
18091809
#if CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED
18101810
if (ble_log_spi_out_init() != 0) {
18111811
ESP_LOGE(BT_LOG_TAG, "BLE Log SPI output init failed");
1812+
err = ESP_ERR_NO_MEM;
18121813
goto error;
18131814
}
18141815
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_ENABLED

‎components/bt/host/bluedroid/api/esp_bluedroid_hci.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ void hci_host_send_packet(uint8_t *data, uint16_t len)
6767
#if (BT_HCI_LOG_INCLUDED == TRUE)
6868
bt_hci_log_record_hci_data(data[0], &data[1], len - 1);
6969
#endif
70-
#if (BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
71-
ble_log_spi_out_write_with_ts(BLE_LOG_SPI_OUT_SOURCE_HCI_DOWNSTREAM, data, len);
72-
#endif // (BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
70+
#if CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
71+
ble_log_spi_out_hci_write(BLE_LOG_SPI_OUT_SOURCE_HCI_DOWNSTREAM, data, len);
72+
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
7373
#if (BT_CONTROLLER_INCLUDED == TRUE)
7474
esp_vhci_host_send_packet(data, len);
7575
#else /* BT_CONTROLLER_INCLUDED == TRUE */

‎components/bt/host/bluedroid/common/include/common/bt_trace.h‎

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,26 @@ static inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t l
223223
#if (BT_BLE_LOG_SPI_OUT_HOST_ENABLED && !CLASSIC_BT_INCLUDED)
224224

225225
#define BTM_TRACE_ERROR(fmt, args...) { \
226+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
227+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_ERROR, "BT_BTM"), fmt, ## args); \
226228
if (btm_cb.trace_level >= BT_TRACE_LEVEL_ERROR && BT_LOG_LEVEL_CHECK(BTM, ERROR)) BT_PRINT_E("BT_BTM", fmt, ## args); \
227229
}
228230

229231
#define BTM_TRACE_WARNING(fmt, args...) { \
232+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
233+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_WARN, "BT_BTM"), fmt, ## args); \
230234
if (btm_cb.trace_level >= BT_TRACE_LEVEL_WARNING && BT_LOG_LEVEL_CHECK(BTM, WARNING)) BT_PRINT_W("BT_BTM", fmt, ## args); \
231235
}
232236

233237
#define BTM_TRACE_API(fmt, args...) { \
234-
ble_log_spi_out_printf_enh(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_BTM", fmt, ## args); \
238+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
239+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_BTM"), fmt, ## args); \
235240
if (btm_cb.trace_level >= BT_TRACE_LEVEL_API && BT_LOG_LEVEL_CHECK(BTM, API)) BT_PRINT_I("BT_BTM", fmt, ## args); \
236241
}
237242

238243
#define BTM_TRACE_EVENT(fmt, args...) { \
239-
ble_log_spi_out_printf_enh(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, BLE_LOG_SPI_OUT_LEVEL_DEBUG, "BT_BTM", fmt, ## args); \
244+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
245+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_DEBUG, "BT_BTM"), fmt, ## args); \
240246
if (btm_cb.trace_level >= BT_TRACE_LEVEL_EVENT && BT_LOG_LEVEL_CHECK(BTM, EVENT)) BT_PRINT_D("BT_BTM", fmt, ## args); \
241247
}
242248

@@ -259,19 +265,26 @@ static inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t l
259265
#if (BT_BLE_LOG_SPI_OUT_HOST_ENABLED && !CLASSIC_BT_INCLUDED)
260266

261267
#define L2CAP_TRACE_ERROR(fmt, args...) { \
268+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
269+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_ERROR, "BT_L2CAP"), fmt, ## args); \
262270
if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_ERROR && BT_LOG_LEVEL_CHECK(L2CAP, ERROR)) BT_PRINT_E("BT_L2CAP", fmt, ## args); \
263271
}
264272

265273
#define L2CAP_TRACE_WARNING(fmt, args...) { \
274+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
275+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_WARN, "BT_L2CAP"), fmt, ## args); \
266276
if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_WARNING && BT_LOG_LEVEL_CHECK(L2CAP, WARNING)) BT_PRINT_W("BT_L2CAP", fmt, ## args); \
267277
}
268278

269279
#define L2CAP_TRACE_API(fmt, args...) { \
270-
ble_log_spi_out_printf_enh(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_L2CAP", fmt, ## args); \
280+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
281+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_L2CAP"), fmt, ## args); \
271282
if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_API && BT_LOG_LEVEL_CHECK(L2CAP, API)) BT_PRINT_I("BT_L2CAP", fmt, ## args); \
272283
}
273284

274285
#define L2CAP_TRACE_EVENT(fmt, args...) { \
286+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
287+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_DEBUG, "BT_L2CAP"), fmt, ## args); \
275288
if (l2cb.l2cap_trace_level >= BT_TRACE_LEVEL_EVENT && BT_LOG_LEVEL_CHECK(L2CAP, EVENT)) BT_PRINT_D("BT_L2CAP", fmt, ## args); \
276289
}
277290

@@ -310,19 +323,26 @@ static inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t l
310323
#if (BT_BLE_LOG_SPI_OUT_HOST_ENABLED && !CLASSIC_BT_INCLUDED)
311324

312325
#define GAP_TRACE_ERROR(fmt, args...) { \
326+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
327+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_ERROR, "BT_GAP"), fmt, ## args); \
313328
if (gap_cb.trace_level >= BT_TRACE_LEVEL_ERROR && BT_LOG_LEVEL_CHECK(GAP, ERROR)) BT_PRINT_E("BT_GAP", fmt, ## args); \
314329
}
315330

316331
#define GAP_TRACE_WARNING(fmt, args...) { \
332+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
333+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_WARN, "BT_GAP"), fmt, ## args); \
317334
if (gap_cb.trace_level >= BT_TRACE_LEVEL_WARNING && BT_LOG_LEVEL_CHECK(GAP, WARNING)) BT_PRINT_W("BT_GAP", fmt, ## args); \
318335
}
319336

320337
#define GAP_TRACE_API(fmt, args...) { \
321-
ble_log_spi_out_printf_enh(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_GAP", fmt, ## args); \
338+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
339+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_GAP"), fmt, ## args); \
322340
if (gap_cb.trace_level >= BT_TRACE_LEVEL_API && BT_LOG_LEVEL_CHECK(GAP, API)) BT_PRINT_I("BT_GAP", fmt, ## args); \
323341
}
324342

325343
#define GAP_TRACE_EVENT(fmt, args...) { \
344+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
345+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_DEBUG, "BT_GAP"), fmt, ## args); \
326346
if (gap_cb.trace_level >= BT_TRACE_LEVEL_EVENT && BT_LOG_LEVEL_CHECK(GAP, EVENT)) BT_PRINT_D("BT_GAP", fmt, ## args); \
327347
}
328348

@@ -440,19 +460,26 @@ static inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t l
440460
#if (BT_BLE_LOG_SPI_OUT_HOST_ENABLED && !CLASSIC_BT_INCLUDED)
441461

442462
#define GATT_TRACE_ERROR(fmt, args...) { \
463+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
464+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_ERROR, "BT_GATT"), fmt, ## args); \
443465
if (gatt_cb.trace_level >= BT_TRACE_LEVEL_ERROR && BT_LOG_LEVEL_CHECK(GATT, ERROR)) BT_PRINT_E("BT_GATT", fmt, ## args); \
444466
}
445467

446468
#define GATT_TRACE_WARNING(fmt, args...) { \
469+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
470+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_WARN, "BT_GATT"), fmt, ## args); \
447471
if (gatt_cb.trace_level >= BT_TRACE_LEVEL_WARNING && BT_LOG_LEVEL_CHECK(GATT, WARNING)) BT_PRINT_W("BT_GATT", fmt, ## args); \
448472
}
449473

450474
#define GATT_TRACE_API(fmt, args...) { \
451-
ble_log_spi_out_printf_enh(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_GATT", fmt, ## args); \
475+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
476+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_GATT"), fmt, ## args); \
452477
if (gatt_cb.trace_level >= BT_TRACE_LEVEL_API && BT_LOG_LEVEL_CHECK(GATT, API)) BT_PRINT_I("BT_GATT", fmt, ## args); \
453478
}
454479

455480
#define GATT_TRACE_EVENT(fmt, args...) { \
481+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
482+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_DEBUG, "BT_GATT"), fmt, ## args); \
456483
if (gatt_cb.trace_level >= BT_TRACE_LEVEL_EVENT && BT_LOG_LEVEL_CHECK(GATT, EVENT)) BT_PRINT_D("BT_GATT", fmt, ## args); \
457484
}
458485

@@ -475,19 +502,26 @@ static inline void trc_dump_buffer(const char *prefix, uint8_t *data, uint16_t l
475502
#if (BT_BLE_LOG_SPI_OUT_HOST_ENABLED && !CLASSIC_BT_INCLUDED)
476503

477504
#define SMP_TRACE_ERROR(fmt, args...) { \
505+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
506+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_ERROR, "BT_SMP"), fmt, ## args); \
478507
if (smp_cb.trace_level >= BT_TRACE_LEVEL_ERROR && BT_LOG_LEVEL_CHECK(SMP, ERROR)) BT_PRINT_E("BT_SMP", fmt, ## args); \
479508
}
480509

481510
#define SMP_TRACE_WARNING(fmt, args...) { \
511+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
512+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_WARN, "BT_SMP"), fmt, ## args); \
482513
if (smp_cb.trace_level >= BT_TRACE_LEVEL_WARNING && BT_LOG_LEVEL_CHECK(SMP, WARNING)) BT_PRINT_W("BT_SMP", fmt, ## args); \
483514
}
484515

485516
#define SMP_TRACE_API(fmt, args...) { \
486-
ble_log_spi_out_printf_enh(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_SMP", fmt, ## args); \
517+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
518+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_INFO, "BT_SMP"), fmt, ## args); \
487519
if (smp_cb.trace_level >= BT_TRACE_LEVEL_API && BT_LOG_LEVEL_CHECK(SMP, API)) BT_PRINT_I("BT_SMP", fmt, ## args); \
488520
}
489521

490522
#define SMP_TRACE_EVENT(fmt, args...) { \
523+
ble_log_spi_out_host_write(BLE_LOG_SPI_OUT_SOURCE_BLUEDROID, \
524+
BLE_LOG_SPI_OUT_BUILD_PREFIX(BLE_LOG_SPI_OUT_LEVEL_DEBUG, "BT_SMP"), fmt, ## args); \
491525
if (smp_cb.trace_level >= BT_TRACE_LEVEL_EVENT && BT_LOG_LEVEL_CHECK(SMP, EVENT)) BT_PRINT_D("BT_SMP", fmt, ## args); \
492526
}
493527

‎components/bt/host/bluedroid/hci/hci_hal_h4.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -600,9 +600,9 @@ void bt_record_hci_data(uint8_t *data, uint16_t len)
600600

601601
static int host_recv_pkt_cb(uint8_t *data, uint16_t len)
602602
{
603-
#if (BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
604-
ble_log_spi_out_write_with_ts(BLE_LOG_SPI_OUT_SOURCE_HCI_UPSTREAM, data, len);
605-
#endif // (BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
603+
#if CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
604+
ble_log_spi_out_hci_write(BLE_LOG_SPI_OUT_SOURCE_HCI_UPSTREAM, data, len);
605+
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
606606
//Target has packet to host, malloc new buffer for packet
607607
BT_HDR *pkt = NULL;
608608
#if (BLE_42_SCAN_EN == TRUE)

‎components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ void esp_vhci_host_send_packet_wrapper(uint8_t *data, uint16_t len)
7272
#if (BT_HCI_LOG_INCLUDED == TRUE)
7373
bt_hci_log_record_hci_data(data[0], &data[1], len - 1);
7474
#endif
75-
#if (CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
76-
ble_log_spi_out_write_with_ts(BLE_LOG_SPI_OUT_SOURCE_HCI_DOWNSTREAM, data, len);
77-
#endif // (CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
75+
#if CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
76+
ble_log_spi_out_hci_write(BLE_LOG_SPI_OUT_SOURCE_HCI_DOWNSTREAM, data, len);
77+
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
7878
esp_vhci_host_send_packet(data, len);
7979
}
8080

@@ -231,9 +231,9 @@ static int dummy_host_rcv_pkt(uint8_t *data, uint16_t len)
231231
*/
232232
static int host_rcv_pkt(uint8_t *data, uint16_t len)
233233
{
234-
#if (CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
235-
ble_log_spi_out_write_with_ts(BLE_LOG_SPI_OUT_SOURCE_HCI_UPSTREAM, data, len);
236-
#endif // (CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED && !SOC_ESP_NIMBLE_CONTROLLER)
234+
#if CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
235+
ble_log_spi_out_hci_write(BLE_LOG_SPI_OUT_SOURCE_HCI_UPSTREAM, data, len);
236+
#endif // CONFIG_BT_BLE_LOG_SPI_OUT_HCI_ENABLED
237237

238238
bt_record_hci_data(data, len);
239239

0 commit comments

Comments
 (0)