From 21b9e64cd6c37aef3475b3403b69c0b2cb61a9d5 Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@gmail.com>
Date: Sat, 19 Jul 2014 06:51:43 +0800
Subject: [PATCH] [BSP] remove COMPONENTS_INIT for lpc176x and stm32f107
 porting.

---
 bsp/lpc176x/applications/application.c   | 38 +++++++++---
 bsp/lpc176x/rtconfig.h                   |  2 +-
 bsp/stm32f107/applications/application.c | 78 ++++++++++++++----------
 bsp/stm32f107/rtconfig.h                 |  4 +-
 4 files changed, 80 insertions(+), 42 deletions(-)

diff --git a/bsp/lpc176x/applications/application.c b/bsp/lpc176x/applications/application.c
index 3ea7c29034..1fda158cb1 100644
--- a/bsp/lpc176x/applications/application.c
+++ b/bsp/lpc176x/applications/application.c
@@ -19,14 +19,20 @@
 #include <rtthread.h>
 #include "platform.h"
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif
 #ifdef RT_USING_LWIP
 #include <emac.h>
+#include <netif/ethernetif.h>
+extern int lwip_system_init(void);
 #endif
+
 #ifdef RT_USING_DFS
 #include <dfs_fs.h>
+#include <sd.h>
+#endif
+
+#ifdef RT_USING_FINSH
+#include <shell.h>
+#include <finsh.h>
 #endif
 
 /* thread phase init */
@@ -38,21 +44,39 @@ void rt_init_thread_entry(void *parameter)
 #ifdef RT_USING_LWIP
     /* register Ethernet interface device */
     lpc17xx_emac_hw_init();
-#endif
 
-#ifdef RT_USING_COMPONENTS_INIT
-    /* initialization RT-Thread Components */
-    rt_components_init();
+    /* initialize lwip stack */
+	/* register ethernetif device */
+	eth_system_device_init();
+
+	/* initialize lwip system */
+	lwip_system_init();
+	rt_kprintf("TCP/IP initialized!\n");
 #endif
 
     /* Filesystem Initialization */
 #ifdef RT_USING_DFS
+    rt_hw_sdcard_init();
+
+	/* initialize the device file system */
+	dfs_init();
+
+#ifdef RT_USING_DFS_ELMFAT
+	/* initialize the elm chan FatFS file system*/
+	elm_init();
+#endif
+
     /* mount sd card fat partition 1 as root directory */
     if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
     	rt_kprintf("File System initialized!\n");
     else
     	rt_kprintf("File System init failed!\n");
 #endif
+
+#ifdef RT_USING_FINSH
+	/* initialize finsh */
+	finsh_system_init();
+#endif
 }
 
 int rt_application_init()
diff --git a/bsp/lpc176x/rtconfig.h b/bsp/lpc176x/rtconfig.h
index 8aefe475d3..07553e2470 100644
--- a/bsp/lpc176x/rtconfig.h
+++ b/bsp/lpc176x/rtconfig.h
@@ -78,7 +78,7 @@
 // </section>
 
 // <bool name="RT_USING_COMPONENTS_INIT" description="Using RT-Thread components initialization" default="true" />
-#define RT_USING_COMPONENTS_INIT
+// #define RT_USING_COMPONENTS_INIT
 // <section name="RT_USING_FINSH" description="Using finsh as shell, which is a C-Express shell" default="true" >
 #define RT_USING_FINSH
 // <bool name="FINSH_USING_SYMTAB" description="Using symbol table in finsh shell" default="true" />
diff --git a/bsp/stm32f107/applications/application.c b/bsp/stm32f107/applications/application.c
index 025451d32e..ef28641004 100644
--- a/bsp/stm32f107/applications/application.c
+++ b/bsp/stm32f107/applications/application.c
@@ -22,11 +22,20 @@
 
 #ifdef RT_USING_DFS
 #include <dfs_fs.h>
