diff --git a/components/bt/controller/esp32h2/bt.c b/components/bt/controller/esp32h2/bt.c index 44d1ed41236..c9390735080 100644 --- a/components/bt/controller/esp32h2/bt.c +++ b/components/bt/controller/esp32h2/bt.c @@ -54,6 +54,7 @@ #include "esp_private/esp_clk_tree_common.h" #include "esp_sleep.h" #include "soc/rtc.h" +#include "modem/modem_syscon_struct.h" #if CONFIG_BT_LE_CONTROLLER_LOG_MODE_BLE_LOG_V2 #include "ble_log.h" @@ -569,6 +570,7 @@ static void IRAM_ATTR esp_reset_modem(uint8_t mdl_opts,uint8_t start) coex_hw_timer_set(0x04, 0x02, 15, 0, 5000); coex_hw_timer_enable(0x04); #endif // CONFIG_SW_COEXIST_ENABLE || CONFIG_EXTERNAL_COEX_ENABLE + // TODO: PM-659 MODEM_SYSCON.modem_rst_conf.val |= (BIT(16) | BIT(18)); MODEM_SYSCON.modem_rst_conf.val &= ~(BIT(16) | BIT(18)); } else { diff --git a/components/esp_hw_support/modem/include/modem/modem_clock_impl.h b/components/esp_hw_support/modem/include/modem/modem_clock_impl.h index 26d83e2068c..110df308b12 100644 --- a/components/esp_hw_support/modem/include/modem/modem_clock_impl.h +++ b/components/esp_hw_support/modem/include/modem/modem_clock_impl.h @@ -96,8 +96,8 @@ typedef esp_err_t (*check_func_t)(struct modem_clock_context *, int); #define REFS_FL_WITH_REFCNT (BIT(0)) /* Enable reference count management (true=use refs, false=ignore refs) */ typedef struct { struct { - int16_t count; /* Reference count for this device, if with_refcnt is enabled */ - uint16_t flags; /* flags for this device */ + int16_t count; /* Reference count for this device, if with_refcnt is enabled */ + uint16_t flags; /* flags for this device */ } refs[MODEM_CLOCK_DEVICE_MAX]; configure_func_t configure; #if CONFIG_ESP_MODEM_CLOCK_ENABLE_CHECKING