diff options
| author | bernard <[email protected]> | 2017-09-29 10:23:56 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2017-09-29 10:23:56 +0800 |
| commit | cccff34fcac04f34233a33e453f2d0ec255bf231 (patch) | |
| tree | d406036f73296b27f3cb96e77ede98dd7803c61d /src/scheduler.c | |
| parent | e9a77b513f0a4b37d539a030592a61b08d03602d (diff) | |
| parent | 3691b67e83ab57196dfc62606b1be18db76994a7 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'src/scheduler.c')
| -rw-r--r-- | src/scheduler.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scheduler.c b/src/scheduler.c index 5cc2f0b067..e3e200efc7 100644 --- a/src/scheduler.c +++ b/src/scheduler.c @@ -42,7 +42,7 @@ static rt_int16_t rt_scheduler_lock_nest; extern volatile rt_uint8_t rt_interrupt_nest; -extern int __rt_ffs(int value); +extern rt_ubase_t __rt_ffs(rt_ubase_t value); rt_list_t rt_thread_priority_table[RT_THREAD_PRIORITY_MAX]; struct rt_thread *rt_current_thread; @@ -90,19 +90,19 @@ static void _rt_scheduler_stack_check(struct rt_thread *thread) RT_ASSERT(thread != RT_NULL); if (*((rt_uint8_t *)thread->stack_addr) != '#' || - (rt_uint32_t)thread->sp <= (rt_uint32_t)thread->stack_addr || + (rt_uint32_t)thread->sp <= (rt_uint32_t)thread->stack_addr || (rt_uint32_t)thread->sp > (rt_uint32_t)thread->stack_addr + (rt_uint32_t)thread->stack_size) { rt_uint32_t level; rt_kprintf("thread:%s stack overflow\n", thread->name); - #ifdef RT_USING_FINSH +#ifdef RT_USING_FINSH { extern long list_thread(void); list_thread(); } - #endif +#endif level = rt_hw_interrupt_disable(); while (level); } |