espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-06-06 05:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(nimble): use pre-allocated buffer for HCI logging

Browse Source
This commit is contained in:
zhanghaipeng
2025-12-26 20:31:38 +08:00
parent 112925dfe7
commit 24ce0703da
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/host/src/ble_hs.c
+26 -17
View File
@@ -34,6 +34,7 @@
#include "bt_common.h"
#if (BT_HCI_LOG_INCLUDED == TRUE)
#include "hci_log/bt_hci_log.h"
#include "soc/soc_caps.h"
#endif // (BT_HCI_LOG_INCLUDED == TRUE)
#if MYNEWT_VAL(BLE_STATIC_TO_DYNAMIC)
@@ -58,6 +59,15 @@
#define BLE_HS_HCI_EVT_COUNT (MYNEWT_VAL(BLE_TRANSPORT_EVT_COUNT) + \
MYNEWT_VAL(BLE_TRANSPORT_EVT_DISCARDABLE_COUNT))
#if (BT_HCI_LOG_INCLUDED == TRUE)
/* HCI logging buffer size */
#if (SOC_ESP_NIMBLE_CONTROLLER && CONFIG_BT_CONTROLLER_ENABLED)
#define BLE_HS_HCI_LOG_BUF_SIZE (517) /* Fixed size for ESP NIMBLE controller */
#else
#define BLE_HS_HCI_LOG_BUF_SIZE (MYNEWT_VAL(BLE_TRANSPORT_ACL_SIZE) + 1)
#endif
#endif
static void ble_hs_event_rx_hci_ev(struct ble_npl_event *ev);
#if NIMBLE_BLE_CONNECT && MYNEWT_VAL(BLE_GATTS)
static void ble_hs_event_tx_notify(struct ble_npl_event *ev);
@@ -821,14 +831,14 @@ ble_hs_rx_data(struct os_mbuf *om, void *arg)
{
int rc;
#if ((BT_HCI_LOG_INCLUDED == TRUE))
uint16_t len = OS_MBUF_PKTHDR(om)->omp_len + 1;
uint8_t *data = (uint8_t *)nimble_platform_mem_malloc(len);
assert(data != NULL);
data[0] = 0x02;
os_mbuf_copydata(om, 0, len - 1, &data[1]);
bt_hci_log_record_hci_data(HCI_LOG_DATA_TYPE_C2H_ACL, &data[1], len - 1);
nimble_platform_mem_free(data);
#if (BT_HCI_LOG_INCLUDED == TRUE)
uint16_t len = OS_MBUF_PKTLEN(om);
if (len + 1 <= BLE_HS_HCI_LOG_BUF_SIZE) {
uint8_t data[BLE_HS_HCI_LOG_BUF_SIZE];
data[0] = 0x02;
os_mbuf_copydata(om, 0, len, &data[1]);
bt_hci_log_record_hci_data(HCI_LOG_DATA_TYPE_C2H_ACL, &data[1], len);
}
#endif // (BT_HCI_LOG_INCLUDED == TRUE)
/* If flow control is enabled, mark this packet with its corresponding
@@ -857,15 +867,14 @@ ble_hs_rx_data(struct os_mbuf *om, void *arg)
int
ble_hs_tx_data(struct os_mbuf *om)
{
#if ((BT_HCI_LOG_INCLUDED == TRUE))
uint16_t len = 0;
uint8_t data[MYNEWT_VAL(BLE_TRANSPORT_ACL_SIZE) + 1];
data[0] = 0x02;
len++;
os_mbuf_copydata(om, 0, OS_MBUF_PKTLEN(om), &data[1]);
len += OS_MBUF_PKTLEN(om);
bt_hci_log_record_hci_data(data[0], &data[1], len - 1);
#if (BT_HCI_LOG_INCLUDED == TRUE)
uint16_t pkt_len = OS_MBUF_PKTLEN(om);
if (pkt_len + 1 <= BLE_HS_HCI_LOG_BUF_SIZE) {
uint8_t data[BLE_HS_HCI_LOG_BUF_SIZE];
data[0] = 0x02;
os_mbuf_copydata(om, 0, pkt_len, &data[1]);
bt_hci_log_record_hci_data(data[0], &data[1], pkt_len);
}
#endif
return ble_transport_to_ll_acl(om);
porting/nimble/src/nimble_port.c
+1 -1
View File
@@ -285,7 +285,7 @@ nimble_port_init(void)
#if MYNEWT_VAL(BT_HCI_LOG_INCLUDED)
bt_hci_log_init();
#endif // (BT_HCI_LOG_INCLUDED == TRUE)
#endif // MYNEWT_VAL(BT_HCI_LOG_INCLUDED)
return ESP_OK;
}