mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bufix/fix_assert_while_stack_deinit_v5.1' into 'release/v5.1'
NimBLE : Fix assert due to controller event while stack deinit (v5.1) See merge request espressif/esp-idf!24620
This commit is contained in:
commit
a7b62bbcaf
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
|
* SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: Apache-2.0
|
* SPDX-License-Identifier: Apache-2.0
|
||||||
*/
|
*/
|
||||||
@ -46,6 +46,7 @@ const static char *TAG = "NimBLE";
|
|||||||
|
|
||||||
int os_msys_buf_alloc(void);
|
int os_msys_buf_alloc(void);
|
||||||
void os_msys_buf_free(void);
|
void os_msys_buf_free(void);
|
||||||
|
extern uint8_t ble_hs_enabled_state;
|
||||||
|
|
||||||
void ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *cmd_cb,
|
void ble_hci_trans_cfg_hs(ble_hci_trans_rx_cmd_fn *cmd_cb,
|
||||||
void *cmd_arg,
|
void *cmd_arg,
|
||||||
@ -184,6 +185,12 @@ static void controller_rcv_pkt_ready(void)
|
|||||||
*/
|
*/
|
||||||
static int host_rcv_pkt(uint8_t *data, uint16_t len)
|
static int host_rcv_pkt(uint8_t *data, uint16_t len)
|
||||||
{
|
{
|
||||||
|
if(!ble_hs_enabled_state) {
|
||||||
|
/* If host is not enabled, drop the packet */
|
||||||
|
ESP_LOGE(TAG, "Host not enabled. Dropping the packet!");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
if (data[0] == BLE_HCI_UART_H4_EVT) {
|
if (data[0] == BLE_HCI_UART_H4_EVT) {
|
||||||
uint8_t *evbuf;
|
uint8_t *evbuf;
|
||||||
int totlen;
|
int totlen;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user