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 #4431 from kjbracey-arm/mbed_lwip_api_compat 

Restore mbed OS 5.4 mbed_lwip_ function prototypes
pull/4200/merge
Martin Kojtal 2017-06-03 08:28:52 +02:00 committed by GitHub
parent 5f138810a9 284843fdb3
commit 533e6f0feb
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_LWIP/lwip-interface/EthernetInterface.cpp
View File

@ -46,7 +46,7 @@ nsapi_error_t EthernetInterface::set_dhcp(bool dhcp)
nsapi_error_t EthernetInterface::connect() nsapi_error_t EthernetInterface::connect()
{ {
return mbed_lwip_bringup(_dhcp, false, return mbed_lwip_bringup_2(_dhcp, false,
_ip_address[0] ? _ip_address : 0, _ip_address[0] ? _ip_address : 0,
_netmask[0] ? _netmask : 0, _netmask[0] ? _netmask : 0,
_gateway[0] ? _gateway : 0); _gateway[0] ? _gateway : 0);
@ -54,7 +54,7 @@ nsapi_error_t EthernetInterface::connect()
nsapi_error_t EthernetInterface::disconnect() nsapi_error_t EthernetInterface::disconnect()
{ {
return mbed_lwip_bringdown(false); return mbed_lwip_bringdown_2(false);
} }
const char *EthernetInterface::get_mac_address() const char *EthernetInterface::get_mac_address()

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

@ -20,6 +20,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include "lwip_stack.h"
#include "eth_arch.h" #include "eth_arch.h"
#include "lwip/opt.h" #include "lwip/opt.h"
@ -391,7 +392,7 @@ char *mbed_lwip_get_ip_address(char *buf, nsapi_size_t buflen)
#endif #endif
} }
const char *mbed_lwip_get_netmask(char *buf, nsapi_size_t buflen) char *mbed_lwip_get_netmask(char *buf, nsapi_size_t 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);
@ -481,7 +482,13 @@ nsapi_error_t mbed_lwip_init(emac_interface_t *emac)
return mbed_lwip_emac_init(emac); return mbed_lwip_emac_init(emac);
} }
nsapi_error_t mbed_lwip_bringup(bool dhcp, bool ppp, const char *ip, const char *netmask, const char *gw) // Backwards compatibility with people using DEVICE_EMAC
nsapi_error_t mbed_lwip_bringup(bool dhcp, const char *ip, const char *netmask, const char *gw)
{
return mbed_lwip_bringup_2(dhcp, false, ip, netmask, gw);
}
nsapi_error_t mbed_lwip_bringup_2(bool dhcp, bool ppp, const char *ip, const char *netmask, const char *gw)
{ {
// Check if we've already connected // Check if we've already connected
if (lwip_connected) { if (lwip_connected) {
@ -624,7 +631,13 @@ void mbed_lwip_clear_ipv6_addresses(struct netif *lwip_netif)
} }
#endif #endif
nsapi_error_t mbed_lwip_bringdown(bool ppp) // Backwards compatibility with people using DEVICE_EMAC
nsapi_error_t mbed_lwip_bringdown(void)
{
return mbed_lwip_bringdown_2(false);
}
nsapi_error_t mbed_lwip_bringdown_2(bool ppp)
{ {
// Check if we've connected // Check if we've connected
if (!lwip_connected) { if (!lwip_connected) {

15
features/FEATURE_LWIP/lwip-interface/lwip_stack.h
View File

@ -24,16 +24,19 @@
extern "C" { extern "C" {
#endif #endif
// Access to lwip through the nsapi // Access to lwip through the nsapi - be wary of API changes as external 1st-generation EMAC
// drivers attach through these.
nsapi_error_t mbed_lwip_init(emac_interface_t *emac); nsapi_error_t mbed_lwip_init(emac_interface_t *emac);
nsapi_error_t mbed_lwip_emac_init(emac_interface_t *emac); nsapi_error_t mbed_lwip_emac_init(emac_interface_t *emac);
nsapi_error_t mbed_lwip_bringup(bool dhcp, bool ppp, const char *ip, const char *netmask, const char *gw); nsapi_error_t mbed_lwip_bringup(bool dhcp, const char *ip, const char *netmask, const char *gw);
nsapi_error_t mbed_lwip_bringdown(bool ppp); nsapi_error_t mbed_lwip_bringup_2(bool dhcp, bool ppp, const char *ip, const char *netmask, const char *gw);
nsapi_error_t mbed_lwip_bringdown(void);
nsapi_error_t mbed_lwip_bringdown_2(bool ppp);
const char *mbed_lwip_get_mac_address(void); const char *mbed_lwip_get_mac_address(void);
char *mbed_lwip_get_ip_address(char *buf, int buflen); char *mbed_lwip_get_ip_address(char *buf, nsapi_size_t buflen);
char *mbed_lwip_get_netmask(char *buf, int buflen); char *mbed_lwip_get_netmask(char *buf, nsapi_size_t buflen);
char *mbed_lwip_get_gateway(char *buf, int buflen); char *mbed_lwip_get_gateway(char *buf, nsapi_size_t buflen);
extern nsapi_stack_t lwip_stack; extern nsapi_stack_t lwip_stack;

4
features/FEATURE_LWIP/lwip-interface/ppp_lwip.cpp
View File

@ -354,7 +354,7 @@ nsapi_error_t nsapi_ppp_connect(FileHandle *stream, Callback<void(nsapi_error_t)
// mustn't start calling input until after connect - // mustn't start calling input until after connect -
// attach deferred until ppp_lwip_connect, called from mbed_lwip_bringup // attach deferred until ppp_lwip_connect, called from mbed_lwip_bringup
nsapi_error_t retcode = mbed_lwip_bringup(false, true, NULL, NULL, NULL); nsapi_error_t retcode = mbed_lwip_bringup_2(false, true, NULL, NULL, NULL);
if (retcode != NSAPI_ERROR_OK && connect_error_code != NSAPI_ERROR_OK) { if (retcode != NSAPI_ERROR_OK && connect_error_code != NSAPI_ERROR_OK) {
return connect_error_code; return connect_error_code;
@ -365,7 +365,7 @@ nsapi_error_t nsapi_ppp_connect(FileHandle *stream, Callback<void(nsapi_error_t)
nsapi_error_t nsapi_ppp_disconnect(FileHandle *stream) nsapi_error_t nsapi_ppp_disconnect(FileHandle *stream)
{ {
return mbed_lwip_bringdown(true); return mbed_lwip_bringdown_2(true);
} }
NetworkStack *nsapi_ppp_get_stack() NetworkStack *nsapi_ppp_get_stack()