Remove API changes

-Remove Nanostack::add_ethernet_interface API change
-Add get_mac_address to MeshEthernetInterface

Author: Arto Kinnunen

features/nanostack/mbed-mesh-api/mbed-mesh-api/MeshInterfaceNanostack.h

@@ -38,14 +38,7 @@ class Nanostack::Interface : public OnboardNetworkStack::Interface, private mbed
     virtual char *get_gateway(char *buf, nsapi_size_t buflen);
     virtual void attach(mbed::Callback<void(nsapi_event_t, intptr_t)> status_cb);
     virtual nsapi_connection_status_t get_connection_status() const;
-
-    void get_mac_address(uint8_t *buf) const
-    {
-        NanostackMACPhy *phy = interface_phy.nanostack_mac_phy();
-        if (phy) {
-            phy->get_mac_address(buf);
-        }
-    }
+    virtual void get_mac_address(uint8_t *buf) const;
 
     /**
      * \brief Callback from C-layer

features/nanostack/mbed-mesh-api/mbed-mesh-api/NanostackEthernetInterface.h

@@ -28,6 +28,7 @@ class Nanostack::EthernetInterface : public Nanostack::Interface {
                                   nsapi_ip_stack_t stack = DEFAULT_STACK,
                                   bool blocking = true);
     virtual nsapi_error_t bringdown();
+    virtual void get_mac_address(uint8_t *buf);
     virtual char *get_mac_address(char *buf, nsapi_size_t buflen);
 
     char *get_interface_name(char *buf);

features/nanostack/mbed-mesh-api/source/MeshInterfaceNanostack.cpp

@@ -107,6 +107,14 @@ nsapi_connection_status_t Nanostack::Interface::get_connection_status() const
     return _connect_status;
 }
 
+void Nanostack::Interface::get_mac_address(uint8_t *buf) const
+{
+    NanostackMACPhy *phy = interface_phy.nanostack_mac_phy();
+    if (phy) {
+        phy->get_mac_address(buf);
+    }
+}
+
 void Nanostack::Interface::attach(
     mbed::Callback<void(nsapi_event_t, intptr_t)> status_cb)
 {

features/nanostack/mbed-mesh-api/source/NanostackEMACInterface.cpp

@@ -178,7 +178,7 @@ void EMACPhy::set_mac_address(uint8_t *mac)
     memcpy(mac_addr, mac, sizeof mac_addr);
 }
 
-nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out, const uint8_t *mac_addr)
+nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, Nanostack::EthernetInterface **interface_out, const uint8_t *mac_addr)
 {
     if (single_phy) {
         return NSAPI_ERROR_DEVICE_ERROR;
@@ -211,7 +211,18 @@ nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, Onb
     return NSAPI_ERROR_OK;
 }
 
-nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out)
+nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out, const uint8_t *mac_addr)
 {
-    return Nanostack::add_ethernet_interface(emac, default_if, interface_out, nullptr);
+    Nanostack::EthernetInterface *interface;
+    nsapi_error_t err = add_ethernet_interface(emac, default_if, &interface, mac_addr);
+    *interface_out = interface;
+    return err;
 }
+
+nsapi_error_t Nanostack::add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out)
+{
+    Nanostack::EthernetInterface *interface;
+    nsapi_error_t err = add_ethernet_interface(emac, default_if, &interface);
+    *interface_out = interface;
+    return err;
+}

features/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp

@@ -130,9 +130,18 @@ char *Nanostack::EthernetInterface::get_interface_name(char *buf)
     return buf;
 };
 
+void Nanostack::EthernetInterface::get_mac_address(uint8_t *buf)
+{
+    if (!buf) {
+        return;
+    }
+
+    get_phy().get_mac_address(buf);
+}
+
 char *Nanostack::EthernetInterface::get_mac_address(char *buf, nsapi_size_t buflen)
 {
-    uint8_t mac_buf[NSAPI_MAC_BYTES];
+    uint8_t mac_buf[NSAPI_MAC_BYTES] = {0};
 
     if (!buf || buflen < NSAPI_MAC_SIZE) {
         return NULL;

features/nanostack/nanostack-interface/Nanostack.h

@@ -43,6 +43,9 @@ class Nanostack : public OnboardNetworkStack, private mbed::NonCopyable<Nanostac
     virtual nsapi_error_t add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out);
     virtual nsapi_error_t add_ethernet_interface(EMAC &emac, bool default_if, OnboardNetworkStack::Interface **interface_out, const uint8_t *mac_addr);
 
+    /* Local variant with stronger typing and manual address specification */
+    nsapi_error_t add_ethernet_interface(EMAC &emac, bool default_if, Nanostack::EthernetInterface **interface_out, const uint8_t *mac_addr = NULL);
+
     virtual nsapi_error_t add_ppp_interface(PPP &ppp, bool default_if, OnboardNetworkStack::Interface **interface_out);
 
     /* Local variant with stronger typing and manual address specification */