wifi - Removed asynchronous functions

Current asynchronous functions do not match the blocking/attach
pattern of the current codebase.

Unfortunately, the asynchronous api can not be updated in the
current time constraints. The async functions will be removed
for now and can be reconsidered at a later date.

Author: geky

features/net/network-socket/WiFiInterface.cpp

@@ -39,51 +39,45 @@ class WiFiInterface: public NetworkInterface
 
     /** WiFiInterface lifetime
      */
-    WiFiInterface();
-    virtual ~WiFiInterface();
+    virtual ~WiFiInterface() {};
 
     /** Set the WiFi network credentials
      *
-     *  @param ssid     Name of the network to connect to
-     *  @param pass     Security passphrase to connect to the network
-     *  @param security Type of encryption for connection
-     *                  (defaults to NSAPI_SECURITY_NONE)
+     *  @param ssid      Name of the network to connect to
+     *  @param pass      Security passphrase to connect to the network
+     *  @param security  Type of encryption for connection
+     *                   (defaults to NSAPI_SECURITY_NONE)
+     *  @return          0 on success, or error code on failure
      */
-    virtual int set_credentials(const char *ssid, const char *pass, nsapi_security_t security = NSAPI_SECURITY_NONE);
+    virtual int set_credentials(const char *ssid, const char *pass, nsapi_security_t security = NSAPI_SECURITY_NONE) = 0;
 
-    /** Start the interface
+    /** Set the WiFi network channel
      *
-     *  Attempts to connect to a WiFi network.
-     *
-     *  @param ssid      Name of the network to connect to
-     *  @param pass      Security passphrase to connect to the network
-     *  @param security  Type of encryption for connection (Default: NSAPI_SECURITY_NONE)
      *  @param channel   Channel on which the connection is to be made, or 0 for any (Default: 0)
-     *  @param timeout   Timeout in milliseconds; 0 for no timeout (Default: 0)
      *  @return          0 on success, or error code on failure
      */
-    virtual int connect(const char *ssid, const char *pass, nsapi_security_t security = NSAPI_SECURITY_NONE,
-                                  uint8_t channel = 0, unsigned timeout = 0) = 0;
+    virtual int set_channel(uint8_t channel) = 0;
 
-    /** Start the interface
+    /** Gets the current radio signal strength for active connection
      *
-     *  Attempts to connect to a WiFi network asynchronously, the call will return straight away. If the @a cb was NULL
-     *  you'll need to query @a get_state until it's in NSAPI_IF_STATE_CONNECTED state, otherwise the @a cb will be
-     *  called with connection results, connected AP details and user data.
+     *  @return         Connection strength in dBm (negative value),
+     *                  or 0 if measurement impossible
+     */
+    virtual int8_t get_rssi() = 0;
+
+    /** Start the interface
      *
-     *  Note: @a ssid and @a pass must be kept until the connection is made, that is the callback has been called or the
-     *        state changed to @a NSAPI_IF_STATE_CONNECTED as they are passed by value.
+     *  Attempts to connect to a WiFi network.
      *
      *  @param ssid      Name of the network to connect to
      *  @param pass      Security passphrase to connect to the network
-     *  @param channel   Channel on which the connection is to be made, or 0 for any (Default: 0)
      *  @param security  Type of encryption for connection (Default: NSAPI_SECURITY_NONE)
-     *  @param cb        Function to be called when the connect finishes (Default: NULL)
-     *  @param timeout   Timeout in milliseconds; 0 for no timeout (Default: 0)
+     *  @param channel   Channel on which the connection is to be made, or 0 for any (Default: 0)
+     *  @return          0 on success, or error code on failure
      */
-    virtual void connect_async(const char *ssid, const char *pass,nsapi_security_t security = NSAPI_SECURITY_NONE,
-                               uint8_t channel = 0, mbed::Callback<void(nsapi_error_t, wifi_ap_t*)> cb = NULL,
-                               unsigned timeout = 0) = 0;
+    virtual int connect(const char *ssid, const char *pass,
+            nsapi_security_t security = NSAPI_SECURITY_NONE,
+            uint8_t channel = 0);
 
     /** Start the interface
      *
@@ -96,51 +90,24 @@ class WiFiInterface: public NetworkInterface
 
     /** Stop the interface
      *
-     *  @return          0 on success, or error code on failure
+     *  @return         0 on success, or error code on failure
      */
     virtual int disconnect() = 0;
 
