libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3857 from thread-liu/master 

[update] drv_hwtimers.c file error struct member variables
This commit is contained in:
Bernard Xiong 2020-08-29 09:47:34 +08:00 committed by GitHub
parent 672881ee15 c77e9991ea
commit 5495e6447d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bsp/stm32/libraries/HAL_Drivers/drv_hwtimer.c
View File

@ -154,10 +154,10 @@ static struct stm32_hwtimer stm32_hwtimer_obj[] =
}; };
/* APBx timer clocks frequency doubler state related to APB1CLKDivider value */ /* APBx timer clocks frequency doubler state related to APB1CLKDivider value */
static void pclkx_doubler_get(uint32_t *pclk1_doubler, uint32_t *pclk2_doubler) static void pclkx_doubler_get(rt_uint32_t *pclk1_doubler, rt_uint32_t *pclk2_doubler)
{ {
uint32_t flatency = 0; rt_uint32_t flatency = 0;
RCC_ClkInitTypeDef RCC_ClkInitStruct; RCC_ClkInitTypeDef RCC_ClkInitStruct = {0};
RT_ASSERT(pclk1_doubler != RT_NULL); RT_ASSERT(pclk1_doubler != RT_NULL);
RT_ASSERT(pclk1_doubler != RT_NULL); RT_ASSERT(pclk1_doubler != RT_NULL);
@ -167,15 +167,27 @@ static void pclkx_doubler_get(uint32_t *pclk1_doubler, uint32_t *pclk2_doubler)
*pclk1_doubler = 1; *pclk1_doubler = 1;
*pclk2_doubler = 1; *pclk2_doubler = 1;
if(RCC_ClkInitStruct.APB1CLKDivider != RCC_HCLK_DIV1) #if defined(SOC_SERIES_STM32MP1)
if (RCC_ClkInitStruct.APB1_Div != RCC_APB1_DIV1)
{ {
*pclk1_doubler = 2; *pclk1_doubler = 2;
} }
if (RCC_ClkInitStruct.APB2_Div != RCC_APB2_DIV1)
if(RCC_ClkInitStruct.APB2CLKDivider != RCC_HCLK_DIV1)
{ {
*pclk2_doubler = 2; *pclk2_doubler = 2;
} }
#else
if (RCC_ClkInitStruct.APB1CLKDivider != RCC_HCLK_DIV1)
{
*pclk1_doubler = 2;
}
#if !defined(SOC_SERIES_STM32F0) && !defined(SOC_SERIES_STM32G0)
if (RCC_ClkInitStruct.APB2CLKDivider != RCC_HCLK_DIV1)
{
*pclk2_doubler = 2;
}
#endif
#endif
} }
static void timer_init(struct rt_hwtimer_device *timer, rt_uint32_t state) static void timer_init(struct rt_hwtimer_device *timer, rt_uint32_t state)