Merge branch 'master' into hk-no-float-validation

Author: hugueskamba

UNITTESTS/features/cellular/framework/AT/at_cellulardevice/unittest.cmake

@@ -43,6 +43,7 @@ set(unittest-test-sources
   stubs/SerialBase_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/CellularContext_stub.cpp
+  stubs/ThisThread_stub.cpp
   stubs/ConditionVariable_stub.cpp
   stubs/Mutex_stub.cpp
 )

components/TARGET_PSA/services/attestation/COMPONENT_PSA_SRV_IMPL/tfm_impl/attestation_core.c

@@ -841,7 +841,6 @@ attest_create_token(struct useful_buf_c *challenge,
     enum attest_token_err_t token_err;
     struct attest_token_ctx attest_token_ctx;
     int32_t key_select;
-    int32_t alg_select;
     uint32_t option_flags = 0;
 
     if (challenge->len == 36) {
@@ -855,14 +854,6 @@ attest_create_token(struct useful_buf_c *challenge,
     /* Lower three bits are the key select */
     key_select = option_flags & 0x7;
 
-    /* Map the key select to an algorithm. Maybe someday we'll support something
-     * other than ES256
-     */
-    switch (key_select) {
-    default:
-        alg_select = COSE_ALGORITHM_ES256;
-    }
-
     /* Get started creating the token. This sets up the CBOR and COSE contexts
      * which causes the COSE headers to be constructed.
      */

components/storage/blockdevice/COMPONENT_SPIF/SPIFBlockDevice.cpp

@@ -19,6 +19,7 @@
 #include "mbed_critical.h"
 
 #include <string.h>
+#include <inttypes.h>
 
 #include "mbed_trace.h"
 #include "mbed_debug.h"

components/wifi/esp8266-driver/ESP8266Interface.cpp

@@ -319,7 +319,7 @@ int ESP8266Interface::set_credentials(const char *ssid, const char *pass, nsapi_
     if (ssid_length > 0
             && ssid_length <= ESP8266_SSID_MAX_LENGTH) {
         memset(ap_ssid, 0, sizeof(ap_ssid));
-        strncpy(ap_ssid, ssid, sizeof(ap_ssid));
+        strncpy(ap_ssid, ssid, ESP8266_SSID_MAX_LENGTH);
     } else {
         return NSAPI_ERROR_PARAMETER;
     }
@@ -438,7 +438,7 @@ int ESP8266Interface::scan(WiFiAccessPoint *res, unsigned count, scan_mode mode,
     }
 
     return _esp.scan(res, count, (mode == SCANMODE_ACTIVE ? ESP8266::SCANMODE_ACTIVE : ESP8266::SCANMODE_PASSIVE),
-                     t_min, t_max);
+                     t_max, t_min);
 }
 
 bool ESP8266Interface::_get_firmware_ok()

drivers/source/usb/USBDevice.cpp

@@ -616,7 +616,7 @@ bool USBDevice::_request_setup()
     bool success = false;
 
     /* Process standard requests */
-    if ((_transfer.setup.bmRequestType.Type == STANDARD_TYPE)) {
+    if (_transfer.setup.bmRequestType.Type == STANDARD_TYPE) {
         switch (_transfer.setup.bRequest) {
             case GET_STATUS:
                 success = _request_get_status();

features/cellular/framework/AT/ATHandler.cpp

@@ -926,7 +926,7 @@ void ATHandler::set_3gpp_error(int err, DeviceErrorType error_type)
         for (size_t i = 0; i < sizeof(map_3gpp_errors) / sizeof(map_3gpp_errors[0]); i++) {
             if (map_3gpp_errors[i][0] == err) {
                 _last_3gpp_error = map_3gpp_errors[i][1];
-                tr_debug("AT3GPP error code %d", get_3gpp_error());
+                tr_error("AT3GPP error code %d", get_3gpp_error());
                 break;
             }
         }
@@ -943,7 +943,7 @@ void ATHandler::at_error(bool error_code_expected, DeviceErrorType error_type)
             set_3gpp_error(err, error_type);
             _last_at_err.errCode = err;
             _last_at_err.errType = error_type;
-            tr_error("AT error code %ld", err);
+            tr_warn("AT error code %ld", err);
         } else {
             tr_warn("ATHandler ERROR reading failed");
         }
@@ -1394,7 +1394,7 @@ void ATHandler::write_int(int32_t param)
     // write the integer subparameter
     const int32_t str_len = 12;
     char number_string[str_len];
-    int32_t result = sprintf(number_string, "%ld", param);
+    int32_t result = sprintf(number_string, "%" PRIi32, param);
     if (result > 0 && result < str_len) {
         (void)write(number_string, strlen(number_string));
     }

features/cellular/framework/AT/AT_CellularBase.cpp

@@ -51,6 +51,6 @@ intptr_t AT_CellularBase::get_property(CellularProperty key)
     if (_property_array) {
         return _property_array[key];
     } else {
-        return NULL;
+        return 0;
     }
 }

features/cellular/framework/AT/AT_CellularContext.cpp

@@ -608,6 +608,7 @@ nsapi_error_t AT_CellularContext::open_data_channel()
                   connected, or timeout after 30 seconds*/
     nsapi_error_t err = nsapi_ppp_connect(_at.get_file_handle(), callback(this, &AT_CellularContext::ppp_status_cb), _uname, _pwd, (nsapi_ip_stack_t)_pdp_type);
     if (err) {
+        tr_error("nsapi_ppp_connect failed");
         ppp_disconnected();
     }
 
@@ -993,6 +994,7 @@ void AT_CellularContext::cellular_callback(nsapi_event_t ev, intptr_t ptr)
                 tr_info("cellular_callback: PPP mode and NSAPI_STATUS_DISCONNECTED");
                 _cb_data.error = NSAPI_ERROR_NO_CONNECTION;
                 _is_connected = false;
+                ppp_disconnected();
             }
         }
 #else

features/cellular/framework/AT/AT_CellularDevice.cpp

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+#include "rtos/ThisThread.h"
 #include "CellularUtil.h"
 #include "AT_CellularDevice.h"
 #include "AT_CellularInformation.h"
@@ -202,6 +203,7 @@ nsapi_error_t AT_CellularDevice::get_sim_state(SimState &state)
     _at->flush();
     nsapi_error_t error = _at->at_cmd_str("+CPIN", "?", simstr, sizeof(simstr));
     ssize_t len = strlen(simstr);
+    device_err_t err = _at->get_last_device_error();
     _at->unlock();
 
     if (len != -1) {
@@ -213,7 +215,6 @@ nsapi_error_t AT_CellularDevice::get_sim_state(SimState &state)
             state = SimStatePukNeeded;
         } else {
             simstr[len] = '\0';
-            tr_error("Unknown SIM state %s", simstr);
             state = SimStateUnknown;
         }
     } else {
@@ -229,7 +230,11 @@ nsapi_error_t AT_CellularDevice::get_sim_state(SimState &state)
             tr_error("SIM PUK required");
             break;
         case SimStateUnknown:
-            tr_warn("SIM state unknown");
+            if (err.errType == DeviceErrorTypeErrorCME && err.errCode == 14) {
+                tr_info("SIM busy");
+            } else {
+                tr_warn("SIM state unknown");
+            }
             break;
         default:
             tr_info("SIM is ready");
@@ -443,12 +448,18 @@ nsapi_error_t AT_CellularDevice::init()
     setup_at_handler();
 
     _at->lock();
-    _at->flush();
-    _at->at_cmd_discard("E0", "");
-
-    _at->at_cmd_discard("+CMEE", "=1");
-
-    _at->at_cmd_discard("+CFUN", "=1");
+    for (int retry = 1; retry <= 3; retry++) {
+        _at->clear_error();
+        _at->flush();
+        _at->at_cmd_discard("E0", "");
+        _at->at_cmd_discard("+CMEE", "=1");
+        _at->at_cmd_discard("+CFUN", "=1");
+        if (_at->get_last_error() == NSAPI_ERROR_OK) {
+            break;
+        }
+        tr_debug("Wait 100ms to init modem");
+        rtos::ThisThread::sleep_for(100); // let modem have time to get ready
+    }
 
     return _at->unlock_return_error();
 }

features/cellular/framework/AT/AT_CellularNetwork.cpp

@@ -211,8 +211,9 @@ nsapi_error_t AT_CellularNetwork::set_registration(const char *plmn)
     if (!plmn) {
         tr_debug("Automatic network registration");
         NWRegisteringMode mode;
-        get_network_registering_mode(mode);
-
+        if (get_network_registering_mode(mode) != NSAPI_ERROR_OK) {
+            return NSAPI_ERROR_DEVICE_ERROR;
+        }
         if (mode != NWModeAutomatic) {
             return _at.at_cmd_discard("+COPS", "=0");
         }