This is an automated email from the ASF dual-hosted git repository. anchao pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 636fedbfdeead6e6b16cc3d4af239e8364529193 Author: zhangyu117 <[email protected]> AuthorDate: Wed Oct 28 17:50:33 2026 +0800 arch/tricore: fix nxstyle errors Fix the existing nxstyle errors in the tricore common code, so that later changes touching these files can pass checkpatch: - Multiple data definitions - Missing blank line after declarations - Bad alignment No functional change. Signed-off-by: zhangyu117 <[email protected]> --- arch/tricore/src/common/tricore_csa.c | 4 +++- arch/tricore/src/common/tricore_irq.c | 2 ++ arch/tricore/src/common/tricore_registerdump.c | 2 +- arch/tricore/src/common/tricore_systimer.c | 8 +++++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/tricore/src/common/tricore_csa.c b/arch/tricore/src/common/tricore_csa.c index ff3d3c4b4a7..5bbbd0cff07 100644 --- a/arch/tricore/src/common/tricore_csa.c +++ b/arch/tricore/src/common/tricore_csa.c @@ -92,7 +92,9 @@ uintptr_t *tricore_alloc_csa(uintptr_t pc, uintptr_t sp, void tricore_reclaim_csa(uintptr_t pcxi) { - uintptr_t head, tail, free; + uintptr_t head; + uintptr_t tail; + uintptr_t free; uintptr_t *next; /* A pointer to the first CSA in the list of CSAs consumed by the task is diff --git a/arch/tricore/src/common/tricore_irq.c b/arch/tricore/src/common/tricore_irq.c index 072e33ab18a..f8e4c6078ec 100644 --- a/arch/tricore/src/common/tricore_irq.c +++ b/arch/tricore/src/common/tricore_irq.c @@ -236,6 +236,7 @@ void up_affinity_irq(int irq, cpu_set_t cpuset) void tricore_ack_irq(int irq) { volatile Ifx_SRC_SRCR *src = &SRC_CPU_CPU0_SB + irq; + IfxSrc_clearRequest(src); } @@ -251,6 +252,7 @@ void tricore_ack_irq(int irq) void up_trigger_irq(int irq, cpu_set_t cpuset) { volatile Ifx_INT_SRB *srb = &INT_SRB0 + up_cpu_index(); + srb->U = cpuset; } #endif diff --git a/arch/tricore/src/common/tricore_registerdump.c b/arch/tricore/src/common/tricore_registerdump.c index c4389340010..91aaa8a2776 100644 --- a/arch/tricore/src/common/tricore_registerdump.c +++ b/arch/tricore/src/common/tricore_registerdump.c @@ -109,7 +109,7 @@ void tricore_dump_csachain(uintptr_t pcxi) tricore_dump_lowcsa((uint32_t *)tricore_csa2addr(pcxi)); } - pcxi = tricore_csa2addr(pcxi)[0]; + pcxi = tricore_csa2addr(pcxi)[0]; } } diff --git a/arch/tricore/src/common/tricore_systimer.c b/arch/tricore/src/common/tricore_systimer.c index 3e8a0470b35..5f1692494cc 100644 --- a/arch/tricore/src/common/tricore_systimer.c +++ b/arch/tricore/src/common/tricore_systimer.c @@ -185,10 +185,12 @@ tricore_systimer_start_absolute(struct oneshot_lowerhalf_s *lower, { struct tricore_systimer_lowerhalf_s *priv = (struct tricore_systimer_lowerhalf_s *)lower; + irqstate_t flags; + uint64_t min_expected; - irqstate_t flags = up_irq_save(); - uint64_t min_expected = tricore_systimer_get_time(priv) + - TRICORE_SYSTIMER_MIN_DELAY; + flags = up_irq_save(); + min_expected = tricore_systimer_get_time(priv) + + TRICORE_SYSTIMER_MIN_DELAY; expected = expected < min_expected ? min_expected : expected; tricore_systimer_set_timecmp(priv, expected);
