Merge pull request ARMmbed#2 from andreaslarssonublox/feature_wifi_ub…

…lox_andreas wifi: ublox fixes to lwip and wifi
geky · Oct 4, 2016 · e1a4db7 · e1a4db7
2 parents 1e7ba5f + 26eb5f1
commit e1a4db7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/features/FEATURE_LWIP/lwip-interface/emac_stack_lwip.cpp b/features/FEATURE_LWIP/lwip-interface/emac_stack_lwip.cpp
@@ -80,4 +80,9 @@ uint32_t emac_stack_mem_chain_len(emac_stack_t* stack, emac_stack_mem_chain_t *c
     return ((struct pbuf*)chain)->tot_len;
 }
 
+void emac_stack_mem_ref(emac_stack_t* stack, emac_stack_mem_t *mem)
+{
+    pbuf_ref((struct pbuf*)mem);
+}
+
 #endif /* DEVICE_EMAC */
diff --git a/features/FEATURE_LWIP/lwip-interface/lwip_stack.c b/features/FEATURE_LWIP/lwip-interface/lwip_stack.c
@@ -337,7 +337,7 @@ const char *mbed_lwip_get_netmask(char *buf, int buflen)
 #if LWIP_IPV4
     const ip4_addr_t *addr = netif_ip4_netmask(&lwip_netif);
     if (!ip4_addr_isany(addr)) {
-        return inet_ntoa_r(addr, buf, buflen);
+        return ip4addr_ntoa_r(addr, buf, buflen);
     } else {
         return NULL;
     }
@@ -351,7 +351,7 @@ char *mbed_lwip_get_gateway(char *buf, int buflen)
 #if LWIP_IPV4
     const ip4_addr_t *addr = netif_ip4_gw(&lwip_netif);
     if (!ip4_addr_isany(addr)) {
-        return inet_ntoa_r(addr, buf, buflen);
+        return ip4addr_ntoa_r(addr, buf, buflen);
     } else {
         return NULL;
     }

diff --git a/features/FEATURE_LWIP/lwip-interface/lwipopts.h b/features/FEATURE_LWIP/lwip-interface/lwipopts.h
@@ -81,9 +81,9 @@
 #define DEFAULT_ACCEPTMBOX_SIZE     8
 
 #ifdef LWIP_DEBUG
-#define TCPIP_THREAD_STACKSIZE      1024*2
+#define TCPIP_THREAD_STACKSIZE      1200*2
 #else
-#define TCPIP_THREAD_STACKSIZE      1024
+#define TCPIP_THREAD_STACKSIZE      1200
 #endif
 
 #define TCPIP_THREAD_PRIO           (osPriorityNormal)

diff --git a/features/netsocket/WiFiAccessPoint.h b/features/netsocket/WiFiAccessPoint.h
@@ -29,6 +29,7 @@ class WiFiAccessPoint
 {
     /** WiFiAccessPoint lifetime
      */
+public:
     WiFiAccessPoint();
     WiFiAccessPoint(nsapi_wifi_ap_t ap);
 

diff --git a/features/netsocket/WiFiInterface.h b/features/netsocket/WiFiInterface.h
@@ -69,7 +69,7 @@ class WiFiInterface: public NetworkInterface
      */
     virtual int connect(const char *ssid, const char *pass,
             nsapi_security_t security = NSAPI_SECURITY_NONE,
-            uint8_t channel = 0);
+            uint8_t channel = 0) = 0;
 
     /** Start the interface
      *

diff --git a/features/netsocket/emac_stack_mem.h b/features/netsocket/emac_stack_mem.h
@@ -96,6 +96,14 @@ emac_stack_mem_t *emac_stack_mem_chain_dequeue(emac_stack_t* stack, emac_stack_m
  */
 uint32_t emac_stack_mem_chain_len(emac_stack_t* stack, emac_stack_mem_chain_t *chain);
 
+/**
+ * Increases the reference counter for the memory
+ *
+ * @param  stack Emac stack context
+ * @param  mem   Memory structure
+ */
+void emac_stack_mem_ref(emac_stack_t* stack, emac_stack_mem_t *mem);
+
 #endif /* DEVICE_EMAC */
 
 #endif /* EMAC_MBED_STACK_MEM_h */
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ class WiFiAccessPoint @@
     {
         /** WiFiAccessPoint lifetime
          */
+    public:
         WiFiAccessPoint();
         WiFiAccessPoint(nsapi_wifi_ap_t ap);
@@ Expand Down @@