merge bsp/simlinux into bsp/simulator

1 files changed, 8 insertions, 14 deletions

diff --git a/bsp/simulator/applications/application.c b/bsp/simulator/applications/application.c
index abd582c3ce..6394cf736b 100644..100755
--- a/bsp/simulator/applications/application.c
+++ b/bsp/simulator/applications/application.c
@@ -18,6 +18,7 @@
 
 #include <components.h>
 
+
 void rt_init_thread_entry(void *parameter)
 {
 #ifdef RT_USING_LWIP
@@ -49,7 +50,8 @@ void rt_init_thread_entry(void *parameter)
 
 #ifdef RT_USING_DFS_ELMFAT
         /* mount sd card fatfs as root directory */
-        if (dfs_mount("sd0", "/disk/sd", "elm", 0, 0) == 0)
+        //if (dfs_mount("sd0", "/disk/sd", "elm", 0, 0) == 0)
+        if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
             rt_kprintf("fatfs initialized!\n");
         else
             rt_kprintf("fatfs initialization failed!\n");
@@ -74,30 +76,23 @@ void rt_init_thread_entry(void *parameter)
     }
 #endif
 
-#if 0
-    {
-        extern void application_init(void);
-        rt_thread_delay(RT_TICK_PER_SECOND);
-        application_init();
-    }
-#endif
-
 #if defined(RT_USING_RTGUI)
-    rt_thread_delay(3000);
-    snake_main();
+    //rt_thread_delay(RT_TICK_PER_SECOND);
+    //snake_main();
 #endif
 }
 
 static void rt_test_thread_entry(void *parameter)
 {
     int i;
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < 5; i++)
     {
         rt_kprintf("hello, world\n");
-        rt_thread_delay(100);
+        rt_thread_delay(RT_TICK_PER_SECOND);
     }
 }
 
+
 int rt_application_init()
 {
     rt_thread_t tid;
@@ -118,5 +113,4 @@ int rt_application_init()
     return 0;
 }
 
-
 /*@}*/