WHD: add join timeout parameter to WiFiSTAInterface and drivers

Author: pennam

connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.cpp

@@ -211,7 +211,8 @@ WhdSTAInterface::WhdSTAInterface(WHD_EMAC &emac, OnboardNetworkStack &stack, Olm
       _security(NSAPI_SECURITY_NONE),
       _whd_emac(emac),
       _olm(&olm),
-      _iface_shared(shared)
+      _iface_shared(shared),
+      _timeout(7000)
 {
 }
 
@@ -334,7 +335,7 @@ nsapi_error_t WhdSTAInterface::connect()
             res = (whd_result_t)whd_wifi_join(_whd_emac.ifp,
                                               &ssid,
                                               security,
-                                              (const uint8_t *)_pass, strlen(_pass));
+                                              (const uint8_t *)_pass, strlen(_pass), _timeout);
     	}
     	else
     	{
@@ -345,7 +346,7 @@ nsapi_error_t WhdSTAInterface::connect()
     		res = (whd_result_t)whd_wifi_join(_whd_emac.ifp,
     		                                   &ssid,
     		                                   security,
-    		                                   (const uint8_t *)_pass, key_length);
+    		                                   (const uint8_t *)_pass, key_length, _timeout);
     	}
     	if (res == WHD_SUCCESS) {
                 break;

connectivity/drivers/emac/COMPONENT_WHD/interface/WhdSTAInterface.h

@@ -119,6 +119,11 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface {
         return 0;
     }
 
+    nsapi_error_t set_timeout(uint32_t timeout)
+    {
+        _timeout = timeout;
+    }
+
     /** Set blocking status of interface. 
      *  Nonblocking mode unsupported.
      *
@@ -257,6 +262,7 @@ class WhdSTAInterface : public WiFiInterface, public EMACInterface {
     nsapi_security_t _security;
     WHD_EMAC &_whd_emac;
     OlmInterface *_olm;
+    uint32_t _timeout;
     whd_interface_shared_info_t &_iface_shared;
 };
 

connectivity/drivers/wifi/COMPONENT_WHD/wifi-host-driver/inc/whd_wifi_api.h

@@ -281,7 +281,7 @@ extern uint32_t whd_wifi_stop_scan(whd_interface_t ifp);
  *           Error code    if an error occurred
  */
 extern uint32_t whd_wifi_join(whd_interface_t ifp, const whd_ssid_t *ssid, whd_security_t auth_type,
-                              const uint8_t *security_key, uint8_t key_length);
+                              const uint8_t *security_key, uint8_t key_length, uint32_t timeout);
 
 /** Joins a specific Wi-Fi network
  *

connectivity/drivers/wifi/COMPONENT_WHD/wifi-host-driver/src/whd_wifi_api.c

@@ -294,6 +294,8 @@ static const uint16_t mcs_data_rate_lookup_table[32][2][2] =
     },
 };
 
+static whd_wifi_join_timeout = DEFAULT_JOIN_ATTEMPT_TIMEOUT;
+
 
 /******************************************************
 *             Static Function prototypes
@@ -1334,7 +1336,7 @@ static uint32_t whd_wifi_join_wait_for_complete(whd_interface_t ifp, cy_semaphor
 
     while (!done)
     {
-        result = cy_rtos_get_semaphore(semaphore, DEFAULT_JOIN_ATTEMPT_TIMEOUT / 10, WHD_FALSE);
+        result = cy_rtos_get_semaphore(semaphore, whd_wifi_join_timeout / 10, WHD_FALSE);
         whd_assert("Get semaphore failed", (result == CY_RSLT_SUCCESS) || (result == CY_RTOS_TIMEOUT) );
         REFERENCE_DEBUG_ONLY_VARIABLE(result);
 
@@ -1345,7 +1347,7 @@ static uint32_t whd_wifi_join_wait_for_complete(whd_interface_t ifp, cy_semaphor
         }
 
         cy_rtos_get_time(&current_time);
-        done = (whd_bool_t)( (current_time - start_time) >= DEFAULT_JOIN_ATTEMPT_TIMEOUT );
+        done = (whd_bool_t)( (current_time - start_time) >= whd_wifi_join_timeout );
     }
 
     if (result != WHD_SUCCESS)
@@ -1574,7 +1576,7 @@ uint32_t whd_wifi_join_specific(whd_interface_t ifp, const whd_scan_result_t *ap
 }
 
 uint32_t whd_wifi_join(whd_interface_t ifp, const whd_ssid_t *ssid, whd_security_t auth_type,
-                       const uint8_t *security_key, uint8_t key_length)
+                       const uint8_t *security_key, uint8_t key_length, uint32_t timeout)
 {
     cy_semaphore_t join_sema;
     whd_result_t result;
@@ -1616,6 +1618,7 @@ uint32_t whd_wifi_join(whd_interface_t ifp, const whd_ssid_t *ssid, whd_security
         ssid_params->SSID_len = htod32(ssid->length);
         memcpy(ssid_params->SSID, ssid->value, ssid_params->SSID_len);
         result = whd_cdc_send_ioctl(ifp, CDC_SET, WLC_SET_SSID, buffer, 0);
+        whd_wifi_join_timeout = timeout;
 
         if (result == WHD_SUCCESS)
         {

connectivity/netsocket/include/netsocket/WiFiInterface.h

@@ -59,6 +59,13 @@ class WiFiInterface: public virtual NetworkInterface {
      */
     virtual nsapi_error_t set_channel(uint8_t channel) = 0;
 
+    /** Set the Wi-Fi network join timeout.
+     *
+     *  @param timeout   joint timeout in milliseconds (Default: 7000).
+     *  @return          NSAPI_ERROR_OK on success, or error code on failure.
+     */
+    virtual nsapi_error_t set_timeout(uint32_t timeout) = 0;
+
     /** Get the current radio signal strength for active connection.
      *
      *  @return         Connection strength in dBm (negative value),