diff options
| author | Bernard Xiong <[email protected]> | 2019-08-08 08:37:49 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-08 08:37:49 +0800 |
| commit | 48afe9318a04b2a22d578333afb89bcc723dbb14 (patch) | |
| tree | 450b238fbe0370a53adeec97b548c1ddb5f3f752 | |
| parent | fcfa986bca110124b1e6b5ccf1c39f519188c5d1 (diff) | |
| parent | 1f842df9ce42f8236bffdce5146b82eea191cd0b (diff) | |
Merge pull request #2930 from murphyzhao/fix-assert
[bsp][stm32] fix RT_ASSERT location error
| -rw-r--r-- | bsp/stm32/libraries/HAL_Drivers/drv_adc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_adc.c b/bsp/stm32/libraries/HAL_Drivers/drv_adc.c index f5a09ba0f0..97ddc4d818 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_adc.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_adc.c @@ -44,9 +44,9 @@ static struct stm32_adc stm32_adc_obj[sizeof(adc_config) / sizeof(adc_config[0]) static rt_err_t stm32_adc_enabled(struct rt_adc_device *device, rt_uint32_t channel, rt_bool_t enabled) { - ADC_HandleTypeDef *stm32_adc_handler = device->parent.user_data; - + ADC_HandleTypeDef *stm32_adc_handler; RT_ASSERT(device != RT_NULL); + stm32_adc_handler = device->parent.user_data; if (enabled) { @@ -141,11 +141,13 @@ static rt_uint32_t stm32_adc_get_channel(rt_uint32_t channel) static rt_err_t stm32_get_adc_value(struct rt_adc_device *device, rt_uint32_t channel, rt_uint32_t *value) { ADC_ChannelConfTypeDef ADC_ChanConf; - ADC_HandleTypeDef *stm32_adc_handler = device->parent.user_data; + ADC_HandleTypeDef *stm32_adc_handler; RT_ASSERT(device != RT_NULL); RT_ASSERT(value != RT_NULL); + stm32_adc_handler = device->parent.user_data; + rt_memset(&ADC_ChanConf, 0, sizeof(ADC_ChanConf)); #if defined(SOC_SERIES_STM32F1) |