diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_common.c b/bsp/Infineon/libraries/HAL_Drivers/drv_common.c index 8645c3e70c..fbab59c5a3 100644 --- a/bsp/Infineon/libraries/HAL_Drivers/drv_common.c +++ b/bsp/Infineon/libraries/HAL_Drivers/drv_common.c @@ -87,7 +87,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * this function will initial ifx board. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { cy_bsp_all_init(); diff --git a/bsp/Infineon/psoc6-pioneerkit_modus/drivers/board.c b/bsp/Infineon/psoc6-pioneerkit_modus/drivers/board.c index cba6511602..12bf0262de 100644 --- a/bsp/Infineon/psoc6-pioneerkit_modus/drivers/board.c +++ b/bsp/Infineon/psoc6-pioneerkit_modus/drivers/board.c @@ -10,7 +10,7 @@ #define configTOTAL_HEAP_SIZE (24*1024) /* Allocate the memory for the heap. */ -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static uint8_t ucHeap[ configTOTAL_HEAP_SIZE ]; /** * This is the timer interrupt service routine. diff --git a/bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c b/bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c index c9e1b184bd..0eef754311 100644 --- a/bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c +++ b/bsp/allwinner/d1s/ports/fal/fal_sd_sfud_port.c @@ -37,7 +37,7 @@ static int read(long offset, uint8_t *buf, size_t size) rt_size_t sector_offset; rt_size_t remain_size = size; rt_size_t req_size; - ALIGN(4) uint8_t buffer[SECTOR_SIZE]; + rt_align(4) uint8_t buffer[SECTOR_SIZE]; while (remain_size) { @@ -60,7 +60,7 @@ static int write(long offset, const uint8_t *buf, size_t size) rt_size_t sector_offset; rt_size_t remain_size = size; rt_size_t req_size; - ALIGN(4) uint8_t buffer[SECTOR_SIZE]; + rt_align(4) uint8_t buffer[SECTOR_SIZE]; while (remain_size) { diff --git a/bsp/allwinner/libraries/libos/src/os.c b/bsp/allwinner/libraries/libos/src/os.c index ff9f948b55..e3b4daa22e 100644 --- a/bsp/allwinner/libraries/libos/src/os.c +++ b/bsp/allwinner/libraries/libos/src/os.c @@ -58,7 +58,7 @@ static inline uint64_t arch_counter_get_cntpct(void) return cval; } -RT_WEAK int msleep(unsigned int msecs) +rt_weak int msleep(unsigned int msecs) { rt_thread_mdelay(msecs); return 0; @@ -76,7 +76,7 @@ void rt_hw_us_delay(rt_uint32_t us) while (arch_counter_get_cntpct() - start <= target) ; } -RT_WEAK int usleep(unsigned int usecs) +rt_weak int usleep(unsigned int usecs) { int tickDiv = 1000 * (1000 / CONFIG_HZ); int ticks = usecs / tickDiv; @@ -189,7 +189,7 @@ void awos_arch_flush_icache_all(void) rt_hw_cpu_icache_invalidate_all(); } -RT_WEAK int32_t hal_spi_gpio_cfg_count(const char *secname) +rt_weak int32_t hal_spi_gpio_cfg_count(const char *secname) { rt_kprintf("FUNCTION:%s not implemented.\n", __FUNCTION__); return 0; @@ -218,13 +218,13 @@ int32_t esCFG_GetGPIOSecKeyCount(char *GPIOSecName) return 0; } -RT_WEAK int hal_spi_gpio_cfg_load(user_gpio_set_t *gpio_cfg, int32_t GPIONum, int id) +rt_weak int hal_spi_gpio_cfg_load(user_gpio_set_t *gpio_cfg, int32_t GPIONum, int id) { rt_kprintf("FUNCTION:%s not implemented.\n", __FUNCTION__); return -1; } -RT_WEAK int hal_i2c_gpio_cfg_load(user_gpio_set_t *gpio_cfg, int32_t GPIONum, int id) +rt_weak int hal_i2c_gpio_cfg_load(user_gpio_set_t *gpio_cfg, int32_t GPIONum, int id) { rt_kprintf("FUNCTION:%s not implemented.\n", __FUNCTION__); return -1; diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/disp2/disp/dev_disp.c b/bsp/allwinner/libraries/sunxi-hal/hal/source/disp2/disp/dev_disp.c index 86740b958c..b7b6bf63ce 100644 --- a/bsp/allwinner/libraries/sunxi-hal/hal/source/disp2/disp/dev_disp.c +++ b/bsp/allwinner/libraries/sunxi-hal/hal/source/disp2/disp/dev_disp.c @@ -808,7 +808,7 @@ static s32 start_process(void) return 0; } -RT_WEAK s32 lcd_vsync_event_process(u32 sel) +rt_weak s32 lcd_vsync_event_process(u32 sel) { return 0; } diff --git a/bsp/allwinner/libraries/sunxi-hal/hal/source/uart/hal_uart.c b/bsp/allwinner/libraries/sunxi-hal/hal/source/uart/hal_uart.c index e7240848ba..8056279ef1 100644 --- a/bsp/allwinner/libraries/sunxi-hal/hal/source/uart/hal_uart.c +++ b/bsp/allwinner/libraries/sunxi-hal/hal/source/uart/hal_uart.c @@ -390,7 +390,7 @@ static void uart_handle_busy(uart_port_t uart_port) hal_writeb(uart_priv->mcr, uart_base + UART_MCR); } -RT_WEAK void hal_uart_handler_hook(uart_port_t uart_port) +rt_weak void hal_uart_handler_hook(uart_port_t uart_port) { } diff --git a/bsp/allwinner_tina/drivers/drv_sdio.c b/bsp/allwinner_tina/drivers/drv_sdio.c index f19cd60d5c..e7b0ccc521 100644 --- a/bsp/allwinner_tina/drivers/drv_sdio.c +++ b/bsp/allwinner_tina/drivers/drv_sdio.c @@ -62,7 +62,7 @@ struct sdio_drv #ifdef CONFIG_MMC_USE_DMA #ifdef TINA_USING_SDIO0 -ALIGN(32) static rt_uint8_t dma_buffer[64 * 1024]; +rt_align(32) static rt_uint8_t dma_buffer[64 * 1024]; #endif #endif @@ -125,7 +125,7 @@ static int mmc_update_clk(tina_mmc_t mmc) static rt_err_t mmc_trans_data_by_dma(tina_mmc_t mmc, struct mmc_xfe_des *xfe) { - ALIGN(32) static struct mmc_des_v4p1 pdes[128]; // mast ALIGN(32) + rt_align(32) static struct mmc_des_v4p1 pdes[128]; unsigned i, rval; unsigned des_idx; unsigned length = xfe->size * xfe->num; diff --git a/bsp/allwinner_tina/libcpu/cpu.c b/bsp/allwinner_tina/libcpu/cpu.c index 19baa4d9fe..459f19619f 100644 --- a/bsp/allwinner_tina/libcpu/cpu.c +++ b/bsp/allwinner_tina/libcpu/cpu.c @@ -11,14 +11,14 @@ #include #include -RT_WEAK void machine_reset(void) +rt_weak void machine_reset(void) { rt_kprintf("reboot system...\n"); rt_hw_interrupt_disable(); while (1); } -RT_WEAK void machine_shutdown(void) +rt_weak void machine_shutdown(void) { rt_kprintf("shutdown...\n"); rt_hw_interrupt_disable(); diff --git a/bsp/apm32/libraries/Drivers/drv_common.c b/bsp/apm32/libraries/Drivers/drv_common.c index 3395028375..0e62a55ccf 100644 --- a/bsp/apm32/libraries/Drivers/drv_common.c +++ b/bsp/apm32/libraries/Drivers/drv_common.c @@ -93,7 +93,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * This function will config the board for initialization. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { /* Systick initialization */ rt_hw_systick_init(); diff --git a/bsp/at32/libraries/rt_drivers/drv_common.c b/bsp/at32/libraries/rt_drivers/drv_common.c index 25ec5900e3..1ae3a11734 100644 --- a/bsp/at32/libraries/rt_drivers/drv_common.c +++ b/bsp/at32/libraries/rt_drivers/drv_common.c @@ -109,7 +109,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * this function will initial at32 board. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { /* system clock initialization */ system_clock_config(); diff --git a/bsp/at32/libraries/rt_drivers/drv_sdio.c b/bsp/at32/libraries/rt_drivers/drv_sdio.c index c10cde04ce..4127de5a7f 100644 --- a/bsp/at32/libraries/rt_drivers/drv_sdio.c +++ b/bsp/at32/libraries/rt_drivers/drv_sdio.c @@ -45,7 +45,7 @@ struct rt_hw_sdio struct sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; static rt_uint32_t at32_sdio_clk_get(struct at32_sdio *hw_sdio) diff --git a/bsp/at91/at91sam9g45/applications/application.c b/bsp/at91/at91sam9g45/applications/application.c index 6bc312b997..bae4b595a0 100644 --- a/bsp/at91/at91sam9g45/applications/application.c +++ b/bsp/at91/at91sam9g45/applications/application.c @@ -32,7 +32,7 @@ static int rt_led_app_init(void); -RT_WEAK int main(void) +rt_weak int main(void) { #ifdef RT_USING_SDIO int timeout = 0; diff --git a/bsp/bluetrum/ab32vg1-ab-prougen/README.md b/bsp/bluetrum/ab32vg1-ab-prougen/README.md index dc3d6c7798..0ee9aed81a 100644 --- a/bsp/bluetrum/ab32vg1-ab-prougen/README.md +++ b/bsp/bluetrum/ab32vg1-ab-prougen/README.md @@ -29,10 +29,10 @@ 所有在中断中使用的函数或数据需要放在 RAM 中，否则会导致系统运行报错。具体做法可以参考下面 ``` c -RT_SECTION(".irq.example.str") +rt_section(".irq.example.str") static const char example_info[] = "example 0x%x"; -RT_SECTION(".irq.example") +rt_section(".irq.example") void example_isr(void) { rt_kprintf(example_info, 11); diff --git a/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c b/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c index ac4381e99d..7d7a1dcd5b 100644 --- a/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c +++ b/bsp/bluetrum/ab32vg1-ab-prougen/board/board.c @@ -68,20 +68,20 @@ void hal_printf(const char *fmt, ...) } #endif -RT_SECTION(".irq") +rt_section(".irq") void os_interrupt_enter(void) { rt_interrupt_enter(); } -RT_SECTION(".irq") +rt_section(".irq") void os_interrupt_leave(void) { rt_interrupt_leave(); } typedef void (*isr_t)(void); -RT_SECTION(".irq") +rt_section(".irq") isr_t register_isr(int vector, isr_t isr) { char buf[8] = {0}; @@ -90,7 +90,7 @@ isr_t register_isr(int vector, isr_t isr) rt_hw_interrupt_install(vector, handle, RT_NULL, buf); } -RT_SECTION(".irq.timer") +rt_section(".irq.timer") void timer0_isr(int vector, void *param) { rt_interrupt_enter(); @@ -136,7 +136,7 @@ void hal_udelay(uint32_t nus) * * @param us microseconds. */ -RT_SECTION(".com_text") +rt_section(".com_text") void rt_hw_us_delay(rt_uint32_t us) { rt_uint32_t ticks; @@ -213,7 +213,7 @@ void rt_hw_board_init(void) #endif } -RT_SECTION(".irq.cache") +rt_section(".irq.cache") void cache_init(void) { os_cache_init(); @@ -221,7 +221,7 @@ void cache_init(void) rt_mutex_init(&mutex_cache, "cache_mutex", RT_IPC_FLAG_PRIO); } -RT_SECTION(".irq.cache") +rt_section(".irq.cache") void os_spiflash_lock(void) { if ((rt_thread_self() != RT_NULL) && (rt_interrupt_nest == 0)) @@ -230,7 +230,7 @@ void os_spiflash_lock(void) } } -RT_SECTION(".irq.cache") +rt_section(".irq.cache") void os_spiflash_unlock(void) { if ((rt_thread_self() != RT_NULL) && (rt_interrupt_nest == 0)) @@ -239,7 +239,7 @@ void os_spiflash_unlock(void) } } -RT_SECTION(".irq.cache") +rt_section(".irq.cache") void os_cache_lock(void) { if ((rt_thread_self() != RT_NULL) && (rt_interrupt_nest == 0)) @@ -248,7 +248,7 @@ void os_cache_lock(void) } } -RT_SECTION(".irq.cache") +rt_section(".irq.cache") void os_cache_unlock(void) { if ((rt_thread_self() != RT_NULL) && (rt_interrupt_nest == 0)) @@ -257,7 +257,7 @@ void os_cache_unlock(void) } } -RT_SECTION(".irq.err.str") +rt_section(".irq.err.str") static const char stack_info[] = "thread sp=0x%x name=%s"; void rt_hw_console_output(const char *str) @@ -271,7 +271,7 @@ void rt_hw_console_output(const char *str) * @note (IRQ in Flash: %x %x - %x %x\n, -, rt_interrupt_nest, PC, miss_addr) * miss_addr: The address in map file minus 0x10000000 */ -RT_SECTION(".irq.err") +rt_section(".irq.err") void exception_isr(void) { #if defined(RT_USING_FINSH) && defined(MSH_USING_BUILT_IN_COMMANDS) diff --git a/bsp/bluetrum/ab32vg1-ab-prougen/board/ports/audio/drv_sound.c b/bsp/bluetrum/ab32vg1-ab-prougen/board/ports/audio/drv_sound.c index e9b4496894..61670c93dc 100644 --- a/bsp/bluetrum/ab32vg1-ab-prougen/board/ports/audio/drv_sound.c +++ b/bsp/bluetrum/ab32vg1-ab-prougen/board/ports/audio/drv_sound.c @@ -109,7 +109,7 @@ void dac_start(void) //AUANGCON1 |= BIT(3); // pa mute } -RT_SECTION(".irq.audio") +rt_section(".irq.audio") void audio_sem_post(void) { rt_sem_release(snd_dev.semaphore); @@ -445,7 +445,7 @@ static struct rt_audio_ops ops = .buffer_info = sound_buffer_info, }; -RT_SECTION(".irq.audio") +rt_section(".irq.audio") static void audio_isr(int vector, void *param) { rt_interrupt_enter(); diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_common.c b/bsp/bluetrum/libraries/hal_drivers/drv_common.c index 7252050589..48248af6df 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_common.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_common.c @@ -16,21 +16,21 @@ static rt_mq_t drv_mq = RT_NULL; void uart0_irq_process(void); void uart1_irq_process(void); -RT_SECTION(".irq.uart") +rt_section(".irq.uart") void uart0_irq_post(void) { rt_uint8_t mq_msg = MSG_UART0_IRQ; rt_mq_send(drv_mq, &mq_msg, 1); } -RT_SECTION(".irq.uart") +rt_section(".irq.uart") void uart1_irq_post(void) { rt_uint8_t mq_msg = MSG_UART1_IRQ; rt_mq_send(drv_mq, &mq_msg, 1); } -RT_SECTION(".irq.uart") +rt_section(".irq.uart") void uart2_irq_post(void) { rt_uint8_t mq_msg = MSG_UART2_IRQ; diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_hwtimer.c b/bsp/bluetrum/libraries/hal_drivers/drv_hwtimer.c index 5d37f536de..ef925fa037 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_hwtimer.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_hwtimer.c @@ -68,7 +68,7 @@ static struct ab32_hwtimer ab32_hwtimer_obj[] = #endif }; -RT_SECTION(".irq.timer") +rt_section(".irq.timer") static void _rt_device_hwtimer_isr(rt_hwtimer_t *timer) { RT_ASSERT(timer != RT_NULL); @@ -216,7 +216,7 @@ static const struct rt_hwtimer_ops _ops = }; #if defined(BSP_USING_TIM2) || defined(BSP_USING_TIM4) || defined(BSP_USING_TIM5) -RT_SECTION(".irq.timer") +rt_section(".irq.timer") void timer2_4_5_isr(int vector, void *param) { rt_interrupt_enter(); @@ -243,7 +243,7 @@ void timer2_4_5_isr(int vector, void *param) #endif #ifdef BSP_USING_TIM3 -RT_SECTION(".irq.timer") +rt_section(".irq.timer") void timer3_isr(int vector, void *param) { rt_interrupt_enter(); @@ -254,7 +254,7 @@ void timer3_isr(int vector, void *param) #endif #ifdef BSP_USING_TIM1 -RT_SECTION(".irq.timer") +rt_section(".irq.timer") void timer1_isr(int vector, void *param) { rt_interrupt_enter(); diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_irrx.c b/bsp/bluetrum/libraries/hal_drivers/drv_irrx.c index e1e1a956c3..5464db5fbd 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_irrx.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_irrx.c @@ -57,7 +57,7 @@ static struct ab32_irrx_data _irrx = {0}; * @param addr inverted address Extended NEC: 16bits address * @param cmd inverted command */ -RT_SECTION(".irq.irrx") +rt_section(".irq.irrx") rt_uint8_t ab32_get_irkey(rt_uint16_t *addr, rt_uint16_t *cmd) { if (_irrx.cnt != 32) { @@ -82,7 +82,7 @@ void ab32_clr_irkey(void) } #ifdef BSP_USING_IRRX_HW -RT_SECTION(".irq.irrx") +rt_section(".irq.irrx") static void irrx_isr(int vector, void *param) { rt_interrupt_enter(); @@ -133,7 +133,7 @@ static void _irrx_hw_init(void) #define TMR3_RCLK (1000u) //xosc26m_div 1M -RT_SECTION(".irq.irrx") +rt_section(".irq.irrx") static void irrx_isr(int vector, void *param) { rt_uint32_t tmrcnt; diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c index 3a8461ab29..bae90100a9 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_sdio.c @@ -47,7 +47,7 @@ struct rthw_sdio struct sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; static rt_uint8_t sd_baud = 119; @@ -496,7 +496,7 @@ static rt_int32_t rthw_sd_detect(struct rt_mmcsd_host *host) * @param host rt_mmcsd_host * @retval None */ -RT_SECTION(".irq.sdio") +rt_section(".irq.sdio") void rthw_sdio_irq_process(struct rt_mmcsd_host *host) { int complete = 0; @@ -617,7 +617,7 @@ static rt_err_t _dma_rxconfig(rt_uint32_t *dst, int Size) return RT_EOK; } -RT_SECTION(".irq.sdio") +rt_section(".irq.sdio") void sdio_isr(int vector, void *param) { /* enter interrupt */ diff --git a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c index 8ccb61ac17..ab296274c5 100644 --- a/bsp/bluetrum/libraries/hal_drivers/drv_usart.c +++ b/bsp/bluetrum/libraries/hal_drivers/drv_usart.c @@ -233,7 +233,7 @@ void uart2_irq_process(void) } #endif -RT_SECTION(".irq.usart") +rt_section(".irq.usart") static void uart_isr(int vector, void *param) { rt_interrupt_enter(); @@ -267,7 +267,7 @@ static void uart_isr(int vector, void *param) } #ifdef HUART_ENABLE -RT_SECTION(".irq.huart") +rt_section(".irq.huart") void huart_timer_isr(void) { huart_if_rx_ovflow(); @@ -279,7 +279,7 @@ void huart_timer_isr(void) uart1_irq_post(); } #else -RT_SECTION(".irq.huart") +rt_section(".irq.huart") void huart_timer_isr(void) { } diff --git a/bsp/core-v-mcu/core-v-cv32e40p/applications/main.c b/bsp/core-v-mcu/core-v-cv32e40p/applications/main.c index d354be67f5..f8ae4e71d7 100644 --- a/bsp/core-v-mcu/core-v-cv32e40p/applications/main.c +++ b/bsp/core-v-mcu/core-v-cv32e40p/applications/main.c @@ -18,7 +18,7 @@ static struct rt_thread test1_thread; static rt_thread_t test2_thread = RT_NULL; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t rt_test1_thread_stack[1024]; static void test1_thread_entry(void* parameter); static void test2_thread_entry(void* parameter); diff --git a/bsp/dm365/applications/board.c b/bsp/dm365/applications/board.c index 2305587b80..fdc198449c 100644 --- a/bsp/dm365/applications/board.c +++ b/bsp/dm365/applications/board.c @@ -27,7 +27,7 @@ rt_uint8_t _fiq_stack_start[1024]; rt_uint8_t _undefined_stack_start[512]; rt_uint8_t _abort_stack_start[512]; - rt_uint8_t _svc_stack_start[1024] RT_SECTION(".nobss"); + rt_uint8_t _svc_stack_start[1024] rt_section(".nobss"); extern unsigned char __bss_start; extern unsigned char __bss_end; #endif diff --git a/bsp/essemi/es32f0654/drivers/drv_gpio.c b/bsp/essemi/es32f0654/drivers/drv_gpio.c index 8c828cdd63..1ac8b315f4 100644 --- a/bsp/essemi/es32f0654/drivers/drv_gpio.c +++ b/bsp/essemi/es32f0654/drivers/drv_gpio.c @@ -76,7 +76,7 @@ struct rt_pin_irq_hdr pin_irq_hdr_tab[] = #ifdef ES_CONF_EXTI_IRQ_0 -RT_WEAK void irq_pin0_callback(void* arg) +rt_weak void irq_pin0_callback(void* arg) { rt_kprintf("\r\nEXTI 0\r\n"); } @@ -84,7 +84,7 @@ RT_WEAK void irq_pin0_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_1 -RT_WEAK void irq_pin1_callback(void* arg) +rt_weak void irq_pin1_callback(void* arg) { rt_kprintf("\r\nEXTI 1\r\n"); } @@ -93,7 +93,7 @@ RT_WEAK void irq_pin1_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_2 - RT_WEAK void irq_pin2_callback(void* arg) + rt_weak void irq_pin2_callback(void* arg) { rt_kprintf("\r\nEXTI 2\r\n"); } @@ -102,7 +102,7 @@ RT_WEAK void irq_pin1_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_3 -RT_WEAK void irq_pin3_callback(void* arg) +rt_weak void irq_pin3_callback(void* arg) { rt_kprintf("\r\nEXTI 3\r\n"); } @@ -111,7 +111,7 @@ RT_WEAK void irq_pin3_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_4 -RT_WEAK void irq_pin4_callback(void* arg) +rt_weak void irq_pin4_callback(void* arg) { rt_kprintf("\r\nEXTI 4\r\n"); } @@ -120,7 +120,7 @@ RT_WEAK void irq_pin4_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_5 -RT_WEAK void irq_pin5_callback(void* arg) +rt_weak void irq_pin5_callback(void* arg) { rt_kprintf("\r\nEXTI 5\r\n"); } @@ -129,7 +129,7 @@ RT_WEAK void irq_pin5_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_6 -RT_WEAK void irq_pin6_callback(void* arg) +rt_weak void irq_pin6_callback(void* arg) { rt_kprintf("\r\nEXTI 6\r\n"); } @@ -138,7 +138,7 @@ RT_WEAK void irq_pin6_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_7 -RT_WEAK void irq_pin7_callback(void* arg) +rt_weak void irq_pin7_callback(void* arg) { rt_kprintf("\r\nEXTI 7\r\n"); } @@ -147,7 +147,7 @@ RT_WEAK void irq_pin7_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_8 -RT_WEAK void irq_pin8_callback(void* arg) +rt_weak void irq_pin8_callback(void* arg) { rt_kprintf("\r\nEXTI 8\r\n"); } @@ -156,7 +156,7 @@ RT_WEAK void irq_pin8_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_9 -RT_WEAK void irq_pin9_callback(void* arg) +rt_weak void irq_pin9_callback(void* arg) { rt_kprintf("\r\nEXTI 9\r\n"); } @@ -165,7 +165,7 @@ RT_WEAK void irq_pin9_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_10 -RT_WEAK void irq_pin10_callback(void* arg) +rt_weak void irq_pin10_callback(void* arg) { rt_kprintf("\r\nEXTI 10\r\n"); } @@ -174,7 +174,7 @@ RT_WEAK void irq_pin10_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_11 -RT_WEAK void irq_pin11_callback(void* arg) +rt_weak void irq_pin11_callback(void* arg) { rt_kprintf("\r\nEXTI 11\r\n"); } @@ -183,7 +183,7 @@ RT_WEAK void irq_pin11_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_12 -RT_WEAK void irq_pin12_callback(void* arg) +rt_weak void irq_pin12_callback(void* arg) { rt_kprintf("\r\nEXTI 12\r\n"); } @@ -192,7 +192,7 @@ RT_WEAK void irq_pin12_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_13 -RT_WEAK void irq_pin13_callback(void* arg) +rt_weak void irq_pin13_callback(void* arg) { rt_kprintf("\r\nEXTI 13\r\n"); } @@ -201,7 +201,7 @@ RT_WEAK void irq_pin13_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_14 -RT_WEAK void irq_pin14_callback(void* arg) +rt_weak void irq_pin14_callback(void* arg) { rt_kprintf("\r\nEXTI 14\r\n"); } @@ -210,7 +210,7 @@ RT_WEAK void irq_pin14_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_15 -RT_WEAK void irq_pin15_callback(void* arg) +rt_weak void irq_pin15_callback(void* arg) { rt_kprintf("\r\nEXTI 15\r\n"); } diff --git a/bsp/essemi/es32f369x/drivers/drv_gpio.c b/bsp/essemi/es32f369x/drivers/drv_gpio.c index 953bb00227..7945e78b81 100644 --- a/bsp/essemi/es32f369x/drivers/drv_gpio.c +++ b/bsp/essemi/es32f369x/drivers/drv_gpio.c @@ -77,7 +77,7 @@ struct rt_pin_irq_hdr pin_irq_hdr_tab[] = #ifdef ES_CONF_EXTI_IRQ_0 -RT_WEAK void irq_pin0_callback(void* arg) +rt_weak void irq_pin0_callback(void* arg) { rt_kprintf("\r\nEXTI 0\r\n"); } @@ -85,7 +85,7 @@ RT_WEAK void irq_pin0_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_1 -RT_WEAK void irq_pin1_callback(void* arg) +rt_weak void irq_pin1_callback(void* arg) { rt_kprintf("\r\nEXTI 1\r\n"); } @@ -94,7 +94,7 @@ RT_WEAK void irq_pin1_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_2 - RT_WEAK void irq_pin2_callback(void* arg) + rt_weak void irq_pin2_callback(void* arg) { rt_kprintf("\r\nEXTI 2\r\n"); } @@ -103,7 +103,7 @@ RT_WEAK void irq_pin1_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_3 -RT_WEAK void irq_pin3_callback(void* arg) +rt_weak void irq_pin3_callback(void* arg) { rt_kprintf("\r\nEXTI 3\r\n"); } @@ -112,7 +112,7 @@ RT_WEAK void irq_pin3_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_4 -RT_WEAK void irq_pin4_callback(void* arg) +rt_weak void irq_pin4_callback(void* arg) { rt_kprintf("\r\nEXTI 4\r\n"); } @@ -121,7 +121,7 @@ RT_WEAK void irq_pin4_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_5 -RT_WEAK void irq_pin5_callback(void* arg) +rt_weak void irq_pin5_callback(void* arg) { rt_kprintf("\r\nEXTI 5\r\n"); } @@ -130,7 +130,7 @@ RT_WEAK void irq_pin5_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_6 -RT_WEAK void irq_pin6_callback(void* arg) +rt_weak void irq_pin6_callback(void* arg) { rt_kprintf("\r\nEXTI 6\r\n"); } @@ -139,7 +139,7 @@ RT_WEAK void irq_pin6_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_7 -RT_WEAK void irq_pin7_callback(void* arg) +rt_weak void irq_pin7_callback(void* arg) { rt_kprintf("\r\nEXTI 7\r\n"); } @@ -148,7 +148,7 @@ RT_WEAK void irq_pin7_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_8 -RT_WEAK void irq_pin8_callback(void* arg) +rt_weak void irq_pin8_callback(void* arg) { rt_kprintf("\r\nEXTI 8\r\n"); } @@ -157,7 +157,7 @@ RT_WEAK void irq_pin8_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_9 -RT_WEAK void irq_pin9_callback(void* arg) +rt_weak void irq_pin9_callback(void* arg) { rt_kprintf("\r\nEXTI 9\r\n"); } @@ -166,7 +166,7 @@ RT_WEAK void irq_pin9_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_10 -RT_WEAK void irq_pin10_callback(void* arg) +rt_weak void irq_pin10_callback(void* arg) { rt_kprintf("\r\nEXTI 10\r\n"); } @@ -175,7 +175,7 @@ RT_WEAK void irq_pin10_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_11 -RT_WEAK void irq_pin11_callback(void* arg) +rt_weak void irq_pin11_callback(void* arg) { rt_kprintf("\r\nEXTI 11\r\n"); } @@ -184,7 +184,7 @@ RT_WEAK void irq_pin11_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_12 -RT_WEAK void irq_pin12_callback(void* arg) +rt_weak void irq_pin12_callback(void* arg) { rt_kprintf("\r\nEXTI 12\r\n"); } @@ -193,7 +193,7 @@ RT_WEAK void irq_pin12_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_13 -RT_WEAK void irq_pin13_callback(void* arg) +rt_weak void irq_pin13_callback(void* arg) { rt_kprintf("\r\nEXTI 13\r\n"); } @@ -202,7 +202,7 @@ RT_WEAK void irq_pin13_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_14 -RT_WEAK void irq_pin14_callback(void* arg) +rt_weak void irq_pin14_callback(void* arg) { rt_kprintf("\r\nEXTI 14\r\n"); } @@ -211,7 +211,7 @@ RT_WEAK void irq_pin14_callback(void* arg) #ifdef ES_CONF_EXTI_IRQ_15 -RT_WEAK void irq_pin15_callback(void* arg) +rt_weak void irq_pin15_callback(void* arg) { rt_kprintf("\r\nEXTI 15\r\n"); } diff --git a/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c b/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c index 28bc2be04d..14aa38b12c 100644 --- a/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c +++ b/bsp/fm33lc026/libraries/HAL_Drivers/drv_common.c @@ -90,7 +90,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * This function will initial STM32 board. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { void SelRCHFToPLL(uint32_t rchf, uint32_t clock); diff --git a/bsp/frdm-k64f/applications/application.c b/bsp/frdm-k64f/applications/application.c index 3d4448e2a5..796cef9659 100644 --- a/bsp/frdm-k64f/applications/application.c +++ b/bsp/frdm-k64f/applications/application.c @@ -35,7 +35,7 @@ float f_var2; float f_var3; float f_var4; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread_led1_stack[1024]; struct rt_thread thread_led1; static void rt_thread_entry_led1(void* parameter) diff --git a/bsp/frdm-k64f/board/drv_emac.c b/bsp/frdm-k64f/board/drv_emac.c index 6770b0d281..87b6c6c34d 100644 --- a/bsp/frdm-k64f/board/drv_emac.c +++ b/bsp/frdm-k64f/board/drv_emac.c @@ -52,10 +52,10 @@ struct emac_device /* inherit from Ethernet device */ struct eth_device parent; - ALIGN(64) enet_rx_bd_struct_t RxBuffDescrip[ENET_RX_RING_LEN]; - ALIGN(64) enet_tx_bd_struct_t TxBuffDescrip[ENET_TX_RING_LEN]; - ALIGN(64) uint8_t RxDataBuff[ENET_RX_RING_LEN * ENET_ALIGN(ENET_RXBUFF_SIZE)]; - ALIGN(64) uint8_t TxDataBuff[ENET_TX_RING_LEN * ENET_ALIGN(ENET_TXBUFF_SIZE)]; + rt_align(64) enet_rx_bd_struct_t RxBuffDescrip[ENET_RX_RING_LEN]; + rt_align(64) enet_tx_bd_struct_t TxBuffDescrip[ENET_TX_RING_LEN]; + rt_align(64) uint8_t RxDataBuff[ENET_RX_RING_LEN * ENET_ALIGN(ENET_RXBUFF_SIZE)]; + rt_align(64) uint8_t TxDataBuff[ENET_TX_RING_LEN * ENET_ALIGN(ENET_TXBUFF_SIZE)]; enet_handle_t enet_handle; rt_uint8_t dev_addr[MAX_ADDR_LEN]; /* MAC address */ diff --git a/bsp/ft2004/drivers/drv_sdctrl.c b/bsp/ft2004/drivers/drv_sdctrl.c index 6807c60020..a501e41aac 100644 --- a/bsp/ft2004/drivers/drv_sdctrl.c +++ b/bsp/ft2004/drivers/drv_sdctrl.c @@ -45,7 +45,7 @@ typedef struct ft_sdctrl_class_t sdctrl_class; -ALIGN(SDCTR_ALIGN_LEN) +rt_align(SDCTR_ALIGN_LEN) static rt_uint8_t cache_buf[SDCTR_BUFF_SIZE]; static void rthw_sdctrl_send_command(ft_sdctrl_class_t *class_p, struct mmcsd_pkg *pkg); diff --git a/bsp/ft32/ft32f072xb-starter/board/board.c b/bsp/ft32/ft32f072xb-starter/board/board.c index 378dda85d3..41b06ac6de 100644 --- a/bsp/ft32/ft32f072xb-starter/board/board.c +++ b/bsp/ft32/ft32f072xb-starter/board/board.c @@ -121,7 +121,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * This function will initial FT32 board. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { SysTick_Config(SystemCoreClock / RT_TICK_PER_SECOND); /* Heap initialization */ diff --git a/bsp/imxrt/libraries/drivers/drv_eth.c b/bsp/imxrt/libraries/drivers/drv_eth.c index 3d15bb5750..695e143d60 100644 --- a/bsp/imxrt/libraries/drivers/drv_eth.c +++ b/bsp/imxrt/libraries/drivers/drv_eth.c @@ -112,11 +112,11 @@ struct rt_imxrt_eth }; AT_NONCACHEABLE_SECTION_ALIGN(static enet_tx_bd_struct_t g_txBuffDescrip[ENET_TXBD_NUM], ENET_BUFF_ALIGNMENT); -ALIGN(ENET_BUFF_ALIGNMENT) +rt_align(ENET_BUFF_ALIGNMENT) rt_uint8_t g_txDataBuff[ENET_TXBD_NUM][RT_ALIGN(ENET_TXBUFF_SIZE, ENET_BUFF_ALIGNMENT)]; AT_NONCACHEABLE_SECTION_ALIGN(static enet_rx_bd_struct_t g_rxBuffDescrip[ENET_RXBD_NUM], ENET_BUFF_ALIGNMENT); -ALIGN(ENET_BUFF_ALIGNMENT) +rt_align(ENET_BUFF_ALIGNMENT) rt_uint8_t g_rxDataBuff[ENET_RXBD_NUM][RT_ALIGN(ENET_RXBUFF_SIZE, ENET_BUFF_ALIGNMENT)]; static struct rt_imxrt_eth imxrt_eth_device; diff --git a/bsp/imxrt/libraries/drivers/drv_sdio.c b/bsp/imxrt/libraries/drivers/drv_sdio.c index 9c756bba5a..6cd2817bcd 100644 --- a/bsp/imxrt/libraries/drivers/drv_sdio.c +++ b/bsp/imxrt/libraries/drivers/drv_sdio.c @@ -69,7 +69,7 @@ static int enable_log = 1; #define USDHC_ADMA2_ADDR_ALIGN (4U) /* define the ADMA2 descriptor table addr align size */ #endif -//ALIGN(USDHC_ADMA2_ADDR_ALIGN) uint32_t g_usdhcAdma2Table[USDHC_ADMA_TABLE_WORDS] SECTION("NonCacheable"); +//rt_align(USDHC_ADMA2_ADDR_ALIGN) uint32_t g_usdhcAdma2Table[USDHC_ADMA_TABLE_WORDS] SECTION("NonCacheable"); AT_NONCACHEABLE_SECTION_ALIGN(uint32_t g_usdhcAdma2Table[USDHC_ADMA_TABLE_WORDS], USDHC_ADMA2_ADDR_ALIGN); struct imxrt_mmcsd { diff --git a/bsp/k210/drivers/drv_uart.c b/bsp/k210/drivers/drv_uart.c index 612de48d71..c1e943d1e5 100644 --- a/bsp/k210/drivers/drv_uart.c +++ b/bsp/k210/drivers/drv_uart.c @@ -446,7 +446,7 @@ static void uart_irq_handler(int irqno, void *param) /* WEAK for SDK 0.5.6 */ -RT_WEAK void uart_debug_init(uart_device_number_t uart_channel) +rt_weak void uart_debug_init(uart_device_number_t uart_channel) { } diff --git a/bsp/loongson/ls1bdev/drivers/display_controller.c b/bsp/loongson/ls1bdev/drivers/display_controller.c index 5dba114b69..7120011df2 100644 --- a/bsp/loongson/ls1bdev/drivers/display_controller.c +++ b/bsp/loongson/ls1bdev/drivers/display_controller.c @@ -33,7 +33,7 @@ struct vga_struct vga_mode[] = {/*"1440x900_67.00"*/ 120280, 1440, 1528, 1680, 1920, 900, 901, 904, 935, }, }; -ALIGN(16) +rt_align(16) volatile rt_uint16_t _rt_framebuffer[FB_YSIZE][FB_XSIZE]; static struct rt_device_graphic_info _dc_info; diff --git a/bsp/loongson/ls1cdev/drivers/display_controller.c b/bsp/loongson/ls1cdev/drivers/display_controller.c index b1c9f59159..03a657b2d8 100644 --- a/bsp/loongson/ls1cdev/drivers/display_controller.c +++ b/bsp/loongson/ls1cdev/drivers/display_controller.c @@ -43,7 +43,7 @@ struct vga_struct vga_mode[] = static volatile int fb_index = 0; -ALIGN(16) +rt_align(16) volatile rt_uint16_t _rt_framebuffer[FB_YSIZE][FB_XSIZE]; volatile rt_uint16_t _rt_framebuffer0[FB_YSIZE][FB_XSIZE]; volatile rt_uint16_t _rt_framebuffer1[FB_YSIZE][FB_XSIZE]; diff --git a/bsp/lpc178x/applications/application.c b/bsp/lpc178x/applications/application.c index b4f437405b..a973f3f4eb 100644 --- a/bsp/lpc178x/applications/application.c +++ b/bsp/lpc178x/applications/application.c @@ -112,7 +112,7 @@ void rt_init_thread_entry(void *parameter) // trun off led n #define rt_hw_led_off(n) LPC_GPIO2->SET |= 1<<25; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread_led_stack[1024]; struct rt_thread thread_led; static void rt_thread_entry_led(void* parameter) diff --git a/bsp/lpc2148/applications/application.c b/bsp/lpc2148/applications/application.c index 731b30a510..e262f1b19d 100644 --- a/bsp/lpc2148/applications/application.c +++ b/bsp/lpc2148/applications/application.c @@ -96,7 +96,7 @@ void rt_init_thread_entry(void *parameter) #define LED3 (1<<18) //P1 #define LED4 (1<<19) //P1 -ALIGN(4) char thread_led1_stack[512]; +rt_align(4) char thread_led1_stack[512]; struct rt_thread thread_led1; void thread_led1_entry(void *parameter) { @@ -122,7 +122,7 @@ void thread_led1_entry(void *parameter) } } -ALIGN(4) char thread_led2_stack[512]; +rt_align(4) char thread_led2_stack[512]; struct rt_thread thread_led2; void thread_led2_entry(void *parameter) { diff --git a/bsp/lpc43xx/M0/applications/application.c b/bsp/lpc43xx/M0/applications/application.c index aec4550213..5ffbfe202a 100644 --- a/bsp/lpc43xx/M0/applications/application.c +++ b/bsp/lpc43xx/M0/applications/application.c @@ -39,7 +39,7 @@ void rt_init_thread_entry(void *parameter) } /*the led thread*/ -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t led_stack[1024]; static struct rt_thread led_thread; static void led_thread_entry(void *parameter) diff --git a/bsp/lpc43xx/M0/applications/vbus_drv.c b/bsp/lpc43xx/M0/applications/vbus_drv.c index 43b4b22aee..c905e98b5f 100644 --- a/bsp/lpc43xx/M0/applications/vbus_drv.c +++ b/bsp/lpc43xx/M0/applications/vbus_drv.c @@ -15,7 +15,7 @@ #include #include -struct rt_vbus_ring rt_vbus_rings[2] RT_SECTION("vbus_ring"); +struct rt_vbus_ring rt_vbus_rings[2] rt_section("vbus_ring"); int rt_vbus_do_init(void) { diff --git a/bsp/lpc43xx/M4/applications/application.c b/bsp/lpc43xx/M4/applications/application.c index 7f1a4e1fdb..4dd4cfb49f 100644 --- a/bsp/lpc43xx/M4/applications/application.c +++ b/bsp/lpc43xx/M4/applications/application.c @@ -22,7 +22,7 @@ #include #endif -static const unsigned char _M0_CODE[] RT_SECTION("M0_CODE") = { +static const unsigned char _M0_CODE[] rt_section("M0_CODE") = { #include "M0_CODE.h" }; @@ -72,7 +72,7 @@ void rt_init_thread_entry(void *parameter) } /*the led thread*/ -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t led_stack[ 512 ]; static struct rt_thread led_thread; static void led_thread_entry(void *parameter) diff --git a/bsp/lpc43xx/M4/applications/vbus_drv.c b/bsp/lpc43xx/M4/applications/vbus_drv.c index c2f41881a9..88750f37d9 100644 --- a/bsp/lpc43xx/M4/applications/vbus_drv.c +++ b/bsp/lpc43xx/M4/applications/vbus_drv.c @@ -15,7 +15,7 @@ #include #include -struct rt_vbus_ring rt_vbus_rings[2] RT_SECTION("vbus_ring"); +struct rt_vbus_ring rt_vbus_rings[2] rt_section("vbus_ring"); int rt_vbus_do_init(void) { diff --git a/bsp/lpc43xx/drivers/drv_emac.c b/bsp/lpc43xx/drivers/drv_emac.c index a2df5dfd4d..03c6321dbf 100644 --- a/bsp/lpc43xx/drivers/drv_emac.c +++ b/bsp/lpc43xx/drivers/drv_emac.c @@ -20,7 +20,7 @@ #define EMAC_PHY_100MBIT 2 #define MAX_ADDR_LEN 6 -static rt_uint32_t ETH_RAM_BASE[4 * 1024] RT_SECTION("ETH_RAM"); +static rt_uint32_t ETH_RAM_BASE[4 * 1024] rt_section("ETH_RAM"); /* EMAC variables located in 16K Ethernet SRAM */ #define RX_DESC_BASE (uint32_t)Ð_RAM_BASE[0] diff --git a/bsp/lpc824/applications/application.c b/bsp/lpc824/applications/application.c index ed7972b4d2..cc7731ca12 100644 --- a/bsp/lpc824/applications/application.c +++ b/bsp/lpc824/applications/application.c @@ -19,11 +19,11 @@ #ifndef RT_USING_HEAP /* if there is not enable heap, we should use static thread and stack. */ -ALIGN(8) +rt_align(8) static rt_uint8_t init_stack[INIT_STACK_SIZE]; static struct rt_thread init_thread; -ALIGN(8) +rt_align(8) static rt_uint8_t led_stack[LED_STACK_SIZE]; static struct rt_thread led_thread; #endif diff --git a/bsp/m16c62p/applications/application.c b/bsp/m16c62p/applications/application.c index 35eb423193..640130a818 100644 --- a/bsp/m16c62p/applications/application.c +++ b/bsp/m16c62p/applications/application.c @@ -17,7 +17,7 @@ static struct rt_thread led; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t led_stack[256]; static void rt_thread_entry_led(void *parameter) diff --git a/bsp/mini2440/drivers/board.c b/bsp/mini2440/drivers/board.c index d089d966ae..ed612dcf38 100644 --- a/bsp/mini2440/drivers/board.c +++ b/bsp/mini2440/drivers/board.c @@ -31,7 +31,7 @@ rt_uint8_t _fiq_stack_start[1024]; rt_uint8_t _undefined_stack_start[512]; rt_uint8_t _abort_stack_start[512]; - rt_uint8_t _svc_stack_start[4096] RT_SECTION(".nobss"); + rt_uint8_t _svc_stack_start[4096] rt_section(".nobss"); #endif #if defined(__CC_ARM) diff --git a/bsp/mm32/libraries/HAL_Drivers/drv_common.c b/bsp/mm32/libraries/HAL_Drivers/drv_common.c index ffd791a770..8bf7b692c3 100644 --- a/bsp/mm32/libraries/HAL_Drivers/drv_common.c +++ b/bsp/mm32/libraries/HAL_Drivers/drv_common.c @@ -121,7 +121,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * This function will initial STM32 board. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { #ifdef BSP_SCB_ENABLE_I_CACHE /* Enable I-Cache---------------------------------------------------------*/ diff --git a/bsp/nios_ii/application.c b/bsp/nios_ii/application.c index a8422dcc46..5929fff453 100644 --- a/bsp/nios_ii/application.c +++ b/bsp/nios_ii/application.c @@ -30,7 +30,7 @@ LED_BASE,\ IORD_ALTERA_AVALON_PIO_DATA(LED_BASE) & ~(1< static struct rt_thread usb_thread; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char usb_thread_stack[1024]; static struct rt_semaphore tx_sem_complete; diff --git a/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili_sample.c b/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili_sample.c index 4171831e67..700f774510 100644 --- a/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili_sample.c +++ b/bsp/nuvoton/libraries/nu_packages/ILI_TPC/ili_sample.c @@ -18,7 +18,7 @@ static rt_sem_t tpc_sem = RT_NULL; -RT_WEAK void nu_touch_inputevent_cb(rt_int16_t x, rt_int16_t y, rt_uint8_t state) +rt_weak void nu_touch_inputevent_cb(rt_int16_t x, rt_int16_t y, rt_uint8_t state) { rt_kprintf("[%d] %d %d\n", state, x, y); } diff --git a/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c b/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c index 88fc946fd3..6691230eaf 100644 --- a/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c +++ b/bsp/nuvoton/libraries/nu_packages/TPC/tpc_worker.c @@ -18,7 +18,7 @@ static rt_sem_t tpc_sem = RT_NULL; -RT_WEAK void nu_touch_inputevent_cb(rt_int16_t x, rt_int16_t y, rt_uint8_t state) +rt_weak void nu_touch_inputevent_cb(rt_int16_t x, rt_int16_t y, rt_uint8_t state) { rt_kprintf("[%d] %d %d\n", state, x, y); } diff --git a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_common.c b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_common.c index 39108514ea..11790226e5 100644 --- a/bsp/nuvoton/libraries/nuc980/rtt_port/drv_common.c +++ b/bsp/nuvoton/libraries/nuc980/rtt_port/drv_common.c @@ -30,7 +30,7 @@ static struct mem_desc hw_mem_desc[] = /** * This function will initial M487 board. */ -RT_WEAK void rt_hw_board_init(void) +rt_weak void rt_hw_board_init(void) { /* initialize base clock */ nu_clock_base_init(); diff --git a/bsp/pic32ethernet/application.c b/bsp/pic32ethernet/application.c index ae2238f60b..b876eca043 100644 --- a/bsp/pic32ethernet/application.c +++ b/bsp/pic32ethernet/application.c @@ -12,7 +12,7 @@ #include #include -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) int thread_led1_stack[512]; struct rt_thread thread_led1; void thread_led1_entry(void* parameter) diff --git a/bsp/qemu-virt64-aarch64/applications/graphic.c b/bsp/qemu-virt64-aarch64/applications/graphic.c index 933e970428..457c62cd25 100644 --- a/bsp/qemu-virt64-aarch64/applications/graphic.c +++ b/bsp/qemu-virt64-aarch64/applications/graphic.c @@ -24,7 +24,7 @@ static rt_uint32_t cur_points[2]; static rt_uint32_t cur_last_points[2]; static rt_bool_t cur_event_sync; static rt_uint32_t color[2] = { 0xff0000, 0x0000ff }; -static rt_uint8_t cursor[VIRTIO_GPU_CURSOR_IMG_SIZE] ALIGN(VIRTIO_PAGE_SIZE); +static rt_uint8_t cursor[VIRTIO_GPU_CURSOR_IMG_SIZE] rt_align(VIRTIO_PAGE_SIZE); void tablet_event_handler(struct virtio_input_event event) { diff --git a/bsp/qemu-virt64-riscv/driver/drv_uart.c b/bsp/qemu-virt64-riscv/driver/drv_uart.c index 627d51766c..d330b6eb9d 100644 --- a/bsp/qemu-virt64-riscv/driver/drv_uart.c +++ b/bsp/qemu-virt64-riscv/driver/drv_uart.c @@ -161,6 +161,6 @@ int rt_hw_uart_init(void) } /* WEAK for SDK 0.5.6 */ -RT_WEAK void uart_debug_init(int uart_channel) +rt_weak void uart_debug_init(int uart_channel) { } diff --git a/bsp/renesas/libraries/HAL_Drivers/drv_common.c b/bsp/renesas/libraries/HAL_Drivers/drv_common.c index 593cc78889..8435932922 100644 --- a/bsp/renesas/libraries/HAL_Drivers/drv_common.c +++ b/bsp/renesas/libraries/HAL_Drivers/drv_common.c @@ -109,7 +109,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * This function will initial STM32 board. */ -RT_WEAK void rt_hw_board_init() +rt_weak void rt_hw_board_init() { rt_hw_systick_init(); diff --git a/bsp/renesas/libraries/HAL_Drivers/drv_sdhi.c b/bsp/renesas/libraries/HAL_Drivers/drv_sdhi.c index 50f3404f32..89f9c24fc5 100644 --- a/bsp/renesas/libraries/HAL_Drivers/drv_sdhi.c +++ b/bsp/renesas/libraries/HAL_Drivers/drv_sdhi.c @@ -24,7 +24,7 @@ struct rthw_sdio static struct rt_mmcsd_host *host; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; rt_err_t command_send(sdhi_instance_ctrl_t *p_ctrl, struct rt_mmcsd_cmd *cmd) diff --git a/bsp/rockchip/common/drivers/drv_cache.c b/bsp/rockchip/common/drivers/drv_cache.c index 641d76d3da..ff0618ab00 100644 --- a/bsp/rockchip/common/drivers/drv_cache.c +++ b/bsp/rockchip/common/drivers/drv_cache.c @@ -248,37 +248,37 @@ int rt_hw_cpu_cache_init(void) #else -RT_WEAK void rt_hw_cpu_icache_enable(void) +rt_weak void rt_hw_cpu_icache_enable(void) { } -RT_WEAK void rt_hw_cpu_icache_disable(void) +rt_weak void rt_hw_cpu_icache_disable(void) { } -RT_WEAK rt_base_t rt_hw_cpu_icache_status(void) +rt_weak rt_base_t rt_hw_cpu_icache_status(void) { return 0; } -RT_WEAK void rt_hw_cpu_icache_ops(int ops, void *addr, int size) +rt_weak void rt_hw_cpu_icache_ops(int ops, void *addr, int size) { } -RT_WEAK void rt_hw_cpu_dcache_enable(void) +rt_weak void rt_hw_cpu_dcache_enable(void) { } -RT_WEAK void rt_hw_cpu_dcache_disable(void) +rt_weak void rt_hw_cpu_dcache_disable(void) { } -RT_WEAK rt_base_t rt_hw_cpu_dcache_status(void) +rt_weak rt_base_t rt_hw_cpu_dcache_status(void) { return 0; } -RT_WEAK void rt_hw_cpu_dcache_ops(int ops, void *addr, int size) +rt_weak void rt_hw_cpu_dcache_ops(int ops, void *addr, int size) { } diff --git a/bsp/rockchip/rk2108/board/common/board_base.c b/bsp/rockchip/rk2108/board/common/board_base.c index 1da53b7757..1478f597ff 100644 --- a/bsp/rockchip/rk2108/board/common/board_base.c +++ b/bsp/rockchip/rk2108/board/common/board_base.c @@ -36,7 +36,7 @@ #endif #ifdef RT_USING_CRU -RT_WEAK const struct clk_init clk_inits[] = +rt_weak const struct clk_init clk_inits[] = { INIT_CLK("SCLK_SHRM", SCLK_SHRM, 10 * MHZ), INIT_CLK("PCLK_SHRM", PCLK_SHRM, 10 * MHZ), @@ -63,7 +63,7 @@ RT_WEAK const struct clk_init clk_inits[] = { /* sentinel */ }, }; -RT_WEAK const struct clk_unused clks_unused[] = +rt_weak const struct clk_unused clks_unused[] = { {0, 0, 0x00030003}, {0, 5, 0x00ee00ee}, @@ -78,7 +78,7 @@ RT_WEAK const struct clk_unused clks_unused[] = #endif #if defined(RT_USING_UART0) -RT_WEAK const struct uart_board g_uart0_board = +rt_weak const struct uart_board g_uart0_board = { .baud_rate = ROCKCHIP_UART_BAUD_RATE_DEFAULT, .dev_flag = ROCKCHIP_UART_SUPPORT_FLAG_DEFAULT, @@ -88,7 +88,7 @@ RT_WEAK const struct uart_board g_uart0_board = #endif /* RT_USING_UART0 */ #if defined(RT_USING_UART1) -RT_WEAK const struct uart_board g_uart1_board = +rt_weak const struct uart_board g_uart1_board = { .baud_rate = ROCKCHIP_UART_BAUD_RATE_DEFAULT, .dev_flag = ROCKCHIP_UART_SUPPORT_FLAG_DEFAULT, @@ -98,7 +98,7 @@ RT_WEAK const struct uart_board g_uart1_board = #endif /* RT_USING_UART1 */ #if defined(RT_USING_UART2) -RT_WEAK const struct uart_board g_uart2_board = +rt_weak const struct uart_board g_uart2_board = { .baud_rate = ROCKCHIP_UART_BAUD_RATE_DEFAULT, .dev_flag = ROCKCHIP_UART_SUPPORT_FLAG_DEFAULT, @@ -108,7 +108,7 @@ RT_WEAK const struct uart_board g_uart2_board = #endif /* RT_USING_UART2 */ extern void SysTick_Handler(void); -RT_WEAK void tick_isr(int vector, void *param) +rt_weak void tick_isr(int vector, void *param) { /* enter interrupt */ rt_interrupt_enter(); diff --git a/bsp/rockchip/rk2108/board/common/iomux_base.c b/bsp/rockchip/rk2108/board/common/iomux_base.c index 0efb098c79..9ab2863072 100644 --- a/bsp/rockchip/rk2108/board/common/iomux_base.c +++ b/bsp/rockchip/rk2108/board/common/iomux_base.c @@ -15,7 +15,7 @@ /** * @brief Config iomux for M4 JTAG */ -RT_WEAK void m4_jtag_iomux_config(void) +rt_weak void m4_jtag_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK0, GPIO_PIN_C7 | // M4_JTAG_TCK @@ -26,7 +26,7 @@ RT_WEAK void m4_jtag_iomux_config(void) /** * @brief Config iomux for UART0 */ -RT_WEAK void uart0_iomux_config(void) +rt_weak void uart0_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK0, GPIO_PIN_C7 | // UART0_RX @@ -37,7 +37,7 @@ RT_WEAK void uart0_iomux_config(void) /** * @brief Config iomux for UART1 */ -RT_WEAK void uart1_m0_iomux_config(void) +rt_weak void uart1_m0_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK0, GPIO_PIN_D1 | // UART1_RX_M0 @@ -49,7 +49,7 @@ RT_WEAK void uart1_m0_iomux_config(void) (0 << GRF_SOC_CON5_GRF_CON_UART1_IOMUX_SEL_SHIFT)); } -RT_WEAK void uart1_m1_iomux_config(void) +rt_weak void uart1_m1_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK0, GPIO_PIN_A5 | // UART1_RX_M1 @@ -61,7 +61,7 @@ RT_WEAK void uart1_m1_iomux_config(void) (1 << GRF_SOC_CON5_GRF_CON_UART1_IOMUX_SEL_SHIFT)); } -RT_WEAK void uart1_m2_iomux_config(void) +rt_weak void uart1_m2_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK1, GPIO_PIN_B1 | // UART1_RX_M2 @@ -73,7 +73,7 @@ RT_WEAK void uart1_m2_iomux_config(void) (2 << GRF_SOC_CON5_GRF_CON_UART1_IOMUX_SEL_SHIFT)); } -RT_WEAK void uart1_m3_iomux_config(void) +rt_weak void uart1_m3_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK0, GPIO_PIN_A5, // UART1_RX_M3 @@ -91,7 +91,7 @@ RT_WEAK void uart1_m3_iomux_config(void) /** * @brief Config iomux for UART2 */ -RT_WEAK void uart2_iomux_config(void) +rt_weak void uart2_iomux_config(void) { HAL_PINCTRL_SetIOMUX(GPIO_BANK1, GPIO_PIN_A0 | // UART2_RX @@ -104,7 +104,7 @@ RT_WEAK void uart2_iomux_config(void) /** * @brief Config iomux for RK2108 */ -RT_WEAK void rt_hw_iomux_config(void) +rt_weak void rt_hw_iomux_config(void) { uart2_iomux_config(); diff --git a/bsp/rx/applications/application.c b/bsp/rx/applications/application.c index 0d8043de91..e942a5f170 100644 --- a/bsp/rx/applications/application.c +++ b/bsp/rx/applications/application.c @@ -172,7 +172,7 @@ void rt_init_thread_entry(void* parameter) -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t led_stack[ 512 ]; static struct rt_thread led_thread; static void led_thread_entry(void* parameter) diff --git a/bsp/sep6200/application/startup.c b/bsp/sep6200/application/startup.c index f2fd32532f..d724bc99dd 100644 --- a/bsp/sep6200/application/startup.c +++ b/bsp/sep6200/application/startup.c @@ -28,7 +28,7 @@ rt_uint8_t _irq_stack_start[1024]; rt_uint8_t _fiq_stack_start[1024]; rt_uint8_t _undefined_stack_start[512]; rt_uint8_t _abort_stack_start[512]; -rt_uint8_t _priv_stack_start[4096]; RT_SECTION(".nobss"); +rt_uint8_t _priv_stack_start[4096]; rt_section(".nobss"); extern unsigned char __bss_start; extern unsigned char __bss_end; diff --git a/bsp/smartfusion2/board/board.c b/bsp/smartfusion2/board/board.c index 0e2240cbdb..1e89ae588e 100644 --- a/bsp/smartfusion2/board/board.c +++ b/bsp/smartfusion2/board/board.c @@ -40,12 +40,12 @@ static uint32_t _SysTick_Config(rt_uint32_t ticks) #if defined(RT_USING_USER_MAIN) && defined(RT_USING_HEAP) #define RT_HEAP_SIZE 1024 static uint32_t rt_heap[RT_HEAP_SIZE]; // heap default size: 4K(1024 * 4) -RT_WEAK void *rt_heap_begin_get(void) +rt_weak void *rt_heap_begin_get(void) { return rt_heap; } -RT_WEAK void *rt_heap_end_get(void) +rt_weak void *rt_heap_end_get(void) { return rt_heap + RT_HEAP_SIZE; } diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_common.c b/bsp/stm32/libraries/HAL_Drivers/drv_common.c index 07ac15297e..0dfffda874 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_common.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_common.c @@ -164,7 +164,7 @@ void rt_hw_us_delay(rt_uint32_t us) /** * This function will initial STM32 board. */ -RT_WEAK void rt_hw_board_init(void) +rt_weak void rt_hw_board_init(void) { #ifdef BSP_SCB_ENABLE_I_CACHE /* Enable I-Cache---------------------------------------------------------*/ diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_lcd_mipi.c b/bsp/stm32/libraries/HAL_Drivers/drv_lcd_mipi.c index e3bb847c5c..e82492e641 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_lcd_mipi.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_lcd_mipi.c @@ -231,22 +231,22 @@ int rt_hw_lcd_init(void) INIT_DEVICE_EXPORT(rt_hw_lcd_init); -RT_WEAK void stm32_mipi_lcd_init(void) +rt_weak void stm32_mipi_lcd_init(void) { rt_kprintf("please Implementation function %s\n", __func__); } -RT_WEAK void stm32_mipi_lcd_config(rt_uint32_t pixel_format) +rt_weak void stm32_mipi_lcd_config(rt_uint32_t pixel_format) { rt_kprintf("please Implementation function %s\n", __func__); } -RT_WEAK void stm32_mipi_display_on(void) +rt_weak void stm32_mipi_display_on(void) { rt_kprintf("please Implementation function %s\n", __func__); } -RT_WEAK void stm32_mipi_display_off(void) +rt_weak void stm32_mipi_display_off(void) { rt_kprintf("please Implementation function %s\n", __func__); } diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_rtc.c b/bsp/stm32/libraries/HAL_Drivers/drv_rtc.c index 1e1a5ad205..8f824637cb 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_rtc.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_rtc.c @@ -43,12 +43,12 @@ static RTC_AlarmTypeDef Alarm_InitStruct = { 0 }; static struct rtc_device_object rtc_device; static RTC_HandleTypeDef RTC_Handler; -RT_WEAK uint32_t HAL_RTCEx_BKUPRead(RTC_HandleTypeDef *hrtc, uint32_t BackupRegister) +rt_weak uint32_t HAL_RTCEx_BKUPRead(RTC_HandleTypeDef *hrtc, uint32_t BackupRegister) { return (~BKUP_REG_DATA); } -RT_WEAK void HAL_RTCEx_BKUPWrite(RTC_HandleTypeDef *hrtc, uint32_t BackupRegister, uint32_t Data) +rt_weak void HAL_RTCEx_BKUPWrite(RTC_HandleTypeDef *hrtc, uint32_t BackupRegister, uint32_t Data) { return; } diff --git a/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c b/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c index 0eb1e9479a..b38adf9f77 100644 --- a/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c +++ b/bsp/stm32/libraries/HAL_Drivers/drv_sdio.c @@ -46,7 +46,7 @@ struct rthw_sdio struct sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; static rt_uint32_t stm32_sdio_clk_get(struct stm32_sdio *hw_sdio) diff --git a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.c b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.c index a2789227a6..545b32a4cd 100644 --- a/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.c +++ b/bsp/stm32/stm32h743-atk-apollo/board/ports/drv_sdio.c @@ -40,7 +40,7 @@ struct rthw_sdio struct sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; /** diff --git a/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.c b/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.c index 838331bd44..617c718a14 100644 --- a/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.c +++ b/bsp/stm32/stm32h743-openmv-h7plus/board/ports/drv_sdio.c @@ -41,7 +41,7 @@ struct rthw_sdio struct sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; /** diff --git a/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.c b/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.c index 6867909f89..bc20457483 100644 --- a/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.c +++ b/bsp/stm32/stm32h750-artpi/board/port/drv_sdio.c @@ -46,7 +46,7 @@ struct rthw_sdio struct sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; /** diff --git a/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c b/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c index 4393c9ea1c..06b9d47eb0 100644 --- a/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c +++ b/bsp/stm32/stm32h750-artpi/board/port/drv_wlan.c @@ -36,7 +36,7 @@ extern int wifi_hw_init(void); static rt_bool_t init_flag = 0; static const struct fal_partition *partition = RT_NULL; -ALIGN(64) +rt_align(64) static const char wifi_nvram_image[] = // # The following parameter values are just placeholders, need to be updated. "manfid=0x2d0" "\x00" diff --git a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_mfx.c b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_mfx.c index c92145f378..da64dd58b2 100644 --- a/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_mfx.c +++ b/bsp/stm32/stm32mp157a-st-ev1/board/ports/drv_mfx.c @@ -129,16 +129,16 @@ rt_uint16_t MFX_IO_ReadMultiple(rt_uint16_t Addr, rt_uint8_t Reg, rt_uint8_t *Bu return read_reg(rt_mfx.i2c_bus, Reg, Length, Buffer); } -RT_WEAK void MFX_IO_Delay(rt_uint32_t Delay) +rt_weak void MFX_IO_Delay(rt_uint32_t Delay) { rt_thread_delay(Delay); } -RT_WEAK void MFX_IO_Wakeup(void) +rt_weak void MFX_IO_Wakeup(void) { } -RT_WEAK void MFX_IO_EnableWakeupPin(void) +rt_weak void MFX_IO_EnableWakeupPin(void) { } diff --git a/bsp/synwit/swm320/drivers/drv_sdio.c b/bsp/synwit/swm320/drivers/drv_sdio.c index d1ab73016b..7547d6f305 100644 --- a/bsp/synwit/swm320/drivers/drv_sdio.c +++ b/bsp/synwit/swm320/drivers/drv_sdio.c @@ -57,7 +57,7 @@ struct swm_sdio_device struct swm_sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; /** diff --git a/bsp/synwit/swm341/drivers/drv_sdio.c b/bsp/synwit/swm341/drivers/drv_sdio.c index 84148f0bf9..6c4eab4a10 100644 --- a/bsp/synwit/swm341/drivers/drv_sdio.c +++ b/bsp/synwit/swm341/drivers/drv_sdio.c @@ -57,7 +57,7 @@ struct swm_sdio_device struct swm_sdio_pkg *pkg; }; -ALIGN(SDIO_ALIGN_LEN) +rt_align(SDIO_ALIGN_LEN) static rt_uint8_t cache_buf[SDIO_BUFF_SIZE]; /** diff --git a/bsp/tae32f5300/board/board.c b/bsp/tae32f5300/board/board.c index 7e37e46d05..0719e297b5 100644 --- a/bsp/tae32f5300/board/board.c +++ b/bsp/tae32f5300/board/board.c @@ -34,12 +34,12 @@ static uint32_t _SysTick_Config(rt_uint32_t ticks) #if defined(RT_USING_USER_MAIN) && defined(RT_USING_HEAP) #define RT_HEAP_SIZE 2048 static uint32_t rt_heap[RT_HEAP_SIZE];/* heap default size: 4K(1024 * 4)*/ -RT_WEAK void *rt_heap_begin_get(void) +rt_weak void *rt_heap_begin_get(void) { return rt_heap; } -RT_WEAK void *rt_heap_end_get(void) +rt_weak void *rt_heap_end_get(void) { return rt_heap + RT_HEAP_SIZE; } diff --git a/bsp/taihu/applications/application.c b/bsp/taihu/applications/application.c index ed1f5aceb9..a6c1c93502 100644 --- a/bsp/taihu/applications/application.c +++ b/bsp/taihu/applications/application.c @@ -15,10 +15,10 @@ #if 0 struct rt_semaphore sem1, sem2; static struct rt_thread thread1; -ALIGN(4) +rt_align(4) static rt_uint8_t thread1_stack[THREAD_STACK_SIZE]; static struct rt_thread thread2; -ALIGN(4) +rt_align(4) static rt_uint8_t thread2_stack[THREAD_STACK_SIZE]; static void thread1_entry(void* parameter) @@ -64,7 +64,7 @@ int rt_application_init() } #else static struct rt_thread thread1; -ALIGN(4) +rt_align(4) static rt_uint8_t thread1_stack[THREAD_STACK_SIZE]; rt_timer_t ttimer; diff --git a/bsp/upd70f3454/applications/application.c b/bsp/upd70f3454/applications/application.c index 65f203a96c..04b9aef37b 100644 --- a/bsp/upd70f3454/applications/application.c +++ b/bsp/upd70f3454/applications/application.c @@ -24,7 +24,7 @@ static struct rt_thread led; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t led_stack[256]; static void rt_thread_entry_led(void *parameter) diff --git a/bsp/wch/risc-v/Libraries/ch32_drivers/drv_can.c b/bsp/wch/risc-v/Libraries/ch32_drivers/drv_can.c index 5fdb561d46..5bd749f906 100644 --- a/bsp/wch/risc-v/Libraries/ch32_drivers/drv_can.c +++ b/bsp/wch/risc-v/Libraries/ch32_drivers/drv_can.c @@ -100,7 +100,7 @@ static struct ch32v307x_can_obj drv_can2 = #endif #ifdef BSP_USING_CAN -RT_WEAK void ch32v307x_can_gpio_init(CAN_TypeDef *can_base) +rt_weak void ch32v307x_can_gpio_init(CAN_TypeDef *can_base) { GPIO_InitTypeDef GPIO_InitSturcture={0}; #ifdef BSP_USING_CAN1 diff --git a/bsp/wch/risc-v/ch32v103r-evt/board/board.c b/bsp/wch/risc-v/ch32v103r-evt/board/board.c index 48d9a99459..50b95a7576 100644 --- a/bsp/wch/risc-v/ch32v103r-evt/board/board.c +++ b/bsp/wch/risc-v/ch32v103r-evt/board/board.c @@ -53,12 +53,12 @@ static uint32_t _SysTick_Config(rt_uint32_t ticks) #define RT_HEAP_SIZE (1024) /* heap default size: 4K(1024 * 4) */ static uint32_t rt_heap[RT_HEAP_SIZE]; -RT_WEAK void *rt_heap_begin_get(void) +rt_weak void *rt_heap_begin_get(void) { return rt_heap; } -RT_WEAK void *rt_heap_end_get(void) +rt_weak void *rt_heap_end_get(void) { return rt_heap + RT_HEAP_SIZE; } diff --git a/bsp/wch/risc-v/ch32v307v-r1/board/board.c b/bsp/wch/risc-v/ch32v307v-r1/board/board.c index 184fd59849..399c957846 100644 --- a/bsp/wch/risc-v/ch32v307v-r1/board/board.c +++ b/bsp/wch/risc-v/ch32v307v-r1/board/board.c @@ -33,12 +33,12 @@ static uint32_t _SysTick_Config(rt_uint32_t ticks) #if defined(RT_USING_USER_MAIN) && defined(RT_USING_HEAP) #define RT_HEAP_SIZE (4096) static uint32_t rt_heap[RT_HEAP_SIZE]; -RT_WEAK void *rt_heap_begin_get(void) +rt_weak void *rt_heap_begin_get(void) { return rt_heap; } -RT_WEAK void *rt_heap_end_get(void) +rt_weak void *rt_heap_end_get(void) { return rt_heap + RT_HEAP_SIZE; } diff --git a/bsp/xplorer4330/applications/application.c b/bsp/xplorer4330/applications/application.c index d475d76a4b..4721f7bd8b 100644 --- a/bsp/xplorer4330/applications/application.c +++ b/bsp/xplorer4330/applications/application.c @@ -29,7 +29,7 @@ void rt_init_thread_entry(void *parameter) #endif } /*the led thread*/ -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t led_stack[ 512 ]; static struct rt_thread led_thread; static void led_thread_entry(void *parameter) diff --git a/components/dfs/filesystems/romfs/romfs.c b/components/dfs/filesystems/romfs/romfs.c index 6897c23d5c..0ca17766c8 100644 --- a/components/dfs/filesystems/romfs/romfs.c +++ b/components/dfs/filesystems/romfs/romfs.c @@ -25,13 +25,13 @@ static const unsigned char _dummy_txt[] = 0x74, 0x68, 0x69, 0x73, 0x20, 0x69, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x21, 0x0d, 0x0a, }; -RT_WEAK const struct romfs_dirent _root_dirent[] = +rt_weak const struct romfs_dirent _root_dirent[] = { {ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy) / sizeof(_dummy[0])}, {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)}, }; -RT_WEAK const struct romfs_dirent romfs_root = +rt_weak const struct romfs_dirent romfs_root = { ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent) / sizeof(_root_dirent[0]) }; diff --git a/components/drivers/pm/pm.c b/components/drivers/pm/pm.c index b4dee11e41..0c6dcf065d 100644 --- a/components/drivers/pm/pm.c +++ b/components/drivers/pm/pm.c @@ -64,12 +64,12 @@ static rt_uint8_t _pm_default_deepsleep = RT_PM_DEFAULT_DEEPSLEEP_MODE; static struct rt_pm_notify _pm_notify; static rt_uint8_t _pm_init_flag = 0; -RT_WEAK rt_uint32_t rt_pm_enter_critical(rt_uint8_t sleep_mode) +rt_weak rt_uint32_t rt_pm_enter_critical(rt_uint8_t sleep_mode) { return rt_hw_interrupt_disable(); } -RT_WEAK void rt_pm_exit_critical(rt_uint32_t ctx, rt_uint8_t sleep_mode) +rt_weak void rt_pm_exit_critical(rt_uint32_t ctx, rt_uint8_t sleep_mode) { rt_hw_interrupt_enable(ctx); } @@ -288,7 +288,7 @@ static rt_bool_t _pm_device_check_idle(void) return RT_TRUE; } -RT_WEAK rt_tick_t pm_timer_next_timeout_tick(rt_uint8_t mode) +rt_weak rt_tick_t pm_timer_next_timeout_tick(rt_uint8_t mode) { switch (mode) { @@ -310,7 +310,7 @@ RT_WEAK rt_tick_t pm_timer_next_timeout_tick(rt_uint8_t mode) * * @return none */ -RT_WEAK rt_uint8_t pm_get_sleep_threshold_mode(rt_uint8_t cur_mode, rt_tick_t timeout_tick) +rt_weak rt_uint8_t pm_get_sleep_threshold_mode(rt_uint8_t cur_mode, rt_tick_t timeout_tick) { rt_uint8_t sleep_mode = cur_mode; diff --git a/components/drivers/spi/spi_wifi_rw009.c b/components/drivers/spi/spi_wifi_rw009.c index 20dd6d7f93..39388f10c4 100644 --- a/components/drivers/spi/spi_wifi_rw009.c +++ b/components/drivers/spi/spi_wifi_rw009.c @@ -68,12 +68,12 @@ struct rw009_wifi struct rt_mailbox rw009_cmd_mb; uint32_t last_cmd; - ALIGN(4) + rt_align(4) rt_uint8_t spi_tx_mempool[(sizeof(struct spi_data_packet) + 4) * SPI_TX_POOL_SIZE]; - ALIGN(4) + rt_align(4) rt_uint8_t spi_rx_mempool[(sizeof(struct spi_data_packet) + 4) * SPI_RX_POOL_SIZE]; - ALIGN(4) + rt_align(4) uint8_t spi_hw_rx_buffer[MAX_SPI_BUFFER_SIZE]; /* status for RW009 */ diff --git a/components/drivers/usb/usbdevice/class/audio_mic.c b/components/drivers/usb/usbdevice/class/audio_mic.c index 81170b8a72..afedf2ef2d 100644 --- a/components/drivers/usb/usbdevice/class/audio_mic.c +++ b/components/drivers/usb/usbdevice/class/audio_mic.c @@ -88,7 +88,7 @@ struct uac_audio_mic }; static struct uac_audio_mic mic; -ALIGN(4) +rt_align(4) static struct udevice_descriptor dev_desc = { USB_DESC_LENGTH_DEVICE, //bLength; @@ -108,7 +108,7 @@ static struct udevice_descriptor dev_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -122,7 +122,7 @@ static struct usb_qualifier_descriptor dev_qualifier = 0, }; -ALIGN(4) +rt_align(4) const static char *_ustring[] = { "Language", @@ -133,7 +133,7 @@ const static char *_ustring[] = "Interface", }; -ALIGN(4) +rt_align(4) static struct uac_ac_descriptor ac_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -214,7 +214,7 @@ static struct uac_ac_descriptor ac_desc = #endif }; -ALIGN(4) +rt_align(4) static struct uinterface_descriptor as_desc0 = { USB_DESC_LENGTH_INTERFACE, @@ -228,7 +228,7 @@ static struct uinterface_descriptor as_desc0 = 0x00, }; -ALIGN(4) +rt_align(4) static struct uac_as_descriptor as_desc = { /* Interface Descriptor */ diff --git a/components/drivers/usb/usbdevice/class/audio_speaker.c b/components/drivers/usb/usbdevice/class/audio_speaker.c index 6148478c02..67da8105e4 100644 --- a/components/drivers/usb/usbdevice/class/audio_speaker.c +++ b/components/drivers/usb/usbdevice/class/audio_speaker.c @@ -89,7 +89,7 @@ struct uac_audio_speaker }; static struct uac_audio_speaker speaker; -ALIGN(4) +rt_align(4) static struct udevice_descriptor dev_desc = { USB_DESC_LENGTH_DEVICE, //bLength; @@ -109,7 +109,7 @@ static struct udevice_descriptor dev_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -123,7 +123,7 @@ static struct usb_qualifier_descriptor dev_qualifier = 0, }; -ALIGN(4) +rt_align(4) const static char *_ustring[] = { "Language", @@ -134,7 +134,7 @@ const static char *_ustring[] = "Interface", }; -ALIGN(4) +rt_align(4) static struct uac_ac_descriptor ac_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -214,7 +214,7 @@ static struct uac_ac_descriptor ac_desc = #endif }; -ALIGN(4) +rt_align(4) static struct uinterface_descriptor as_desc0 = { USB_DESC_LENGTH_INTERFACE, @@ -228,7 +228,7 @@ static struct uinterface_descriptor as_desc0 = 0x00, }; -ALIGN(4) +rt_align(4) static struct uac_as_descriptor as_desc = { /* Interface Descriptor */ diff --git a/components/drivers/usb/usbdevice/class/cdc_vcom.c b/components/drivers/usb/usbdevice/class/cdc_vcom.c index 91b49d47de..8eacd9248d 100644 --- a/components/drivers/usb/usbdevice/class/cdc_vcom.c +++ b/components/drivers/usb/usbdevice/class/cdc_vcom.c @@ -57,7 +57,7 @@ #define _SER_NO_LEN 14 /*rt_strlen("32021919830108")*/ #endif /*RT_VCOM_SER_LEN*/ -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t vcom_thread_stack[VCOM_TASK_STK_SIZE]; static struct rt_thread vcom_thread; static struct ucdc_line_coding line_coding; @@ -91,7 +91,7 @@ struct vcom_tx_msg rt_size_t size; }; -ALIGN(4) +rt_align(4) static struct udevice_descriptor dev_desc = { USB_DESC_LENGTH_DEVICE, //bLength; @@ -111,7 +111,7 @@ static struct udevice_descriptor dev_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -126,7 +126,7 @@ static struct usb_qualifier_descriptor dev_qualifier = }; /* communcation interface descriptor */ -ALIGN(4) +rt_align(4) const static struct ucdc_comm_descriptor _comm_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -200,7 +200,7 @@ const static struct ucdc_comm_descriptor _comm_desc = }; /* data interface descriptor */ -ALIGN(4) +rt_align(4) const static struct ucdc_data_descriptor _data_desc = { /* interface descriptor */ @@ -234,15 +234,15 @@ const static struct ucdc_data_descriptor _data_desc = 0x00, }, }; -ALIGN(4) +rt_align(4) static char serno[_SER_NO_LEN + 1] = {'\0'}; -RT_WEAK rt_err_t vcom_get_stored_serno(char *serno, int size); +rt_weak rt_err_t vcom_get_stored_serno(char *serno, int size); rt_err_t vcom_get_stored_serno(char *serno, int size) { return RT_ERROR; } -ALIGN(4) +rt_align(4) const static char* _ustring[] = { "Language", diff --git a/components/drivers/usb/usbdevice/class/ecm.c b/components/drivers/usb/usbdevice/class/ecm.c index 575da357e5..4f41c00531 100644 --- a/components/drivers/usb/usbdevice/class/ecm.c +++ b/components/drivers/usb/usbdevice/class/ecm.c @@ -36,13 +36,13 @@ struct rt_ecm_eth rt_uint8_t host_addr[MAX_ADDR_LEN]; rt_uint8_t dev_addr[MAX_ADDR_LEN]; - ALIGN(4) + rt_align(4) rt_uint8_t rx_pool[512]; - ALIGN(4) + rt_align(4) rt_size_t rx_size; - ALIGN(4) + rt_align(4) rt_size_t rx_offset; - ALIGN(4) + rt_align(4) char rx_buffer[USB_ETH_MTU]; char tx_buffer[USB_ETH_MTU]; @@ -51,7 +51,7 @@ struct rt_ecm_eth }; typedef struct rt_ecm_eth * rt_ecm_eth_t; -ALIGN(4) +rt_align(4) static struct udevice_descriptor _dev_desc = { USB_DESC_LENGTH_DEVICE, /* bLength */ @@ -71,7 +71,7 @@ static struct udevice_descriptor _dev_desc = }; /* communcation interface descriptor */ -ALIGN(4) +rt_align(4) const static struct ucdc_eth_descriptor _comm_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -141,7 +141,7 @@ const static struct ucdc_eth_descriptor _comm_desc = }; /* data interface descriptor */ -ALIGN(4) +rt_align(4) const static struct ucdc_data_descriptor _data_desc = { /* interface descriptor */ @@ -176,7 +176,7 @@ const static struct ucdc_data_descriptor _data_desc = }, }; -ALIGN(4) +rt_align(4) const static char* _ustring[] = { "Language", /* LANGID */ @@ -187,7 +187,7 @@ const static char* _ustring[] = "Interface", /* INTERFACE */ }; -ALIGN(4) +rt_align(4) //FS and HS needed static struct usb_qualifier_descriptor dev_qualifier = { diff --git a/components/drivers/usb/usbdevice/class/hid.c b/components/drivers/usb/usbdevice/class/hid.c index aa8877e471..a95e1d82e5 100644 --- a/components/drivers/usb/usbdevice/class/hid.c +++ b/components/drivers/usb/usbdevice/class/hid.c @@ -31,7 +31,7 @@ struct hid_s }; /* CustomHID_ConfigDescriptor */ -ALIGN(4) +rt_align(4) const rt_uint8_t _report_desc[]= { #ifdef RT_USB_DEVICE_HID_KEYBOARD @@ -236,7 +236,7 @@ const rt_uint8_t _report_desc[]= #endif }; /* CustomHID_ReportDescriptor */ -ALIGN(4) +rt_align(4) static struct udevice_descriptor _dev_desc = { USB_DESC_LENGTH_DEVICE, //bLength; @@ -256,7 +256,7 @@ static struct udevice_descriptor _dev_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -272,7 +272,7 @@ static struct usb_qualifier_descriptor dev_qualifier = /* hid interface descriptor */ -ALIGN(4) +rt_align(4) const static struct uhid_comm_descriptor _hid_comm_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -361,7 +361,7 @@ const static struct uhid_comm_descriptor _hid_comm_desc = }, }; -ALIGN(4) +rt_align(4) const static char* _ustring[] = { "Language", @@ -612,11 +612,11 @@ static rt_size_t _hid_write(rt_device_t dev, rt_off_t pos, const void *buffer, r return 0; } -RT_WEAK void HID_Report_Received(hid_report_t report) +rt_weak void HID_Report_Received(hid_report_t report) { dump_report(report); } -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t hid_thread_stack[512]; static struct rt_thread hid_thread; diff --git a/components/drivers/usb/usbdevice/class/mstorage.c b/components/drivers/usb/usbdevice/class/mstorage.c index 97a189834b..b8f21a29df 100644 --- a/components/drivers/usb/usbdevice/class/mstorage.c +++ b/components/drivers/usb/usbdevice/class/mstorage.c @@ -71,7 +71,7 @@ struct mstorage struct rt_device_blk_geometry geometry; }; -ALIGN(4) +rt_align(4) static struct udevice_descriptor dev_desc = { USB_DESC_LENGTH_DEVICE, //bLength; @@ -91,7 +91,7 @@ static struct udevice_descriptor dev_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -106,7 +106,7 @@ static struct usb_qualifier_descriptor dev_qualifier = }; -ALIGN(4) +rt_align(4) const static struct umass_descriptor _mass_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -157,7 +157,7 @@ const static struct umass_descriptor _mass_desc = }, }; -ALIGN(4) +rt_align(4) const static char* _ustring[] = { "Language", @@ -180,7 +180,7 @@ static rt_size_t _read_10(ufunction_t func, ustorage_cbw_t cbw); static rt_size_t _write_10(ufunction_t func, ustorage_cbw_t cbw); static rt_size_t _verify_10(ufunction_t func, ustorage_cbw_t cbw); -ALIGN(4) +rt_align(4) static struct scsi_cmd cmd_data[] = { {SCSI_TEST_UNIT_READY, _test_unit_ready, 6, FIXED, 0, DIR_NONE}, diff --git a/components/drivers/usb/usbdevice/class/rndis.c b/components/drivers/usb/usbdevice/class/rndis.c index 69ca3f5d69..425ff62ee1 100644 --- a/components/drivers/usb/usbdevice/class/rndis.c +++ b/components/drivers/usb/usbdevice/class/rndis.c @@ -53,20 +53,20 @@ struct rt_rndis_eth struct rt_timer timer; #endif /* RNDIS_DELAY_LINK_UP */ - ALIGN(4) + rt_align(4) rt_uint8_t rx_pool[512]; - ALIGN(4) + rt_align(4) rt_uint8_t tx_pool[512]; rt_uint32_t cmd_pool[2]; - ALIGN(4) + rt_align(4) char rx_buffer[sizeof(struct rndis_packet_msg) + USB_ETH_MTU + 14]; rt_size_t rx_offset; rt_size_t rx_length; rt_bool_t rx_flag; rt_bool_t rx_frist; - ALIGN(4) + rt_align(4) char tx_buffer[sizeof(struct rndis_packet_msg) + USB_ETH_MTU + 14]; struct rt_semaphore tx_buffer_free; @@ -77,7 +77,7 @@ struct rt_rndis_eth typedef struct rt_rndis_eth * rt_rndis_eth_t; static rt_uint32_t oid_packet_filter = 0x0000000; -ALIGN(4) +rt_align(4) static struct udevice_descriptor _dev_desc = { USB_DESC_LENGTH_DEVICE, /* bLength */ @@ -97,7 +97,7 @@ static struct udevice_descriptor _dev_desc = }; /* communcation interface descriptor */ -ALIGN(4) +rt_align(4) const static struct ucdc_comm_descriptor _comm_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -171,7 +171,7 @@ const static struct ucdc_comm_descriptor _comm_desc = }; /* data interface descriptor */ -ALIGN(4) +rt_align(4) const static struct ucdc_data_descriptor _data_desc = { /* interface descriptor */ @@ -206,7 +206,7 @@ const static struct ucdc_data_descriptor _data_desc = }, }; -ALIGN(4) +rt_align(4) const static char* _ustring[] = { "Language", /* LANGID */ @@ -218,7 +218,7 @@ const static char* _ustring[] = USB_STRING_OS }; -ALIGN(4) +rt_align(4) struct usb_os_function_comp_id_descriptor rndis_func_comp_id_desc = { .bFirstInterfaceNumber = USB_DYNAMIC, @@ -229,7 +229,7 @@ struct usb_os_function_comp_id_descriptor rndis_func_comp_id_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -244,7 +244,7 @@ static struct usb_qualifier_descriptor dev_qualifier = }; /* supported OIDs */ -ALIGN(4) +rt_align(4) const static rt_uint32_t oid_supported_list[] = { /* General OIDs */ diff --git a/components/drivers/usb/usbdevice/class/winusb.c b/components/drivers/usb/usbdevice/class/winusb.c index b5a169d2cb..4e534399be 100644 --- a/components/drivers/usb/usbdevice/class/winusb.c +++ b/components/drivers/usb/usbdevice/class/winusb.c @@ -22,7 +22,7 @@ struct winusb_device #define WINUSB_INTF_STR_INDEX 13 typedef struct winusb_device * winusb_device_t; -ALIGN(4) +rt_align(4) static struct udevice_descriptor dev_desc = { USB_DESC_LENGTH_DEVICE, //bLength; @@ -42,7 +42,7 @@ static struct udevice_descriptor dev_desc = }; //FS and HS needed -ALIGN(4) +rt_align(4) static struct usb_qualifier_descriptor dev_qualifier = { sizeof(dev_qualifier), //bLength @@ -56,7 +56,7 @@ static struct usb_qualifier_descriptor dev_qualifier = 0, }; -ALIGN(4) +rt_align(4) struct winusb_descriptor _winusb_desc = { #ifdef RT_USB_DEVICE_COMPOSITE @@ -108,7 +108,7 @@ struct winusb_descriptor _winusb_desc = }, }; -ALIGN(4) +rt_align(4) const static char* _ustring[] = { "Language", @@ -120,13 +120,13 @@ const static char* _ustring[] = USB_STRING_OS//must be }; -ALIGN(4) +rt_align(4) struct usb_os_proerty winusb_proerty[] = { USB_OS_PROPERTY_DESC(USB_OS_PROPERTY_TYPE_REG_SZ,"DeviceInterfaceGUID",RT_WINUSB_GUID), }; -ALIGN(4) +rt_align(4) struct usb_os_function_comp_id_descriptor winusb_func_comp_id_desc = { .bFirstInterfaceNumber = USB_DYNAMIC, diff --git a/components/drivers/usb/usbdevice/core/usbdevice_core.c b/components/drivers/usb/usbdevice/core/usbdevice_core.c index 7b3a3ff67d..58d7170012 100644 --- a/components/drivers/usb/usbdevice/core/usbdevice_core.c +++ b/components/drivers/usb/usbdevice/core/usbdevice_core.c @@ -2225,7 +2225,7 @@ rt_err_t rt_usbd_event_signal(struct udev_msg* msg) } -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t usb_thread_stack[RT_USBD_THREAD_STACK_SZ]; static struct rt_thread usb_thread; #define USBD_MQ_MSG_SZ 32 diff --git a/components/finsh/finsh.h b/components/finsh/finsh.h index 73c12b3c34..cf13b761d5 100644 --- a/components/finsh/finsh.h +++ b/components/finsh/finsh.h @@ -45,7 +45,7 @@ typedef long (*syscall_func)(void); __TI_FINSH_EXPORT_FUNCTION(__fsym_##cmd); \ const char __fsym_##cmd##_name[] = #cmd; \ const char __fsym_##cmd##_desc[] = #desc; \ - RT_USED RT_NOBLOCKED const struct finsh_syscall __fsym_##cmd = \ + rt_used RT_NOBLOCKED const struct finsh_syscall __fsym_##cmd = \ { \ __fsym_##cmd##_name, \ __fsym_##cmd##_desc, \ @@ -53,9 +53,9 @@ typedef long (*syscall_func)(void); }; #else #define MSH_FUNCTION_EXPORT_CMD(name, cmd, desc) \ - const char __fsym_##cmd##_name[] RT_SECTION(".rodata.name") = #cmd; \ - const char __fsym_##cmd##_desc[] RT_SECTION(".rodata.name") = #desc; \ - RT_USED const struct finsh_syscall __fsym_##cmd RT_SECTION("FSymTab")= \ + const char __fsym_##cmd##_name[] rt_section(".rodata.name") = #cmd; \ + const char __fsym_##cmd##_desc[] rt_section(".rodata.name") = #desc; \ + rt_used const struct finsh_syscall __fsym_##cmd rt_section("FSymTab")= \ { \ __fsym_##cmd##_name, \ __fsym_##cmd##_desc, \ @@ -88,7 +88,7 @@ typedef long (*syscall_func)(void); #else #define MSH_FUNCTION_EXPORT_CMD(name, cmd, desc) \ const char __fsym_##cmd##_name[] = #cmd; \ - RT_USED const struct finsh_syscall __fsym_##cmd RT_SECTION("FSymTab")= \ + rt_used const struct finsh_syscall __fsym_##cmd rt_section("FSymTab")= \ { \ __fsym_##cmd##_name, \ (syscall_func)&name \ diff --git a/components/finsh/shell.c b/components/finsh/shell.c index fecb4f4af3..321cadd8f9 100644 --- a/components/finsh/shell.c +++ b/components/finsh/shell.c @@ -35,7 +35,7 @@ /* finsh thread */ #ifndef RT_USING_HEAP static struct rt_thread finsh_thread; - ALIGN(RT_ALIGN_SIZE) + rt_align(RT_ALIGN_SIZE) static char finsh_thread_stack[FINSH_THREAD_STACK_SIZE]; struct finsh_shell _shell; #endif diff --git a/components/legacy/rtlegacy.h b/components/legacy/rtlegacy.h index 19b7f38209..661925dc0b 100644 --- a/components/legacy/rtlegacy.h +++ b/components/legacy/rtlegacy.h @@ -14,11 +14,21 @@ #include #include -/* legacy version macros */ +/* rtdef.h */ + +/* legacy version macros (<5.0.0) */ #define RT_VERSION RT_VERSION_MAJOR /**< major version number */ #define RT_SUBVERSION RT_VERSION_MINOR /**< minor version number */ #define RT_REVISION RT_VERSION_PATCH /**< revise version number */ +/* legacy attributes define (<5.0.0) */ +#define RT_SECTION rt_section +#define RT_WEAK rt_weak +#define RT_USED rt_used +#ifndef ALIGN +#define ALIGN rt_align +#endif + /* IPC */ #ifdef RT_USING_DEVICE_IPC #include "ipc/workqueue_legacy.h" diff --git a/components/libc/compilers/armlibc/syscalls.c b/components/libc/compilers/armlibc/syscalls.c index 74097da58f..f163ab1ad9 100644 --- a/components/libc/compilers/armlibc/syscalls.c +++ b/components/libc/compilers/armlibc/syscalls.c @@ -310,7 +310,7 @@ void _ttywrch(int ch) } /* for exit() and abort() */ -RT_WEAK void _sys_exit(int return_code) +rt_weak void _sys_exit(int return_code) { extern void __rt_libc_exit(int status); __rt_libc_exit(return_code); diff --git a/components/libc/compilers/common/ctime.c b/components/libc/compilers/common/ctime.c index ace480a54b..eb755e2263 100644 --- a/components/libc/compilers/common/ctime.c +++ b/components/libc/compilers/common/ctime.c @@ -63,8 +63,8 @@ static const short __spm[13] = (31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31), }; -ALIGN(4) static const char *days = "Sun Mon Tue Wed Thu Fri Sat "; -ALIGN(4) static const char *months = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec "; +rt_align(4) static const char *days = "Sun Mon Tue Wed Thu Fri Sat "; +rt_align(4) static const char *months = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec "; static int __isleap(int year) { @@ -346,7 +346,7 @@ RTM_EXPORT(strftime); /* inherent in the toolchain */ * If timer is not a NULL pointer, the return value is also stored in timer. * */ -RT_WEAK time_t time(time_t *t) +rt_weak time_t time(time_t *t) { struct timeval now; @@ -366,7 +366,7 @@ RT_WEAK time_t time(time_t *t) } RTM_EXPORT(time); -RT_WEAK clock_t clock(void) +rt_weak clock_t clock(void) { return rt_tick_get(); } diff --git a/components/libc/cplusplus/cxx_crt_init.c b/components/libc/cplusplus/cxx_crt_init.c index 46946089ff..9e5262c101 100644 --- a/components/libc/cplusplus/cxx_crt_init.c +++ b/components/libc/cplusplus/cxx_crt_init.c @@ -16,25 +16,25 @@ #if defined(__ARMCC_VERSION) extern void $Super$$__cpp_initialize__aeabi_(void); /* we need to change the cpp_initialize order */ -RT_WEAK void $Sub$$__cpp_initialize__aeabi_(void) +rt_weak void $Sub$$__cpp_initialize__aeabi_(void) { /* empty */ } #elif defined(__GNUC__) && !defined(__CS_SOURCERYGXX_MAJ__) /* The _init()/_fini() routines has been defined in codesourcery g++ lite */ -RT_WEAK void _init() +rt_weak void _init() { } -RT_WEAK void _fini() +rt_weak void _fini() { } -RT_WEAK void *__dso_handle = 0; +rt_weak void *__dso_handle = 0; #endif -RT_WEAK int cplusplus_system_init(void) +rt_weak int cplusplus_system_init(void) { #if defined(__ARMCC_VERSION) /* If there is no SHT$$INIT_ARRAY, calling diff --git a/components/lwp/lwp.c b/components/lwp/lwp.c index 7dafed6a35..9e4dccd14a 100644 --- a/components/lwp/lwp.c +++ b/components/lwp/lwp.c @@ -970,7 +970,7 @@ _exit: } #endif /* ARCH_MM_MMU */ -RT_WEAK int lwp_load(const char *filename, struct rt_lwp *lwp, uint8_t *load_addr, size_t addr_size, struct process_aux *aux) +rt_weak int lwp_load(const char *filename, struct rt_lwp *lwp, uint8_t *load_addr, size_t addr_size, struct process_aux *aux) { uint8_t *ptr; int ret = -1; diff --git a/components/lwp/lwp_avl.c b/components/lwp/lwp_avl.c index 71eb089264..d9996eae3e 100644 --- a/components/lwp/lwp_avl.c +++ b/components/lwp/lwp_avl.c @@ -208,7 +208,7 @@ int lwp_avl_traversal(struct lwp_avl_struct *ptree, int (*fun)(struct lwp_avl_st return ret; } -RT_WEAK struct lwp_avl_struct* lwp_map_find_first(struct lwp_avl_struct* ptree) +rt_weak struct lwp_avl_struct* lwp_map_find_first(struct lwp_avl_struct* ptree) { if (ptree == AVL_EMPTY) { diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c index 0c49e3c960..a3e2002851 100644 --- a/components/lwp/lwp_syscall.c +++ b/components/lwp/lwp_syscall.c @@ -1599,7 +1599,7 @@ fail: return GET_ERRNO(); } -RT_WEAK long sys_clone(void *arg[]) +rt_weak long sys_clone(void *arg[]) { return _sys_clone(arg); } @@ -1829,12 +1829,12 @@ size_t lwp_user_strlen(const char *s, int *err) /* arm needs to wrap fork/clone call to preserved lr & caller saved regs */ -RT_WEAK int sys_fork(void) +rt_weak int sys_fork(void) { return _sys_fork(); } -RT_WEAK int sys_vfork(void) +rt_weak int sys_vfork(void) { return sys_fork(); } diff --git a/components/lwp/page.c b/components/lwp/page.c index 5cf63be5e0..5dccd5fe34 100644 --- a/components/lwp/page.c +++ b/components/lwp/page.c @@ -37,7 +37,7 @@ static size_t page_nr; static struct page *page_list[ARCH_PAGE_LIST_SIZE]; -RT_WEAK int rt_hw_clz(size_t n) +rt_weak int rt_hw_clz(size_t n) { int bits = sizeof(size_t) * 8; @@ -66,7 +66,7 @@ RT_WEAK int rt_hw_clz(size_t n) return bits - n; } -RT_WEAK int rt_hw_ctz(size_t n) +rt_weak int rt_hw_ctz(size_t n) { int ret = sizeof(size_t) * 8; diff --git a/components/net/at/include/at.h b/components/net/at/include/at.h index 0a385058a0..aec11372dd 100644 --- a/components/net/at/include/at.h +++ b/components/net/at/include/at.h @@ -51,7 +51,7 @@ extern "C" { #endif #define AT_CMD_EXPORT(_name_, _args_expr_, _test_, _query_, _setup_, _exec_) \ - RT_USED static const struct at_cmd __at_cmd_##_test_##_query_##_setup_##_exec_ RT_SECTION("RtAtCmdTab") = \ + rt_used static const struct at_cmd __at_cmd_##_test_##_query_##_setup_##_exec_ rt_section("RtAtCmdTab") = \ { \ _name_, \ _args_expr_, \ diff --git a/components/net/at/src/at_server.c b/components/net/at/src/at_server.c index 5d6a63fd98..9e5d9174b1 100644 --- a/components/net/at/src/at_server.c +++ b/components/net/at/src/at_server.c @@ -638,12 +638,12 @@ __exit: } INIT_COMPONENT_EXPORT(at_server_init); -RT_WEAK void at_port_reset(void) +rt_weak void at_port_reset(void) { LOG_E("The reset for AT server is not implement."); } -RT_WEAK void at_port_factory_reset(void) +rt_weak void at_port_factory_reset(void) { LOG_E("The factory reset for AT server is not implement."); } diff --git a/components/net/at/src/at_utils.c b/components/net/at/src/at_utils.c index 736d567dfa..9ffaab199c 100644 --- a/components/net/at/src/at_utils.c +++ b/components/net/at/src/at_utils.c @@ -65,7 +65,7 @@ const char *at_get_last_cmd(rt_size_t *cmd_size) return send_buf; } -RT_WEAK rt_size_t at_utils_send(rt_device_t dev, +rt_weak rt_size_t at_utils_send(rt_device_t dev, rt_off_t pos, const void *buffer, rt_size_t size) diff --git a/components/net/lwip/port/sys_arch.c b/components/net/lwip/port/sys_arch.c index 709028ee25..145958a0fb 100644 --- a/components/net/lwip/port/sys_arch.c +++ b/components/net/lwip/port/sys_arch.c @@ -539,7 +539,7 @@ u32_t sys_now(void) return rt_tick_get_millisecond(); } -RT_WEAK void mem_init(void) +rt_weak void mem_init(void) { } diff --git a/components/net/netdev/src/netdev_ipaddr.c b/components/net/netdev/src/netdev_ipaddr.c index afb6d1d962..dd12ee81cf 100644 --- a/components/net/netdev/src/netdev_ipaddr.c +++ b/components/net/netdev/src/netdev_ipaddr.c @@ -263,7 +263,7 @@ in_addr_t netdev_ipaddr_addr(const char *cp) #if NETDEV_IPV6 -RT_WEAK const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; +rt_weak const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; /** * Check whether "cp" is a valid ascii representation diff --git a/components/utilities/ulog/syslog/syslog.c b/components/utilities/ulog/syslog/syslog.c index d5f31b0c18..474a524b89 100644 --- a/components/utilities/ulog/syslog/syslog.c +++ b/components/utilities/ulog/syslog/syslog.c @@ -168,7 +168,7 @@ static const char *get_month_str(uint8_t month) } } -RT_WEAK rt_size_t syslog_formater(char *log_buf, int level, const char *tag, rt_bool_t newline, const char *format, va_list args) +rt_weak rt_size_t syslog_formater(char *log_buf, int level, const char *tag, rt_bool_t newline, const char *format, va_list args) { extern rt_size_t ulog_strcpy(rt_size_t cur_len, char *dst, const char *src); diff --git a/components/utilities/ulog/ulog.c b/components/utilities/ulog/ulog.c index 430ead3f1c..539f7ef24c 100644 --- a/components/utilities/ulog/ulog.c +++ b/components/utilities/ulog/ulog.c @@ -246,7 +246,7 @@ static char *get_log_buf(void) } } -RT_WEAK rt_size_t ulog_head_formater(char *log_buf, rt_uint32_t level, const char *tag) +rt_weak rt_size_t ulog_head_formater(char *log_buf, rt_uint32_t level, const char *tag) { /* the caller has locker, so it can use static variable for reduce stack usage */ static rt_size_t log_len; @@ -371,7 +371,7 @@ RT_WEAK rt_size_t ulog_head_formater(char *log_buf, rt_uint32_t level, const cha } -RT_WEAK rt_size_t ulog_tail_formater(char *log_buf, rt_size_t log_len, rt_bool_t newline, rt_uint32_t level) +rt_weak rt_size_t ulog_tail_formater(char *log_buf, rt_size_t log_len, rt_bool_t newline, rt_uint32_t level) { /* the caller has locker, so it can use static variable for reduce stack usage */ static rt_size_t newline_len; @@ -418,7 +418,7 @@ RT_WEAK rt_size_t ulog_tail_formater(char *log_buf, rt_size_t log_len, rt_bool_t return log_len; } -RT_WEAK rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *tag, rt_bool_t newline, +rt_weak rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *tag, rt_bool_t newline, const char *format, va_list args) { /* the caller has locker, so it can use static variable for reduce stack usage */ @@ -446,7 +446,7 @@ RT_WEAK rt_size_t ulog_formater(char *log_buf, rt_uint32_t level, const char *ta return ulog_tail_formater(log_buf, log_len, newline, level); } -RT_WEAK rt_size_t ulog_hex_formater(char *log_buf, const char *tag, const rt_uint8_t *buf, rt_size_t size, rt_size_t width, rt_base_t addr) +rt_weak rt_size_t ulog_hex_formater(char *log_buf, const char *tag, const rt_uint8_t *buf, rt_size_t size, rt_size_t width, rt_base_t addr) { #define __is_print(ch) ((unsigned int)((ch) - ' ') < 127u - ' ') /* the caller has locker, so it can use static variable for reduce stack usage */ diff --git a/components/utilities/utest/utest.h b/components/utilities/utest/utest.h index 33d50efddb..41859612e2 100644 --- a/components/utilities/utest/utest.h +++ b/components/utilities/utest/utest.h @@ -137,8 +137,8 @@ utest_t utest_handle_get(void); * */ #define UTEST_TC_EXPORT(testcase, name, init, cleanup, timeout) \ - RT_USED static const struct utest_tc_export _utest_testcase \ - RT_SECTION("UtestTcTab") = \ + rt_used static const struct utest_tc_export _utest_testcase \ + rt_section("UtestTcTab") = \ { \ name, \ timeout, \ diff --git a/components/utilities/var_export/var_export.c b/components/utilities/var_export/var_export.c index e4146d6ff8..abc412a682 100644 --- a/components/utilities/var_export/var_export.c +++ b/components/utilities/var_export/var_export.c @@ -21,22 +21,22 @@ static rt_size_t ve_exporter_num = 0; /* for ARM C and IAR Compiler */ #if defined(__ARMCC_VERSION) || defined (__ICCARM__) || defined(__ICCRX__) -static RT_USED const struct ve_exporter __ve_table_start -RT_SECTION("0.""VarExpTab") = {"ve_start", "ve_start", 0}; +static rt_used const struct ve_exporter __ve_table_start +rt_section("0.""VarExpTab") = {"ve_start", "ve_start", 0}; -static RT_USED const struct ve_exporter __ve_table_end -RT_SECTION("2.""VarExpTab") = {"ve_end", "ve_end", 2}; +static rt_used const struct ve_exporter __ve_table_end +rt_section("2.""VarExpTab") = {"ve_end", "ve_end", 2}; #endif /* for MS VC++ compiler */ #if defined(_MSC_VER) #pragma section("VarExpTab$a", read) __declspec(allocate("VarExpTab$a")) -RT_USED const struct ve_exporter __ve_table_start = { "ve_start", "ve_start", 0}; +rt_used const struct ve_exporter __ve_table_start = { "ve_start", "ve_start", 0}; #pragma section("VarExpTab$z", read) __declspec(allocate("VarExpTab$z")) -RT_USED const struct ve_exporter __ve_table_end = { "ve_end", "ve_end", 2}; +rt_used const struct ve_exporter __ve_table_end = { "ve_end", "ve_end", 2}; /* Find var objects in VarExpTab segments */ static int ve_init_find_obj(unsigned int *begin, unsigned int *end, ve_exporter_t *table) diff --git a/components/utilities/var_export/var_export.h b/components/utilities/var_export/var_export.h index b0e2e88b3f..f4ca9122bb 100644 --- a/components/utilities/var_export/var_export.h +++ b/components/utilities/var_export/var_export.h @@ -44,10 +44,10 @@ typedef struct ve_iterator ve_iterator_t; /* exporter's export command */ #if defined(__ARMCC_VERSION) || defined(__IAR_SYSTEMS_ICC__) #define VAR_EXPORT(module, identi, value) \ - const char _vexp_##identi##_module[] RT_SECTION(".rodata.vexp") = #module; \ - const char _vexp_##identi##_identi[] RT_SECTION(".rodata.vexp") = #identi; \ - RT_USED const struct ve_exporter _vexp_##module##identi \ - RT_SECTION("1."#module".VarExpTab."#identi) = \ + const char _vexp_##identi##_module[] rt_section(".rodata.vexp") = #module; \ + const char _vexp_##identi##_identi[] rt_section(".rodata.vexp") = #identi; \ + rt_used const struct ve_exporter _vexp_##module##identi \ + rt_section("1."#module".VarExpTab."#identi) = \ { \ _vexp_##identi##_module, \ _vexp_##identi##_identi, \ @@ -55,10 +55,10 @@ typedef struct ve_iterator ve_iterator_t; } #elif defined(__GNUC__) #define VAR_EXPORT(module, identi, value) \ - const char _vexp_##identi##_module[] RT_SECTION(".rodata.vexp") = #module; \ - const char _vexp_##identi##_identi[] RT_SECTION(".rodata.vexp") = #identi; \ - RT_USED const struct ve_exporter _vexp_##module##identi \ - RT_SECTION(#module".VarExpTab."#identi) = \ + const char _vexp_##identi##_module[] rt_section(".rodata.vexp") = #module; \ + const char _vexp_##identi##_identi[] rt_section(".rodata.vexp") = #identi; \ + rt_used const struct ve_exporter _vexp_##module##identi \ + rt_section(#module".VarExpTab."#identi) = \ { \ _vexp_##identi##_module, \ _vexp_##identi##_identi, \ @@ -67,10 +67,10 @@ typedef struct ve_iterator ve_iterator_t; #elif defined(_MSC_VER) #pragma section("VarExpTab$f",read) #define VAR_EXPORT(module, identi, value) \ - const char _vexp_##identi##_module[] RT_SECTION(".rodata.vexp") = #module; \ - const char _vexp_##identi##_identi[] RT_SECTION(".rodata.vexp") = #identi; \ + const char _vexp_##identi##_module[] rt_section(".rodata.vexp") = #module; \ + const char _vexp_##identi##_identi[] rt_section(".rodata.vexp") = #identi; \ __declspec(allocate("VarExpTab$f")) \ - RT_USED const struct ve_exporter _vexp_##module##identi = \ + rt_used const struct ve_exporter _vexp_##module##identi = \ { \ _vexp_##identi##_module, \ _vexp_##identi##_identi, \ diff --git a/components/vmm/vmm.c b/components/vmm/vmm.c index 709f947b4e..b37bc4389c 100644 --- a/components/vmm/vmm.c +++ b/components/vmm/vmm.c @@ -22,9 +22,9 @@ extern void rt_hw_interrupt_init(void); extern void rt_application_init(void); -void vmm_entry(struct vmm_entry_param* param) RT_SECTION(".vmm_init"); +void vmm_entry(struct vmm_entry_param* param) rt_section(".vmm_init"); -struct rt_thread vmm_thread RT_SECTION(".bss.share.vmm"); +struct rt_thread vmm_thread rt_section(".bss.share.vmm"); extern rt_uint8_t vmm_stack_start; extern rt_uint8_t vmm_stack_end; @@ -75,7 +75,7 @@ static void vmm_entry_glue(rt_uint32_t level, unsigned int kernel_domain) /* inline would make the section setting meaningless */ __attribute__((noinline)) - RT_SECTION(".vmm_glue"); + rt_section(".vmm_glue"); static void vmm_entry_glue(rt_uint32_t level, unsigned int vmm_domain, unsigned int kernel_domain) diff --git a/components/vmm/vmm_context.c b/components/vmm/vmm_context.c index bf8f2a058e..8cb502da75 100644 --- a/components/vmm/vmm_context.c +++ b/components/vmm/vmm_context.c @@ -18,7 +18,7 @@ #include "vmm_context.h" -struct rt_vmm_share_layout rt_vmm_share RT_SECTION(".vmm.share"); +struct rt_vmm_share_layout rt_vmm_share rt_section(".vmm.share"); volatile struct vmm_context *_vmm_context = RT_NULL; @@ -31,13 +31,13 @@ void vmm_context_init(void *context_addr) } #ifdef RT_VMM_USING_DOMAIN -unsigned long guest_domain_val RT_SECTION(".bss.share"); -unsigned long vmm_domain_val RT_SECTION(".bss.share"); +unsigned long guest_domain_val rt_section(".bss.share"); +unsigned long vmm_domain_val rt_section(".bss.share"); /* some RT-Thread code need to be called in the guest * context(rt_thread_idle_excute for example). To simplify the code, we need a * "super" domain mode to have access of both side. The code executed in super * domain mode is restricted and should be harmless. */ -unsigned long super_domain_val RT_SECTION(".bss.share"); +unsigned long super_domain_val rt_section(".bss.share"); void vmm_context_init_domain(struct vmm_domain *domain) { asm volatile ("mrc p15, 0, %0, c3, c0\n" : "=r" (guest_domain_val)); diff --git a/documentation/basic/basic.md b/documentation/basic/basic.md index 25d8faa0d5..5beacacf83 100644 --- a/documentation/basic/basic.md +++ b/documentation/basic/basic.md @@ -715,10 +715,10 @@ Macro definitions are often used in RT-Thread. For example, some common macro de #define rt_inline static __inline ``` -2）RT_USED，definition is as follows, the purpose of this macro is to explain to the compiler that this code is useful, compilation needs to be saved even if it is not called in the function. For example, RT-Thread auto-initialization uses custom segments, using RT_USED will retain custom code snippets. +2）rt_used，definition is as follows, the purpose of this macro is to explain to the compiler that this code is useful, compilation needs to be saved even if it is not called in the function. For example, RT-Thread auto-initialization uses custom segments, using rt_used will retain custom code snippets. ```c -#define RT_USED __attribute__((used)) +#define rt_used __attribute__((used)) ``` 3）RT_UNUSED，definition is as follows, indicates that a function or variable may not be used. This attribute prevents the compiler from generating warnings. @@ -727,10 +727,10 @@ Macro definitions are often used in RT-Thread. For example, some common macro de #define RT_UNUSED __attribute__((unused)) ``` -4）RT_WEAK，definition is as follows, often used to define functions, when linking the function, the compiler will link the function without the keyword prefix first and link the function modified by weak if it can't find those functions. +4）rt_weak，definition is as follows, often used to define functions, when linking the function, the compiler will link the function without the keyword prefix first and link the function modified by weak if it can't find those functions. ```c -#define RT_WEAK __weak +#define rt_weak __weak ``` 5）ALIGN(n)，definition is as follows, is used to align its stored address with n bytes when allocating an address space to an object. Here, n can be the power of 2. Byte alignment not only facilitates quick CPU access, but also save memory space if byte alignment is properly used. diff --git a/examples/utest/testcases/kernel/event_tc.c b/examples/utest/testcases/kernel/event_tc.c index 9847529214..c9b94cd6d6 100644 --- a/examples/utest/testcases/kernel/event_tc.c +++ b/examples/utest/testcases/kernel/event_tc.c @@ -20,11 +20,11 @@ static struct rt_event static_event = {0}; static rt_event_t dynamic_event = RT_NULL; static rt_uint32_t dynamic_event_recv_thread_finish = 0, dynamic_event_send_thread_finish = 0; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread3_stack[1024]; static struct rt_thread thread3; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread4_stack[1024]; static struct rt_thread thread4; #endif /* RT_USING_HEAP */ @@ -32,11 +32,11 @@ static struct rt_thread thread4; static rt_uint32_t recv_event_times1 = 0, recv_event_times2 = 0; static rt_uint32_t static_event_recv_thread_finish = 0, static_event_send_thread_finish = 0; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread1_stack[1024]; static struct rt_thread thread1; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread2_stack[1024]; static struct rt_thread thread2; diff --git a/examples/utest/testcases/kernel/mailbox_tc.c b/examples/utest/testcases/kernel/mailbox_tc.c index dc01507c2b..7d400f24d7 100644 --- a/examples/utest/testcases/kernel/mailbox_tc.c +++ b/examples/utest/testcases/kernel/mailbox_tc.c @@ -20,11 +20,11 @@ static rt_mailbox_t test_dynamic_mb; static uint8_t static_mb_recv_thread_finish, static_mb_send_thread_finish; static uint8_t dynamic_mb_recv_thread_finish, dynamic_mb_send_thread_finish; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread1_stack[1024]; static struct rt_thread thread1; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread2_stack[1024]; static struct rt_thread thread2; diff --git a/examples/utest/testcases/kernel/thread_tc.c b/examples/utest/testcases/kernel/thread_tc.c index 74ae42bdc7..d295e7fb86 100644 --- a/examples/utest/testcases/kernel/thread_tc.c +++ b/examples/utest/testcases/kernel/thread_tc.c @@ -16,7 +16,7 @@ #define THREAD_STACK_SIZE 512 #define THREAD_TIMESLICE 10 -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static char thread2_stack[1024]; static struct rt_thread thread2; #ifdef RT_USING_HEAP diff --git a/include/rtdef.h b/include/rtdef.h index 393b589d36..d9a841b5b9 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -159,10 +159,10 @@ typedef rt_base_t rt_off_t; /**< Type for offset */ /* Compiler Related Definitions */ #if defined(__ARMCC_VERSION) /* ARM Compiler */ -#define RT_SECTION(x) __attribute__((section(x))) -#define RT_USED __attribute__((used)) -#define ALIGN(n) __attribute__((aligned(n))) -#define RT_WEAK __attribute__((weak)) +#define rt_section(x) __attribute__((section(x))) +#define rt_used __attribute__((used)) +#define rt_align(n) __attribute__((aligned(n))) +#define rt_weak __attribute__((weak)) #define rt_inline static __inline /* module compiling */ #ifdef RT_USING_MODULE @@ -171,11 +171,11 @@ typedef rt_base_t rt_off_t; /**< Type for offset */ #define RTT_API __declspec(dllexport) #endif /* RT_USING_MODULE */ #elif defined (__IAR_SYSTEMS_ICC__) /* for IAR Compiler */ -#define RT_SECTION(x) @ x -#define RT_USED __root +#define rt_section(x) @ x +#define rt_used __root #define PRAGMA(x) _Pragma(#x) -#define ALIGN(n) PRAGMA(data_alignment=n) -#define RT_WEAK __weak +#define rt_align(n) PRAGMA(data_alignment=n) +#define rt_weak __weak #define rt_inline static inline #define RTT_API #elif defined (__GNUC__) /* GNU GCC Compiler */ @@ -189,51 +189,51 @@ typedef __gnuc_va_list va_list; #endif /* RT_USING_LIBC */ #define __RT_STRINGIFY(x...) #x #define RT_STRINGIFY(x...) __RT_STRINGIFY(x) -#define RT_SECTION(x) __attribute__((section(x))) -#define RT_USED __attribute__((used)) -#define ALIGN(n) __attribute__((aligned(n))) -#define RT_WEAK __attribute__((weak)) +#define rt_section(x) __attribute__((section(x))) +#define rt_used __attribute__((used)) +#define rt_align(n) __attribute__((aligned(n))) +#define rt_weak __attribute__((weak)) #define rt_inline static __inline #define RTT_API #elif defined (__ADSPBLACKFIN__) /* for VisualDSP++ Compiler */ -#define RT_SECTION(x) __attribute__((section(x))) -#define RT_USED __attribute__((used)) -#define ALIGN(n) __attribute__((aligned(n))) -#define RT_WEAK __attribute__((weak)) +#define rt_section(x) __attribute__((section(x))) +#define rt_used __attribute__((used)) +#define rt_align(n) __attribute__((aligned(n))) +#define rt_weak __attribute__((weak)) #define rt_inline static inline #define RTT_API #elif defined (_MSC_VER) -#define RT_SECTION(x) -#define RT_USED -#define ALIGN(n) __declspec(align(n)) -#define RT_WEAK +#define rt_section(x) +#define rt_used +#define rt_align(n) __declspec(align(n)) +#define rt_weak #define rt_inline static __inline #define RTT_API #elif defined (__TI_COMPILER_VERSION__) /* The way that TI compiler set section is different from other(at least * GCC and MDK) compilers. See ARM Optimizing C/C++ Compiler 5.9.3 for more * details. */ -#define RT_SECTION(x) __attribute__((section(x))) +#define rt_section(x) __attribute__((section(x))) #ifdef __TI_EABI__ -#define RT_USED __attribute__((retain)) __attribute__((used)) +#define rt_used __attribute__((retain)) __attribute__((used)) #else -#define RT_USED __attribute__((used)) +#define rt_used __attribute__((used)) #endif #define PRAGMA(x) _Pragma(#x) -#define ALIGN(n) __attribute__((aligned(n))) +#define rt_align(n) __attribute__((aligned(n))) #ifdef __TI_EABI__ -#define RT_WEAK __attribute__((weak)) +#define rt_weak __attribute__((weak)) #else -#define RT_WEAK +#define rt_weak #endif #define rt_inline static inline #define RTT_API #elif defined (__TASKING__) -#define RT_SECTION(x) __attribute__((section(x))) -#define RT_USED __attribute__((used, protect)) +#define rt_section(x) __attribute__((section(x))) +#define rt_used __attribute__((used, protect)) #define PRAGMA(x) _Pragma(#x) -#define ALIGN(n) __attribute__((__align(n))) -#define RT_WEAK __attribute__((weak)) +#define rt_align(n) __attribute__((__align(n))) +#define rt_weak __attribute__((weak)) #define rt_inline static inline #define RTT_API #else @@ -256,7 +256,7 @@ typedef int (*init_fn_t)(void); const char __rti_level_##fn[] = ".rti_fn." level; \ const char __rti_##fn##_name[] = #fn; \ __declspec(allocate("rti_fn$f")) \ - RT_USED const struct rt_init_desc __rt_init_msc_##fn = \ + rt_used const struct rt_init_desc __rt_init_msc_##fn = \ {__rti_level_##fn, fn, __rti_##fn##_name}; #else struct rt_init_desc @@ -267,7 +267,7 @@ typedef int (*init_fn_t)(void); #define INIT_EXPORT(fn, level) \ const char __rti_level_##fn[] = ".rti_fn." level; \ __declspec(allocate("rti_fn$f")) \ - RT_USED const struct rt_init_desc __rt_init_msc_##fn = \ + rt_used const struct rt_init_desc __rt_init_msc_##fn = \ {__rti_level_##fn, fn }; #endif #else @@ -279,11 +279,11 @@ typedef int (*init_fn_t)(void); }; #define INIT_EXPORT(fn, level) \ const char __rti_##fn##_name[] = #fn; \ - RT_USED const struct rt_init_desc __rt_init_desc_##fn RT_SECTION(".rti_fn." level) = \ + rt_used const struct rt_init_desc __rt_init_desc_##fn rt_section(".rti_fn." level) = \ { __rti_##fn##_name, fn}; #else #define INIT_EXPORT(fn, level) \ - RT_USED const init_fn_t __rt_init_##fn RT_SECTION(".rti_fn." level) = fn + rt_used const init_fn_t __rt_init_##fn rt_section(".rti_fn." level) = fn #endif #endif #else diff --git a/include/rtm.h b/include/rtm.h index ec05662416..62d77a0a35 100644 --- a/include/rtm.h +++ b/include/rtm.h @@ -31,8 +31,8 @@ __declspec(allocate("RTMSymTab$f"))const char __rtmsym_##symbol##_name[] = "__vs #else #define RTM_EXPORT(symbol) \ -const char __rtmsym_##symbol##_name[] RT_SECTION(".rodata.name") = #symbol; \ -const struct rt_module_symtab __rtmsym_##symbol RT_SECTION("RTMSymTab")= \ +const char __rtmsym_##symbol##_name[] rt_section(".rodata.name") = #symbol; \ +const struct rt_module_symtab __rtmsym_##symbol rt_section("RTMSymTab")= \ { \ (void *)&symbol, \ __rtmsym_##symbol##_name \ diff --git a/libcpu/aarch64/common/cpu.c b/libcpu/aarch64/common/cpu.c index 8dc6635ef4..63731a05ba 100644 --- a/libcpu/aarch64/common/cpu.c +++ b/libcpu/aarch64/common/cpu.c @@ -17,7 +17,7 @@ #ifdef RT_USING_SMP /* The more common mpidr_el1 table, redefine it in BSP if it is in other cases */ -RT_WEAK rt_uint64_t rt_cpu_mpidr_early[] = +rt_weak rt_uint64_t rt_cpu_mpidr_early[] = { [0] = 0x80000000, [1] = 0x80000001, @@ -96,7 +96,7 @@ void rt_hw_spin_unlock(rt_hw_spinlock_t *lock) /*@{*/ /** shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { register rt_int32_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arc/em/cpuport.c b/libcpu/arc/em/cpuport.c index d3bd8af6fe..8befd509ab 100644 --- a/libcpu/arc/em/cpuport.c +++ b/libcpu/arc/em/cpuport.c @@ -32,7 +32,7 @@ struct init_stack_frame { /** * shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { } diff --git a/libcpu/arm/AT91SAM7S/cpu.c b/libcpu/arm/AT91SAM7S/cpu.c index 18d8d6208a..d917083d0b 100644 --- a/libcpu/arm/AT91SAM7S/cpu.c +++ b/libcpu/arm/AT91SAM7S/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { } @@ -28,7 +28,7 @@ RT_WEAK void rt_hw_cpu_reset() * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/AT91SAM7X/cpu.c b/libcpu/arm/AT91SAM7X/cpu.c index ffa4092900..bb60ce4565 100644 --- a/libcpu/arm/AT91SAM7X/cpu.c +++ b/libcpu/arm/AT91SAM7X/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { } @@ -28,7 +28,7 @@ RT_WEAK void rt_hw_cpu_reset() * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/am335x/cpu.c b/libcpu/arm/am335x/cpu.c index 3688d31d56..d91542fbb9 100644 --- a/libcpu/arm/am335x/cpu.c +++ b/libcpu/arm/am335x/cpu.c @@ -182,7 +182,7 @@ rt_base_t rt_hw_cpu_dcache_status() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/am335x/mmu.c b/libcpu/arm/am335x/mmu.c index 19cc9fc6e0..7df85fc451 100644 --- a/libcpu/arm/am335x/mmu.c +++ b/libcpu/arm/am335x/mmu.c @@ -156,7 +156,7 @@ void mmu_setmtt(rt_uint32_t vaddrStart, rt_uint32_t vaddrEnd, rt_uint32_t paddrS } /* set page table */ -RT_WEAK void mmu_setmtts(void) +rt_weak void mmu_setmtts(void) { mmu_setmtt(0x00000000, 0xFFFFFFFF, 0x00000000, RW_NCNB); /* None cached for 4G memory */ mmu_setmtt(0x80200000, 0x80800000 - 1, 0x80200000, RW_CB); /* 126M cached DDR memory */ diff --git a/libcpu/arm/arm926/cpuport.c b/libcpu/arm/arm926/cpuport.c index d27ee10d30..e4d70e1f6f 100644 --- a/libcpu/arm/arm926/cpuport.c +++ b/libcpu/arm/arm926/cpuport.c @@ -146,7 +146,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { rt_kprintf("Restarting system...\n"); @@ -161,7 +161,7 @@ RT_WEAK void rt_hw_cpu_reset() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/arm926/machine.c b/libcpu/arm/arm926/machine.c index 19baa4d9fe..459f19619f 100644 --- a/libcpu/arm/arm926/machine.c +++ b/libcpu/arm/arm926/machine.c @@ -11,14 +11,14 @@ #include #include -RT_WEAK void machine_reset(void) +rt_weak void machine_reset(void) { rt_kprintf("reboot system...\n"); rt_hw_interrupt_disable(); while (1); } -RT_WEAK void machine_shutdown(void) +rt_weak void machine_shutdown(void) { rt_kprintf("shutdown...\n"); rt_hw_interrupt_disable(); diff --git a/libcpu/arm/armv6/cpuport.c b/libcpu/arm/armv6/cpuport.c index 232e7f0cec..ea9b385b4e 100644 --- a/libcpu/arm/armv6/cpuport.c +++ b/libcpu/arm/armv6/cpuport.c @@ -147,7 +147,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { rt_kprintf("Restarting system...\n"); @@ -162,7 +162,7 @@ RT_WEAK void rt_hw_cpu_reset() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/armv6/mmu.c b/libcpu/arm/armv6/mmu.c index deb2f8365f..0e553ef2c4 100644 --- a/libcpu/arm/armv6/mmu.c +++ b/libcpu/arm/armv6/mmu.c @@ -421,13 +421,13 @@ void mmu_invalidate_dcache_all() #endif /* level1 page table */ -static volatile unsigned int _pgd_table[4*1024] ALIGN(16*1024); +static volatile unsigned int _pgd_table[4*1024] rt_align(16*1024); /* * level2 page table * RT_MMU_PTE_SIZE must be 1024*n */ #define RT_MMU_PTE_SIZE 4096 -static volatile unsigned int _pte_table[RT_MMU_PTE_SIZE] ALIGN(1*1024); +static volatile unsigned int _pte_table[RT_MMU_PTE_SIZE] rt_align(1*1024); void mmu_create_pgd(struct mem_desc *mdesc) { diff --git a/libcpu/arm/cortex-a/cpuport.c b/libcpu/arm/cortex-a/cpuport.c index aea3b88f00..e3ce568243 100644 --- a/libcpu/arm/cortex-a/cpuport.c +++ b/libcpu/arm/cortex-a/cpuport.c @@ -74,7 +74,7 @@ void rt_hw_spin_unlock(rt_hw_spinlock_t *lock) /*@{*/ /** shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/cortex-a/gicv3.c b/libcpu/arm/cortex-a/gicv3.c index ce9833ad05..5039b0c5a1 100644 --- a/libcpu/arm/cortex-a/gicv3.c +++ b/libcpu/arm/cortex-a/gicv3.c @@ -42,12 +42,12 @@ static unsigned int _gic_max_irq; * PE within a cluster with an Affinity 0 value equal to the bit number. * @return {rt_uint32_t} 0 is finish , 1 is data valid */ -RT_WEAK rt_uint32_t arm_gic_cpumask_to_affval(rt_uint32_t *cpu_mask, rt_uint32_t *cluster_id, rt_uint32_t *target_list) +rt_weak rt_uint32_t arm_gic_cpumask_to_affval(rt_uint32_t *cpu_mask, rt_uint32_t *cluster_id, rt_uint32_t *target_list) { return 0; } -RT_WEAK rt_uint64_t get_main_cpu_affval(void) +rt_weak rt_uint64_t get_main_cpu_affval(void) { return 0; } diff --git a/libcpu/arm/cortex-m0/cpuport.c b/libcpu/arm/cortex-m0/cpuport.c index af343aa8b2..4d53640b2d 100644 --- a/libcpu/arm/cortex-m0/cpuport.c +++ b/libcpu/arm/cortex-m0/cpuport.c @@ -131,7 +131,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) /** * reset CPU */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk); } diff --git a/libcpu/arm/cortex-m23/cpuport.c b/libcpu/arm/cortex-m23/cpuport.c index a3b18f5f35..1385118211 100644 --- a/libcpu/arm/cortex-m23/cpuport.c +++ b/libcpu/arm/cortex-m23/cpuport.c @@ -132,7 +132,7 @@ void rt_hw_hard_fault_exception(struct exception_stack_frame *contex) /** * reset CPU */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE;//((0x5FAUL << SCB_AIRCR_VECTKEY_Pos) |SCB_AIRCR_SYSRESETREQ_Msk); } diff --git a/libcpu/arm/cortex-m3/cpuport.c b/libcpu/arm/cortex-m3/cpuport.c index 0f09930554..75449fad3a 100644 --- a/libcpu/arm/cortex-m3/cpuport.c +++ b/libcpu/arm/cortex-m3/cpuport.c @@ -346,7 +346,7 @@ void rt_hw_hard_fault_exception(struct exception_info * exception_info) /** * shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); @@ -356,7 +356,7 @@ RT_WEAK void rt_hw_cpu_shutdown(void) /** * reset CPU */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-m33/cpuport.c b/libcpu/arm/cortex-m33/cpuport.c index 44e7c287f5..a713665539 100644 --- a/libcpu/arm/cortex-m33/cpuport.c +++ b/libcpu/arm/cortex-m33/cpuport.c @@ -488,7 +488,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) /** * shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); @@ -498,7 +498,7 @@ RT_WEAK void rt_hw_cpu_shutdown(void) /** * reset CPU */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-m4/cpuport.c b/libcpu/arm/cortex-m4/cpuport.c index 717b4ba3df..903c228f82 100644 --- a/libcpu/arm/cortex-m4/cpuport.c +++ b/libcpu/arm/cortex-m4/cpuport.c @@ -431,7 +431,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) /** * shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); @@ -441,7 +441,7 @@ RT_WEAK void rt_hw_cpu_shutdown(void) /** * reset CPU */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-m7/cpuport.c b/libcpu/arm/cortex-m7/cpuport.c index 274cc19c88..510a51dde1 100644 --- a/libcpu/arm/cortex-m7/cpuport.c +++ b/libcpu/arm/cortex-m7/cpuport.c @@ -430,7 +430,7 @@ void rt_hw_hard_fault_exception(struct exception_info *exception_info) /** * shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); @@ -440,7 +440,7 @@ RT_WEAK void rt_hw_cpu_shutdown(void) /** * reset CPU */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { SCB_AIRCR = SCB_RESET_VALUE; } diff --git a/libcpu/arm/cortex-r4/cpu.c b/libcpu/arm/cortex-r4/cpu.c index b63a07732d..2741bfef9b 100644 --- a/libcpu/arm/cortex-r4/cpu.c +++ b/libcpu/arm/cortex-r4/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { } @@ -28,7 +28,7 @@ RT_WEAK void rt_hw_cpu_reset() * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/dm36x/cpuport.c b/libcpu/arm/dm36x/cpuport.c index a23dc323c6..915c79c34f 100644 --- a/libcpu/arm/dm36x/cpuport.c +++ b/libcpu/arm/dm36x/cpuport.c @@ -145,7 +145,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { rt_kprintf("Restarting system...\n"); @@ -160,7 +160,7 @@ RT_WEAK void rt_hw_cpu_reset() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/dm36x/mmu.c b/libcpu/arm/dm36x/mmu.c index bec2e6a71c..31fdf74bb8 100644 --- a/libcpu/arm/dm36x/mmu.c +++ b/libcpu/arm/dm36x/mmu.c @@ -421,12 +421,12 @@ void mmu_invalidate_dcache_all() #endif /* level1 page table */ -static volatile unsigned int _pgd_table[4*1024] ALIGN(16*1024); +static volatile unsigned int _pgd_table[4*1024] rt_align(16*1024); /* * level2 page table * RT_MMU_PTE_SIZE must be 1024*n */ -static volatile unsigned int _pte_table[RT_MMU_PTE_SIZE] ALIGN(1*1024); +static volatile unsigned int _pte_table[RT_MMU_PTE_SIZE] rt_align(1*1024); void mmu_create_pgd(struct mem_desc *mdesc) { diff --git a/libcpu/arm/lpc214x/cpuport.c b/libcpu/arm/lpc214x/cpuport.c index a1f594dcb9..de5a900a67 100644 --- a/libcpu/arm/lpc214x/cpuport.c +++ b/libcpu/arm/lpc214x/cpuport.c @@ -163,7 +163,7 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { } @@ -171,7 +171,7 @@ RT_WEAK void rt_hw_cpu_reset(void) * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/lpc24xx/cpu.c b/libcpu/arm/lpc24xx/cpu.c index d9c74020bb..9e19cbf73c 100644 --- a/libcpu/arm/lpc24xx/cpu.c +++ b/libcpu/arm/lpc24xx/cpu.c @@ -20,7 +20,7 @@ * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { } @@ -28,7 +28,7 @@ RT_WEAK void rt_hw_cpu_reset() * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/realview-a8-vmm/cpu.c b/libcpu/arm/realview-a8-vmm/cpu.c index 48e859e4e5..95c122f1d2 100644 --- a/libcpu/arm/realview-a8-vmm/cpu.c +++ b/libcpu/arm/realview-a8-vmm/cpu.c @@ -18,7 +18,7 @@ /*@{*/ /** shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/realview-a8-vmm/interrupt.c b/libcpu/arm/realview-a8-vmm/interrupt.c index 23ff062a8b..5a91004f8e 100644 --- a/libcpu/arm/realview-a8-vmm/interrupt.c +++ b/libcpu/arm/realview-a8-vmm/interrupt.c @@ -26,9 +26,9 @@ extern volatile rt_uint8_t rt_interrupt_nest; struct rt_irq_desc isr_table[MAX_HANDLERS]; /* Those varibles will be accessed in ISR, so we need to share them. */ -rt_uint32_t rt_interrupt_from_thread RT_SECTION(".bss.share.int"); -rt_uint32_t rt_interrupt_to_thread RT_SECTION(".bss.share.int"); -rt_uint32_t rt_thread_switch_interrupt_flag RT_SECTION(".bss.share.int"); +rt_uint32_t rt_interrupt_from_thread rt_section(".bss.share.int"); +rt_uint32_t rt_interrupt_to_thread rt_section(".bss.share.int"); +rt_uint32_t rt_thread_switch_interrupt_flag rt_section(".bss.share.int"); const unsigned int VECTOR_BASE = 0x00; extern void rt_cpu_vector_set_base(unsigned int addr); diff --git a/libcpu/arm/s3c24x0/cpu.c b/libcpu/arm/s3c24x0/cpu.c index 06db937eb9..88208efc9b 100644 --- a/libcpu/arm/s3c24x0/cpu.c +++ b/libcpu/arm/s3c24x0/cpu.c @@ -148,7 +148,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { /* Disable all interrupt except the WDT */ INTMSK = (~((rt_uint32_t)1 << INTWDT)); @@ -171,7 +171,7 @@ RT_WEAK void rt_hw_cpu_reset() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/s3c44b0/cpu.c b/libcpu/arm/s3c44b0/cpu.c index d80ca054e2..e64c6769d6 100644 --- a/libcpu/arm/s3c44b0/cpu.c +++ b/libcpu/arm/s3c44b0/cpu.c @@ -100,7 +100,7 @@ rt_base_t rt_hw_cpu_dcache_status() * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { } @@ -108,7 +108,7 @@ RT_WEAK void rt_hw_cpu_reset() * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/libcpu/arm/sep4020/cpu.c b/libcpu/arm/sep4020/cpu.c index 2977f38f4c..c488686e2d 100644 --- a/libcpu/arm/sep4020/cpu.c +++ b/libcpu/arm/sep4020/cpu.c @@ -152,7 +152,7 @@ rt_base_t rt_hw_cpu_dcache_status() * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { /* enable watchdog */ @@ -173,7 +173,7 @@ RT_WEAK void rt_hw_cpu_reset() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/avr32/uc3/cpu.c b/libcpu/avr32/uc3/cpu.c index 4aaf6c8896..37b0828cf8 100644 --- a/libcpu/avr32/uc3/cpu.c +++ b/libcpu/avr32/uc3/cpu.c @@ -19,7 +19,7 @@ * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { /*NOTREACHED*/ } diff --git a/libcpu/mips/gs232/cpuport.c b/libcpu/mips/gs232/cpuport.c index e22d9bc14d..a4a6728ccd 100644 --- a/libcpu/mips/gs232/cpuport.c +++ b/libcpu/mips/gs232/cpuport.c @@ -23,7 +23,7 @@ * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset(void) +rt_weak void rt_hw_cpu_reset(void) { /* open the watch-dog */ WDT_EN = 0x01; /* watch dog enable */ @@ -38,7 +38,7 @@ RT_WEAK void rt_hw_cpu_reset(void) * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); diff --git a/libcpu/risc-v/common/cpuport.c b/libcpu/risc-v/common/cpuport.c index c35f0da6f0..c3cbe7b5cc 100644 --- a/libcpu/risc-v/common/cpuport.c +++ b/libcpu/risc-v/common/cpuport.c @@ -138,7 +138,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, * #endif */ #ifndef RT_USING_SMP -RT_WEAK void rt_hw_context_switch_interrupt(rt_ubase_t from, rt_ubase_t to, rt_thread_t from_thread, rt_thread_t to_thread) +rt_weak void rt_hw_context_switch_interrupt(rt_ubase_t from, rt_ubase_t to, rt_thread_t from_thread, rt_thread_t to_thread) { if (rt_thread_switch_interrupt_flag == 0) rt_interrupt_from_thread = from; @@ -151,7 +151,7 @@ RT_WEAK void rt_hw_context_switch_interrupt(rt_ubase_t from, rt_ubase_t to, rt_t #endif /* end of RT_USING_SMP */ /** shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/risc-v/hpmicro/cpuport.c b/libcpu/risc-v/hpmicro/cpuport.c index 8063e4bc45..7574624104 100644 --- a/libcpu/risc-v/hpmicro/cpuport.c +++ b/libcpu/risc-v/hpmicro/cpuport.c @@ -77,7 +77,7 @@ void rt_hw_context_switch_interrupt(rt_ubase_t from, rt_ubase_t to) } /** shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_uint32_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/risc-v/k210/interrupt.c b/libcpu/risc-v/k210/interrupt.c index b5384b01ee..23d11c1813 100644 --- a/libcpu/risc-v/k210/interrupt.c +++ b/libcpu/risc-v/k210/interrupt.c @@ -176,7 +176,7 @@ rt_isr_handler_t rt_hw_interrupt_install(int vector, rt_isr_handler_t handler, return old_handler; } -RT_WEAK +rt_weak void plic_irq_handle(plic_irq_t irq) { rt_kprintf("UN-handled interrupt %d occurred!!!\n", irq); diff --git a/libcpu/risc-v/nuclei/cpuport.c b/libcpu/risc-v/nuclei/cpuport.c index 88f3af8230..2ce24694c1 100644 --- a/libcpu/risc-v/nuclei/cpuport.c +++ b/libcpu/risc-v/nuclei/cpuport.c @@ -150,7 +150,7 @@ void rt_hw_context_switch(rt_ubase_t from, rt_ubase_t to) * @brief shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/risc-v/t-head/e9xx/cpuport.c b/libcpu/risc-v/t-head/e9xx/cpuport.c index 824fe5240f..18bb265130 100644 --- a/libcpu/risc-v/t-head/e9xx/cpuport.c +++ b/libcpu/risc-v/t-head/e9xx/cpuport.c @@ -135,7 +135,7 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, } /** shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/rx/cpuport.c b/libcpu/rx/cpuport.c index f92f17466e..20ae133bb1 100644 --- a/libcpu/rx/cpuport.c +++ b/libcpu/rx/cpuport.c @@ -179,7 +179,7 @@ void rt_hw_context_switch_interrupt(rt_uint32_t from, rt_uint32_t to) * * @author LXZ (2014/11/8) */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); diff --git a/libcpu/sim/win32/startup.c b/libcpu/sim/win32/startup.c index 975e088c1e..18ef2c997d 100644 --- a/libcpu/sim/win32/startup.c +++ b/libcpu/sim/win32/startup.c @@ -251,7 +251,7 @@ int entry(void) #ifndef RT_USING_HEAP /* if there is not enable heap, we should use static thread and stack. */ -ALIGN(8) +rt_align(8) static rt_uint8_t main_stack[RT_MAIN_THREAD_STACK_SIZE]; struct rt_thread main_thread; #endif diff --git a/libcpu/ti-dsp/c28x/cpuport.c b/libcpu/ti-dsp/c28x/cpuport.c index e5ffbd3cc3..069449c1dc 100644 --- a/libcpu/ti-dsp/c28x/cpuport.c +++ b/libcpu/ti-dsp/c28x/cpuport.c @@ -157,7 +157,7 @@ int __rt_ffs(int value) /** * shutdown CPU */ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); diff --git a/libcpu/ti-dsp/c6x/cpuport.c b/libcpu/ti-dsp/c6x/cpuport.c index 158f587311..31f1255a2d 100644 --- a/libcpu/ti-dsp/c6x/cpuport.c +++ b/libcpu/ti-dsp/c6x/cpuport.c @@ -19,7 +19,7 @@ * None * RETURNED VALUE: None -----------------------------------------------------------------------------*/ -RT_WEAK void rt_hw_cpu_shutdown(void) +rt_weak void rt_hw_cpu_shutdown(void) { rt_kprintf("shutdown...\n"); diff --git a/libcpu/unicore32/sep6200/cpu.c b/libcpu/unicore32/sep6200/cpu.c index 8ce7f89186..26aa673d84 100644 --- a/libcpu/unicore32/sep6200/cpu.c +++ b/libcpu/unicore32/sep6200/cpu.c @@ -245,7 +245,7 @@ static void sep6200_poweroff(void) * reset cpu by dog's time-out * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { rt_kprintf("Soft reset, Restarting system...\n"); @@ -260,7 +260,7 @@ RT_WEAK void rt_hw_cpu_reset() * shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_base_t level; rt_kprintf("shutdown...\n"); diff --git a/libcpu/xilinx/microblaze/cpu.c b/libcpu/xilinx/microblaze/cpu.c index 461d3ad97b..70a908a22d 100755 --- a/libcpu/xilinx/microblaze/cpu.c +++ b/libcpu/xilinx/microblaze/cpu.c @@ -14,7 +14,7 @@ * this function will reset CPU * */ -RT_WEAK void rt_hw_cpu_reset() +rt_weak void rt_hw_cpu_reset() { } @@ -22,7 +22,7 @@ RT_WEAK void rt_hw_cpu_reset() * this function will shutdown CPU * */ -RT_WEAK void rt_hw_cpu_shutdown() +rt_weak void rt_hw_cpu_shutdown() { rt_kprintf("shutdown...\n"); diff --git a/src/clock.c b/src/clock.c index 0e88bf4d61..e736bc9f91 100644 --- a/src/clock.c +++ b/src/clock.c @@ -164,7 +164,7 @@ RTM_EXPORT(rt_tick_from_millisecond); * * @return Return passed millisecond from boot. */ -RT_WEAK rt_tick_t rt_tick_get_millisecond(void) +rt_weak rt_tick_t rt_tick_get_millisecond(void) { #if 1000 % RT_TICK_PER_SECOND == 0u return rt_tick_get() * (1000u / RT_TICK_PER_SECOND); diff --git a/src/components.c b/src/components.c index 78eb002214..809ca72a1d 100644 --- a/src/components.c +++ b/src/components.c @@ -165,7 +165,7 @@ int entry(void) #ifndef RT_USING_HEAP /* if there is not enable heap, we should use static thread and stack. */ -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t main_thread_stack[RT_MAIN_THREAD_STACK_SIZE]; struct rt_thread main_thread; #endif /* RT_USING_HEAP */ diff --git a/src/idle.c b/src/idle.c index 30f22d8963..214a6b2ad2 100644 --- a/src/idle.c +++ b/src/idle.c @@ -48,7 +48,7 @@ static rt_list_t _rt_thread_defunct = RT_LIST_OBJECT_INIT(_rt_thread_defunct); static struct rt_thread idle_thread[_CPUS_NR]; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t idle_thread_stack[_CPUS_NR][IDLE_THREAD_STACK_SIZE]; #ifdef RT_USING_SMP @@ -56,7 +56,7 @@ static rt_uint8_t idle_thread_stack[_CPUS_NR][IDLE_THREAD_STACK_SIZE]; #define SYSTEM_THREAD_STACK_SIZE IDLE_THREAD_STACK_SIZE #endif static struct rt_thread rt_system_thread; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t rt_system_stack[SYSTEM_THREAD_STACK_SIZE]; static struct rt_semaphore system_sem; #endif diff --git a/src/irq.c b/src/irq.c index e7465da305..0073eaf529 100644 --- a/src/irq.c +++ b/src/irq.c @@ -78,7 +78,7 @@ volatile rt_uint8_t rt_interrupt_nest = 0; * * @see rt_interrupt_leave */ -RT_WEAK void rt_interrupt_enter(void) +rt_weak void rt_interrupt_enter(void) { rt_base_t level; @@ -100,7 +100,7 @@ RTM_EXPORT(rt_interrupt_enter); * * @see rt_interrupt_enter */ -RT_WEAK void rt_interrupt_leave(void) +rt_weak void rt_interrupt_leave(void) { rt_base_t level; @@ -123,7 +123,7 @@ RTM_EXPORT(rt_interrupt_leave); * * @return the number of nested interrupts. */ -RT_WEAK rt_uint8_t rt_interrupt_get_nest(void) +rt_weak rt_uint8_t rt_interrupt_get_nest(void) { rt_uint8_t ret; rt_base_t level; diff --git a/src/kservice.c b/src/kservice.c index ba93b61c7e..d6ba39e006 100644 --- a/src/kservice.c +++ b/src/kservice.c @@ -54,7 +54,7 @@ static volatile int __rt_errno; static rt_device_t _console_device = RT_NULL; #endif -RT_WEAK void rt_hw_us_delay(rt_uint32_t us) +rt_weak void rt_hw_us_delay(rt_uint32_t us) { (void) us; RT_DEBUG_LOG(RT_DEBUG_DEVICE, ("rt_hw_us_delay() doesn't support for this board." @@ -186,7 +186,7 @@ RTM_EXPORT(_rt_errno); * * @return The address of source memory. */ -RT_WEAK void *rt_memset(void *s, int c, rt_ubase_t count) +rt_weak void *rt_memset(void *s, int c, rt_ubase_t count) { #ifdef RT_KSERVICE_USING_TINY_SIZE char *xs = (char *)s; @@ -266,7 +266,7 @@ RTM_EXPORT(rt_memset); * * @return The address of destination memory */ -RT_WEAK void *rt_memcpy(void *dst, const void *src, rt_ubase_t count) +rt_weak void *rt_memcpy(void *dst, const void *src, rt_ubase_t count) { #ifdef RT_KSERVICE_USING_TINY_SIZE char *tmp = (char *)dst, *s = (char *)src; @@ -902,7 +902,7 @@ static char *print_number(char *buf, * * @return The number of characters actually written to buffer. */ -RT_WEAK int rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args) +rt_weak int rt_vsnprintf(char *buf, rt_size_t size, const char *fmt, va_list args) { #ifdef RT_KPRINTF_USING_LONGLONG unsigned long long num; @@ -1308,7 +1308,7 @@ extern void console_init(); RTM_EXPORT(rt_console_set_device); #endif /* RT_USING_DEVICE */ -RT_WEAK void rt_hw_console_output(const char *str) +rt_weak void rt_hw_console_output(const char *str) { /* empty console output */ } @@ -1344,7 +1344,7 @@ void rt_kputs(const char *str) * * @return The number of characters actually written to buffer. */ -RT_WEAK int rt_kprintf(const char *fmt, ...) +rt_weak int rt_kprintf(const char *fmt, ...) { va_list args; rt_size_t length; @@ -1529,7 +1529,7 @@ rt_inline void _slab_info(rt_size_t *total, * * @param end_addr the end address of system page. */ -RT_WEAK void rt_system_heap_init(void *begin_addr, void *end_addr) +rt_weak void rt_system_heap_init(void *begin_addr, void *end_addr) { rt_ubase_t begin_align = RT_ALIGN((rt_ubase_t)begin_addr, RT_ALIGN_SIZE); rt_ubase_t end_align = RT_ALIGN_DOWN((rt_ubase_t)end_addr, RT_ALIGN_SIZE); @@ -1549,7 +1549,7 @@ RT_WEAK void rt_system_heap_init(void *begin_addr, void *end_addr) * * @return the pointer to allocated memory or NULL if no free memory was found. */ -RT_WEAK void *rt_malloc(rt_size_t size) +rt_weak void *rt_malloc(rt_size_t size) { rt_base_t level; void *ptr; @@ -1575,7 +1575,7 @@ RTM_EXPORT(rt_malloc); * * @return the changed memory block address. */ -RT_WEAK void *rt_realloc(void *rmem, rt_size_t newsize) +rt_weak void *rt_realloc(void *rmem, rt_size_t newsize) { rt_base_t level; void *nptr; @@ -1603,7 +1603,7 @@ RTM_EXPORT(rt_realloc); * * @return pointer to allocated memory / NULL pointer if there is an error. */ -RT_WEAK void *rt_calloc(rt_size_t count, rt_size_t size) +rt_weak void *rt_calloc(rt_size_t count, rt_size_t size) { void *p; @@ -1624,7 +1624,7 @@ RTM_EXPORT(rt_calloc); * * @param rmem the address of memory which will be released. */ -RT_WEAK void rt_free(void *rmem) +rt_weak void rt_free(void *rmem) { rt_base_t level; @@ -1650,7 +1650,7 @@ RTM_EXPORT(rt_free); * * @param max_used is a pointer to get the maximum memory used. */ -RT_WEAK void rt_memory_info(rt_size_t *total, +rt_weak void rt_memory_info(rt_size_t *total, rt_size_t *used, rt_size_t *max_used) { @@ -1703,7 +1703,7 @@ void rt_page_free(void *addr, rt_size_t npages) * @return The memory block address was returned successfully, otherwise it was * returned empty RT_NULL. */ -RT_WEAK void *rt_malloc_align(rt_size_t size, rt_size_t align) +rt_weak void *rt_malloc_align(rt_size_t size, rt_size_t align) { void *ptr; void *align_ptr; @@ -1749,7 +1749,7 @@ RTM_EXPORT(rt_malloc_align); * * @param ptr is the memory block pointer. */ -RT_WEAK void rt_free_align(void *ptr) +rt_weak void rt_free_align(void *ptr) { void *real_ptr = RT_NULL; diff --git a/src/timer.c b/src/timer.c index 5e200c0c95..cfe4fc8678 100644 --- a/src/timer.c +++ b/src/timer.c @@ -45,7 +45,7 @@ static rt_uint8_t _soft_timer_status = RT_SOFT_TIMER_IDLE; /* soft timer list */ static rt_list_t _soft_timer_list[RT_TIMER_SKIP_LIST_LEVEL]; static struct rt_thread _timer_thread; -ALIGN(RT_ALIGN_SIZE) +rt_align(RT_ALIGN_SIZE) static rt_uint8_t _timer_thread_stack[RT_TIMER_THREAD_STACK_SIZE]; #endif /* RT_USING_TIMER_SOFT */