[rel][bug][bt] fix bug about lwip timer not restart

Project: Bluetooth

redmine: #id, REDMINE-5715

ext-redmine: bug|feat#id

[Description in detail]

Affected branch: [master]

Change-Id: I52e206fcb321156c98403de565f4901db358c942

Author: chaotaoyang

porting/rtt/bt_pan/bt_lwip.c

@@ -11,7 +11,6 @@
 #include "bts2_app_pan.h"
 #include "bt_lwip.h"
 #include "bt_prot.h"
-#include "lwip/pbuf.h"
 #include "bts2_app_demo.h"
 
 #include "rtdef.h"
@@ -23,6 +22,8 @@
 #ifdef RT_USING_LWIP
 #include <netif/ethernetif.h>
 #include <lwip/netifapi.h>
+#include "lwip/pbuf.h"
+#include "lwip/timeouts.h"
 #ifdef LWIP_USING_DHCPD
     #include <dhcp_server.h>
 #endif
@@ -59,7 +60,7 @@ void rt_bt_lwip_event_handle(struct rt_bt_lwip_pan_dev *bt_dev, int event)
     {
         LOG_D("event: CONNECT");
         lwip_prot->connected_flag = RT_TRUE;
-        lwip_sys_init();//to restart timer
+        sys_timeouts_init();//to restart timer
         netifapi_netif_common(eth_dev->netif, netif_set_link_up, NULL);
 #ifdef RT_LWIP_DHCP
         dhcp_start(eth_dev->netif);

porting/rtt/bt_pan/bt_lwip_pan_dev.c

@@ -12,7 +12,6 @@ extern "C" {
 #endif
 #include <rthw.h>
 #include <rtthread.h>
-#include "lwip/pbuf.h"
 #include "rtdef.h"
 #include "bts2_app_inc.h"
 #include "bt_prot.h"
@@ -31,7 +30,7 @@ struct rt_bt_dev_ops dev_ops =
     bt_lwip_pan_dev_send_data
 };
 
-struct rt_bt_lwip_pan_dev * bt_lwip_get_default_pan_dev()
+struct rt_bt_lwip_pan_dev *bt_lwip_get_default_pan_dev()
 {
     return &bt_lwip_pan_dev[0];
 }
@@ -58,23 +57,23 @@ void rt_lwip_instance_register_event_handler(struct rt_bt_lwip_pan_dev *bt_dev,
 
 void bt_lwip_pan_dev_recv_data(void *buff, int len)
 {
-    struct rt_bt_lwip_pan_dev * bt_dev = bt_lwip_get_default_pan_dev();
+    struct rt_bt_lwip_pan_dev *bt_dev = bt_lwip_get_default_pan_dev();
 
-    if(bt_dev)
+    if (bt_dev)
     {
         rt_bt_prot_recv_data(bt_dev, buff, len);
     }
 }
 
 extern void rt_bt_lwip_event_handle(struct rt_bt_lwip_pan_dev *bt_dev, int event);
 rt_err_t bt_pan_connect_event_handle(uint16_t event_id)
- {
-    
+{
+
     switch (event_id)
     {
     case BT_NOTIFY_PAN_PROFILE_CONNECTED:
     {
-        struct rt_bt_lwip_pan_dev * bt_dev = bt_lwip_get_default_pan_dev();
+        struct rt_bt_lwip_pan_dev *bt_dev = bt_lwip_get_default_pan_dev();
 
         if (bt_dev && bt_dev->prot)
         {
@@ -96,20 +95,20 @@ rt_err_t bt_pan_connect_event_handle(uint16_t event_id)
     }
     default:
         break;
-     }
-     return RT_EOK;
- }
+    }
+    return RT_EOK;
+}
 
- rt_err_t bt_lwip_pan_dev_send_data(struct rt_bt_lwip_pan_dev *bt_dev, void *buff, int len)
- {
+rt_err_t bt_lwip_pan_dev_send_data(struct rt_bt_lwip_pan_dev *bt_dev, void *buff, int len)
+{
 
-    if(bt_dev)
+    if (bt_dev)
     {
         extern void bt_pan_send_data(void *buff, int len);
         bt_pan_send_data(buff, len);
     }
     return RT_EOK;
- }
+}
 #ifdef __cplusplus
 }
 #endif

porting/rtt/bt_pan/bt_prot.c

@@ -6,7 +6,6 @@
 
 #include <rthw.h>
 #include <rtthread.h>
-#include "lwip/pbuf.h"
 #include "rtdef.h"
 #include "bts2_bt.h"
 #include "bts2_app_pan.h"