Merge branch 'master' into ktime

Author: zmshahaha

.clang-format

@@ -23,7 +23,7 @@ AlignConsecutiveBitFields:
   AlignCompound: true
   PadOperators: true
 AlignConsecutiveDeclarations:
-  Enabled: false
+  Enabled: true
   AcrossEmptyLines: false
   AcrossComments: false
   AlignCompound: false

.github/workflows/bsp_buildings.yml

@@ -284,6 +284,7 @@ jobs:
                 - "Infineon/psoc6-cy8ckit-062-WIFI-BT"
                 - "Infineon/psoc6-cy8cproto-062S3-4343W"
                 - "Infineon/psoc6-evaluationkit-062S2"
+                - "Infineon/xmc7200-kit_xmc7200_evk"
                 - "fujitsu/mb9x/mb9bf500r"
                 - "fujitsu/mb9x/mb9bf506r"
                 - "fujitsu/mb9x/mb9bf618s"

bsp/Infineon/README.md

@@ -12,6 +12,15 @@ PSOC6 系列 BSP 目前支持情况如下表所示：
 | [psoc6-cy8ckit-062-WIFI-BT](psoc6-cy8ckit-062-WIFI-BT)     | Infineon 官方 psoc6-cy8ckit-062-WIFI-BT 开发板              |
 | [psoc6-cy8ckit-062s4](psoc6-cy8ckit-062s4)                 | Infineon 官方 psoc6-cy8ckit-062s4 开发板                    |
 
+XMC 系列 BSP 目前支持情况如下表所示：
+
+| 更多操作**BSP 文件夹名称**                         | **开发板名称**                               |
+| -------------------------------------------------- | -------------------------------------------- |
+| **XMC系列**                                        |                                              |
+| [xmc7200-kit_xmc7200_evk](xmc7200-kit_xmc7200_evk) | Infineon 官方 xmc7200-kit_xmc7200_evk 开发板 |
+
+
+
 可以通过阅读相应 BSP 下的 README 来快速上手，如果想要使用 BSP 更多功能可参考 docs 文件夹下提供的说明文档，如下表所示：
 
 | **BSP 制作与提交**                           | **简介**                                                     |

bsp/Infineon/libraries/HAL_Drivers/drv_gpio.c

@@ -15,13 +15,17 @@
 #define PIN_GET(pin)        ((uint8_t)(((uint8_t)pin) & 0x07U))
 #define PORT_GET(pin)       ((uint8_t)(((uint8_t)pin) >> 3U))
 
-#define __IFX_PORT_MAX      15u
+#if defined(SOC_XMC7200D_E272K8384AA)
+#define __IFX_PORT_MAX      35u
+#else
+#define __IFX_PORT_MAX      14u
+#endif
 
 #define PIN_IFXPORT_MAX     __IFX_PORT_MAX
 
 static cyhal_gpio_callback_data_t irq_cb_data[PIN_IFXPORT_MAX];
 
