Skip to content

Commit f8935f8

Browse files
committed
Merge branch 'bugfix/update_hci_log_datalen' into 'master'
fix(nimble): update HCI log functions to use uint16_t for data length See merge request espressif/esp-idf!42013
2 parents eff16d4 + 222e62a commit f8935f8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

components/bt/common/hci_log/bt_hci_log.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ static char IRAM_ATTR *bt_data_type_to_str(uint8_t data_type)
140140
}
141141
#endif
142142

143-
void bt_hci_log_record_hex(bt_hci_log_t *p_hci_log_ctl, uint8_t *hex, uint8_t hex_len)
143+
void bt_hci_log_record_hex(bt_hci_log_t *p_hci_log_ctl, uint8_t *hex, uint16_t hex_len)
144144
{
145145
uint8_t hci_log_char;
146146
uint8_t *g_hci_log_buffer;
@@ -205,7 +205,7 @@ void bt_hci_log_record_string(bt_hci_log_t *p_hci_log_ctl, char *string)
205205
}
206206
}
207207

208-
esp_err_t IRAM_ATTR bt_hci_log_record_data(bt_hci_log_t *p_hci_log_ctl, char *str, uint8_t data_type, uint8_t *data, uint8_t data_len)
208+
esp_err_t IRAM_ATTR bt_hci_log_record_data(bt_hci_log_t *p_hci_log_ctl, char *str, uint8_t data_type, uint8_t *data, uint16_t data_len)
209209
{
210210
osi_mutex_t mutex_lock;
211211
uint8_t *g_hci_log_buffer;
@@ -331,7 +331,7 @@ void bt_hci_log_record_hci_enable(bool enable)
331331
enable_hci_log_flag = enable;
332332
}
333333

334-
esp_err_t IRAM_ATTR bt_hci_log_record_hci_data(uint8_t data_type, uint8_t *data, uint8_t data_len)
334+
esp_err_t IRAM_ATTR bt_hci_log_record_hci_data(uint8_t data_type, uint8_t *data, uint16_t data_len)
335335
{
336336
if (!enable_hci_log_flag) return ESP_OK;
337337
return bt_hci_log_record_data(&g_bt_hci_log_data_ctl, NULL, data_type, data, data_len);

components/bt/common/hci_log/include/hci_log/bt_hci_log.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ esp_err_t bt_hci_log_deinit(void);
8787
* @return ESP_OK - success, other - failed
8888
*
8989
*/
90-
esp_err_t bt_hci_log_record_hci_data(uint8_t data_type, uint8_t *data, uint8_t data_len);
90+
esp_err_t bt_hci_log_record_hci_data(uint8_t data_type, uint8_t *data, uint16_t data_len);
9191

9292
/**
9393
*

0 commit comments

Comments
 (0)