hal: renesas: ra: Modify BSP_PRV_IELS_ENUM for build process

khoa-nguyen-18 · KhiemNguyenT · commit b033822ae238 · 2025-03-21T10:36:57.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
@@ -68,7 +68,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)
 /*
  ID Code
  Note: To permanently lock and disable the debug interface define the
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
@@ -66,7 +66,7 @@ extern "C" {
 #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)
+#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
@@ -327,7 +327,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -304,7 +304,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)
 
 /* Block Protection Register 0 */
 #ifndef BSP_CFG_ROM_REG_BPS0
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
@@ -313,7 +313,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -67,7 +67,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)
 /*
  ID Code
  Note: To lock and disable the debug interface define BSP_ID_CODE_LOCKED in
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
@@ -330,7 +330,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -337,7 +337,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -67,7 +67,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)
 /*
  ID Code
  Note: To permanently lock and disable the debug interface define the
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
@@ -336,7 +336,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -305,7 +305,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)
 
 /* Block Protection Register 0 */
 #ifndef BSP_CFG_ROM_REG_BPS0
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
@@ -70,7 +70,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)
 /*
  ID Code
  Note: To lock and disable the debug interface define BSP_ID_CODE_LOCKED in
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
@@ -70,7 +70,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)
 /*
  ID Code
  Note: To permanently lock and disable the debug interface define the
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
@@ -70,7 +70,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)
 /*
  ID Code
  Note: To permanently lock and disable the debug interface define the
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 */
@@ -337,7 +338,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -1,8 +1,9 @@
 /*
-* Copyright (c) 2020 - 2025 Renesas Electronics Corporation and/or its affiliates
-*
-* SPDX-License-Identifier: BSD-3-Clause
-*/
+ * Copyright (c) 2020 - 2025 Renesas Electronics Corporation and/or its
+ * affiliates
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
 
 #ifndef BSP_MCU_FAMILY_CFG_H_
 #define BSP_MCU_FAMILY_CFG_H_
@@ -226,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 */
@@ -337,7 +339,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -378,7 +378,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -373,7 +373,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
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
@@ -358,7 +358,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)
 
 /* Dual Mode Select Register */
 #ifndef BSP_CFG_ROM_REG_DUALSEL
