Skip to content

Commit 2fad154

Browse files
0xc01700xc0170
authored
Merge pull request #10116 from 0xc0170/rollup
Rollup pt2: fixes for 5.12.1
2 parents 91b81c6 + 686095e commit 2fad154

File tree

22 files changed

+72
-151
lines changed

22 files changed

+72
-151
lines changed

‎TESTS/mbed-crypto/sanity/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -438,9 +438,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t
438438

439439
utest::v1::status_t test_setup(const size_t number_of_cases)
440440
{
441-
#ifndef NO_GREENTEA
442441
GREENTEA_SETUP(120, "default_auto");
443-
#endif
444442
return verbose_test_setup_handler(number_of_cases);
445443
}
446444

‎TESTS/mbed_hal/spm/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,7 @@ Case cases[] = {
150150

151151
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
152152
{
153-
#ifndef NO_GREENTEA
154153
GREENTEA_SETUP(20, "default_auto");
155-
#endif
156154
return greentea_test_setup_handler(number_of_cases);
157155
}
158156

‎TESTS/psa/attestation/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,7 @@ using namespace utest::v1;
4444

4545
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
4646
{
47-
#ifndef NO_GREENTEA
4847
GREENTEA_SETUP(60, "default_auto");
49-
#endif
5048
return greentea_test_setup_handler(number_of_cases);
5149
}
5250

‎TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -468,9 +468,7 @@ utest::v1::status_t case_teardown_handler(const Case *const source, const size_t
468468

469469
utest::v1::status_t test_setup(const size_t number_of_cases)
470470
{
471-
#ifndef NO_GREENTEA
472471
GREENTEA_SETUP(120, "default_auto");
473-
#endif
474472
return verbose_test_setup_handler(number_of_cases);
475473
}
476474

‎TESTS/psa/crypto_init/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@ using namespace utest::v1;
4141

4242
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
4343
{
44-
#ifndef NO_GREENTEA
4544
GREENTEA_SETUP(60, "default_auto");
46-
#endif
4745
return greentea_test_setup_handler(number_of_cases);
4846
}
4947

‎TESTS/psa/entropy_inject/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,7 @@ void run_entropy_inject_with_crypto_init()
9292

9393
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
9494
{
95-
#ifndef NO_GREENTEA
9695
GREENTEA_SETUP(60, "default_auto");
97-
#endif
9896

9997
/* fill seed in some data */
10098
for (size_t i = 0; i < sizeof(seed); ++i) {

‎TESTS/psa/its_ps/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,7 @@ Case cases[] = {
184184

185185
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)
186186
{
187-
#ifndef NO_GREENTEA
188187
GREENTEA_SETUP(60, "default_auto");
189-
#endif
190188
return greentea_test_setup_handler(number_of_cases);
191189
}
192190

‎TESTS/psa/spm_client/COMPONENT_NSPE/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,9 +475,7 @@ Case cases[] = {
475475
utest::v1::status_t test_setup(const size_t number_of_cases)
476476
{
477477
// Setup Greentea using a reasonable timeout in seconds
478-
#ifndef NO_GREENTEA
479478
GREENTEA_SETUP(60, "default_auto");
480-
#endif
481479
return verbose_test_setup_handler(number_of_cases);
482480
}
483481

‎TESTS/psa/spm_server/COMPONENT_NSPE/main.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,7 @@ utest::v1::status_t spm_setup(const size_t number_of_cases)
213213
error("Could not open a connection with SERVER_TESTS_PART1_CONTROL ROT_SRV");
214214
}
215215

216-
#ifndef NO_GREENTEA
217216
GREENTEA_SETUP(60, "default_auto");
218-
#endif
219217
return greentea_test_setup_handler(number_of_cases);
220218
}
221219

‎TESTS/psa/spm_smoke/COMPONENT_NSPE/main.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ void example_main(void)
7474

7575
utest::v1::status_t greentea_setup(const size_t number_of_cases)
7676
{
77-
#ifndef NO_GREENTEA
7877
GREENTEA_SETUP(20, "default_auto");
79-
#endif
80-
// Call the default reporting function
8178
return greentea_test_setup_handler(number_of_cases);
8279
}
8380

‎UNITTESTS/features/cellular/framework/device/cellularstatemachine/cellularstatemachinetest.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ enum UT_CellularState {
3434
UT_STATE_DEVICE_READY,
3535
UT_STATE_SIM_PIN,
3636
UT_STATE_REGISTERING_NETWORK,
37-
UT_STATE_MANUAL_REGISTERING_NETWORK,
3837
UT_STATE_ATTACHING_NETWORK,
3938
UT_STATE_MAX_FSM_STATE
4039
};
@@ -392,8 +391,8 @@ TEST_F(TestCellularStateMachine, test_run_to_state)
392391
ut.set_plmn("12345");
393392
ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_registered());
394393
(void)ut.get_current_status(current_state, target_state);
395-
ASSERT_EQ(UT_STATE_MANUAL_REGISTERING_NETWORK, current_state);
396-
ASSERT_EQ(UT_STATE_MANUAL_REGISTERING_NETWORK, target_state);
394+
ASSERT_EQ(UT_STATE_REGISTERING_NETWORK, current_state);
395+
ASSERT_EQ(UT_STATE_REGISTERING_NETWORK, target_state);
397396
ut.cellular_event_changed((nsapi_event_t)CellularRegistrationStatusChanged, (intptr_t)&data);
398397
ut.reset();
399398

‎features/FEATURE_BLE/targets/TARGET_CORDIO/driver/CordioHCIDriver.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,11 @@ void CordioHCIDriver::handle_reset_sequence(uint8_t *pMsg)
223223
} break;
224224

225225
case HCI_OPCODE_LE_WRITE_DEF_DATA_LEN:
226+
/* send next command in sequence */
227+
HciReadLocalVerInfoCmd();
228+
break;
229+
230+
case HCI_OPCODE_READ_LOCAL_VER_INFO:
226231
if (hciCoreCb.extResetSeq) {
227232
/* send first extended command */
228233
(*hciCoreCb.extResetSeq)(pMsg, opcode);

‎features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioGattServer.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,10 @@ ble_error_t GattServer::insert_descriptor(
488488
#endif // BLE_FEATURE_SECURE_CONNECTIONS
489489
#endif // BLE_FEATURE_SECURITY
490490
}
491+
492+
if (properties & READ_PROPERTY) {
493+
attribute_it->settings |= ATTS_SET_READ_CBACK;
494+
}
491495
}
492496

493497
// configure write permission
@@ -517,6 +521,10 @@ ble_error_t GattServer::insert_descriptor(
517521
#endif // BLE_FEATURE_SECURE_CONNECTIONS
518522
#endif // BLE_FEATURE_SECURITY
519523
}
524+
525+
if (properties & WRITABLE_PROPERTIES) {
526+
attribute_it->settings |= ATTS_SET_WRITE_CBACK;
527+
}
520528
}
521529

522530
attribute_it++;

‎features/cellular/framework/AT/AT_CellularNetwork.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ void AT_CellularNetwork::read_reg_params_and_compare(RegistrationType type)
171171
reg_params._status == RegisteredRoaming)) {
172172
if (previous_registration_status == RegisteredHomeNetwork ||
173173
previous_registration_status == RegisteredRoaming) {
174-
call_network_cb(NSAPI_STATUS_DISCONNECTED);
174+
if (type != C_REG) {// we are interested only if we drop from packet network
175+
_connection_status_cb(NSAPI_EVENT_CONNECTION_STATUS_CHANGE, NSAPI_STATUS_DISCONNECTED);
176+
}
175177
}
176178
}
177179
}
@@ -268,6 +270,9 @@ nsapi_error_t AT_CellularNetwork::set_registration(const char *plmn)
268270
tr_debug("Manual network registration to %s", plmn);
269271
_at.cmd_start("AT+COPS=1,2,");
270272
_at.write_string(plmn);
273+
if (_op_act != RAT_UNKNOWN) {
274+
_at.write_int(_op_act);
275+
}
271276
_at.cmd_stop_read_resp();
272277
}
273278

0 commit comments

Comments
 (0)