Merge pull request #1622 from armink/fix_com_init

[components] Update dfs and lwIP 2.0.2 re-initialization process.

1 files changed, 7 insertions, 6 deletions

diff --git a/components/net/lwip-2.0.2/src/arch/sys_arch.c b/components/net/lwip-2.0.2/src/arch/sys_arch.c
index 316b970048..97d962e63e 100644
--- a/components/net/lwip-2.0.2/src/arch/sys_arch.c
+++ b/components/net/lwip-2.0.2/src/arch/sys_arch.c
@@ -98,7 +98,7 @@ static void tcpip_init_done_callback(void *arg)
 
             /* leave critical */
             rt_exit_critical();
-			LOCK_TCPIP_CORE();
+            LOCK_TCPIP_CORE();
 
             netif_add(ethif->netif, &ipaddr, &netmask, &gw,
                       ethif, netif_device_init, tcpip_input);
@@ -121,7 +121,7 @@ static void tcpip_init_done_callback(void *arg)
                 netif_set_link_up(ethif->netif);
             }
 
-			UNLOCK_TCPIP_CORE();
+            UNLOCK_TCPIP_CORE();
             /* enter critical */
             rt_enter_critical();
         }
@@ -136,18 +136,17 @@ static void tcpip_init_done_callback(void *arg)
  * LwIP system initialization
  */
 extern int eth_system_device_init_private(void);
-static volatile uint8_t init_ok = 0;
 int lwip_system_init(void)
 {
     rt_err_t rc;
     struct rt_semaphore done_sem;
+    static rt_bool_t init_ok = RT_FALSE;
 
-    if(init_ok)
+    if (init_ok)
     {
         rt_kprintf("lwip system already init.\n");
-        return 0;        
+        return 0;
     }
-    init_ok = 1;
 
     eth_system_device_init_private();
 
@@ -189,6 +188,8 @@ int lwip_system_init(void)
 #endif
     rt_kprintf("lwIP-%d.%d.%d initialized!\n", LWIP_VERSION_MAJOR, LWIP_VERSION_MINOR, LWIP_VERSION_REVISION);
 
+    init_ok = RT_TRUE;
+
     return 0;
 }
 INIT_PREV_EXPORT(lwip_system_init);