summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/clock.c2
-rw-r--r--src/components.c2
-rw-r--r--src/idle.c4
-rw-r--r--src/irq.c6
-rw-r--r--src/kservice.c28
-rw-r--r--src/timer.c2
6 files changed, 22 insertions, 22 deletions
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 */