Skip to content

Commit 196645a

Browse files
committed
Fix linting errors
Signed-off-by: Brendan Moran <[email protected]>
1 parent 4d5d95a commit 196645a

File tree

2 files changed

+36
-26
lines changed

2 files changed

+36
-26
lines changed

test/baremetal/platform/m55-an547/platform.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,4 @@ LDFLAGS += \
6060
EXTRA_SOURCES = $(wildcard $(M55_AN547_PATH)/*.c)
6161
EXEC_WRAPPER := $(realpath $(PLATFORM_PATH)/exec_wrapper.py)
6262

63-
CYCLES ?= SYSTICK
63+
CYCLES ?= SYSTICK

test/hal/hal.c

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ uint64_t get_cyclecounter(void)
101101
#include "pmu_armv8.h"
102102

103103
volatile uint64_t v8m_pmu_cycles;
104-
void DebugMon_Handler(void) {
104+
void DebugMon_Handler(void)
105+
{
105106
uint32_t ovsclr;
106107
ARM_PMU_CNTR_Disable(PMU_CNTENSET_CCNTR_ENABLE_Msk);
107108
v8m_pmu_cycles += ARM_PMU_Get_CCNTR();
@@ -121,7 +122,8 @@ void enable_cyclecounter(void)
121122
void disable_cyclecounter(void)
122123
{
123124
ARM_PMU_Disable();
124-
CoreDebug->DEMCR &= (~CoreDebug_DEMCR_TRCENA_Msk) & (~CoreDebug_DEMCR_MON_EN_Msk);
125+
CoreDebug->DEMCR &=
126+
(~CoreDebug_DEMCR_TRCENA_Msk) & (~CoreDebug_DEMCR_MON_EN_Msk);
125127
}
126128
uint64_t get_cyclecounter(void)
127129
{
@@ -348,44 +350,52 @@ void SysTick_Handler(void)
348350
{
349351
uint32_t cnt;
350352
uint32_t fail;
351-
do {
352-
__asm__ volatile (
353-
"ldrex %[val], [%[guard]]\n"
354-
"addw %[val], %[val], #1\n"
355-
"strex %[fail], %[val], [%[guard]]\n"
356-
:[fail] "=r" (fail), [val] "=&r" (cnt)
357-
:[guard] "r" (&systick_overflows) : "memory");
353+
do
354+
{
355+
__asm__ volatile(
356+
"ldrex %[val], [%[guard]]\n"
357+
"addw %[val], %[val], #1\n"
358+
"strex %[fail], %[val], [%[guard]]\n"
359+
: [fail] "=r"(fail), [val] "=&r"(cnt)
360+
: [guard] "r"(&systick_overflows)
361+
: "memory");
358362
} while (fail);
359363
}
360364

361-
void enable_cyclecounter(void) {
365+
void enable_cyclecounter(void)
366+
{
362367
uint32_t cnt;
363368
uint32_t fail;
364-
do {
365-
__asm__ volatile ("ldrex.w %[val], [%[guard]]"
366-
:[val] "=&r" (cnt)
367-
:[guard] "r" (&systick_overflows));
369+
do
370+
{
371+
__asm__ volatile("ldrex.w %[val], [%[guard]]"
372+
: [val] "=&r"(cnt)
373+
: [guard] "r"(&systick_overflows));
368374
cnt = 0;
369-
__asm__ volatile ("strex.w %[fail], %[val], [%[guard]]"
370-
:[fail] "=r" (fail), [val] "=&r" (cnt)
371-
:[guard] "r" (&systick_overflows) : "memory");
375+
__asm__ volatile("strex.w %[fail], %[val], [%[guard]]"
376+
: [fail] "=r"(fail), [val] "=&r"(cnt)
377+
: [guard] "r"(&systick_overflows)
378+
: "memory");
372379
} while (fail);
373380
SysTick_Config(0xFFFFFFu);
374381
}
375382

376383
void disable_cyclecounter(void) { return; }
377384

378-
uint64_t get_cyclecounter(void) {
385+
uint64_t get_cyclecounter(void)
386+
{
379387
uint32_t val;
380388
uint32_t cnt;
381389
uint32_t fail;
382-
do {
383-
__asm__ volatile (
384-
"ldrex %[cnt], [%[guard]]\n"
385-
"ldr %[val], [%[systv]]\n"
386-
"strex %[fail], %[cnt], [%[guard]]\n"
387-
:[fail] "=r" (fail), [cnt] "=&r" (cnt), [val] "=r" (val)
388-
:[guard] "r" (&systick_overflows), [systv] "r" (&(SysTick->VAL)): "memory");
390+
do
391+
{
392+
__asm__ volatile(
393+
"ldrex %[cnt], [%[guard]]\n"
394+
"ldr %[val], [%[systv]]\n"
395+
"strex %[fail], %[cnt], [%[guard]]\n"
396+
: [fail] "=r"(fail), [cnt] "=&r"(cnt), [val] "=r"(val)
397+
: [guard] "r"(&systick_overflows), [systv] "r"(&(SysTick->VAL))
398+
: "memory");
389399
} while (fail);
390400
return ((uint64_t)cnt + 1) * 16777216llu - val;
391401
}

0 commit comments

Comments
 (0)