-static const struct pin_irq_map pin_irq_map[] =
+static struct pin_irq_map pin_irq_map[] =
 {
     {CYHAL_PORT_0,  ioss_interrupts_gpio_0_IRQn},
 #if !defined(SOC_CY8C6245LQI_S3D72) && !defined(SOC_CY8C6244LQI_S4D92)
@@ -44,6 +48,27 @@ static const struct pin_irq_map pin_irq_map[] =
     {CYHAL_PORT_13,  ioss_interrupts_gpio_13_IRQn},
 #endif
     {CYHAL_PORT_14,  ioss_interrupts_gpio_14_IRQn},
+#if defined(SOC_XMC7200D_E272K8384AA)
+    {CYHAL_PORT_15,  ioss_interrupts_gpio_15_IRQn},
+    {CYHAL_PORT_16,  ioss_interrupts_gpio_16_IRQn},
+    {CYHAL_PORT_17,  ioss_interrupts_gpio_17_IRQn},
+    {CYHAL_PORT_18,  ioss_interrupts_gpio_18_IRQn},
+    {CYHAL_PORT_19,  ioss_interrupts_gpio_19_IRQn},
+    {CYHAL_PORT_20,  ioss_interrupts_gpio_20_IRQn},
+    {CYHAL_PORT_21,  ioss_interrupts_gpio_21_IRQn},
+    {CYHAL_PORT_22,  ioss_interrupts_gpio_23_IRQn},
+    {CYHAL_PORT_24,  ioss_interrupts_gpio_24_IRQn},
+    {CYHAL_PORT_25,  ioss_interrupts_gpio_25_IRQn},
+    {CYHAL_PORT_26,  ioss_interrupts_gpio_26_IRQn},
+    {CYHAL_PORT_27,  ioss_interrupts_gpio_27_IRQn},
+    {CYHAL_PORT_28,  ioss_interrupts_gpio_28_IRQn},
+    {CYHAL_PORT_29,  ioss_interrupts_gpio_29_IRQn},
+    {CYHAL_PORT_30,  ioss_interrupts_gpio_30_IRQn},
+    {CYHAL_PORT_31,  ioss_interrupts_gpio_31_IRQn},
+    {CYHAL_PORT_32,  ioss_interrupts_gpio_32_IRQn},
+    {CYHAL_PORT_33,  ioss_interrupts_gpio_33_IRQn},
+    {CYHAL_PORT_34,  ioss_interrupts_gpio_34_IRQn},
+#endif
 };
 
 static struct rt_pin_irq_hdr pin_irq_handler_tab[] =
@@ -64,6 +89,27 @@ static struct rt_pin_irq_hdr pin_irq_handler_tab[] =
     {-1, 0, RT_NULL, RT_NULL},
     {-1, 0, RT_NULL, RT_NULL},
     {-1, 0, RT_NULL, RT_NULL},
+#if defined(SOC_XMC7200D_E272K8384AA)
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+    {-1, 0, RT_NULL, RT_NULL},
+#endif
 };
 
 rt_inline void pin_irq_handler(int irqno)
@@ -275,12 +321,10 @@ static rt_err_t ifx_pin_irq_enable(struct rt_device *device, rt_base_t pin,
 
 #if !defined(COMPONENT_CAT1C)
         IRQn_Type irqn = (IRQn_Type)(irqmap->irqno + PORT_GET(irqmap->port));
-#endif
         irq_cb_data[irqn].callback = irq_callback;
         irq_cb_data[irqn].callback_arg = (rt_uint16_t *)&pin_irq_map[gpio_port].port;
-
         cyhal_gpio_register_callback(gpio_pin, &irq_cb_data[irqn]);
-
+#endif
         Cy_GPIO_ClearInterrupt(CYHAL_GET_PORTADDR(gpio_pin), CYHAL_GET_PIN(gpio_pin));
 
         switch (pin_irq_handler_tab[gpio_port].mode)
@@ -313,9 +357,8 @@ static rt_err_t ifx_pin_irq_enable(struct rt_device *device, rt_base_t pin,
 
 #if !defined(COMPONENT_CAT1C)
         IRQn_Type irqn = (IRQn_Type)(irqmap->irqno + PORT_GET(irqmap->port));
-#endif
         _cyhal_irq_disable(irqn);
-
+#endif
         rt_hw_interrupt_enable(level);
     }
     else

bsp/Infineon/libraries/HAL_Drivers/drv_gpio.h

@@ -23,7 +23,11 @@
 struct pin_irq_map
 {
     rt_uint16_t port;
+#if defined(SOC_SERIES_IFX_XMC)
+    rt_uint32_t irqno;
+#else
     IRQn_Type irqno;
+#endif
 };
 
 int rt_hw_pin_init(void);

bsp/Infineon/libraries/HAL_Drivers/drv_uart.c

@@ -226,7 +226,11 @@ static rt_err_t ifx_control(struct rt_serial_device *serial, int cmd, void *arg)
         Cy_SysInt_Init(uart->config->UART_SCB_IRQ_cfg, uart->config->userIsr);
 
         /* Enable the interrupt */
+#if defined(SOC_SERIES_IFX_XMC)
+        NVIC_EnableIRQ(UART_NvicMuxN_IRQn);
+#else
         NVIC_EnableIRQ(uart->config->intrSrc);
+#endif
         break;
     }
 

bsp/Infineon/libraries/HAL_Drivers/drv_uart.h

