Merge pull request #2874 from 0xc0170/feature_wifi_ublox

emac HAL API, WiFiInterface additions

Author: sg-

features/FEATURE_LWIP/lwip-interface/EthernetInterface.cpp

@@ -41,25 +41,25 @@ int EthernetInterface::set_dhcp(bool dhcp)
 
 int EthernetInterface::connect()
 {
-    return lwip_bringup(_dhcp,
+    return mbed_lwip_bringup(_dhcp,
             _ip_address[0] ? _ip_address : 0,
             _netmask[0] ? _netmask : 0,
             _gateway[0] ? _gateway : 0);
 }
 
 int EthernetInterface::disconnect()
 {
-    return lwip_bringdown();
+    return mbed_lwip_bringdown();
 }
 
 const char *EthernetInterface::get_mac_address()
 {
-    return lwip_get_mac_address();
+    return mbed_lwip_get_mac_address();
 }
 
 const char *EthernetInterface::get_ip_address()
 {
-    if (lwip_get_ip_address(_ip_address, sizeof _ip_address)) {
+    if (mbed_lwip_get_ip_address(_ip_address, sizeof _ip_address)) {
         return _ip_address;
     }
 
@@ -68,7 +68,7 @@ const char *EthernetInterface::get_ip_address()
 
 const char *EthernetInterface::get_netmask()
 {
-    if (lwip_get_netmask(_netmask, sizeof _netmask)) {
+    if (mbed_lwip_get_netmask(_netmask, sizeof _netmask)) {
         return _netmask;
     }
 
@@ -77,7 +77,7 @@ const char *EthernetInterface::get_netmask()
 
 const char *EthernetInterface::get_gateway()
 {
-    if (lwip_get_gateway(_gateway, sizeof _gateway)) {
+    if (mbed_lwip_get_gateway(_gateway, sizeof _gateway)) {
         return _gateway;
     }
 

features/FEATURE_LWIP/lwip-interface/emac_lwip.c

@@ -0,0 +1,91 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2016 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "platform.h"
+
+#if DEVICE_EMAC
+
+#include "emac_api.h"
+#include "emac_stack_mem.h"
+#include "lwip/tcpip.h"
+#include "lwip/tcp.h"
+#include "lwip/ip.h"
+#include "netif/etharp.h"
+
+static err_t emac_lwip_low_level_output(struct netif *netif, struct pbuf *p)
+{
+    emac_interface_t *mac = (emac_interface_t *)netif->state;
+    bool ret = mac->ops.link_out(mac, (emac_stack_mem_t *)p);
+
+    return ret ? ERR_OK : ERR_IF;
+}
+
+static void emac_lwip_input(void *data, emac_stack_t *buf)
+{
+    struct pbuf *p = (struct pbuf *)buf;
+    struct netif *netif = (struct netif *)data;
+
+    /* pass all packets to ethernet_input, which decides what packets it supports */
+    if (netif->input(p, netif) != ERR_OK) {
+        LWIP_DEBUGF(NETIF_DEBUG, ("Emac LWIP: IP input error\n"));
+
+        pbuf_free(p);
+    }
+}
+
+static void emac_lwip_state_change(void *data, bool up)
+{
+    struct netif *netif = (struct netif *)data;
+
+    if (up) {
+        tcpip_callback_with_block((tcpip_callback_fn)netif_set_link_up, netif, 1);
+    } else {
+        tcpip_callback_with_block((tcpip_callback_fn)netif_set_link_down, netif, 1);
+    }
+}
+
+err_t emac_lwip_if_init(struct netif *netif)
+{
+    int err = ERR_OK;
+    emac_interface_t *mac = (emac_interface_t *)netif->state;
+
+    mac->ops.set_link_input_cb(mac, emac_lwip_input, netif);
+    mac->ops.set_link_state_cb(mac, emac_lwip_state_change, netif);
+
+    netif->hwaddr_len = mac->ops.get_hwaddr_size(mac);
+    mac->ops.get_hwaddr(mac, netif->hwaddr);
+
+    netif->mtu = mac->ops.get_mtu_size(mac);
+
+    /* Interface capabilities */
+    netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP;
+
+    mac->ops.get_ifname(mac, netif->name, 2);
+
+#if LWIP_IPV4
+    netif->output = etharp_output;
+#endif /* LWIP_IPV4 */
+
+    netif->linkoutput = emac_lwip_low_level_output;
+
+    if (!mac->ops.power_up(mac)) {
+        err = ERR_IF;
+    }
+
+    return err;
+}
+
+#endif /* DEVICE_EMAC */

features/FEATURE_LWIP/lwip-interface/emac_stack_lwip.cpp

@@ -0,0 +1,88 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2016 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "platform.h"
+
+#if DEVICE_EMAC
+
+#include "emac_stack_mem.h"
+#include "pbuf.h"
+
+emac_stack_mem_t *emac_stack_mem_alloc(emac_stack_t* stack, uint32_t size, uint32_t align)
+{
+
+    struct pbuf *pbuf = pbuf_alloc(PBUF_RAW, size + align, PBUF_RAM);
+    if (pbuf == NULL) {
+        return NULL;
+    }
+
+    if (align) {
+        uint32_t remainder = (uint32_t)pbuf->payload % align;
+        uint32_t offset = align - remainder;
+        if (offset >= align) {
+            offset = align;
+        }
+
+        pbuf->payload = (void*)((char*)pbuf->payload + offset);
+        pbuf->tot_len -= offset;
+        pbuf->len -= offset;
+    }
+
+    return (emac_stack_mem_t*)pbuf;
+}
+
+void emac_stack_mem_free(emac_stack_t* stack, emac_stack_mem_t *mem)
+{
+    pbuf_free((struct pbuf*)mem);
+}
+
+void *emac_stack_mem_ptr(emac_stack_t* stack, emac_stack_mem_t *mem)
+{
+    return ((struct pbuf*)mem)->payload;
+}
+
+uint32_t emac_stack_mem_len(emac_stack_t* stack, emac_stack_mem_t *mem)
+{
+    return ((struct pbuf*)mem)->len;
+}
+
+void emac_stack_mem_set_len(emac_stack_t* stack, emac_stack_mem_t *mem, uint32_t len)
+{
+    struct pbuf *pbuf = (struct pbuf*)mem;
+
+    pbuf->len = len;
+}
+
+emac_stack_mem_t *emac_stack_mem_chain_dequeue(emac_stack_t* stack, emac_stack_mem_chain_t **chain)
+{
+    struct pbuf **list = (struct pbuf**)chain;
+    struct pbuf *head = *list;
+    *list = (*list)->next;
+
+    return (emac_stack_mem_t *)head;
+}
+
+uint32_t emac_stack_mem_chain_len(emac_stack_t* stack, emac_stack_mem_chain_t *chain)
+{
+    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 */

features/FEATURE_LWIP/lwip-interface/eth_arch.h

@@ -29,13 +29,17 @@
 extern "C" {
 #endif
 
+#if DEVICE_EMAC
+err_t emac_lwip_if_init(struct netif *netif);
+
+#else /* DEVICE_EMAC */
 void eth_arch_enable_interrupts(void);
 void eth_arch_disable_interrupts(void);
 err_t eth_arch_enetif_init(struct netif *netif);
+#endif
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif // #ifndef ETHARCHINTERFACE_H_
-