diff --git a/components/bt/bt.c b/components/bt/bt.c index 9362720260..3a158bbe59 100644 --- a/components/bt/bt.c +++ b/components/bt/bt.c @@ -1440,6 +1440,7 @@ void IRAM_ATTR __attribute__((noinline)) r_assert(const char *condition, int par #define BT_IS_ALIVE true #define BT_NOT_ALIVE false +#define BT_INT_STA_REG (0x3FF7100C) extern bool connection_is_alive(); extern uint32_t real_bt_isr_count ; @@ -1473,8 +1474,10 @@ void esp_bt_check_need_restart() { if(connection_is_alive() && (check_bt_is_alive()==false)) { + uint32_t intenable; + asm volatile ("rsr %0, INTENABLE\n" :"=r"(intenable)); ets_printf("!! Check BT is not alive. Abort !!"); - RMT_DBG_LOG_ERROR("BT not alive"); + RMT_DBG_LOG_ERROR("BT not alive,INT R:0x%x EN 0x%x",*((uint32_t*)BT_INT_STA_REG),intenable); abort(); } } diff --git a/components/bt/lib b/components/bt/lib index 840cd09dba..64fa8c61c6 160000 --- a/components/bt/lib +++ b/components/bt/lib @@ -1 +1 @@ -Subproject commit 840cd09dbac8b4cad0c7d9ef530e9bb59cfa4c1d +Subproject commit 64fa8c61c658ffb55fc7a527dd7a1ac6509645b8 diff --git a/components/espcoredump/include/esp_core_dump.h b/components/espcoredump/include/esp_core_dump.h index 7230952e85..e87601aa3c 100755 --- a/components/espcoredump/include/esp_core_dump.h +++ b/components/espcoredump/include/esp_core_dump.h @@ -86,6 +86,6 @@ void esp_core_dump_to_uart(XtExcFrame *frame); */ esp_err_t esp_core_dump_image_get(size_t* out_addr, size_t *out_size); -bool esp_log_dump_init(uint32_t (*get_len)(void), int * (*get_ptr)(void)); +bool esp_log_dump_init(uint32_t (*get_len)(void), uint32_t * (*get_ptr)(void)); #endif diff --git a/components/espcoredump/src/core_dump_port.c b/components/espcoredump/src/core_dump_port.c index f509b704aa..f88fb10b3f 100755 --- a/components/espcoredump/src/core_dump_port.c +++ b/components/espcoredump/src/core_dump_port.c @@ -161,7 +161,7 @@ uint32_t esp_core_dump_get_stack(core_dump_task_header_t *task_snapshot, uint32_ static uint32_t (*_get_len)(void) = NULL; static int * (*_get_ptr)(void) = NULL; -bool esp_log_dump_init(uint32_t (*get_len)(void), int * (*get_ptr)(void)) +bool esp_log_dump_init(uint32_t (*get_len)(void), uint32_t * (*get_ptr)(void)) { _get_len = get_len; _get_ptr = get_ptr;