diff options
| author | Bernard Xiong <[email protected]> | 2021-10-04 23:32:35 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-10-04 23:32:35 +0800 |
| commit | 634e5341a6ee73001988216962cda398a42b1ce4 (patch) | |
| tree | 0c6fa7ba576213ab05156112aa7a0d80fa95da96 | |
| parent | edea2b38d2ba0b17246971bd5b05fd6813a66ad0 (diff) | |
| parent | e49925584f407e23f264e5e551b7853d72a32ef0 (diff) | |
Merge pull request #5120 from mysterywolf/ab32
[ab32vg1] 修复NULL和uint8报错
| -rw-r--r-- | .github/workflows/action.yml | 1 | ||||
| -rw-r--r-- | bsp/bluetrum/libraries/hal_drivers/drv_common.c | 8 | ||||
| -rw-r--r-- | bsp/bluetrum/libraries/hal_drivers/drv_usart.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 88056a1da5..40e6bd6052 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -138,6 +138,7 @@ jobs: - {RTT_BSP: "raspberry-pi/raspi4-32", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "hc32l196", RTT_TOOL_CHAIN: "sourcery-arm"} - {RTT_BSP: "tae32f5300", RTT_TOOL_CHAIN: "sourcery-arm"} + - {RTT_BSP: "bluetrum/ab32vg1-ab-prougen", RTT_TOOL_CHAIN: "sourcery-riscv"} steps: - uses: actions/checkout@v2 - name: Set up Python diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_common.c b/bsp/bluetrum/libraries/hal_drivers/drv_common.c index 75b3426010..7252050589 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_common.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_common.c @@ -19,27 +19,27 @@ void uart1_irq_process(void); RT_SECTION(".irq.uart") void uart0_irq_post(void) { - uint8_t mq_msg = MSG_UART0_IRQ; + rt_uint8_t mq_msg = MSG_UART0_IRQ; rt_mq_send(drv_mq, &mq_msg, 1); } RT_SECTION(".irq.uart") void uart1_irq_post(void) { - uint8_t mq_msg = MSG_UART1_IRQ; + rt_uint8_t mq_msg = MSG_UART1_IRQ; rt_mq_send(drv_mq, &mq_msg, 1); } RT_SECTION(".irq.uart") void uart2_irq_post(void) { - uint8_t mq_msg = MSG_UART2_IRQ; + rt_uint8_t mq_msg = MSG_UART2_IRQ; rt_mq_send(drv_mq, &mq_msg, 1); } static void drv_thread_entry(void *parameter) { - uint8_t mq_msg = 0; + rt_uint8_t mq_msg = 0; while (1) { rt_mq_recv(drv_mq, &mq_msg, 1, RT_WAITING_FOREVER); switch (mq_msg) { diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c index 23aa85848d..d1a46ad095 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c @@ -324,7 +324,7 @@ int rt_hw_usart_init(void) | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX | uart_obj[i].uart_dma_flag - , NULL); + , RT_NULL); RT_ASSERT(result == RT_EOK); } |