-    /** Get the current WiFi interface state
-     *
-     * @returns         Interface state enum
-     */
-    virtual nsapi_if_state_t get_state() = 0;
-
-    /** Gets the current radio signal strength for active connection
-     *
-     * @return Connection strength in dBm (negative value), or 0 if measurement impossible
-     */
-    virtual int8_t get_rssi() = 0;
-
     /** Scan for available networks
      *
-     * This function will block.
+     *  The scan will 
+     *  If the network interface is set to non-blocking mode, scan will attempt to scan
+     *  for WiFi networks asynchronously and return NSAPI_ERROR_WOULD_BLOCK. If a callback
+     *  is attached, the callback will be called when the operation has completed.
      *
      * @param  ap       Pointer to allocated array to store discovered AP
      * @param  count    Size of allocated @a res array, or 0 to only count available AP
      * @param  timeout  Timeout in milliseconds; 0 for no timeout (Default: 0)
      * @return          Number of entries in @a, or if @a count was 0 number of available networks, negative on error
      *                  see @a nsapi_error
      */
-    virtual int scan(wifi_ap_t *res, unsigned count, unsigned timeout = 0) = 0;
-
-    /** Scan for available networks
-     *
-     * This function won't block, it'll return immediately and call provided callback for each discovered network with
-     * AP data and user @a data. After the last discovered network @a cb will be called with NULL as @a ap, so it
-     * will be always called at least once.
-     *
-     * @param  cb    Function to be called for every discovered network
-     * @param  data  User handle that will be passed to @a cb along with the AP data (Default: NULL)
-     * @param  timeout  Timeout in milliseconds; 0 for no timeout (Default: 0)
-     */
-    virtual void scan_async(mbed::Callback<void(wifi_ap_t*)> cb, unsigned timeout = 0) = 0;
-
-protected:
-    char *_ssid;
-    char *_pass;
-    nsapi_security_t _security;
-    char _ip_address[16]; //IPv4 only thus 16
+    virtual int scan(wifi_ap_t *res, unsigned count) = 0;
 };
 
 #endif

features/net/network-socket/WiFiInterface.h

@@ -40,12 +40,11 @@ typedef enum nsapi_error {
     NSAPI_ERROR_NO_SOCKET     = -3005,     /*!< socket not available for use */
     NSAPI_ERROR_NO_ADDRESS    = -3006,     /*!< IP address is not known */
     NSAPI_ERROR_NO_MEMORY     = -3007,     /*!< memory resource not available */
-    NSAPI_ERROR_DNS_FAILURE   = -3008,     /*!< DNS failed to complete successfully */
-    NSAPI_ERROR_DHCP_FAILURE  = -3009,     /*!< DHCP failed to complete successfully */
-    NSAPI_ERROR_AUTH_FAILURE  = -3010,     /*!< connection to access point failed */
-    NSAPI_ERROR_DEVICE_ERROR  = -3011,     /*!< failure interfacing with the network processor */
-    NSAPI_ERROR_TIMEOUT       = -3012,     /*!< operation timed out */
-    NSAPI_ERROR_NO_SSID      = -3013,      /*!< ssid not found */
+    NSAPI_ERROR_NO_SSID       = -3008,     /*!< ssid not found */
+    NSAPI_ERROR_DNS_FAILURE   = -3009,     /*!< DNS failed to complete successfully */
+    NSAPI_ERROR_DHCP_FAILURE  = -3010,     /*!< DHCP failed to complete successfully */
+    NSAPI_ERROR_AUTH_FAILURE  = -3011,     /*!< connection to access point failed */
+    NSAPI_ERROR_DEVICE_ERROR  = -3012,     /*!< failure interfacing with the network processor */
 } nsapi_error_t;
 
 /** Enum of encryption types
@@ -62,17 +61,6 @@ typedef enum nsapi_security {
     NSAPI_SECURITY_UNSSUPPORTED = 0xFF,     /*!< unknown/unsupported security in scan results */
 } nsapi_security_t;
 
-/** Enum of interface states
- *
- * List of all possible states a WiFi network interface can be in
- */
-typedef enum nsapi_if_state {
-    NSAPI_IF_STATE_NOT_CONNECTED = 0x0,
-    NSAPI_IF_STATE_CONNECTING    = 0x01,
-    NSAPI_IF_STATE_CONNECTED     = 0x02,
-    NSAPI_IF_STATE_ERROR         = 0xFF
-} nsapi_if_state_t;
-
 /** Maximum size of IP address representation
  */
 #define NSAPI_IP_SIZE NSAPI_IPv6_SIZE