Update BSP and WifiInterface for WHD Changes

Author: Kyle Kearney

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSTAInterface.cpp

@@ -36,19 +36,18 @@
                           ((((unsigned char*)a)[5])==(((unsigned char*)b)[5])))
 
 struct whd_scan_userdata {
-    Semaphore *sema;
+    rtos::Semaphore *sema;
     WiFiAccessPoint *aps;
     std::vector<whd_scan_result_t> *result_buff;
     unsigned count;
     unsigned offset;
-    whd_interface_t ifp;
     bool scan_in_progress;
 };
 
 static whd_scan_userdata interal_scan_data;
 static whd_scan_result_t internal_scan_result;
 
-extern "C" void whd_emac_wifi_link_state_changed(bool state_up, whd_interface_t ifp);
+extern "C" void whd_emac_wifi_link_state_changed(whd_interface_t ifp, whd_bool_t state_up);
 
 
 int whd_toerror(whd_result_t res)
@@ -182,8 +181,8 @@ nsapi_error_t WhdSTAInterface::set_credentials(const char *ssid, const char *pas
 {
     if ((ssid == NULL) ||
             (strlen(ssid) == 0) ||
-            (pass == NULL && ( security != NSAPI_SECURITY_NONE && security != NSAPI_SECURITY_WPA2_ENT)) ||
-            (strlen(pass) == 0 && ( security != NSAPI_SECURITY_NONE && security != NSAPI_SECURITY_WPA2_ENT)) ||
+            (pass == NULL && (security != NSAPI_SECURITY_NONE && security != NSAPI_SECURITY_WPA2_ENT)) ||
+            (strlen(pass) == 0 && (security != NSAPI_SECURITY_NONE && security != NSAPI_SECURITY_WPA2_ENT)) ||
             (strlen(pass) > 63 && (security == NSAPI_SECURITY_WPA2 || security == NSAPI_SECURITY_WPA || security == NSAPI_SECURITY_WPA_WPA2))
        ) {
         return NSAPI_ERROR_PARAMETER;
@@ -256,7 +255,7 @@ nsapi_error_t WhdSTAInterface::connect()
     }
 
     if (whd_wifi_is_ready_to_transceive(_whd_emac.ifp) == WHD_SUCCESS) {
-        whd_emac_wifi_link_state_changed(true, _whd_emac.ifp);
+        whd_emac_wifi_link_state_changed(_whd_emac.ifp, WHD_TRUE);
     }
 
     // bring up
@@ -351,7 +350,7 @@ static void whd_scan_handler(whd_scan_result_t **result_ptr,
         }
     }
 
-    if (data->count > 0) {
+    if (data->count > 0 && data->aps != NULL) {
         // get ap stats
         nsapi_wifi_ap ap;
 
@@ -388,7 +387,6 @@ int WhdSTAInterface::scan(WiFiAccessPoint *aps, unsigned count)
     interal_scan_data.aps = aps;
     interal_scan_data.count = count;
     interal_scan_data.offset = 0;
-    interal_scan_data.ifp = _whd_emac.ifp;
     interal_scan_data.scan_in_progress = true;
     interal_scan_data.result_buff = new std::vector<whd_scan_result_t>();
     whd_result_t whd_res;
@@ -400,12 +398,8 @@ int WhdSTAInterface::scan(WiFiAccessPoint *aps, unsigned count)
     if (whd_res != WHD_SUCCESS) {
         res = whd_toerror(whd_res);
     } else {
-        int tok = interal_scan_data.sema->wait();
-        if (tok < 1) {
-            res = NSAPI_ERROR_WOULD_BLOCK;
-        } else {
-            res = interal_scan_data.offset;
-        }
+        interal_scan_data.sema->acquire();
+        res = interal_scan_data.offset;
     }
 
     delete interal_scan_data.sema;
@@ -415,6 +409,9 @@ int WhdSTAInterface::scan(WiFiAccessPoint *aps, unsigned count)
 
 int WhdSTAInterface::is_interface_connected(void)
 {
+    if (!_whd_emac.ifp) {
+        return WHD_INTERFACE_NOT_UP;
+    }
     _whd_emac.ifp->role = WHD_STA_ROLE;
     if ((whd_wifi_is_ready_to_transceive(_whd_emac.ifp) == WHD_SUCCESS)) {
         return WHD_SUCCESS;
@@ -489,6 +486,13 @@ int WhdSTAInterface::wifi_set_ioctl_value(uint32_t ioctl, uint32_t value)
     return res;
 }
 
+int WhdSTAInterface::wifi_get_ifp(whd_interface_t *ifp)
+{
+    int res = WHD_SUCCESS;
+    *ifp = _whd_emac.ifp;
+    return res;
+}
+
 int WhdSTAInterface::wifi_set_up(void)
 {
     int res = WHD_SUCCESS;
@@ -502,3 +506,10 @@ int WhdSTAInterface::wifi_set_down(void)
     res = whd_wifi_set_down(_whd_emac.ifp);
     return res;
 }
+
+int WhdSTAInterface::wifi_set_coex_config(whd_coex_config_t *coex_config)
+{
+    int res = WHD_SUCCESS;
+    res = whd_wifi_set_coex_config(_whd_emac.ifp, coex_config);
+    return res;
+}

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSTAInterface.h

@@ -161,12 +161,18 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface {
     /* set ioctl value */
     int wifi_set_ioctl_value(uint32_t ioctl, uint32_t value) ;
 
+    /* get WHD ifp value */
+    int wifi_get_ifp(whd_interface_t *ifp);
+
     /* set wifi interface up */
     int wifi_set_up(void);
 
     /* set wifi interface down */
     int wifi_set_down(void);
 
+    /* set wifi coex configuration */
+    int wifi_set_coex_config(whd_coex_config_t *coex_config);
+
     /** Set Offload Manager Information
      *  NOTE: Only allowed while disconnected
      *
@@ -211,5 +217,4 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface {
     OlmInterface *_olm;
 };
 
-extern int wiced_leave_ap(int interface);
 #endif

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSoftAPInterface.cpp

@@ -1,5 +1,5 @@
-/* Wiced implementation of NetworkInterfaceAPI
- * Copyright (c) 2017-2019 ARM Limited
+/*
+ * Copyright (c) 2018-2019 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+
 #include "nsapi.h"
 #include "lwipopts.h"
 #include "WhdSoftAPInterface.h"
@@ -29,11 +30,33 @@
 extern int whd_toerror(whd_result_t res);
 extern nsapi_security_t whd_tosecurity(whd_security_t sec);
 extern whd_security_t whd_fromsecurity(nsapi_security_t sec);
-extern "C" void whd_emac_wifi_link_state_changed(bool state_up, whd_interface_t ifp);
+extern "C" void whd_emac_wifi_link_state_changed(whd_interface_t ifp, whd_bool_t state_up);
+
+static const whd_event_num_t ap_events[] = { WLC_E_LINK, WLC_E_IF, WLC_E_DEAUTH, WLC_E_DEAUTH_IND, WLC_E_DISASSOC, WLC_E_DISASSOC_IND, WLC_E_ASSOC_IND, WLC_E_REASSOC_IND, WLC_E_NONE };
+
+static void *whd_default_handle_softap_events(whd_interface_t ifp, const whd_event_header_t *event_header,
+                                              const uint8_t *event_data, void *handler_user_data)
+{
+    whd_driver_t whd_driver = ifp->whd_driver;
 
+    UNUSED_PARAMETER(event_header);
+    UNUSED_PARAMETER(event_data);
+    UNUSED_PARAMETER(handler_user_data);
+
+    WHD_IOCTL_LOG_ADD_EVENT(whd_driver, event_header->event_type, event_header->flags, event_header->reason);
+
+    if ((event_header->event_type == (whd_event_num_t)WLC_E_LINK) ||
+            (event_header->event_type == WLC_E_IF)) {
+        if (osSemaphoreGetCount(whd_driver->ap_info.whd_wifi_sleep_flag) < 1) {
+            osStatus_t result = osSemaphoreRelease(whd_driver->ap_info.whd_wifi_sleep_flag);
+            if (result != osOK) {
+                printf("Release whd_wifi_sleep_flag ERROR: %d", result);
+            }
+        }
+    }
+    return handler_user_data;
+}
 
-static const whd_event_num_t ap_client_events[] = { WLC_E_DEAUTH, WLC_E_DEAUTH_IND, WLC_E_DISASSOC, WLC_E_DISASSOC_IND, WLC_E_ASSOC_IND, WLC_E_REASSOC_IND, WLC_E_NONE };
-static uint16_t ap_event_entry = 2;
 
 WhdSoftAPInterface::WhdSoftAPInterface(WHD_EMAC &emac, OnboardNetworkStack &stack)
     : EMACInterface(emac, stack),
@@ -44,18 +67,24 @@ WhdSoftAPInterface::WhdSoftAPInterface(WHD_EMAC &emac, OnboardNetworkStack &stac
 
 
 int WhdSoftAPInterface::start(const char *ssid, const char *pass, nsapi_security_t security, uint8_t channel,
-                              bool start_dhcp_server, const whd_custom_ie_info_t *ie_info)
+                              bool start_dhcp_server, const whd_custom_ie_info_t *ie_info, bool ap_sta_concur)
 {
     nsapi_error_t        err;
 
-    /* set up our interface */
-    if (!_interface) {
-        nsapi_error_t err = _stack.add_ethernet_interface(_emac, true, &_interface);
-        if (err != NSAPI_ERROR_OK) {
-            _interface = NULL;
-            return err;
+    // power up primary emac interface first
+    if (ap_sta_concur) {
+        WHD_EMAC &emac_prime = WHD_EMAC::get_instance(WHD_STA_ROLE);
+        if (!emac_prime.power_up()) {
+            printf("Primary interface power up ERROR!\n");
+            return NSAPI_ERROR_DEVICE_ERROR;
         }
-        _interface->attach(_connection_status_cb);
+    }
+
+    // set concurrency mode and power up secondary, the bsp init is done by primary emac
+    _whd_emac.ap_sta_concur = ap_sta_concur;
+    if (!_whd_emac.power_up()) {
+        printf("Secondary interface power up ERROR!\n");
+        return NSAPI_ERROR_DEVICE_ERROR;
     }
 
     // setup ssid
@@ -75,6 +104,27 @@ int WhdSoftAPInterface::start(const char *ssid, const char *pass, nsapi_security
         return err;
     }
 
+    // update default softap interface event handler
+    err = unregister_event_handler();
+    if (err != NSAPI_ERROR_OK) {
+        printf("unregister_event_handler() ERROR: %d\n", err);
+        return err;
+    }
+    err = register_event_handler(whd_default_handle_softap_events);
+    if (err != NSAPI_ERROR_OK) {
+        printf("register_event_handler() ERROR: %d\n", err);
+        return err;
+    }
+
+    if (!_interface) {
+        nsapi_error_t err = _stack.add_ethernet_interface(_whd_emac, true, &_interface);
+        if (err != NSAPI_ERROR_OK) {
+            _interface = NULL;
+            return err;
+        }
+        _interface->attach(_connection_status_cb);
+    }
+
     if (ie_info) {
         err = whd_wifi_manage_custom_ie(_whd_emac.ifp, WHD_ADD_CUSTOM_IE, (const uint8_t *)ie_info->oui,
                                         ie_info->subtype, (const void *)ie_info->data, ie_info->length, ie_info->which_packets);
@@ -94,10 +144,9 @@ int WhdSoftAPInterface::start(const char *ssid, const char *pass, nsapi_security
     set_dhcp(false);
 
     if (whd_wifi_is_ready_to_transceive(_whd_emac.ifp) == WHD_SUCCESS) {
-        whd_emac_wifi_link_state_changed(true, _whd_emac.ifp);
+        whd_emac_wifi_link_state_changed(_whd_emac.ifp, WHD_TRUE);
     }
 
-    // bring up
     err = _interface->bringup(_dhcp,
                               _ip_address[0] ? _ip_address : 0,
                               _netmask[0] ? _netmask : 0,
@@ -130,10 +179,11 @@ int WhdSoftAPInterface::get_associated_client_list(void *client_list_buffer, uin
 
 int WhdSoftAPInterface::register_event_handler(whd_event_handler_t softap_event_handler)
 {
-    return whd_management_set_event_handler(_whd_emac.ifp, ap_client_events, softap_event_handler, NULL, &ap_event_entry);
+    uint16_t ap_events_entry = _whd_emac.ifp->event_reg_list[WHD_AP_EVENT_ENTRY];
+    return whd_management_set_event_handler(_whd_emac.ifp, ap_events, softap_event_handler, NULL, &ap_events_entry);
 }
 
 int WhdSoftAPInterface::unregister_event_handler(void)
 {
-    return whd_wifi_deregister_event_handler(_whd_emac.ifp, ap_event_entry);
+    return whd_wifi_deregister_event_handler(_whd_emac.ifp, _whd_emac.ifp->event_reg_list[WHD_AP_EVENT_ENTRY]);
 }

features/netsocket/emac-drivers/TARGET_WHD/interface/WhdSoftAPInterface.h

@@ -1,5 +1,5 @@
-/* WHD SoftAP implementation of SoftAPInterface
- * Copyright (c) 2017-2019 ARM Limited
+/*
+ * Copyright (c) 2018-2019 ARM Limited
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -70,14 +70,15 @@ class WhdSoftAPInterface : public EMACInterface {
      *  @param pass                 Security passphrase for connection to SoftAP
      *  @param security             Type of encryption for connection
      *  @param channel              Channel for SoftAP
-     *  @param start_dhcp_server    start dhcp server for connection
-     *  @param[in]          Optional Custom IE
+     *  @param start_dhcp_server    Start dhcp server for connection
+     *  @param whd_custom_ie        Optional Custom IE
+     *  @param ap_sta_concur        Enable STA+AP concurrency mode
      *
      *  @return          0 on success, or error code on failure
      *                  see @a nsapi_error
      */
     int start(const char *ssid, const char *pass, nsapi_security_t security, uint8_t channel,
-              bool start_dhcp_server = true, const whd_custom_ie_info_t *ie_info = NULL);
+              bool start_dhcp_server = true, const whd_custom_ie_info_t *ie_info = NULL, bool ap_sta_concur = false);
 
     /**
      * Remove Wi-Fi custom IE