ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from andreaslarssonublox/feature_wifi_ublox_andreas 

wifi: ublox fixes to lwip and wifi
pull/2874/head
Martin Kojtal 2016-10-04 16:17:20 +01:00 committed by GitHub
parent 1e7ba5fe79 26eb5f19f2
commit e1a4db716b
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
features/FEATURE_LWIP/lwip-interface/emac_stack_lwip.cpp
View File

@ -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; 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 */ #endif /* DEVICE_EMAC */

4
features/FEATURE_LWIP/lwip-interface/lwip_stack.c
View File

@ -337,7 +337,7 @@ const char *mbed_lwip_get_netmask(char *buf, int buflen)
#if LWIP_IPV4 #if LWIP_IPV4
const ip4_addr_t *addr = netif_ip4_netmask(&lwip_netif); const ip4_addr_t *addr = netif_ip4_netmask(&lwip_netif);
if (!ip4_addr_isany(addr)) { if (!ip4_addr_isany(addr)) {
return inet_ntoa_r(addr, buf, buflen); return ip4addr_ntoa_r(addr, buf, buflen);
} else { } else {
return NULL; return NULL;
} }
@ -351,7 +351,7 @@ char *mbed_lwip_get_gateway(char *buf, int buflen)
#if LWIP_IPV4 #if LWIP_IPV4
const ip4_addr_t *addr = netif_ip4_gw(&lwip_netif); const ip4_addr_t *addr = netif_ip4_gw(&lwip_netif);
if (!ip4_addr_isany(addr)) { if (!ip4_addr_isany(addr)) {
return inet_ntoa_r(addr, buf, buflen); return ip4addr_ntoa_r(addr, buf, buflen);
} else { } else {
return NULL; return NULL;
} }

4
features/FEATURE_LWIP/lwip-interface/lwipopts.h
View File

@ -81,9 +81,9 @@
#define DEFAULT_ACCEPTMBOX_SIZE 8 #define DEFAULT_ACCEPTMBOX_SIZE 8
#ifdef LWIP_DEBUG #ifdef LWIP_DEBUG
#define TCPIP_THREAD_STACKSIZE 1024*2 #define TCPIP_THREAD_STACKSIZE 1200*2
#else #else
#define TCPIP_THREAD_STACKSIZE 1024 #define TCPIP_THREAD_STACKSIZE 1200
#endif #endif
#define TCPIP_THREAD_PRIO (osPriorityNormal) #define TCPIP_THREAD_PRIO (osPriorityNormal)

1
features/netsocket/WiFiAccessPoint.h
View File

@ -29,6 +29,7 @@ class WiFiAccessPoint
{ {
/** WiFiAccessPoint lifetime /** WiFiAccessPoint lifetime
*/ */
public:
WiFiAccessPoint(); WiFiAccessPoint();
WiFiAccessPoint(nsapi_wifi_ap_t ap); WiFiAccessPoint(nsapi_wifi_ap_t ap);

2
features/netsocket/WiFiInterface.h
View File

@ -69,7 +69,7 @@ public:
*/ */
virtual int connect(const char *ssid, const char *pass, virtual int connect(const char *ssid, const char *pass,
nsapi_security_t security = NSAPI_SECURITY_NONE, nsapi_security_t security = NSAPI_SECURITY_NONE,
uint8_t channel = 0); uint8_t channel = 0) = 0;
/** Start the interface /** Start the interface
* *

8
features/netsocket/emac_stack_mem.h
View File

@ -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); 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 /* DEVICE_EMAC */
#endif /* EMAC_MBED_STACK_MEM_h */ #endif /* EMAC_MBED_STACK_MEM_h */