ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12507 from variablo87/cellular-context-semaphore-release 

Cellular: release _semaphore only once
pull/12597/head
Martin Kojtal 2020-03-09 07:14:47 +00:00 committed by GitHub
parent 1f2e66dd49 327445a00b
commit c17f32f04e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/cellular/framework/AT/AT_CellularContext.cpp
View File

@ -886,11 +886,7 @@ void AT_CellularContext::cellular_callback(nsapi_event_t ev, intptr_t ptr)
cellular_connection_status_t st = (cellular_connection_status_t)ev; cellular_connection_status_t st = (cellular_connection_status_t)ev;
_cb_data.error = data->error; _cb_data.error = data->error;
_cb_data.final_try = data->final_try; _cb_data.final_try = data->final_try;
if (data->final_try) {
if (_current_op != OP_INVALID) {
_semaphore.release();
}
}
#if MBED_CONF_CELLULAR_USE_APN_LOOKUP #if MBED_CONF_CELLULAR_USE_APN_LOOKUP
if (st == CellularSIMStatusChanged && data->status_data == CellularDevice::SimStateReady && if (st == CellularSIMStatusChanged && data->status_data == CellularDevice::SimStateReady &&
_cb_data.error == NSAPI_ERROR_OK) { _cb_data.error == NSAPI_ERROR_OK) {
@ -937,7 +933,7 @@ void AT_CellularContext::cellular_callback(nsapi_event_t ev, intptr_t ptr)
#endif #endif
if (_is_blocking) { if (_is_blocking) {
if (_cb_data.error != NSAPI_ERROR_OK) { if ((data->final_try) || (_cb_data.error != NSAPI_ERROR_OK)) {
// operation failed, release semaphore // operation failed, release semaphore
if (_current_op != OP_INVALID) { if (_current_op != OP_INVALID) {
_current_op = OP_INVALID; _current_op = OP_INVALID;