Diff: LWIPBP3595Interface.cpp

Revision:

5:d03489ec5033

Parent:

4:b49b4b36aaa4

Child:

6:993197aaf5a4

--- a/LWIPBP3595Interface.cpp	Fri Oct 28 06:27:14 2016 +0000
+++ b/LWIPBP3595Interface.cpp	Thu Nov 24 09:13:23 2016 +0000
@@ -85,7 +85,9 @@
         return NSAPI_ERROR_AUTH_FAILURE;
     }
 
-    if ((security == NSAPI_SECURITY_WPA) || (security == NSAPI_SECURITY_WPA2)) {
+    if ((security == NSAPI_SECURITY_WPA)
+     || (security == NSAPI_SECURITY_WPA2)
+     || (security == NSAPI_SECURITY_WPA_WPA2)) {
         // Set PSK
         tBAWidData.pucData = (grp_u8 *)pass;
         tBAWidData.ulSize  = strlen((char *)tBAWidData.pucData);
@@ -145,22 +147,22 @@
 {
 }
 
-int LWIPBP3595Interface::set_network(const char *ip_address, const char *netmask, const char *gateway)
+nsapi_error_t LWIPBP3595Interface::set_network(const char *ip_address, const char *netmask, const char *gateway)
 {
     _dhcp = false;
     strncpy(_ip_address, ip_address ? ip_address : "", sizeof(_ip_address));
     strncpy(_netmask, netmask ? netmask : "", sizeof(_netmask));
     strncpy(_gateway, gateway ? gateway : "", sizeof(_gateway));
-    return 0;
+    return NSAPI_ERROR_OK;
 }
 
-int LWIPBP3595Interface::set_dhcp(bool dhcp)
+nsapi_error_t LWIPBP3595Interface::set_dhcp(bool dhcp)
 {
     _dhcp = dhcp;
-    return 0;
+    return NSAPI_ERROR_OK;
 }
 
-int LWIPBP3595Interface::set_credentials(const char *ssid, const char *pass, nsapi_security_t security)
+nsapi_error_t LWIPBP3595Interface::set_credentials(const char *ssid, const char *pass, nsapi_security_t security)
 {
     memset(_ssid, 0, sizeof(_ssid));
     strncpy(_ssid, ssid, sizeof(_ssid));
@@ -173,7 +175,7 @@
     return 0;
 }
 
-int LWIPBP3595Interface::set_channel(uint8_t channel)
+nsapi_error_t LWIPBP3595Interface::set_channel(uint8_t channel)
 {
     int     ret;
     grp_u8  ucWidData8;     // 8bit wid data
@@ -209,14 +211,14 @@
     return 0;
 }
 
-int LWIPBP3595Interface::connect(const char *ssid, const char *pass, nsapi_security_t security, uint8_t channel)
+nsapi_error_t LWIPBP3595Interface::connect(const char *ssid, const char *pass, nsapi_security_t security, uint8_t channel)
 {
     set_credentials(ssid, pass, security);
     set_channel(channel);
     return connect();
 }
 
-int LWIPBP3595Interface::connect()
+nsapi_error_t LWIPBP3595Interface::connect()
 {
     int ret;
 
@@ -231,12 +233,12 @@
             _gateway[0] ? _gateway : 0);
 }
 
-int LWIPBP3595Interface::disconnect()
+nsapi_error_t LWIPBP3595Interface::disconnect()
 {
     return mbed_lwip_wifi_bringdown();
 }
 
-int LWIPBP3595Interface::scan(WiFiAccessPoint *res, unsigned count)
+nsapi_size_or_error_t LWIPBP3595Interface::scan(WiFiAccessPoint *res, unsigned count)
 {
     int     cnt;
     int     ret;
@@ -325,7 +327,7 @@
         return _ip_address;
     }
 
-    return 0;
+    return NULL;
 }
 
 const char *LWIPBP3595Interface::get_netmask()
@@ -334,7 +336,7 @@
         return _netmask;
     }
 
-    return 0;
+    return NULL;
 }
 
 const char *LWIPBP3595Interface::get_gateway()
@@ -343,7 +345,7 @@
         return _gateway;
     }
 
-    return 0;
+    return NULL;
 }
 
 NetworkStack *LWIPBP3595Interface::get_stack()