hal: renesas: ra: Modify BSP_PRV_IELS_ENUM for build process

khoa-nguyen-18 · KhiemNguyenT · commit 123bce8aa1e2 · 2025-08-05T11:15:25.000+07:00
Modify BSP_PRV_IELS_ENUM to use CONCAT instead of ##

Signed-off-by: Khoa Nguyen &lt;khoa.nguyen.xh@renesas.com&gt;
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2a1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2a1/bsp_mcu_family_cfg.h
@@ -41,7 +41,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 #ifdef __cplusplus
 }
 #endif
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2l1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2l1/bsp_mcu_family_cfg.h
@@ -38,9 +38,8 @@ extern "C" {
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
 #endif
-/* Used to create IELS values for the interrupt initialization table
- * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ICU_##vector)
+/* Used to create IELS values for the interrupt initialization table g_interrupt_event_link_select. */
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ICU_, vector)
 
 #define BSP_CFG_DCDC_ENABLE (0)
 #define BSP_CFG_DCDC_VOLTAGE_RANGE (BSP_POWER_MODE_DCDC_2V7_TO_3V6)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e1/bsp_mcu_family_cfg.h
@@ -306,7 +306,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e2/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e2/bsp_mcu_family_cfg.h
@@ -288,7 +288,7 @@ extern "C" {
 #endif
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4l1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4l1/bsp_mcu_family_cfg.h
@@ -292,7 +292,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m1/bsp_mcu_family_cfg.h
@@ -47,7 +47,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifdef __cplusplus
 }
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m2/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m2/bsp_mcu_family_cfg.h
@@ -309,7 +309,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m3/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m3/bsp_mcu_family_cfg.h
@@ -316,7 +316,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4w1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4w1/bsp_mcu_family_cfg.h
@@ -40,7 +40,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifdef __cplusplus
 }
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6e1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6e1/bsp_mcu_family_cfg.h
@@ -315,7 +315,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6e2/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6e2/bsp_mcu_family_cfg.h
@@ -288,7 +288,7 @@ extern "C" {
 #endif
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m1/bsp_mcu_family_cfg.h
@@ -43,7 +43,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector)    CONCAT(ELC_, vector)
 
 #ifdef __cplusplus
 }
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m2/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m2/bsp_mcu_family_cfg.h
@@ -43,7 +43,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 /* SDRAM controller configuration */
 #if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, renesas_ra_sdram))
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m3/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m3/bsp_mcu_family_cfg.h
@@ -43,7 +43,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 /* SDRAM controller configuration */
 #if DT_NODE_HAS_STATUS_OKAY(DT_INST(0, renesas_ra_sdram))
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m4/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m4/bsp_mcu_family_cfg.h
@@ -226,8 +226,9 @@ extern "C" {
 
 /* Security attribution for NMI registers. */
 #ifndef BSP_TZ_CFG_ICUSARB
-#define BSP_TZ_CFG_ICUSARB (0 | 0xFFFFFFFEU) /* Should match AIRCR.BFHFNMINS.  \
-                                              */
+#define BSP_TZ_CFG_ICUSARB                                                     \
+  (0 | 0xFFFFFFFEU) /* Should match AIRCR.BFHFNMINS.                           \
+                     */
 #endif
 
 /* Security attribution for registers for DMAC channels */
@@ -316,7 +317,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m5/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra6m5/bsp_mcu_family_cfg.h
@@ -227,8 +227,9 @@ extern "C" {
 
 /* Security attribution for NMI registers. */
 #ifndef BSP_TZ_CFG_ICUSARB
-#define BSP_TZ_CFG_ICUSARB (0 | 0xFFFFFFFEU) /* Should match AIRCR.BFHFNMINS.  \
-                                              */
+#define BSP_TZ_CFG_ICUSARB                                                     \
+  (0 | 0xFFFFFFFEU) /* Should match AIRCR.BFHFNMINS.                           \
+                     */
 #endif
 
 /* Security attribution for registers for DMAC channels */
@@ -317,7 +318,7 @@ extern "C" {
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra8d1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra8d1/bsp_mcu_family_cfg.h
@@ -351,7 +351,7 @@
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra8m1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra8m1/bsp_mcu_family_cfg.h
@@ -347,7 +347,7 @@
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
diff --git a/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra8t1/bsp_mcu_family_cfg.h b/zephyr/ra/ra_cfg/fsp_cfg/bsp/ra8t1/bsp_mcu_family_cfg.h
@@ -332,7 +332,7 @@
 
 /* Used to create IELS values for the interrupt initialization table
  * g_interrupt_event_link_select. */
-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)
+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)
 
 #ifndef BSP_CLOCK_CFG_MAIN_OSC_WAIT
 #define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ extern "C" {`
`41`	`41`
`42`	`42`	`/* Used to create IELS values for the interrupt initialization table`
`43`	`43`	`* g_interrupt_event_link_select. */`
`44`		`-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)`
	`44`	`+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)`
`45`	`45`	`#ifdef __cplusplus`
`46`	`46`	`}`
`47`	`47`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ extern "C" {`
`47`	`47`
`48`	`48`	`/* Used to create IELS values for the interrupt initialization table`
`49`	`49`	`* g_interrupt_event_link_select. */`
`50`		`-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)`
	`50`	`+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)`
`51`	`51`
`52`	`52`	`#ifdef __cplusplus`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ extern "C" {`
`40`	`40`
`41`	`41`	`/* Used to create IELS values for the interrupt initialization table`
`42`	`42`	`* g_interrupt_event_link_select. */`
`43`		`-#define BSP_PRV_IELS_ENUM(vector) (ELC_##vector)`
	`43`	`+#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)`
`44`	`44`
`45`	`45`	`#ifdef __cplusplus`
`46`	`46`	`}`