libs/rt-thread-official
libs/rt-thread-official
4
0
Fork 0
mirror of https://github.com/RT-Thread/rt-thread.git synced 2025-02-28 04:27:07 +08:00
Code Issues Releases Wiki Activity

[src]解除组件初始化与使用user main的依赖

Browse Source
This commit is contained in:
yangjie 2019-09-11 12:01:24 +08:00
parent 2ed84b61b0
commit e7cb38c9c3
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/SConscript
View File

@ -6,9 +6,6 @@ src = Glob('*.c')
CPPPATH = [RTT_ROOT + '/include'] CPPPATH = [RTT_ROOT + '/include']
if GetDepend('RT_USING_COMPONENTS_INIT') == False:
SrcRemove(src, ['components.c'])
if GetDepend('RT_USING_MODULE') == False: if GetDepend('RT_USING_MODULE') == False:
SrcRemove(src, ['module.c']) SrcRemove(src, ['module.c'])

5
src/components.c
View File

@ -126,6 +126,7 @@ void rt_components_init(void)
} }
#endif #endif
} }
#endif /* RT_USING_COMPONENTS_INIT */
#ifdef RT_USING_USER_MAIN #ifdef RT_USING_USER_MAIN
@ -174,9 +175,10 @@ void main_thread_entry(void *parameter)
extern int main(void); extern int main(void);
extern int $Super$$main(void); extern int $Super$$main(void);
#ifdef RT_USING_COMPONENTS_INIT
/* RT-Thread components initialization */ /* RT-Thread components initialization */
rt_components_init(); rt_components_init();
#endif
#ifdef RT_USING_SMP #ifdef RT_USING_SMP
rt_hw_secondary_cpu_up(); rt_hw_secondary_cpu_up();
#endif #endif
@ -254,4 +256,3 @@ int rtthread_startup(void)
return 0; return 0;
} }
#endif #endif
#endif