+#include <dfs_init.h>
+#include <dfs_elm.h>
 #endif
 
-#ifdef RT_USING_COMPONENTS_INIT
-#include <components.h>
-#endif /* RT_USING_COMPONENTS_INIT */
+#ifdef RT_USING_LWIP
+#include <stm32_eth.h>
+#include <netif/ethernetif.h>
+extern int lwip_system_init(void);
+#endif
+
+#ifdef RT_USING_FINSH
+#include <shell.h>
+#include <finsh.h>
+#endif
 
 void rt_init_thread_entry(void* parameter)
 {
@@ -35,45 +44,50 @@ void rt_init_thread_entry(void* parameter)
         rt_platform_init();
     }
 
-#ifdef RT_USING_COMPONENTS_INIT
-    /* initialization RT-Thread Components */
-    rt_components_init();
-#endif
-
     /* Filesystem Initialization */
 #if defined(RT_USING_DFS) && defined(RT_USING_DFS_ELMFAT)
+	/* initialize the device file system */
+	dfs_init();
+
+	/* initialize the elm chan FatFS file system*/
+	elm_init();
+    
+    /* mount sd card fat partition 1 as root directory */
+    if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
+    {
+        rt_kprintf("File System initialized!\n");
+    }
+    else
     {
-        /* mount sd card fat partition 1 as root directory */
-        if (dfs_mount("sd0", "/", "elm", 0, 0) == 0)
-        {
-            rt_kprintf("File System initialized!\n");
-        }
-        else
-        {
-            rt_kprintf("File System initialzation failed!\n");
-        }
+        rt_kprintf("File System initialzation failed!\n");
     }
 #endif /* RT_USING_DFS && RT_USING_DFS_ELMFAT */
+
+#ifdef RT_USING_LWIP
+	/* initialize lwip stack */
+	/* register ethernetif device */
+	eth_system_device_init();
+
+	/* initialize lwip system */
+	lwip_system_init();
+	rt_kprintf("TCP/IP initialized!\n");
+#endif
+
+#ifdef RT_USING_FINSH
+	/* initialize finsh */
+	finsh_system_init();
+	finsh_set_device(RT_CONSOLE_DEVICE_NAME);
+#endif
 }
 
 int rt_application_init(void)
 {
-    rt_thread_t init_thread;
+    rt_thread_t tid;
 
-#if (RT_THREAD_PRIORITY_MAX == 32)
-    init_thread = rt_thread_create("init",
-                                   rt_init_thread_entry, RT_NULL,
-                                   2048, 8, 20);
-#else
-    init_thread = rt_thread_create("init",
-                                   rt_init_thread_entry, RT_NULL,
-                                   2048, 80, 20);
-#endif
-
-    if (init_thread != RT_NULL)
-    {
-        rt_thread_startup(init_thread);
-    }
+    tid = rt_thread_create("init",
+        rt_init_thread_entry, RT_NULL,
+        2048, RT_THREAD_PRIORITY_MAX/3, 20);
+    if (tid != RT_NULL) rt_thread_startup(tid);
 
     return 0;
 }
diff --git a/bsp/stm32f107/rtconfig.h b/bsp/stm32f107/rtconfig.h
index 7450367dbf..7f308c103f 100644
--- a/bsp/stm32f107/rtconfig.h
+++ b/bsp/stm32f107/rtconfig.h
@@ -69,8 +69,8 @@
 #define RT_CONSOLE_DEVICE_NAME	"uart1"
 // </section>
 
-// <section name="RT_USING_COMPONENTS_INIT" description="Using components init" default="true" >
-#define RT_USING_COMPONENTS_INIT
+// <section name="RT_USING_COMPONENTS_INIT" description="Using components init" default="false" >
+// #define RT_USING_COMPONENTS_INIT
 // </section>
 
 /* SECTION: finsh, a C-Express shell */
-- 
GitLab