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

fix(bluetooth/controller): fixed alloc memory fail when use uhci on ESP32-C6 and ESP32-H2

Browse Source
This commit is contained in:
zwl
2024-07-16 10:16:15 +08:00
committed by Zhao Wei Liang
parent 5a545d6885
commit d5df6dd78b
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
components/bt/porting/transport/driver/uart/hci_driver_uart_dma.c
View File

@ -423,6 +423,10 @@ int hci_driver_uart_dma_tx_start(esp_bt_hci_tl_callback_t callback, void *arg)
uart_env.tx.link_head = lldesc_head; uart_env.tx.link_head = lldesc_head;
uart_env.tx.callback = callback; uart_env.tx.callback = callback;
uart_env.tx.arg = arg; uart_env.tx.arg = arg;
/* The DMA interrupt may have been triggered before setting the tx_state,
* So we set it first.
*/
hci_driver_uart_dma_txstate_set(HCI_TRANS_TX_START);
gdma_start(s_tx_channel, (intptr_t)(uart_env.tx.link_head)); gdma_start(s_tx_channel, (intptr_t)(uart_env.tx.link_head));
return 0; return 0;
} else { } else {
@ -513,6 +517,11 @@ hci_driver_uart_dma_process_task(void *p)
while (true) { while (true) {
xSemaphoreTake(s_hci_driver_uart_dma_env.process_sem, portMAX_DELAY); xSemaphoreTake(s_hci_driver_uart_dma_env.process_sem, portMAX_DELAY);
ESP_LOGD(TAG, "task run:%d\n",s_hci_driver_uart_dma_env.hci_tx_state); ESP_LOGD(TAG, "task run:%d\n",s_hci_driver_uart_dma_env.hci_tx_state);
/* Process Tx data */
if (s_hci_driver_uart_dma_env.hci_tx_state == HCI_TRANS_TX_IDLE) {
hci_driver_uart_dma_tx_start(hci_driver_uart_dma_send_callback, (void*)&uart_env);
}
if (s_hci_driver_uart_dma_env.rxinfo_mem_exhausted) { if (s_hci_driver_uart_dma_env.rxinfo_mem_exhausted) {
rx_data = (void *)uart_env.rx.link_head->buf; rx_data = (void *)uart_env.rx.link_head->buf;
rx_len = uart_env.rx.link_head->length; rx_len = uart_env.rx.link_head->length;
@ -553,14 +562,6 @@ hci_driver_uart_dma_process_task(void *p)
os_memblock_put(s_hci_driver_uart_dma_env.hci_rx_data_pool, rx_data); os_memblock_put(s_hci_driver_uart_dma_env.hci_rx_data_pool, rx_data);
} }
} }
/* Process Tx data */
if (s_hci_driver_uart_dma_env.hci_tx_state == HCI_TRANS_TX_IDLE) {
ret = hci_driver_uart_dma_tx_start(hci_driver_uart_dma_send_callback, (void*)&uart_env);
if (!ret) {
s_hci_driver_uart_dma_env.hci_tx_state = HCI_TRANS_TX_START;
}
}
} }
} }