diff options
author | Soby Mathew <soby.mathew@arm.com> | 2018-10-03 11:22:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-03 11:22:02 +0100 |
commit | a4277cda5c7f57a7205f4c29edbb488d518c29b5 (patch) | |
tree | 1616051969b3214f63bb1aea9f2620a83d596210 /drivers | |
parent | f19d2104eb35c77076348e917dea7eb64860b743 (diff) | |
parent | d47509d6ac195d61c928cad8954d50200bad2205 (diff) | |
download | trusted-firmware-a-a4277cda5c7f57a7205f4c29edbb488d518c29b5.tar.gz |
Merge pull request #1588 from satheesbalya-arm/sb1_2596_misra_tim_console
Fix misra warnings in delay timer and console drivers
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/delay_timer/delay_timer.c | 19 | ||||
-rw-r--r-- | drivers/delay_timer/generic_delay_timer.c | 6 |
2 files changed, 13 insertions, 12 deletions
diff --git a/drivers/delay_timer/delay_timer.c b/drivers/delay_timer/delay_timer.c index 587724eb1a..feac3579fe 100644 --- a/drivers/delay_timer/delay_timer.c +++ b/drivers/delay_timer/delay_timer.c @@ -20,20 +20,21 @@ static const timer_ops_t *timer_ops; ***********************************************************/ void udelay(uint32_t usec) { - assert(timer_ops != NULL && - (timer_ops->clk_mult != 0) && - (timer_ops->clk_div != 0) && + assert((timer_ops != NULL) && + (timer_ops->clk_mult != 0U) && + (timer_ops->clk_div != 0U) && (timer_ops->get_timer_value != NULL)); uint32_t start, delta, total_delta; - assert(usec < UINT32_MAX / timer_ops->clk_div); + assert(usec < (UINT32_MAX / timer_ops->clk_div)); start = timer_ops->get_timer_value(); /* Add an extra tick to avoid delaying less than requested. */ total_delta = - div_round_up(usec * timer_ops->clk_div, timer_ops->clk_mult) + 1; + div_round_up(usec * timer_ops->clk_div, + timer_ops->clk_mult) + 1U; do { /* @@ -51,7 +52,7 @@ void udelay(uint32_t usec) ***********************************************************/ void mdelay(uint32_t msec) { - udelay(msec*1000); + udelay(msec * 1000U); } /*********************************************************** @@ -60,9 +61,9 @@ void mdelay(uint32_t msec) ***********************************************************/ void timer_init(const timer_ops_t *ops_ptr) { - assert(ops_ptr != NULL && - (ops_ptr->clk_mult != 0) && - (ops_ptr->clk_div != 0) && + assert((ops_ptr != NULL) && + (ops_ptr->clk_mult != 0U) && + (ops_ptr->clk_div != 0U) && (ops_ptr->get_timer_value != NULL)); timer_ops = ops_ptr; diff --git a/drivers/delay_timer/generic_delay_timer.c b/drivers/delay_timer/generic_delay_timer.c index 8a36c8abd7..03ca5321a7 100644 --- a/drivers/delay_timer/generic_delay_timer.c +++ b/drivers/delay_timer/generic_delay_timer.c @@ -49,9 +49,9 @@ void generic_delay_timer_init(void) unsigned int div = plat_get_syscnt_freq2(); /* Reduce multiplier and divider by dividing them repeatedly by 10 */ - while ((mult % 10 == 0) && (div % 10 == 0)) { - mult /= 10; - div /= 10; + while (((mult % 10U) == 0U) && ((div % 10U) == 0U)) { + mult /= 10U; + div /= 10U; } generic_delay_timer_init_args(mult, div); |