This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 1c829655acd032a7abbfcf96b170090b388187e8 Author: hujun5 <[email protected]> AuthorDate: Thu Nov 19 16:50:51 2026 +0800 arch/arm: fix nxstyle issues in ARM-M IRQ sources Fix the following nxstyle violations that are reported once these files are touched by a change and therefore checked in their entirety: - Bad alignment: the two statements inside the if-bodies are indented with 11 spaces instead of 10. - Statement on same line as 'if': split the single line if statements into brace blocks. - Statement on same line as 'else': "else (cond)" is not valid C, it was meant to be "else if (cond)". - Missing blank line after declarations in lc823450_irq_register(). - Bad right brace alignment: a duplicated closing brace. Only whitespace, brace placement and the else-if keyword are changed. No behavior change is intended, except for the "else (cond)" construct which could not compile at all. Signed-off-by: buxiasen <[email protected]> Signed-off-by: hujun5 <[email protected]> --- arch/arm/src/efm32/efm32_irq.c | 2 +- arch/arm/src/eoss3/eoss3_irq.c | 2 +- arch/arm/src/imx9/imx9_irq.c | 36 ++++++------- arch/arm/src/kinetis/kinetis_irq.c | 16 +++--- arch/arm/src/lc823450/lc823450_irq.c | 15 +++--- arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c | 8 +-- arch/arm/src/mcx-nxxx/nxxx_irq.c | 28 +++++----- arch/arm/src/mx8mp/mx8mp_irq.c | 16 +++--- arch/arm/src/sam34/sam_irq.c | 24 ++++----- arch/arm/src/samd5e5/sam_irq.c | 60 +++++++++++----------- arch/arm/src/samv7/sam_irq.c | 24 ++++----- arch/arm/src/tiva/common/tiva_irq.c | 20 ++++---- arch/arm/src/xmc4/xmc4_irq.c | 16 +++--- .../arm/stm32f3/stm32f334-disco/src/stm32_smps.c | 38 +++++++++++--- boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c | 40 ++++++++++++--- 15 files changed, 197 insertions(+), 148 deletions(-) diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c index 6e29d15985a..5d1fad66df9 100644 --- a/arch/arm/src/efm32/efm32_irq.c +++ b/arch/arm/src/efm32/efm32_irq.c @@ -503,7 +503,7 @@ int up_prioritize_irq(int irq, int priority) regaddr = NVIC_SYSH_PRIORITY(irq); irq -= 4; } - else (irq < EFM32_IRQ_NVECTORS) + else if (irq < EFM32_IRQ_NVECTORS) { /* NVIC_IRQ_PRIORITY() maps {0..} to one of many priority registers */ diff --git a/arch/arm/src/eoss3/eoss3_irq.c b/arch/arm/src/eoss3/eoss3_irq.c index 3196772628e..7531030df65 100644 --- a/arch/arm/src/eoss3/eoss3_irq.c +++ b/arch/arm/src/eoss3/eoss3_irq.c @@ -484,7 +484,7 @@ int up_prioritize_irq(int irq, int priority) regaddr = NVIC_SYSH_PRIORITY(irq); irq -= 4; } - else (irq < EOSS3_IRQ_NVECTORS) + else if (irq < EOSS3_IRQ_NVECTORS) { /* NVIC_IRQ_PRIORITY() maps {0..} to one of many priority registers */ diff --git a/arch/arm/src/imx9/imx9_irq.c b/arch/arm/src/imx9/imx9_irq.c index 4e11aef071d..c2b6c4e2ece 100644 --- a/arch/arm/src/imx9/imx9_irq.c +++ b/arch/arm/src/imx9/imx9_irq.c @@ -235,71 +235,71 @@ static int imx9_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (extint < 32) { - *regaddr = (NVIC_IRQ_ENABLE(0) + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ_ENABLE(0) + offset); + *bit = 1 << extint; } else #if IMX9_IRQ_NEXTINT > 32 if (extint < 64) { - *regaddr = (NVIC_IRQ_ENABLE(32) + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ_ENABLE(32) + offset); + *bit = 1 << (extint - 32); } else #endif #if IMX9_IRQ_NEXTINT > 64 if (extint < 96) { - *regaddr = (NVIC_IRQ_ENABLE(64) + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ_ENABLE(64) + offset); + *bit = 1 << (extint - 64); } else #endif #if IMX9_IRQ_NEXTINT > 96 if (extint < 128) { - *regaddr = (NVIC_IRQ_ENABLE(96) + offset); - *bit = 1 << (extint - 96); + *regaddr = (NVIC_IRQ_ENABLE(96) + offset); + *bit = 1 << (extint - 96); } else #endif #if IMX9_IRQ_NEXTINT > 128 if (extint < 160) { - *regaddr = (NVIC_IRQ_ENABLE(128) + offset); - *bit = 1 << (extint - 128); + *regaddr = (NVIC_IRQ_ENABLE(128) + offset); + *bit = 1 << (extint - 128); } else #endif #if IMX9_IRQ_NEXTINT > 160 if (extint < 192) { - *regaddr = (NVIC_IRQ_ENABLE(160) + offset); - *bit = 1 << (extint - 160); + *regaddr = (NVIC_IRQ_ENABLE(160) + offset); + *bit = 1 << (extint - 160); } else #endif #if IMX9_IRQ_NEXTINT > 192 if (extint < 224) { - *regaddr = (NVIC_IRQ_ENABLE(192) + offset); - *bit = 1 << (extint - 192); + *regaddr = (NVIC_IRQ_ENABLE(192) + offset); + *bit = 1 << (extint - 192); } else #endif #if IMX9_IRQ_NEXTINT > 224 if (extint < 256) { - *regaddr = (NVIC_IRQ_ENABLE(224) + offset); - *bit = 1 << (extint - 224); + *regaddr = (NVIC_IRQ_ENABLE(224) + offset); + *bit = 1 << (extint - 224); } else #endif #if IMX9_IRQ_NEXTINT > 256 if (extint < 288) { - *regaddr = (NVIC_IRQ_ENABLE(256) + offset); - *bit = 1 << (extint - 256); + *regaddr = (NVIC_IRQ_ENABLE(256) + offset); + *bit = 1 << (extint - 256); } else #endif diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c index 9d1267ce9ac..68f7fdba1ee 100644 --- a/arch/arm/src/kinetis/kinetis_irq.c +++ b/arch/arm/src/kinetis/kinetis_irq.c @@ -222,23 +222,23 @@ static int kinetis_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (irq < (KINETIS_IRQ_FIRST + 32)) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << (irq - KINETIS_IRQ_FIRST); + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << (irq - KINETIS_IRQ_FIRST); } else if (irq < (KINETIS_IRQ_FIRST + 64)) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (irq - KINETIS_IRQ_FIRST - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (irq - KINETIS_IRQ_FIRST - 32); } else if (irq < (KINETIS_IRQ_FIRST + 96)) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (irq - KINETIS_IRQ_FIRST - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (irq - KINETIS_IRQ_FIRST - 64); } else if (irq < NR_IRQS) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (irq - KINETIS_IRQ_FIRST - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (irq - KINETIS_IRQ_FIRST - 96); } else { diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c index 83bd97b3661..ed4a5931c43 100644 --- a/arch/arm/src/lc823450/lc823450_irq.c +++ b/arch/arm/src/lc823450/lc823450_irq.c @@ -364,18 +364,18 @@ static int lc823450_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (irq < LC823450_IRQ_INTERRUPTS + 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << (irq - LC823450_IRQ_INTERRUPTS); + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << (irq - LC823450_IRQ_INTERRUPTS); } else if (irq < LC823450_IRQ_INTERRUPTS + 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (irq - LC823450_IRQ_INTERRUPTS - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (irq - LC823450_IRQ_INTERRUPTS - 32); } else if (irq < NR_IRQS) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (irq - LC823450_IRQ_INTERRUPTS - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (irq - LC823450_IRQ_INTERRUPTS - 64); } else { @@ -390,7 +390,7 @@ static int lc823450_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, *regaddr = NVIC_SYSHCON; if (irq == LC823450_IRQ_MEMFAULT) { - *bit = NVIC_SYSHCON_MEMFAULTENA; + *bit = NVIC_SYSHCON_MEMFAULTENA; } else if (irq == LC823450_IRQ_BUSFAULT) { @@ -806,6 +806,7 @@ int lc823450_irq_register(int irq, struct lc823450_irq_ops *ops) irq < LC823450_IRQ_VIRTUAL + LC823450_IRQ_NVIRTUALIRQS) { irqstate_t flags; + flags = irqsave(); virq_ops[irq - LC823450_IRQ_VIRTUAL] = ops; irqrestore(flags); diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c index f0a1edc318c..f1396a42c87 100644 --- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c +++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c @@ -197,13 +197,13 @@ static int lpc17_40_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (irq < (LPC17_40_IRQ_EXTINT + 32)) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << (irq - LPC17_40_IRQ_EXTINT); + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << (irq - LPC17_40_IRQ_EXTINT); } else if (irq < LPC17_40_IRQ_NIRQS) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (irq - LPC17_40_IRQ_EXTINT - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (irq - LPC17_40_IRQ_EXTINT - 32); } else { diff --git a/arch/arm/src/mcx-nxxx/nxxx_irq.c b/arch/arm/src/mcx-nxxx/nxxx_irq.c index ad8dc209525..e0fd0d36dc7 100644 --- a/arch/arm/src/mcx-nxxx/nxxx_irq.c +++ b/arch/arm/src/mcx-nxxx/nxxx_irq.c @@ -294,55 +294,55 @@ static int nxxx_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else #if NXXX_IRQ_NEXTINT > 32 if (extint < 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else #endif #if NXXX_IRQ_NEXTINT > 64 if (extint < 96) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (extint - 64); } else #endif #if NXXX_IRQ_NEXTINT > 96 if (extint < 128) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (extint - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (extint - 96); } else #endif #if NXXX_IRQ_NEXTINT > 128 if (extint < 160) { - *regaddr = (NVIC_IRQ128_159_ENABLE + offset); - *bit = 1 << (extint - 128); + *regaddr = (NVIC_IRQ128_159_ENABLE + offset); + *bit = 1 << (extint - 128); } else #endif #if NXXX_IRQ_NEXTINT > 160 if (extint < 192) { - *regaddr = (NVIC_IRQ160_191_ENABLE + offset); - *bit = 1 << (extint - 160); + *regaddr = (NVIC_IRQ160_191_ENABLE + offset); + *bit = 1 << (extint - 160); } else #endif #if NXXX_IRQ_NEXTINT > 192 if (extint < 219) { - *regaddr = (NVIC_IRQ192_223_ENABLE + offset); - *bit = 1 << (extint - 192); + *regaddr = (NVIC_IRQ192_223_ENABLE + offset); + *bit = 1 << (extint - 192); } else #endif diff --git a/arch/arm/src/mx8mp/mx8mp_irq.c b/arch/arm/src/mx8mp/mx8mp_irq.c index cc51afca782..95f46cd1ad3 100644 --- a/arch/arm/src/mx8mp/mx8mp_irq.c +++ b/arch/arm/src/mx8mp/mx8mp_irq.c @@ -239,23 +239,23 @@ static int mx8mp_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (irq < (MX8MP_IRQ_FIRST + 32)) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << (irq - MX8MP_IRQ_FIRST); + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << (irq - MX8MP_IRQ_FIRST); } else if (irq < (MX8MP_IRQ_FIRST + 64)) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (irq - MX8MP_IRQ_FIRST - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (irq - MX8MP_IRQ_FIRST - 32); } else if (irq < (MX8MP_IRQ_FIRST + 96)) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (irq - MX8MP_IRQ_FIRST - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (irq - MX8MP_IRQ_FIRST - 64); } else if (irq < NR_IRQS) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (irq - MX8MP_IRQ_FIRST - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (irq - MX8MP_IRQ_FIRST - 96); } else { diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c index 957d3e8c347..0e48261501a 100644 --- a/arch/arm/src/sam34/sam_irq.c +++ b/arch/arm/src/sam34/sam_irq.c @@ -223,37 +223,37 @@ static int sam_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, #if SAM_IRQ_NEXTINT <= 32 if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else #elif SAM_IRQ_NEXTINT <= 64 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else #elif SAM_IRQ_NEXTINT <= 96 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (extint - 64); } else #else diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c index a7dc4a791f1..1053aa7855f 100644 --- a/arch/arm/src/samd5e5/sam_irq.c +++ b/arch/arm/src/samd5e5/sam_irq.c @@ -261,86 +261,86 @@ static int sam_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, #if SAM_IRQ_NEXTINT <= 32 if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else #elif SAM_IRQ_NEXTINT <= 64 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else #elif SAM_IRQ_NEXTINT <= 96 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (extint - 64); } else #elif SAM_IRQ_NEXTINT <= 128 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else if (extint < 96) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (extint - 64); } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (extint - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (extint - 96); } else #elif SAM_IRQ_NEXTINT <= 160 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else if (extint < 96) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (extint - 64); } else if (extint < 128) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (extint - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (extint - 96); } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ128_159_ENABLE + offset); - *bit = 1 << (extint - 128); + *regaddr = (NVIC_IRQ128_159_ENABLE + offset); + *bit = 1 << (extint - 128); } else #else diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c index 24a625aa7d5..01f42804512 100644 --- a/arch/arm/src/samv7/sam_irq.c +++ b/arch/arm/src/samv7/sam_irq.c @@ -225,37 +225,37 @@ static int sam_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, #if SAM_IRQ_NEXTINT <= 32 if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else #elif SAM_IRQ_NEXTINT <= 64 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else #elif SAM_IRQ_NEXTINT <= 96 if (extint < 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << extint; + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << extint; } else if (extint < 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (extint - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (extint - 32); } else if (extint < SAM_IRQ_NEXTINT) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (extint - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (extint - 64); } else #else diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c index 3a90f3f869b..58082cfb95c 100644 --- a/arch/arm/src/tiva/common/tiva_irq.c +++ b/arch/arm/src/tiva/common/tiva_irq.c @@ -276,31 +276,31 @@ static int tiva_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, if (irq < TIVA_IRQ_INTERRUPTS + 32) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS); + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS); } else if (irq < TIVA_IRQ_INTERRUPTS + 64) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 32); } #if TIVA_IRQ_NEXTINT > 63 else if (irq < TIVA_IRQ_INTERRUPTS + 96) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 64); } #if TIVA_IRQ_NEXTINT > 95 else if (irq < TIVA_IRQ_INTERRUPTS + 128) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 96); } #if TIVA_IRQ_NEXTINT > 127 else if (irq < TIVA_IRQ_INTERRUPTS + 160) { - *regaddr = (NVIC_IRQ128_159_ENABLE + offset); - *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 128); + *regaddr = (NVIC_IRQ128_159_ENABLE + offset); + *bit = 1 << (irq - TIVA_IRQ_INTERRUPTS - 128); } #if TIVA_IRQ_NEXTINT > 159 # warning Missing logic diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c index 13a8a22e04c..5e5fedaef21 100644 --- a/arch/arm/src/xmc4/xmc4_irq.c +++ b/arch/arm/src/xmc4/xmc4_irq.c @@ -221,23 +221,23 @@ static int xmc4_irqinfo(int irq, uintptr_t *regaddr, uint32_t *bit, { if (irq < (XMC4_IRQ_FIRST + 32)) { - *regaddr = (NVIC_IRQ0_31_ENABLE + offset); - *bit = 1 << (irq - XMC4_IRQ_FIRST); + *regaddr = (NVIC_IRQ0_31_ENABLE + offset); + *bit = 1 << (irq - XMC4_IRQ_FIRST); } else if (irq < (XMC4_IRQ_FIRST + 64)) { - *regaddr = (NVIC_IRQ32_63_ENABLE + offset); - *bit = 1 << (irq - XMC4_IRQ_FIRST - 32); + *regaddr = (NVIC_IRQ32_63_ENABLE + offset); + *bit = 1 << (irq - XMC4_IRQ_FIRST - 32); } else if (irq < (XMC4_IRQ_FIRST + 96)) { - *regaddr = (NVIC_IRQ64_95_ENABLE + offset); - *bit = 1 << (irq - XMC4_IRQ_FIRST - 64); + *regaddr = (NVIC_IRQ64_95_ENABLE + offset); + *bit = 1 << (irq - XMC4_IRQ_FIRST - 64); } else if (irq < NR_IRQS) { - *regaddr = (NVIC_IRQ96_127_ENABLE + offset); - *bit = 1 << (irq - XMC4_IRQ_FIRST - 96); + *regaddr = (NVIC_IRQ96_127_ENABLE + offset); + *bit = 1 << (irq - XMC4_IRQ_FIRST - 96); } else { diff --git a/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c index 9253f274ce9..50a32802032 100644 --- a/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c +++ b/boards/arm/stm32f3/stm32f334-disco/src/stm32_smps.c @@ -757,8 +757,15 @@ static void smps_duty_set(struct smps_priv_s *priv, case CONVERTER_MODE_BUCK: { - if (out >= priv->v_in) out = priv->v_in; - if (out < 0.0) out = 0.0; + if (out >= priv->v_in) + { + out = priv->v_in; + } + + if (out < 0.0) + { + out = 0.0; + } duty = out / priv->v_in; @@ -768,7 +775,10 @@ static void smps_duty_set(struct smps_priv_s *priv, cmp = (uint16_t)(per * duty); - if (cmp > per - 30) cmp = per - 30; + if (cmp > per - 30) + { + cmp = per - 30; + } /* Set T4 duty cycle. T11 is complementary to T4 */ @@ -781,8 +791,15 @@ static void smps_duty_set(struct smps_priv_s *priv, { per = HRTIM_PER_GET(hrtim, HRTIM_TIMER_TIMA); - if (out < priv->v_in) out = priv->v_in; - if (out >= BOOST_VOLT_MAX) out = BOOST_VOLT_MAX; + if (out < priv->v_in) + { + out = priv->v_in; + } + + if (out >= BOOST_VOLT_MAX) + { + out = BOOST_VOLT_MAX; + } duty = 1.0 - priv->v_in / out; @@ -805,8 +822,15 @@ static void smps_duty_set(struct smps_priv_s *priv, per = HRTIM_PER_GET(hrtim, HRTIM_TIMER_TIMA); - if (out < priv->v_in) out = priv->v_in; - if (out >= BOOST_VOLT_MAX) out = BOOST_VOLT_MAX; + if (out < priv->v_in) + { + out = priv->v_in; + } + + if (out >= BOOST_VOLT_MAX) + { + out = BOOST_VOLT_MAX; + } duty = 1.0 - priv->v_in / out; diff --git a/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c b/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c index 9a51ba29084..29a481a0ddf 100644 --- a/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c +++ b/boards/arm/stm32g4/b-g474e-dpow1/src/stm32_smps.c @@ -876,8 +876,15 @@ static void smps_duty_set(struct smps_priv_s *priv, case CONVERTER_MODE_BUCK: { - if (out >= priv->v_in) out = priv->v_in; - if (out < 0.0) out = 0.0; + if (out >= priv->v_in) + { + out = priv->v_in; + } + + if (out < 0.0) + { + out = 0.0; + } duty = out / priv->v_in; @@ -887,7 +894,10 @@ static void smps_duty_set(struct smps_priv_s *priv, cmp = (uint16_t)(per * duty); - if (cmp > per - 30) cmp = per - 30; + if (cmp > per - 30) + { + cmp = per - 30; + } /* Set T5 duty cycle. T1 is complementary to T5 */ @@ -900,8 +910,15 @@ static void smps_duty_set(struct smps_priv_s *priv, { per = HRTIM_PER_GET(hrtim, HRTIM_TIMER_TIMC); - if (out < priv->v_in) out = priv->v_in; - if (out >= BOOST_VOLT_MAX) out = BOOST_VOLT_MAX; + if (out < priv->v_in) + { + out = priv->v_in; + } + + if (out >= BOOST_VOLT_MAX) + { + out = BOOST_VOLT_MAX; + } duty = 1.0 - priv->v_in / out; @@ -924,8 +941,15 @@ static void smps_duty_set(struct smps_priv_s *priv, per = HRTIM_PER_GET(hrtim, HRTIM_TIMER_TIMC); - if (out < priv->v_in) out = priv->v_in; - if (out >= BOOST_VOLT_MAX) out = BOOST_VOLT_MAX; + if (out < priv->v_in) + { + out = priv->v_in; + } + + if (out >= BOOST_VOLT_MAX) + { + out = BOOST_VOLT_MAX; + } duty = 1.0 - priv->v_in / out; @@ -945,7 +969,7 @@ static void smps_duty_set(struct smps_priv_s *priv, pwrerr("ERROR: Unknown converter mode %d!\n", mode); break; } - } + } } /****************************************************************************
