Selaa lähdekoodia

[Kernel] Fix main() issue in Keil MDK

Bernard Xiong 10 vuotta sitten
vanhempi
commit
9339c2d96e
1 muutettua tiedostoa jossa 4 lisäystä ja 1 poistoa
  1. 4 1
      src/init.c

+ 4 - 1
src/init.c

@@ -149,13 +149,14 @@ struct rt_thread main_thread;
 void main_thread_entry(void *parameter)
 {
     extern int main(void);
+    extern int $Super$$main(void);
 
     /* RT-Thread components initialization */
     rt_components_init();
 
     /* invoke system main function */
 #ifdef __CC_ARM
-    $Sub$$main();
+    $Super$$main(); /* for ARMCC. */
 #else
     main();
 #endif
@@ -183,6 +184,8 @@ void rt_application_init(void)
 
 int rtthread_startup(void)
 {
+	rt_hw_interrupt_disable();
+
     /* board level initalization
      * NOTE: please initialize heap inside board initialization.
      */