From 99e9ea61bce6a0b1a2521e914f9d7cefd92e17e6 Mon Sep 17 00:00:00 2001 From: mazhiyuan Date: Wed, 13 Oct 2021 11:02:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bsp?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bsp/at91sam9g45/platform/system_clock.c | 2 +- bsp/ft2004/drivers/drv_spi.c | 4 ++-- bsp/ft2004/drivers/drv_spi.h | 2 +- bsp/ft2004/drivers/ft2004.c | 2 +- bsp/ft2004/drivers/gtimer.c | 2 +- bsp/maxim/libraries/HAL_Drivers/drv_gpio.c | 4 ++-- bsp/maxim/libraries/HAL_Drivers/drv_uart.c | 2 +- bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c | 1 + bsp/raspberry-pi/raspi3-32/applications/test_device.c | 5 +++-- bsp/raspberry-pi/raspi3-32/cpu/cp15.h | 2 +- bsp/raspberry-pi/raspi3-32/cpu/interrupt.c | 2 +- components/drivers/hwcrypto/hw_gcm.h | 4 ++-- components/drivers/hwcrypto/hw_symmetric.c | 2 +- libcpu/arm/cortex-a/gicv3.c | 6 +++--- libcpu/arm/cortex-a/gicv3.h | 2 +- src/thread.c | 2 +- 16 files changed, 23 insertions(+), 21 deletions(-) diff --git a/bsp/at91sam9g45/platform/system_clock.c b/bsp/at91sam9g45/platform/system_clock.c index 551daf31e..fc29064b4 100644 --- a/bsp/at91sam9g45/platform/system_clock.c +++ b/bsp/at91sam9g45/platform/system_clock.c @@ -44,7 +44,7 @@ static struct clk plla = { static struct clk mck = { "mck", 0, - NULL, + RT_NULL, {RT_NULL, RT_NULL}, }; diff --git a/bsp/ft2004/drivers/drv_spi.c b/bsp/ft2004/drivers/drv_spi.c index 0ac38709e..a7b136a4b 100644 --- a/bsp/ft2004/drivers/drv_spi.c +++ b/bsp/ft2004/drivers/drv_spi.c @@ -32,7 +32,7 @@ typedef struct { FSpi_Ctrl_t spi_ctrl; struct rt_spi_bus spi_bus; - uint16_t spi_cs_pin; + rt_uint16_t spi_cs_pin; spi_cs_handler_t spi_cs_handler; } ft2004_spi_class; @@ -214,7 +214,7 @@ static const struct rt_spi_ops ft2004_spi_ops = /** * Attach the spi device to SPI bus, this function must be used after initialization. */ -rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, uint16_t cs_gpio_pin) +rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, rt_uint16_t cs_gpio_pin) { rt_err_t result; struct rt_spi_device *spi_device; diff --git a/bsp/ft2004/drivers/drv_spi.h b/bsp/ft2004/drivers/drv_spi.h index 5b31ab678..22eaaa403 100644 --- a/bsp/ft2004/drivers/drv_spi.h +++ b/bsp/ft2004/drivers/drv_spi.h @@ -19,7 +19,7 @@ #define SPI_BUS_NAME "spi0" #define SPI_DEV_NAME "S25FS256" -rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, uint16_t cs_gpio_pin); +rt_err_t rt_hw_spi_device_attach(const char *bus_name, const char *device_name, rt_uint16_t cs_gpio_pin); #ifdef __cplusplus extern "C" diff --git a/bsp/ft2004/drivers/ft2004.c b/bsp/ft2004/drivers/ft2004.c index da0499327..5104931ef 100644 --- a/bsp/ft2004/drivers/ft2004.c +++ b/bsp/ft2004/drivers/ft2004.c @@ -75,7 +75,7 @@ rt_uint32_t arm_gic_cpumask_to_affval(rt_uint32_t *cpu_mask, rt_uint32_t *cluste void send_core_isg(void) { - for (size_t i = 0; i <= 0xf; i++) + for (rt_size_t i = 0; i <= 0xf; i++) { /* code */ rt_kprintf("i %x \r\n", i); diff --git a/bsp/ft2004/drivers/gtimer.c b/bsp/ft2004/drivers/gtimer.c index b35acc6e6..fd5f96950 100644 --- a/bsp/ft2004/drivers/gtimer.c +++ b/bsp/ft2004/drivers/gtimer.c @@ -86,7 +86,7 @@ static inline rt_uint64_t __get_cntp_cval(void) * This function assigns the given value to PL1 Physical Timer Control Register (CNTP_CTL). * param value: CNTP_CTL Register value to set */ -static inline void __set_cntp_ctl(uint32_t value) +static inline void __set_cntp_ctl(rt_uint32_t value) { __set_cp(15, 0, value, 14, 2, 1); } diff --git a/bsp/maxim/libraries/HAL_Drivers/drv_gpio.c b/bsp/maxim/libraries/HAL_Drivers/drv_gpio.c index e2001371d..2f91bb6ea 100644 --- a/bsp/maxim/libraries/HAL_Drivers/drv_gpio.c +++ b/bsp/maxim/libraries/HAL_Drivers/drv_gpio.c @@ -158,7 +158,7 @@ static rt_err_t mcu_pin_dettach_irq(struct rt_device *device, rt_int32_t pin) tmp_gpio_cfg.func = GPIO_FUNC_IN; GPIO_Config(&tmp_gpio_cfg); GPIO_IntDisable(&tmp_gpio_cfg); - GPIO_RegisterCallback(&tmp_gpio_cfg, NULL, NULL); + GPIO_RegisterCallback(&tmp_gpio_cfg, RT_NULL, RT_NULL); return RT_EOK; } @@ -189,7 +189,7 @@ const static struct rt_pin_ops _mcu_pin_ops = mcu_pin_attach_irq, mcu_pin_dettach_irq, mcu_pin_irq_enable, - NULL, + RT_NULL, }; int rt_hw_pin_init(void) diff --git a/bsp/maxim/libraries/HAL_Drivers/drv_uart.c b/bsp/maxim/libraries/HAL_Drivers/drv_uart.c index 7e53800a3..2994a7ac2 100644 --- a/bsp/maxim/libraries/HAL_Drivers/drv_uart.c +++ b/bsp/maxim/libraries/HAL_Drivers/drv_uart.c @@ -241,7 +241,7 @@ int rt_hw_usart_init(void) RT_DEVICE_FLAG_RDWR | RT_DEVICE_FLAG_INT_RX | RT_DEVICE_FLAG_INT_TX - , NULL); + , RT_NULL); RT_ASSERT(result == RT_EOK); } diff --git a/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c b/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c index 7df6a2684..5b1141134 100644 --- a/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c +++ b/bsp/nuvoton/libraries/nu_packages/Demo/slcd_show_tick.c @@ -16,6 +16,7 @@ #include #include +#include #include "slcd_rhe6616tp01.h" diff --git a/bsp/raspberry-pi/raspi3-32/applications/test_device.c b/bsp/raspberry-pi/raspi3-32/applications/test_device.c index ec7e48021..ab78c1bb3 100644 --- a/bsp/raspberry-pi/raspi3-32/applications/test_device.c +++ b/bsp/raspberry-pi/raspi3-32/applications/test_device.c @@ -14,7 +14,8 @@ #include #include #include -#include "raspi.h" +#include +#include #ifdef BSP_USING_HDMI #include "drv_fb.h" @@ -368,7 +369,7 @@ int test_rtc(void) { #ifdef BSP_USING_RTC rt_kprintf("Hello Test RTC!\n"); - uint8_t i; + rt_uint8_t i; time_t now; rt_err_t ret = RT_EOK; diff --git a/bsp/raspberry-pi/raspi3-32/cpu/cp15.h b/bsp/raspberry-pi/raspi3-32/cpu/cp15.h index d8075c84d..9f1c4bb2a 100644 --- a/bsp/raspberry-pi/raspi3-32/cpu/cp15.h +++ b/bsp/raspberry-pi/raspi3-32/cpu/cp15.h @@ -142,7 +142,7 @@ static inline rt_uint32_t read_cntctrl(void) return val; } -static inline uint32_t write_cntctrl(uint32_t val) +static inline rt_uint32_t write_cntctrl(rt_uint32_t val) { asm volatile ("mcr p15, 0, %0, c14, c1, 0" : :"r"(val)); diff --git a/bsp/raspberry-pi/raspi3-32/cpu/interrupt.c b/bsp/raspberry-pi/raspi3-32/cpu/interrupt.c index 11cfdb3d2..7a0b9210e 100644 --- a/bsp/raspberry-pi/raspi3-32/cpu/interrupt.c +++ b/bsp/raspberry-pi/raspi3-32/cpu/interrupt.c @@ -66,7 +66,7 @@ void rt_hw_interrupt_init(void) for (index = 0; index < MAX_HANDLERS; index ++) { isr_table[index].handler = default_isr_handler; - isr_table[index].param = NULL; + isr_table[index].param = RT_NULL; #ifdef RT_USING_INTERRUPT_INFO rt_strncpy(isr_table[index].name, "unknown", RT_NAME_MAX); isr_table[index].counter = 0; diff --git a/components/drivers/hwcrypto/hw_gcm.h b/components/drivers/hwcrypto/hw_gcm.h index 3a2f87bc3..6c3470ec1 100644 --- a/components/drivers/hwcrypto/hw_gcm.h +++ b/components/drivers/hwcrypto/hw_gcm.h @@ -22,9 +22,9 @@ struct hwcrypto_gcm; struct hwcrypto_gcm_ops { rt_err_t (*start)(struct hwcrypto_gcm *gcm_ctx, - const unsigned char *add, size_t add_len); /**< Set additional data. start GCM operation */ + const unsigned char *add, rt_size_t add_len); /**< Set additional data. start GCM operation */ rt_err_t (*finish)(struct hwcrypto_gcm *gcm_ctx, - const unsigned char *tag, size_t tag_len); /**< finish GCM operation. get tag */ + const unsigned char *tag, rt_size_t tag_len); /**< finish GCM operation. get tag */ }; /** diff --git a/components/drivers/hwcrypto/hw_symmetric.c b/components/drivers/hwcrypto/hw_symmetric.c index 9398298fe..4a8237c46 100644 --- a/components/drivers/hwcrypto/hw_symmetric.c +++ b/components/drivers/hwcrypto/hw_symmetric.c @@ -66,7 +66,7 @@ rt_err_t rt_hwcrypto_symmetric_crypt(struct rt_hwcrypto_ctx *ctx, hwcrypto_mode } if (mode != HWCRYPTO_MODE_ENCRYPT && mode != HWCRYPTO_MODE_DECRYPT) { - return -EINVAL; + return -RT_EINVAL; } /* Input information packaging */ diff --git a/libcpu/arm/cortex-a/gicv3.c b/libcpu/arm/cortex-a/gicv3.c index a3fb0e767..ce9833ad0 100644 --- a/libcpu/arm/cortex-a/gicv3.c +++ b/libcpu/arm/cortex-a/gicv3.c @@ -187,7 +187,7 @@ void arm_gic_clear_pending_irq(rt_uint32_t index, int irq) } } -void arm_gic_set_configuration(rt_uint32_t index, int irq, uint32_t config) +void arm_gic_set_configuration(rt_uint32_t index, int irq, rt_uint32_t config) { rt_uint32_t icfgr; rt_uint32_t shift; @@ -428,8 +428,8 @@ rt_uint32_t arm_gic_get_interface_id(rt_uint32_t index) void arm_gic_set_group(rt_uint32_t index, int irq, rt_uint32_t group) { - uint32_t igroupr; - uint32_t shift; + rt_uint32_t igroupr; + rt_uint32_t shift; RT_ASSERT(index < ARM_GIC_MAX_NR); RT_ASSERT(group <= 1U); diff --git a/libcpu/arm/cortex-a/gicv3.h b/libcpu/arm/cortex-a/gicv3.h index 813a4f4c8..d37955287 100644 --- a/libcpu/arm/cortex-a/gicv3.h +++ b/libcpu/arm/cortex-a/gicv3.h @@ -151,7 +151,7 @@ rt_uint32_t arm_gic_get_pending_irq(rt_uint32_t index, int irq); void arm_gic_set_pending_irq(rt_uint32_t index, int irq); void arm_gic_clear_pending_irq(rt_uint32_t index, int irq); -void arm_gic_set_configuration(rt_uint32_t index, int irq, uint32_t config); +void arm_gic_set_configuration(rt_uint32_t index, int irq, rt_uint32_t config); rt_uint32_t arm_gic_get_configuration(rt_uint32_t index, int irq); void arm_gic_clear_active(rt_uint32_t index, int irq); diff --git a/src/thread.c b/src/thread.c index 0c7ae4bea..ab5264053 100644 --- a/src/thread.c +++ b/src/thread.c @@ -782,7 +782,7 @@ rt_err_t rt_thread_control(rt_thread_t thread, int cmd, void *arg) return RT_ERROR; } - cpu = (rt_uint8_t)(size_t)arg; + cpu = (rt_uint8_t)(rt_size_t)arg; thread->bind_cpu = cpu > RT_CPUS_NR? RT_CPUS_NR : cpu; break; } -- GitLab