ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12915 from rajkan01/hal_gettick_api_optim 

Optimise HAL_GetTick API
pull/12956/head
Martin Kojtal 2020-05-11 15:12:28 +02:00 committed by GitHub
parent 1b2a68ae20 4ab794b47f
commit a707fd133e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
targets/TARGET_STM/hal_tick_overrides.c
View File

@ -27,11 +27,13 @@ extern int mbed_sdk_inited;
void init_16bit_timer(void);
void init_32bit_timer(void);
#if TIM_MST_BIT_WIDTH == 16
// Variables also reset in us_ticker_init()
uint32_t prev_time = 0;
uint32_t elapsed_time = 0;
#if TIM_MST_BIT_WIDTH <= 16
static uint16_t prev_time;
#else
static uint32_t prev_time;
#endif
static uint32_t total_ticks;
static uint16_t prev_tick_remainder;
// Overwrite default HAL functions defined as "weak"
@ -47,26 +49,24 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
uint32_t HAL_GetTick()
{
#if TIM_MST_BIT_WIDTH == 16
uint32_t new_time;
if (mbed_sdk_inited) {
// Apply the latest time recorded just before the sdk is inited
new_time = ticker_read_us(get_us_ticker_data()) + prev_time;
prev_time = 0; // Use this time only once
return (new_time / 1000);
uint32_t new_time = us_ticker_read();
uint32_t elapsed_time = (((new_time - prev_time) & US_TICKER_MASK) + prev_tick_remainder);
prev_time = new_time;
uint32_t elapsed_ticks;
// Speed optimisation for small time intervals, avoiding a potentially-slow C library divide.
if (TIM_MST_BIT_WIDTH <= 16 || elapsed_time < 65536) {
elapsed_ticks = 0;
while (elapsed_time >= 1000) {
elapsed_ticks++;
elapsed_time -= 1000;
}
prev_tick_remainder = elapsed_time;
} else {
new_time = us_ticker_read();
elapsed_time += (new_time - prev_time) & 0xFFFF; // Only use the lower 16 bits
prev_time = new_time;
return (elapsed_time / 1000);
elapsed_ticks = elapsed_time / 1000;
prev_tick_remainder = elapsed_time % 1000;
}
#else // 32-bit timer
if (mbed_sdk_inited) {
return (ticker_read_us(get_us_ticker_data()) / 1000);
} else {
return (us_ticker_read() / 1000);
}
#endif
total_ticks += elapsed_ticks;
return total_ticks;
}
void HAL_SuspendTick(void)

7
targets/TARGET_STM/us_ticker.c
View File

@ -42,9 +42,6 @@ void us_ticker_irq_handler(void);
// ************************************ 16-bit timer ************************************
#if TIM_MST_BIT_WIDTH == 16
extern uint32_t prev_time;
extern uint32_t elapsed_time;
#if defined(TARGET_STM32F0)
void timer_update_irq_handler(void)
{
@ -128,10 +125,6 @@ void init_16bit_timer(void)
#endif
__HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC1);
// Used by HAL_GetTick()
prev_time = 0;
elapsed_time = 0;
}
// ************************************ 32-bit timer ************************************