Skip to content

Commit 67276e3

Browse files
committed
[NRF52840]: fix coding style us_ticker.c
1 parent 560bd74 commit 67276e3

File tree

1 file changed

+23
-54
lines changed

1 file changed

+23
-54
lines changed

targets/TARGET_NORDIC/TARGET_NRF5_SDK13/us_ticker.c

Lines changed: 23 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ void RTC1_IRQHandler(void);
111111

112112
void common_rtc_init(void)
113113
{
114-
if (m_common_rtc_enabled)
115-
{
114+
if (m_common_rtc_enabled) {
116115
return;
117116
}
118117

@@ -228,12 +227,10 @@ void common_rtc_set_interrupt(uint32_t us_timestamp, uint32_t cc_channel,
228227
uint64_t current_time64 = common_rtc_64bit_us_get();
229228
// [add upper 32 bits from the current time to the timestamp value]
230229
uint64_t timestamp64 = us_timestamp +
231-
(current_time64 & ~(uint64_t)0xFFFFFFFF);
232-
230+
(current_time64 & ~(uint64_t)0xFFFFFFFF);
233231
// [if the original timestamp value happens to be after the 32 bit counter
234232
// of microsends overflows, correct the upper 32 bits accordingly]
235-
if (us_timestamp < (uint32_t)(current_time64 & 0xFFFFFFFF))
236-
{
233+
if (us_timestamp < (uint32_t)(current_time64 & 0xFFFFFFFF)) {
237234
timestamp64 += ((uint64_t)1 << 32);
238235
}
239236
// [microseconds -> ticks, always round the result up to avoid too early
@@ -248,8 +245,7 @@ void common_rtc_set_interrupt(uint32_t us_timestamp, uint32_t cc_channel,
248245
// value is 2 ticks. This guarantees that the compare trigger is properly
249246
// setup before the compare condition occurs.
250247
uint32_t closest_safe_compare = common_rtc_32bit_ticks_get() + 2;
251-
if ((int)(compare_value - closest_safe_compare) <= 0)
252-
{
248+
if ((int)(compare_value - closest_safe_compare) <= 0) {
253249
compare_value = closest_safe_compare;
254250
}
255251

@@ -314,7 +310,7 @@ static uint32_t previous_tick_cc_value = 0;
314310
*/
315311
MBED_WEAK uint32_t const os_trv;
316312
MBED_WEAK uint32_t const os_clockrate;
317-
MBED_WEAK void OS_Tick_Handler()
313+
MBED_WEAK void OS_Tick_Handler(void)
318314
{
319315
}
320316

@@ -461,14 +457,11 @@ static uint32_t get_next_tick_cc_delta()
461457
{
462458
uint32_t delta = 0;
463459

464-
if (os_clockrate != 1000)
465-
{
460+
if (os_clockrate != 1000) {
466461
// In RTX, by default SYSTICK is is used.
467462
// A tick event is generated every os_trv + 1 clock cycles of the system timer.
468463
delta = os_trv + 1;
469-
}
470-
else
471-
{
464+
} else {
472465
// If the clockrate is set to 1000us then 1000 tick should happen every second.
473466
// Unfortunatelly, when clockrate is set to 1000, os_trv is equal to 31.
474467
// If (os_trv + 1) is used as the delta value between two ticks, 1000 ticks will be
@@ -484,24 +477,19 @@ static uint32_t get_next_tick_cc_delta()
484477
// Every five ticks (20%, 200 delta in one second), the delta is equal to 32
485478
// The remaining (32) deltas equal to 32 are distributed using primes numbers.
486479
static uint32_t counter = 0;
487-
if ((counter % 5) == 0 || (counter % 31) == 0 || (counter % 139) == 0 || (counter == 503))
488-
{
480+
if ((counter % 5) == 0 || (counter % 31) == 0 || (counter % 139) == 0 || (counter == 503)) {
489481
delta = 32;
490-
}
491-
else
492-
{
482+
} else {
493483
delta = 33;
494484
}
495485
++counter;
496-
if (counter == 1000)
497-
{
486+
if (counter == 1000) {
498487
counter = 0;
499488
}
500489
}
501490
return delta;
502491
}
503492

504-
505493
static inline void clear_tick_interrupt()
506494
{
507495
nrf_rtc_event_clear(COMMON_RTC_INSTANCE, OS_TICK_EVENT);
@@ -519,27 +507,18 @@ static inline bool is_in_wrapped_range(uint32_t begin, uint32_t end, uint32_t va
519507
{
520508
// regular case, begin < end
521509
// return true if begin <= val < end
522-
if (begin < end)
523-
{
524-
if (begin <= val && val < end)
525-
{
510+
if (begin < end) {
511+
if (begin <= val && val < end) {
526512
return true;
527-
}
528-
else
529-
{
513+
} else {
530514
return false;
531515
}
532-
}
533-
else
534-
{
516+
} else {
535517
// In this case end < begin because it has wrap around the limits
536518
// return false if end < val < begin
537-
if (end < val && val < begin)
538-
{
519+
if (end < val && val < begin) {
539520
return false;
540-
}
541-
else
542-
{
521+
} else {
543522
return true;
544523
}
545524
}
@@ -566,8 +545,7 @@ static void register_next_tick()
566545
uint32_t current_counter = nrf_rtc_counter_get(COMMON_RTC_INSTANCE);
567546

568547
// If an overflow occur, set the next tick in COUNTER + delta clock cycles
569-
if (is_in_wrapped_range(previous_tick_cc_value, new_compare_value, current_counter + 1) == false)
570-
{
548+
if (is_in_wrapped_range(previous_tick_cc_value, new_compare_value, current_counter + 1) == false) {
571549
new_compare_value = current_counter + delta;
572550
}
573551
nrf_rtc_cc_set(COMMON_RTC_INSTANCE, OS_TICK_CC_CHANNEL, new_compare_value);
@@ -633,29 +611,20 @@ uint32_t os_tick_val(void)
633611
uint32_t next_tick_cc_value = nrf_rtc_cc_get(COMMON_RTC_INSTANCE, OS_TICK_CC_CHANNEL);
634612

635613
// do not use os_tick_ovf because its counter value can be different
636-
if (is_in_wrapped_range(previous_tick_cc_value, next_tick_cc_value, current_counter))
637-
{
638-
if (next_tick_cc_value > previous_tick_cc_value)
639-
{
614+
if(is_in_wrapped_range(previous_tick_cc_value, next_tick_cc_value, current_counter)) {
615+
if (next_tick_cc_value > previous_tick_cc_value) {
640616
return next_tick_cc_value - current_counter;
641-
}
642-
else if (current_counter <= next_tick_cc_value)
643-
{
617+
} else if(current_counter <= next_tick_cc_value) {
644618
return next_tick_cc_value - current_counter;
645-
}
646-
else
647-
{
619+
} else {
648620
return next_tick_cc_value + (MAX_RTC_COUNTER_VAL - current_counter);
649621
}
650-
}
651-
else
652-
{
622+
} else {
653623
// use (os_trv + 1) has the base step, can be totally inacurate ...
654624
uint32_t clock_cycles_by_tick = os_trv + 1;
655625

656626
// if current counter has wrap arround, add the limit to it.
657-
if (current_counter < next_tick_cc_value)
658-
{
627+
if (current_counter < next_tick_cc_value) {
659628
current_counter = current_counter + MAX_RTC_COUNTER_VAL;
660629
}
661630

0 commit comments

Comments
 (0)