mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'fix/ble_log_v2_cache_error_v5.4' into 'release/v5.4'
BLE Log v2 Function Update 251125 (v5.4) See merge request espressif/esp-idf!43869
This commit is contained in:
@@ -421,6 +421,7 @@ deref:
|
|||||||
BLE_LOG_REF_COUNT_RELEASE(&lbm_ref_count);
|
BLE_LOG_REF_COUNT_RELEASE(&lbm_ref_count);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BLE_LOG_IRAM_ATTR
|
||||||
bool ble_log_write_hex(ble_log_src_t src_code, const uint8_t *addr, size_t len)
|
bool ble_log_write_hex(ble_log_src_t src_code, const uint8_t *addr, size_t len)
|
||||||
{
|
{
|
||||||
BLE_LOG_REF_COUNT_ACQUIRE(&lbm_ref_count);
|
BLE_LOG_REF_COUNT_ACQUIRE(&lbm_ref_count);
|
||||||
|
|||||||
@@ -29,10 +29,10 @@ extern uint32_t r_ble_lll_timer_current_tick_get(void);
|
|||||||
#elif defined(CONFIG_IDF_TARGET_ESP32C2)
|
#elif defined(CONFIG_IDF_TARGET_ESP32C2)
|
||||||
extern uint32_t r_os_cputime_get32(void);
|
extern uint32_t r_os_cputime_get32(void);
|
||||||
#define BLE_LOG_GET_LC_TS r_os_cputime_get32()
|
#define BLE_LOG_GET_LC_TS r_os_cputime_get32()
|
||||||
/* Legacy BLE Controller (Wait for support) */
|
/* Legacy BLE Controller */
|
||||||
// #elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
|
#elif defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3)
|
||||||
// extern uint32_t lld_read_clock_us(void);
|
extern uint32_t lld_read_clock_us(void);
|
||||||
// #define BLE_LOG_GET_LC_TS lld_read_clock_us()
|
#define BLE_LOG_GET_LC_TS lld_read_clock_us()
|
||||||
#else /* Other targets */
|
#else /* Other targets */
|
||||||
#define BLE_LOG_GET_LC_TS 0
|
#define BLE_LOG_GET_LC_TS 0
|
||||||
#endif /* BLE targets */
|
#endif /* BLE targets */
|
||||||
|
|||||||
Reference in New Issue
Block a user