@@ -26,7 +26,11 @@ struct ifx_uart_config
     rt_uint32_t tx_pin;
     rt_uint32_t rx_pin;
     CySCB_Type *usart_x;
+#if defined(SOC_SERIES_IFX_XMC)
+    rt_uint32_t intrSrc;
+#else
     IRQn_Type intrSrc;
+#endif
     cy_israddress userIsr;
     cy_stc_sysint_t *UART_SCB_IRQ_cfg;
 };

bsp/Infineon/libraries/HAL_Drivers/uart_config.h

@@ -19,6 +19,28 @@ extern "C"
 {
 #endif
 
+#if defined(SOC_SERIES_IFX_XMC)
+#if defined(UART_CPU_IRQ_Number)
+#if (UART_CPU_IRQ_Number == 0)
+    #define UART_NvicMuxN_IRQn NvicMux0_IRQn
+#elif(UART_CPU_IRQ_Number == 1)
+    #define UART_NvicMuxN_IRQn NvicMux1_IRQn
+#elif (UART_CPU_IRQ_Number == 2)
+    #define UART_NvicMuxN_IRQn NvicMux2_IRQn
+#elif (UART_CPU_IRQ_Number == 3)
+    #define UART_NvicMuxN_IRQn NvicMux3_IRQn
+#elif (UART_CPU_IRQ_Number == 4)
+    #define UART_NvicMuxN_IRQn NvicMux4_IRQn
+#elif (UART_CPU_IRQ_Number == 5)
+    #define UART_NvicMuxN_IRQn NvicMux5_IRQn
+#elif (UART_CPU_IRQ_Number == 6)
+    #define UART_NvicMuxN_IRQn NvicMux6_IRQn
+#elif (UART_CPU_IRQ_Number == 7)
+    #define UART_NvicMuxN_IRQn NvicMux7_IRQn
+#endif
+#endif
+#endif
+
 #ifdef BSP_USING_UART0
     /* UART0 device driver structure */
     cy_stc_sysint_t UART0_SCB_IRQ_cfg =
@@ -47,7 +69,11 @@ extern "C"
     /* UART3 device driver structure */
     cy_stc_sysint_t UART3_SCB_IRQ_cfg =
         {
+#if defined(SOC_SERIES_IFX_XMC)
+            .intrSrc = ((UART_NvicMuxN_IRQn << 16) | (cy_en_intr_t)scb_3_interrupt_IRQn),
+#else
             .intrSrc = (IRQn_Type)scb_3_interrupt_IRQn,
+#endif
             .intrPriority = (7u),
     };
 #endif
@@ -67,7 +93,6 @@ extern "C"
             .intrPriority = (7u),
     };
 #endif
-
 #ifdef BSP_USING_UART6
     /* UART6 device driver structure */
     cy_stc_sysint_t UART6_SCB_IRQ_cfg =
@@ -76,6 +101,7 @@ extern "C"
             .intrPriority = (7u),
     };
 #endif
+
 #if defined(BSP_USING_UART0)
 #ifndef UART0_CONFIG
 #define UART0_CONFIG                            \
@@ -139,6 +165,18 @@ extern "C"
 
 #if defined(BSP_USING_UART3)
 #ifndef UART3_CONFIG
+#if defined(SOC_XMC7200D_E272K8384AA)
+#define UART3_CONFIG                            \
+    {                                           \
+        .name = "uart3",                        \
+        .tx_pin = P13_1,                        \
+        .rx_pin = P13_0,                        \
+        .usart_x = SCB3,                        \
+        .intrSrc = scb_3_interrupt_IRQn,        \
+        .userIsr = uart_isr_callback(uart3),    \
+        .UART_SCB_IRQ_cfg = &UART3_SCB_IRQ_cfg, \
+    }
+#else
 #define UART3_CONFIG                            \
     {                                           \
         .name = "uart3",                        \
@@ -149,6 +187,7 @@ extern "C"
         .userIsr = uart_isr_callback(uart3),    \
         .UART_SCB_IRQ_cfg = &UART3_SCB_IRQ_cfg, \
     }
+#endif
     void uart3_isr_callback(void);
 #endif /* UART3_CONFIG */
 #endif /* BSP_USING_UART3 */