Skip to content

Commit a6fd4b7

Browse files
committed
hal: Fix for Zephyr's recent upgrade to CMSIS 6
A handful of source files were still using an old version of CMSIS and would no longer build after the recent upgrade to CMSIS 6 introduced in zephyrproject-rtos/zephyr#90063 Signed-off-by: Egill Sigurdur <egill@egill.xyz>
1 parent 2994b7d commit a6fd4b7

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

gd32a50x/standard_peripheral/source/gd32a50x_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void nvic_irq_enable(uint8_t nvic_irq, uint8_t nvic_irq_pre_priority,
8484
temp_pre=2U;
8585
temp_sub=0x2U;
8686
}
87-
/* get the temp_priority to fill the NVIC->IP register */
87+
/* get the temp_priority to fill the NVIC->IPR register */
8888
temp_priority = (uint32_t)nvic_irq_pre_priority << (0x4U - temp_pre);
8989
temp_priority |= (uint32_t)nvic_irq_sub_priority &((uint32_t)0x0FU >> (0x4U - temp_sub));
9090
temp_priority = temp_priority << 0x04U;

gd32e10x/standard_peripheral/source/gd32e10x_misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ void nvic_irq_enable(uint8_t nvic_irq,
9797
break;
9898
}
9999

100-
/* get the temp_priority to fill the NVIC->IP register */
100+
/* get the temp_priority to fill the NVIC->IPR register */
101101
temp_priority = (uint32_t)nvic_irq_pre_priority << (0x4U - temp_pre);
102102
temp_priority |= nvic_irq_sub_priority &(0x0FU >> (0x4U - temp_sub));
103103
temp_priority = temp_priority << 0x04U;
104-
NVIC->IP[nvic_irq] = (uint8_t)temp_priority;
104+
NVIC->IPR[nvic_irq] = (uint8_t)temp_priority;
105105

106106
/* enable the selected IRQ */
107107
NVIC->ISER[nvic_irq >> 0x05U] = (uint32_t)0x01U << (nvic_irq & (uint8_t)0x1FU);

gd32e50x/standard_peripheral/source/gd32e50x_misc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void nvic_irq_enable(uint8_t nvic_irq, uint8_t nvic_irq_pre_priority,
8787
temp_pre=2U;
8888
temp_sub=0x2U;
8989
}
90-
/* get the temp_priority to fill the NVIC->IP register */
90+
/* get the temp_priority to fill the NVIC->IPR register */
9191
temp_priority = (uint32_t)nvic_irq_pre_priority << (0x4U - temp_pre);
9292
temp_priority |= nvic_irq_sub_priority &(0x0FU >> (0x4U - temp_sub));
9393
temp_priority = temp_priority << 0x04U;

gd32f3x0/standard_peripheral/source/gd32f3x0_misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ void nvic_irq_enable(uint8_t nvic_irq,
9797
break;
9898
}
9999

100-
/* get the temp_priority to fill the NVIC->IP register */
100+
/* get the temp_priority to fill the NVIC->IPR register */
101101
temp_priority = (uint32_t)nvic_irq_pre_priority << (0x4U - temp_pre);
102102
temp_priority |= nvic_irq_sub_priority &(0x0FU >> (0x4U - temp_sub));
103103
temp_priority = temp_priority << 0x04U;
104-
NVIC->IP[nvic_irq] = (uint8_t)temp_priority;
104+
NVIC->IPR[nvic_irq] = (uint8_t)temp_priority;
105105

106106
/* enable the selected IRQ */
107107
NVIC->ISER[nvic_irq >> 0x05U] = (uint32_t)0x01U << (nvic_irq & (uint8_t)0x1FU);

gd32f403/standard_peripheral/source/gd32f403_misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ void nvic_irq_enable(uint8_t nvic_irq, uint8_t nvic_irq_pre_priority,
8686
temp_pre=2U;
8787
temp_sub=0x2U;
8888
}
89-
/* get the temp_priority to fill the NVIC->IP register */
89+
/* get the temp_priority to fill the NVIC->IPR register */
9090
temp_priority = (uint32_t)nvic_irq_pre_priority << (0x4U - temp_pre);
9191
temp_priority |= nvic_irq_sub_priority &(0x0FU >> (0x4U - temp_sub));
9292
temp_priority = temp_priority << 0x04U;
93-
NVIC->IP[nvic_irq] = (uint8_t)temp_priority;
93+
NVIC->IPR[nvic_irq] = (uint8_t)temp_priority;
9494
/* enable the selected IRQ */
9595
NVIC->ISER[nvic_irq >> 0x05U] = (uint32_t)0x01U << (nvic_irq & (uint8_t)0x1FU);
9696
}

gd32f4xx/standard_peripheral/source/gd32f4xx_misc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,11 @@ void nvic_irq_enable(uint8_t nvic_irq, uint8_t nvic_irq_pre_priority,
8686
temp_pre = 2U;
8787
temp_sub = 0x2U;
8888
}
89-
/* get the temp_priority to fill the NVIC->IP register */
89+
/* get the temp_priority to fill the NVIC->IPR register */
9090
temp_priority = (uint32_t)nvic_irq_pre_priority << (0x4U - temp_pre);
9191
temp_priority |= nvic_irq_sub_priority & (0x0FU >> (0x4U - temp_sub));
9292
temp_priority = temp_priority << 0x04U;
93-
NVIC->IP[nvic_irq] = (uint8_t)temp_priority;
93+
NVIC->IPR[nvic_irq] = (uint8_t)temp_priority;
9494
/* enable the selected IRQ */
9595
NVIC->ISER[nvic_irq >> 0x05U] = (uint32_t)0x01U << (nvic_irq & (uint8_t)0x1FU);
9696
}

0 commit comments

Comments
 (0)