From d7f5c3e55fe29937df831ff93418908bb30b39b3 Mon Sep 17 00:00:00 2001 From: wangmengyang Date: Wed, 27 Jun 2018 17:23:23 +0800 Subject: [PATCH] component/bt: remove the call of assert in time conversion functions which can be caused in ISR --- components/bt/bt.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/components/bt/bt.c b/components/bt/bt.c index 88a9cd712..620fb7752 100644 --- a/components/bt/bt.c +++ b/components/bt/bt.c @@ -575,9 +575,7 @@ static int IRAM_ATTR rand_wrapper(void) static uint32_t IRAM_ATTR btdm_lpcycles_2_us(uint32_t cycles) { - // Sanity check. The number of lp cycles should not be too high to avoid overflow. Thrs: 100s (for 32kHz freq) - assert(cycles < 3200000); - + // The number of lp cycles should not lead to overflow. Thrs: 100s (for 32kHz freq) // clock measurement is conducted uint64_t us = (uint64_t)btdm_lpcycle_us * cycles; us = (us + (1 << (btdm_lpcycle_us_frac - 1))) >> btdm_lpcycle_us_frac; @@ -589,9 +587,7 @@ static uint32_t IRAM_ATTR btdm_lpcycles_2_us(uint32_t cycles) */ static uint32_t IRAM_ATTR btdm_us_2_lpcycles(uint32_t us) { - // Sanity check: the number of sleep duration(us) should not be too high to avoid overflow. Thrs: 100s - assert(us < 100000000); - + // The number of sleep duration(us) should not lead to overflow. Thrs: 100s // Compute the sleep duration in us to low power clock cycles, with calibration result applied // clock measurement is conducted uint64_t cycles = ((uint64_t)(us) << btdm_lpcycle_us_frac) / btdm_lpcycle_us;