Browse Source

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

yangjie 5 years ago
parent
commit
e7cb38c9c3
2 changed files with 4 additions and 6 deletions
  1. 0 3
      src/SConscript
  2. 4 3
      src/components.c

+ 0 - 3
src/SConscript

@@ -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'])
 
 

+ 4 - 3
src/components.c

@@ -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
 
 
@@ -173,10 +174,11 @@ 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