espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 11:17:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ble): fixed upper layer trans append failure bug

Browse Source 
(cherry picked from commit 1e6bc70837)

Co-authored-by: Zhou Xiao <zhouxiao@espressif.com>
This commit is contained in:
Zhou Xiao
2025-05-22 16:55:09 +08:00
parent 772fa9b2c7
commit 10ec6c6f27
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
components/bt/common/ble_log/ble_log_spi_out.c
View File

@ -166,7 +166,7 @@ extern void esp_panic_handler_feed_wdts(void);
static int spi_out_init_trans(spi_out_trans_cb_t **trans_cb, uint16_t buf_size); static int spi_out_init_trans(spi_out_trans_cb_t **trans_cb, uint16_t buf_size);
static void spi_out_deinit_trans(spi_out_trans_cb_t **trans_cb); static void spi_out_deinit_trans(spi_out_trans_cb_t **trans_cb);
static void spi_out_tx_done_cb(spi_transaction_t *ret_trans); static void spi_out_tx_done_cb(spi_transaction_t *ret_trans);
static inline int spi_out_append_trans(spi_out_trans_cb_t *trans_cb); static inline void spi_out_append_trans(spi_out_trans_cb_t *trans_cb);
static int spi_out_log_cb_init(spi_out_log_cb_t **log_cb, uint16_t buf_size, uint8_t type); static int spi_out_log_cb_init(spi_out_log_cb_t **log_cb, uint16_t buf_size, uint8_t type);
static void spi_out_log_cb_deinit(spi_out_log_cb_t **log_cb); static void spi_out_log_cb_deinit(spi_out_log_cb_t **log_cb);
@ -282,30 +282,30 @@ IRAM_ATTR static void spi_out_pre_tx_cb(spi_transaction_t *ret_trans)
while (esp_timer_get_time() - last_tx_done_ts < SPI_OUT_TRANS_ITVL_MIN_US) {} while (esp_timer_get_time() - last_tx_done_ts < SPI_OUT_TRANS_ITVL_MIN_US) {}
} }
IRAM_ATTR static inline int spi_out_append_trans(spi_out_trans_cb_t *trans_cb) IRAM_ATTR static inline void spi_out_append_trans(spi_out_trans_cb_t *trans_cb)
{ {
if (trans_cb->flag != TRANS_CB_FLAG_NEED_QUEUE || !trans_cb->length) { if (trans_cb->flag != TRANS_CB_FLAG_NEED_QUEUE || !trans_cb->length) {
return -1; return;
} }
// Note: To support dump log when disabled // Note: To support dump log when disabled
if (!spi_out_enabled) { if (!spi_out_enabled) {
trans_cb->length = 0; goto recycle;
trans_cb->flag = TRANS_CB_FLAG_AVAILABLE;
return 0;
} }
// CRITICAL: Length unit conversion from bytes to bits // CRITICAL: Length unit conversion from bytes to bits
trans_cb->trans.length = trans_cb->length * 8; trans_cb->trans.length = trans_cb->length * 8;
trans_cb->trans.rxlength = 0; trans_cb->trans.rxlength = 0;
if (spi_device_queue_trans(spi_handle, &(trans_cb->trans), 0) == ESP_OK) { trans_cb->flag = TRANS_CB_FLAG_IN_QUEUE;
trans_cb->flag = TRANS_CB_FLAG_IN_QUEUE; if (spi_device_queue_trans(spi_handle, &(trans_cb->trans), 0) != ESP_OK) {
return 0; goto recycle;
} else {
trans_cb->length = 0;
trans_cb->flag = TRANS_CB_FLAG_AVAILABLE;
return -1;
} }
return;
recycle:
trans_cb->length = 0;
trans_cb->flag = TRANS_CB_FLAG_AVAILABLE;
return;
} }
static int spi_out_log_cb_init(spi_out_log_cb_t **log_cb, uint16_t buf_size, uint8_t type) static int spi_out_log_cb_init(spi_out_log_cb_t **log_cb, uint16_t buf_size, uint8_t type)
@ -360,7 +360,7 @@ IRAM_ATTR static inline bool spi_out_log_cb_check_trans(spi_out_log_cb_t *log_cb
goto failed; goto failed;
} }
if (trans_cb->flag == TRANS_CB_FLAG_AVAILABLE) { if (trans_cb->flag == TRANS_CB_FLAG_AVAILABLE) {
if ((trans_cb->buf_size - trans_cb->length) >= (len + SPI_OUT_FRAME_OVERHEAD)) { if ((trans_cb->buf_size - trans_cb->length) >= frame_len) {
return true; return true;
} else { } else {
trans_cb->flag = TRANS_CB_FLAG_NEED_QUEUE; trans_cb->flag = TRANS_CB_FLAG_NEED_QUEUE;